From 1109b4cb35a37ac09cca4754e9e822ea81d0ce07 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Mon, 4 Feb 2013 15:03:24 +0530
Subject: [PATCH 001/164] [IMP]add session tag for yaml and based on session
 user whole yaml tested

bzr revid: sgo@tinyerp.com-20130204093324-6jdty26tepmvjhhs
---
 .../addons/base/security/ir.model.access.csv    |  2 +-
 openerp/tools/yaml_import.py                    | 17 ++++++++++++++---
 openerp/tools/yaml_tag.py                       | 13 +++++++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv
index 35d5b82bc41..3a29108d61e 100644
--- a/openerp/addons/base/security/ir.model.access.csv
+++ b/openerp/addons/base/security/ir.model.access.csv
@@ -17,7 +17,7 @@
 "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_data_all","ir_model_data all","model_ir_model_data",,1,1,1,1
 "access_ir_model_fields_all","ir_model_fields all","model_ir_model_fields",,1,0,0,0
 "access_ir_module_category_group_user","ir_module_category group_user","model_ir_module_category",,1,0,0,0
 "access_ir_module_module_group_user","ir_module_module group_user","model_ir_module_module","group_system",1,1,1,1
diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index 3172caac1f4..1629ee1b9be 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -88,6 +88,9 @@ def is_ir_set(node):
 def is_string(node):
     return isinstance(node, basestring)
 
+def is_session(node):
+    return _is_yaml_mapping(node, yaml_tag.Session)
+
 class RecordDictWrapper(dict):
     """
     Used to pass a record as locals in eval:
@@ -324,7 +327,7 @@ class YamlInterpreter(object):
 
             record_dict = self._create_record(model, fields, view_info, default=default)
             _logger.debug("RECORD_DICT %s" % record_dict)
-            id = self.pool.get('ir.model.data')._update(self.cr, SUPERUSER_ID, record.model, \
+            id = self.pool.get('ir.model.data')._update(self.cr, self.uid, record.model, \
                     self.module, record_dict, record.id, noupdate=self.isnoupdate(record), mode=self.mode, context=context)
             self.id_map[record.id] = int(id)
             if config.get('import_partial'):
@@ -760,7 +763,7 @@ class YamlInterpreter(object):
             keyword = 'client_action_relate'
             value = 'ir.actions.act_window,%s' % id
             replace = node.replace or True
-            self.pool.get('ir.model.data').ir_set(self.cr, SUPERUSER_ID, 'action', keyword, \
+            self.pool.get('ir.model.data').ir_set(self.cr, self.uid, 'action', keyword, \
                     node.id, [node.src_model], value, replace=replace, noupdate=self.isnoupdate(node), isobject=True, xml_id=node.id)
         # TODO add remove ir.model.data
 
@@ -775,10 +778,16 @@ class YamlInterpreter(object):
                 self.pool.get(node.model).unlink(self.cr, self.uid, ids)
         else:
             self._log("Record not deleted.")
+            
+    def process_session(self, node):
+        record, fields = node.items()[0]
+        uid = self.get_id(record.uid)
+        self.uid = uid
+        _logger.debug("RECORD_DICT %s" % uid)
 
     def process_url(self, node):
         self.validate_xml_id(node.id)
-
+        
         res = {'name': node.name, 'url': node.url, 'target': node.target}
 
         id = self.pool.get('ir.model.data')._update(self.cr, SUPERUSER_ID, \
@@ -889,6 +898,8 @@ class YamlInterpreter(object):
             self.process_act_window(node)
         elif is_report(node):
             self.process_report(node)
+        elif is_session(node):
+            self.process_session(node)
         elif is_workflow(node):
             if isinstance(node, types.DictionaryType):
                 self.process_workflow(node)
diff --git a/openerp/tools/yaml_tag.py b/openerp/tools/yaml_tag.py
index b22787ddf98..c4d5f251479 100644
--- a/openerp/tools/yaml_tag.py
+++ b/openerp/tools/yaml_tag.py
@@ -32,6 +32,13 @@ class Record(YamlTag):
     def __str__(self):
         return '!record {model: %s, id: %s}:' % (str(self.model,), str(self.id,))
 
+class Session(YamlTag):
+    def __init__(self, uid, **kwargs):
+        self.uid = uid
+        super(Session, self).__init__(**kwargs)
+    def __str__(self):
+        return '!session {uid: %s}:' % (str(self.uid,))
+
 class Python(YamlTag):
     def __init__(self, model, severity=logging.ERROR, name="", **kwargs):
         self.model= model
@@ -113,6 +120,11 @@ def record_constructor(loader, node):
     assert "id" in kwargs, "'id' argument is required for !record"
     return Record(**kwargs)
 
+def session_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    assert "uid" in kwargs, "'uid' argument is required for !session"
+    return Session(**kwargs)
+
 def python_constructor(loader, node):
     kwargs = loader.construct_mapping(node)
     return Python(**kwargs)
@@ -182,6 +194,7 @@ def add_constructors():
     yaml.add_constructor(u"!eval", eval_constructor)
     yaml.add_multi_constructor(u"!ref", ref_constructor)
     yaml.add_constructor(u"!ir_set", ir_set_constructor)
+    yaml.add_constructor(u"!session", session_constructor)
 add_constructors()
 
 

From 5ec04f670303a984c53b11bcdc0c0fed0bd51720 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Mon, 4 Feb 2013 15:04:25 +0530
Subject: [PATCH 002/164] [IMP]add yml file based on new session tag which test
 yml as per session user

bzr revid: sgo@tinyerp.com-20130204093425-blivw1198zxhsh2u
---
 addons/sale/__openerp__.py           |  3 ++-
 addons/sale/test/sale_order_demo.yml | 16 ----------------
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 addons/sale/test/sale_order_demo.yml

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 8cc4919e3a1..6ba3a02bb00 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -80,7 +80,8 @@ The Dashboard for the Sales Manager will include
     ],
     'demo': ['sale_demo.xml'],
     'test': [
-        'test/sale_order_demo.yml',
+        'test/sale_order_salesmanager_demo.yml',
+        'test/sale_order_salesman_demo.yml',
         'test/manual_order_policy.yml',
         'test/cancel_order.yml',
         'test/delete_order.yml',
diff --git a/addons/sale/test/sale_order_demo.yml b/addons/sale/test/sale_order_demo.yml
deleted file mode 100644
index 7e5a223e8b0..00000000000
--- a/addons/sale/test/sale_order_demo.yml
+++ /dev/null
@@ -1,16 +0,0 @@
--
-  In order to test process of the Sale Order, I create sale order
--
-  !record {model: sale.order, id: sale_order_test1}:
-    partner_id: base.res_partner_2
-    note: Invoice after delivery
-    payment_term: account.account_payment_term
-    order_line: 
-      - product_id: product.product_product_7
-        product_uom_qty: 8
--
-  I verify that the onchange was correctly triggered
--
-  !assert {model: sale.order, id: sale.sale_order_test1, string: The onchange function of product was not correctly triggered}:
-    - order_line[0].name == u'[LCD17] 17\u201d LCD Monitor'
-    - order_line[0].price_unit == 1350.0

From 72043cfbc34586a937918ea2ac1a5f7ab177fb25 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Mon, 4 Feb 2013 18:02:12 +0530
Subject: [PATCH 003/164] [ADD]yml files

bzr revid: sgo@tinyerp.com-20130204123212-psghdi2mnp4r2lut
---
 addons/sale/test/sale_order_salesman_demo.yml | 32 +++++++++++++++++++
 .../test/sale_order_salesmanager_demo.yml     | 28 ++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 addons/sale/test/sale_order_salesman_demo.yml
 create mode 100644 addons/sale/test/sale_order_salesmanager_demo.yml

diff --git a/addons/sale/test/sale_order_salesman_demo.yml b/addons/sale/test/sale_order_salesman_demo.yml
new file mode 100644
index 00000000000..4e297249322
--- /dev/null
+++ b/addons/sale/test/sale_order_salesman_demo.yml
@@ -0,0 +1,32 @@
+-
+  In order to test process of the Sale Order, I create sale order
+-
+  Create a user 'Salesman'
+-
+  !record {model: res.users, id: res_users_salesman}:
+    company_id: base.main_company
+    name: Salesman
+    login: su
+    password: su
+    groups_id:
+      - base.group_sale_salesman_all_leads
+-
+  Create a user 'Salesman'
+-
+  Now, check the data with salesman
+-
+  !session {uid: res_users_salesman}:
+-
+  !record {model: sale.order, id: sale_order_test2}:
+    partner_id: base.res_partner_3
+    note: Invoice after delivery
+    payment_term: account.account_payment_term
+    order_line: 
+      - product_id: product.product_product_7
+        product_uom_qty: 7
+-
+  I verify that the onchange was correctly triggered
+-
+  !assert {model: sale.order, id: sale.sale_order_test2, string: The onchange function of product was not correctly triggered}:
+    - order_line[0].name == u'[LCD17] 17\u201d LCD Monitor'
+    - order_line[0].price_unit == 1350.0
diff --git a/addons/sale/test/sale_order_salesmanager_demo.yml b/addons/sale/test/sale_order_salesmanager_demo.yml
new file mode 100644
index 00000000000..f4d7750029d
--- /dev/null
+++ b/addons/sale/test/sale_order_salesmanager_demo.yml
@@ -0,0 +1,28 @@
+-
+  In order to test process of the Sale Order, I create sale order
+-
+  !record {model: res.users, id: res_users_salesmanager}:
+    company_id: base.main_company
+    name: Sales manager
+    login: sm
+    password: sm
+    groups_id:
+      - base.group_sale_manager
+-
+  Now, check the data with sales Manager
+-
+  !session {uid: res_users_salesmanager}:
+-
+  !record {model: sale.order, id: sale_order_test1}:
+    partner_id: base.res_partner_2
+    note: Invoice after delivery
+    payment_term: account.account_payment_term
+    order_line: 
+      - product_id: product.product_product_7
+        product_uom_qty: 8
+-
+  I verify that the onchange was correctly triggered
+-
+  !assert {model: sale.order, id: sale.sale_order_test1, string: The onchange function of product was not correctly triggered}:
+    - order_line[0].name == u'[LCD17] 17\u201d LCD Monitor'
+    - order_line[0].price_unit == 1350.0

From 74a681e9dbafa5759ada82ec9262fe893ed99f9f Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Mon, 18 Feb 2013 11:40:14 +0530
Subject: [PATCH 004/164] [IMP]revert changes as per new spec

bzr revid: sgo@tinyerp.com-20130218061014-lg6uk108vajx43mo
---
 openerp/tools/yaml_import.py | 13 +------------
 openerp/tools/yaml_tag.py    | 13 -------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index 1629ee1b9be..9a8b2a6cd8d 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -88,9 +88,6 @@ def is_ir_set(node):
 def is_string(node):
     return isinstance(node, basestring)
 
-def is_session(node):
-    return _is_yaml_mapping(node, yaml_tag.Session)
-
 class RecordDictWrapper(dict):
     """
     Used to pass a record as locals in eval:
@@ -763,7 +760,7 @@ class YamlInterpreter(object):
             keyword = 'client_action_relate'
             value = 'ir.actions.act_window,%s' % id
             replace = node.replace or True
-            self.pool.get('ir.model.data').ir_set(self.cr, self.uid, 'action', keyword, \
+            self.pool.get('ir.model.data').ir_set(self.cr, SUPERUSER_ID, 'action', keyword, \
                     node.id, [node.src_model], value, replace=replace, noupdate=self.isnoupdate(node), isobject=True, xml_id=node.id)
         # TODO add remove ir.model.data
 
@@ -779,12 +776,6 @@ class YamlInterpreter(object):
         else:
             self._log("Record not deleted.")
             
-    def process_session(self, node):
-        record, fields = node.items()[0]
-        uid = self.get_id(record.uid)
-        self.uid = uid
-        _logger.debug("RECORD_DICT %s" % uid)
-
     def process_url(self, node):
         self.validate_xml_id(node.id)
         
@@ -898,8 +889,6 @@ class YamlInterpreter(object):
             self.process_act_window(node)
         elif is_report(node):
             self.process_report(node)
-        elif is_session(node):
-            self.process_session(node)
         elif is_workflow(node):
             if isinstance(node, types.DictionaryType):
                 self.process_workflow(node)
diff --git a/openerp/tools/yaml_tag.py b/openerp/tools/yaml_tag.py
index c4d5f251479..b22787ddf98 100644
--- a/openerp/tools/yaml_tag.py
+++ b/openerp/tools/yaml_tag.py
@@ -32,13 +32,6 @@ class Record(YamlTag):
     def __str__(self):
         return '!record {model: %s, id: %s}:' % (str(self.model,), str(self.id,))
 
-class Session(YamlTag):
-    def __init__(self, uid, **kwargs):
-        self.uid = uid
-        super(Session, self).__init__(**kwargs)
-    def __str__(self):
-        return '!session {uid: %s}:' % (str(self.uid,))
-
 class Python(YamlTag):
     def __init__(self, model, severity=logging.ERROR, name="", **kwargs):
         self.model= model
@@ -120,11 +113,6 @@ def record_constructor(loader, node):
     assert "id" in kwargs, "'id' argument is required for !record"
     return Record(**kwargs)
 
-def session_constructor(loader, node):
-    kwargs = loader.construct_mapping(node)
-    assert "uid" in kwargs, "'uid' argument is required for !session"
-    return Session(**kwargs)
-
 def python_constructor(loader, node):
     kwargs = loader.construct_mapping(node)
     return Python(**kwargs)
@@ -194,7 +182,6 @@ def add_constructors():
     yaml.add_constructor(u"!eval", eval_constructor)
     yaml.add_multi_constructor(u"!ref", ref_constructor)
     yaml.add_constructor(u"!ir_set", ir_set_constructor)
-    yaml.add_constructor(u"!session", session_constructor)
 add_constructors()
 
 

From 3be3625587d11fbb44f2df3ca0c920d58831ad1b Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Mon, 18 Feb 2013 12:58:21 +0530
Subject: [PATCH 005/164] [IMP]improve code as per new spec

bzr revid: sgo@tinyerp.com-20130218072821-c1x1bwvv1gp77w9t
---
 addons/sale/test/sale_order_salesman_demo.yml     | 3 ++-
 addons/sale/test/sale_order_salesmanager_demo.yml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/sale/test/sale_order_salesman_demo.yml b/addons/sale/test/sale_order_salesman_demo.yml
index 4e297249322..dbaf35c7a8f 100644
--- a/addons/sale/test/sale_order_salesman_demo.yml
+++ b/addons/sale/test/sale_order_salesman_demo.yml
@@ -15,7 +15,8 @@
 -
   Now, check the data with salesman
 -
-  !session {uid: res_users_salesman}:
+  !context
+    'uid': 'res_users_salesman'
 -
   !record {model: sale.order, id: sale_order_test2}:
     partner_id: base.res_partner_3
diff --git a/addons/sale/test/sale_order_salesmanager_demo.yml b/addons/sale/test/sale_order_salesmanager_demo.yml
index f4d7750029d..47bb9081a55 100644
--- a/addons/sale/test/sale_order_salesmanager_demo.yml
+++ b/addons/sale/test/sale_order_salesmanager_demo.yml
@@ -11,7 +11,8 @@
 -
   Now, check the data with sales Manager
 -
-  !session {uid: res_users_salesmanager}:
+  !context
+    'uid': 'res_users_salesmanager'
 -
   !record {model: sale.order, id: sale_order_test1}:
     partner_id: base.res_partner_2

From e983e49f209d4ac7283a6cc034cfbc9e27c3138d Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Mon, 18 Feb 2013 15:40:43 +0530
Subject: [PATCH 006/164] [IMP]improve code

bzr revid: sgo@tinyerp.com-20130218101043-7hy8m5goylr7fv2t
---
 addons/sale/test/sale_order_salesman_demo.yml     | 6 ++----
 addons/sale/test/sale_order_salesmanager_demo.yml | 4 +++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/sale/test/sale_order_salesman_demo.yml b/addons/sale/test/sale_order_salesman_demo.yml
index dbaf35c7a8f..56c781d1451 100644
--- a/addons/sale/test/sale_order_salesman_demo.yml
+++ b/addons/sale/test/sale_order_salesman_demo.yml
@@ -1,7 +1,7 @@
 -
   In order to test process of the Sale Order, I create sale order
 -
-  Create a user 'Salesman'
+  Create a user as 'Salesman'
 -
   !record {model: res.users, id: res_users_salesman}:
     company_id: base.main_company
@@ -10,13 +10,11 @@
     password: su
     groups_id:
       - base.group_sale_salesman_all_leads
--
-  Create a user 'Salesman'
 -
   Now, check the data with salesman
 -
   !context
-    'uid': 'res_users_salesman'
+    uid: 'res_users_salesman'
 -
   !record {model: sale.order, id: sale_order_test2}:
     partner_id: base.res_partner_3
diff --git a/addons/sale/test/sale_order_salesmanager_demo.yml b/addons/sale/test/sale_order_salesmanager_demo.yml
index 47bb9081a55..f09e1327a75 100644
--- a/addons/sale/test/sale_order_salesmanager_demo.yml
+++ b/addons/sale/test/sale_order_salesmanager_demo.yml
@@ -1,5 +1,7 @@
 -
   In order to test process of the Sale Order, I create sale order
+-
+    Create a user as 'Salesmanager'
 -
   !record {model: res.users, id: res_users_salesmanager}:
     company_id: base.main_company
@@ -12,7 +14,7 @@
   Now, check the data with sales Manager
 -
   !context
-    'uid': 'res_users_salesmanager'
+    uid: 'res_users_salesmanager'
 -
   !record {model: sale.order, id: sale_order_test1}:
     partner_id: base.res_partner_2

From 095af7d4932006e94ec30d06889ea6e86594c3b4 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Mon, 18 Feb 2013 17:02:38 +0530
Subject: [PATCH 007/164] [IMP]remove extra spaces

bzr revid: sgo@tinyerp.com-20130218113238-x6wf0vxjmv0etwft
---
 openerp/tools/yaml_import.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index 9a8b2a6cd8d..46168f40bae 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -775,10 +775,9 @@ class YamlInterpreter(object):
                 self.pool.get(node.model).unlink(self.cr, self.uid, ids)
         else:
             self._log("Record not deleted.")
-            
+
     def process_url(self, node):
         self.validate_xml_id(node.id)
-        
         res = {'name': node.name, 'url': node.url, 'target': node.target}
 
         id = self.pool.get('ir.model.data')._update(self.cr, SUPERUSER_ID, \

From 83af08294e7ca5b0f788ea99822a19ba4fd0660f Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 19 Feb 2013 12:57:34 +0530
Subject: [PATCH 008/164] [IMP]improve yaml for cancel order

bzr revid: sgo@tinyerp.com-20130219072734-70093wqxyory3arz
---
 addons/sale/__openerp__.py                      |  2 +-
 ..._order.yml => cancel_order_sale_manager.yml} | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)
 rename addons/sale/test/{cancel_order.yml => cancel_order_sale_manager.yml} (89%)

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 6ba3a02bb00..26014e8cadd 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -83,7 +83,7 @@ The Dashboard for the Sales Manager will include
         'test/sale_order_salesmanager_demo.yml',
         'test/sale_order_salesman_demo.yml',
         'test/manual_order_policy.yml',
-        'test/cancel_order.yml',
+        'test/cancel_order_sale_manager.yml',
         'test/delete_order.yml',
         'test/edi_sale_order.yml',
     ],
diff --git a/addons/sale/test/cancel_order.yml b/addons/sale/test/cancel_order_sale_manager.yml
similarity index 89%
rename from addons/sale/test/cancel_order.yml
rename to addons/sale/test/cancel_order_sale_manager.yml
index 12b28fcb7e8..78a3af6113b 100644
--- a/addons/sale/test/cancel_order.yml
+++ b/addons/sale/test/cancel_order_sale_manager.yml
@@ -3,7 +3,21 @@
   I confirm order (with at least 2 lines)
 -
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_8}
-
+-
+    Create a user as 'Salesmanager for cancel order'
+-
+  !record {model: res.users, id: res_users_can_so}:
+    company_id: base.main_company
+    name: Sales manager for cancel
+    login: smc
+    password: smc
+    groups_id:
+      - base.group_sale_manager
+-
+  Now, check the data with sales Manager for cancel order.
+-
+  !context
+    uid: 'res_users_can_so'
 -
   I check state of order in 'Sale Order'.
 -
@@ -32,6 +46,7 @@
     ctx = context.copy()
     ctx.update({"active_model": 'sale.order', "active_ids": [ref("sale_order_8")], "active_id":ref("sale_order_8")})
     pay_id = self.create(cr, uid, {'advance_payment_method': 'fixed', 'amount': 5})
+    print ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>.",uid
     self.create_invoices(cr, uid, [pay_id], context=ctx)
     invoice_ids = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_8")).invoice_ids
 

From 3e01083a1bb6bac3e2b46734cbd154a685283634 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 19 Feb 2013 14:23:28 +0530
Subject: [PATCH 009/164] [IMP]improve code

bzr revid: sgo@tinyerp.com-20130219085328-um1q8bs4iw773ivs
---
 addons/sale/test/cancel_order_sale_manager.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/sale/test/cancel_order_sale_manager.yml b/addons/sale/test/cancel_order_sale_manager.yml
index 78a3af6113b..770d1a5924d 100644
--- a/addons/sale/test/cancel_order_sale_manager.yml
+++ b/addons/sale/test/cancel_order_sale_manager.yml
@@ -46,7 +46,6 @@
     ctx = context.copy()
     ctx.update({"active_model": 'sale.order', "active_ids": [ref("sale_order_8")], "active_id":ref("sale_order_8")})
     pay_id = self.create(cr, uid, {'advance_payment_method': 'fixed', 'amount': 5})
-    print ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>.",uid
     self.create_invoices(cr, uid, [pay_id], context=ctx)
     invoice_ids = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_8")).invoice_ids
 

From d4a1cec260ffa9fb1c10430df6e8c38880ecaf6a Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 19 Feb 2013 18:49:21 +0530
Subject: [PATCH 010/164] [IMP]improve code and yml

bzr revid: sgo@tinyerp.com-20130219131921-nbfs273xujvriomu
---
 addons/sale/__openerp__.py                    |  4 +-
 addons/sale/test/create_sale_users.yml        | 20 +++++++++
 addons/sale/test/sale_order_demo.yml          | 41 +++++++++++++++++++
 .../test/sale_order_salesmanager_demo.yml     | 31 --------------
 4 files changed, 63 insertions(+), 33 deletions(-)
 create mode 100644 addons/sale/test/create_sale_users.yml
 create mode 100644 addons/sale/test/sale_order_demo.yml
 delete mode 100644 addons/sale/test/sale_order_salesmanager_demo.yml

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 6ba3a02bb00..2bea86b41af 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -80,8 +80,8 @@ The Dashboard for the Sales Manager will include
     ],
     'demo': ['sale_demo.xml'],
     'test': [
-        'test/sale_order_salesmanager_demo.yml',
-        'test/sale_order_salesman_demo.yml',
+        'test/create_sale_users.yml',
+        'test/sale_order_demo.yml',
         'test/manual_order_policy.yml',
         'test/cancel_order.yml',
         'test/delete_order.yml',
diff --git a/addons/sale/test/create_sale_users.yml b/addons/sale/test/create_sale_users.yml
new file mode 100644
index 00000000000..a61c4bd7c99
--- /dev/null
+++ b/addons/sale/test/create_sale_users.yml
@@ -0,0 +1,20 @@
+-
+   Create a user as 'Salesmanager'
+-
+  !record {model: res.users, id: res_users_salesmanager}:
+    company_id: base.main_company
+    name: Sales manager
+    login: sm
+    password: sm
+    groups_id:
+      - base.group_sale_manager
+-
+   Create a user as 'Salesman'
+-
+  !record {model: res.users, id: res_users_salesman}:
+    company_id: base.main_company
+    name: Salesman
+    login: su
+    password: su
+    groups_id:
+      - base.group_sale_salesman_all_leads
diff --git a/addons/sale/test/sale_order_demo.yml b/addons/sale/test/sale_order_demo.yml
new file mode 100644
index 00000000000..84aaa43a3cf
--- /dev/null
+++ b/addons/sale/test/sale_order_demo.yml
@@ -0,0 +1,41 @@
+-
+  Test the data with salesman,
+-
+  !context
+    uid: 'res_users_salesman'
+-
+  In order to test process of the Sale Order, I create sale order
+-
+  !record {model: sale.order, id: sale_order_test1}:
+    partner_id: base.res_partner_2
+    note: Invoice after delivery
+    payment_term: account.account_payment_term
+    order_line: 
+      - product_id: product.product_product_7
+        product_uom_qty: 8
+-
+  I verify that the onchange was correctly triggered
+-
+  !assert {model: sale.order, id: sale.sale_order_test1, string: The onchange function of product was not correctly triggered}:
+    - order_line[0].name == u'[LCD17] 17\u201d LCD Monitor'
+    - order_line[0].price_unit == 1350.0
+    - order_line[0].product_uom_qty == 8
+    - order_line[0].product_uom.id == ref('product.product_uom_unit')
+
+-
+  I create another sale order
+-
+  !record {model: sale.order, id: sale_order_test2}:
+    partner_id: base.res_partner_2
+    order_line: 
+      - product_id: product.product_product_7
+        product_uom_qty: 16
+        product_uom: product.product_uom_dozen
+-
+  I verify that the onchange was correctly triggered
+-
+  !assert {model: sale.order, id: sale.sale_order_test2, string: The onchange function of product was not correctly triggered}:
+    - order_line[0].name == u'[LCD17] 17\u201d LCD Monitor'
+    - order_line[0].price_unit == 1350.0 * 12
+    - order_line[0].product_uom.id == ref('product.product_uom_dozen')
+    - order_line[0].product_uom_qty == 16
\ No newline at end of file
diff --git a/addons/sale/test/sale_order_salesmanager_demo.yml b/addons/sale/test/sale_order_salesmanager_demo.yml
deleted file mode 100644
index f09e1327a75..00000000000
--- a/addons/sale/test/sale_order_salesmanager_demo.yml
+++ /dev/null
@@ -1,31 +0,0 @@
--
-  In order to test process of the Sale Order, I create sale order
--
-    Create a user as 'Salesmanager'
--
-  !record {model: res.users, id: res_users_salesmanager}:
-    company_id: base.main_company
-    name: Sales manager
-    login: sm
-    password: sm
-    groups_id:
-      - base.group_sale_manager
--
-  Now, check the data with sales Manager
--
-  !context
-    uid: 'res_users_salesmanager'
--
-  !record {model: sale.order, id: sale_order_test1}:
-    partner_id: base.res_partner_2
-    note: Invoice after delivery
-    payment_term: account.account_payment_term
-    order_line: 
-      - product_id: product.product_product_7
-        product_uom_qty: 8
--
-  I verify that the onchange was correctly triggered
--
-  !assert {model: sale.order, id: sale.sale_order_test1, string: The onchange function of product was not correctly triggered}:
-    - order_line[0].name == u'[LCD17] 17\u201d LCD Monitor'
-    - order_line[0].price_unit == 1350.0

From 33636c1dcfdd95e231d5e6b202775129d8e8ddd8 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 19 Feb 2013 18:57:12 +0530
Subject: [PATCH 011/164] [REM]remove file

bzr revid: sgo@tinyerp.com-20130219132712-hr0sns52uy0821th
---
 addons/sale/test/sale_order_salesman_demo.yml | 31 -------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 addons/sale/test/sale_order_salesman_demo.yml

diff --git a/addons/sale/test/sale_order_salesman_demo.yml b/addons/sale/test/sale_order_salesman_demo.yml
deleted file mode 100644
index 56c781d1451..00000000000
--- a/addons/sale/test/sale_order_salesman_demo.yml
+++ /dev/null
@@ -1,31 +0,0 @@
--
-  In order to test process of the Sale Order, I create sale order
--
-  Create a user as 'Salesman'
--
-  !record {model: res.users, id: res_users_salesman}:
-    company_id: base.main_company
-    name: Salesman
-    login: su
-    password: su
-    groups_id:
-      - base.group_sale_salesman_all_leads
--
-  Now, check the data with salesman
--
-  !context
-    uid: 'res_users_salesman'
--
-  !record {model: sale.order, id: sale_order_test2}:
-    partner_id: base.res_partner_3
-    note: Invoice after delivery
-    payment_term: account.account_payment_term
-    order_line: 
-      - product_id: product.product_product_7
-        product_uom_qty: 7
--
-  I verify that the onchange was correctly triggered
--
-  !assert {model: sale.order, id: sale.sale_order_test2, string: The onchange function of product was not correctly triggered}:
-    - order_line[0].name == u'[LCD17] 17\u201d LCD Monitor'
-    - order_line[0].price_unit == 1350.0

From fad27029faa105e9ca8d934d00680373d1487dc5 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 20 Feb 2013 10:27:34 +0530
Subject: [PATCH 012/164] [IMP] add yml file & improve code in crm

bzr revid: fka@tinyerp.com-20130220045734-auwnnd55vpimt3ep
---
 addons/crm/__openerp__.py                     |  1 +
 addons/crm/security/ir.model.access.csv       |  1 +
 .../crm/test/process/lead2opportunity2win.yml |  5 +++
 .../lead2opportunity_assign_salesmen.yml      | 45 ++++++++++---------
 addons/crm/test/process/merge_opportunity.yml |  1 -
 addons/crm/test/process/phonecalls.yml        |  5 +++
 addons/crm/test/ui/crm_access_group_users.yml | 20 +++++++++
 addons/mail/security/ir.model.access.csv      |  4 +-
 8 files changed, 59 insertions(+), 23 deletions(-)
 create mode 100644 addons/crm/test/ui/crm_access_group_users.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 0dd075d48e6..1d0ea32c0bc 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -103,6 +103,7 @@ Dashboard for CRM will include:
         'crm_action_rule_demo.xml',
     ],
     'test': [
+        'test/ui/crm_access_group_users.yml',
         'test/process/communication_with_customer.yml',
         'test/process/lead2opportunity2win.yml',
         'test/process/lead2opportunity_assign_salesmen.yml',
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 74394d3c5ce..0f2cf267b47 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -29,6 +29,7 @@ access_calendar_attendee_crm_manager,calendar.attendee.crm.manager,model_calenda
 access_res_partner,res.partner.crm.user,base.model_res_partner,base.group_sale_salesman,1,1,1,0
 access_res_partner_category,res.partner.category.crm.user,base.model_res_partner_category,base.group_sale_salesman,1,1,1,0
 mail_mailgate_thread,mail.thread,mail.model_mail_thread,base.group_sale_salesman,1,1,1,1
+access_mail_message,mail.message,mail.model_mail_message,base.group_sale_salesman,1,1,1,0
 access_crm_case_categ_manager,crm.case.categ manager,model_crm_case_categ,base.group_sale_manager,1,1,1,1
 access_base_action_rule_manager,base.action.rule manager,base_action_rule.model_base_action_rule,base.group_sale_manager,1,1,1,1
 access_crm_lead_report_user,crm.lead.report user,model_crm_lead_report,base.group_sale_salesman,1,1,1,1
diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml
index 94e7149ef77..fc56b513588 100644
--- a/addons/crm/test/process/lead2opportunity2win.yml
+++ b/addons/crm/test/process/lead2opportunity2win.yml
@@ -1,3 +1,8 @@
+-
+  Now, check the data with Salesman.
+-
+  !context
+    uid: 'crm_res_users_salesman'
 -
   In order to test the conversion of a lead into a opportunity,
 -
diff --git a/addons/crm/test/process/lead2opportunity_assign_salesmen.yml b/addons/crm/test/process/lead2opportunity_assign_salesmen.yml
index 0edd3b8edce..0d823dc87f4 100644
--- a/addons/crm/test/process/lead2opportunity_assign_salesmen.yml
+++ b/addons/crm/test/process/lead2opportunity_assign_salesmen.yml
@@ -1,5 +1,30 @@
 -
   During a lead to opp conversion, salesmen should be assigned to leads following the round-robin method.  Start by creating 6 leads (1 to 6) and 4 salesmen (A to D).
+-
+  !record {model: res.users, id: test_res_user_01}:
+    name: 'Test user A'
+    login: 'tua'
+    new_password: 'tua'
+-
+  !record {model: res.users, id: test_res_user_02}:
+    name: 'Test user B'
+    login: 'tub'
+    new_password: 'tub'
+-
+  !record {model: res.users, id: test_res_user_03}:
+    name: 'Test user C'
+    login: 'tuc'
+    new_password: 'tuc'
+-
+  !record {model: res.users, id: test_res_user_04}:
+    name: 'Test user D'
+    login: 'tud'
+    new_password: 'tud'
+-
+  Now, check the data with Salesman.
+-
+  !context
+    uid: 'crm_res_users_salesman'
 -
   !record {model: crm.lead, id: test_crm_lead_01}:
     type: 'lead'
@@ -36,26 +61,6 @@
     name: 'Test lead 6'
     partner_name: 'Agrolait SuperSeed SA'
     stage_id: stage_lead1
--
-  !record {model: res.users, id: test_res_user_01}:
-    name: 'Test user A'
-    login: 'tua'
-    new_password: 'tua'
--
-  !record {model: res.users, id: test_res_user_02}:
-    name: 'Test user B'
-    login: 'tub'
-    new_password: 'tub'
--
-  !record {model: res.users, id: test_res_user_03}:
-    name: 'Test user C'
-    login: 'tuc'
-    new_password: 'tuc'
--
-  !record {model: res.users, id: test_res_user_04}:
-    name: 'Test user D'
-    login: 'tud'
-    new_password: 'tud'
 -
   I create a mass convert wizard and convert all the leads.
 -
diff --git a/addons/crm/test/process/merge_opportunity.yml b/addons/crm/test/process/merge_opportunity.yml
index c50af5214e6..e9027e228d7 100644
--- a/addons/crm/test/process/merge_opportunity.yml
+++ b/addons/crm/test/process/merge_opportunity.yml
@@ -1,4 +1,3 @@
-
 -
   During a mixed merge (involving leads and opps), data should be handled a certain way following their type (m2o, m2m, text, ...)  Start by creating two leads and an opp.
 -
diff --git a/addons/crm/test/process/phonecalls.yml b/addons/crm/test/process/phonecalls.yml
index 51a933f3223..a71bfc05e03 100644
--- a/addons/crm/test/process/phonecalls.yml
+++ b/addons/crm/test/process/phonecalls.yml
@@ -1,3 +1,8 @@
+-
+  Now, check the data with Salesman.
+-
+  !context
+    uid: 'crm_res_users_salesman'
 -
   I schedule a phone call with a customer.
 -
diff --git a/addons/crm/test/ui/crm_access_group_users.yml b/addons/crm/test/ui/crm_access_group_users.yml
new file mode 100644
index 00000000000..194c202ef15
--- /dev/null
+++ b/addons/crm/test/ui/crm_access_group_users.yml
@@ -0,0 +1,20 @@
+-
+    Create a user as 'Salesmanager'
+-
+  !record {model: res.users, id: crm_res_users_salesmanager}:
+    company_id: base.main_company
+    name: Sales manager
+    login: csm
+    password: csm
+    groups_id:
+      - base.group_sale_manager
+-
+  Create a user as 'Salesman'
+-
+  !record {model: res.users, id: crm_res_users_salesman}:
+    company_id: base.main_company
+    name: Salesman
+    login: csu
+    password: csu
+    groups_id:
+      - base.group_sale_salesman_all_leads
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index 1141a3f928d..8faa06b0aa5 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -7,12 +7,12 @@ access_mail_mail_system,mail.mail.system,model_mail_mail,base.group_system,1,1,1
 access_mail_followers_all,mail.followers.all,model_mail_followers,,1,0,0,0
 access_mail_followers_user,mail.followers.user,model_mail_followers,base.group_user,1,1,0,0
 access_mail_followers_system,mail.followers.system,model_mail_followers,base.group_system,1,1,1,1
-access_mail_notification_all,mail.notification.all,model_mail_notification,,1,0,0,0
+access_mail_notification_all,mail.notification.all,model_mail_notification,,1,0,1,0
 access_mail_notification_user,mail.notification.user,model_mail_notification,base.group_user,1,1,1,0
 access_mail_notification_system,mail.notification.system,model_mail_notification,base.group_system,1,1,1,1
 access_mail_group_all,mail.group.all,model_mail_group,,1,0,0,0
 access_mail_group_user,mail.group.user,model_mail_group,base.group_user,1,1,1,1
-access_mail_alias_all,mail.alias.all,model_mail_alias,,1,0,0,0
+access_mail_alias_all,mail.alias.all,model_mail_alias,,1,0,1,0
 access_mail_alias_user,mail.alias.user,model_mail_alias,base.group_user,1,1,1,0
 access_mail_alias_system,mail.alias.system,model_mail_alias,base.group_system,1,1,1,1
 access_mail_message_subtype_all,mail.message.subtype.all,model_mail_message_subtype,,1,0,0,0

From e07255568279284eebf4e337131ec7fb6af3984d Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Wed, 20 Feb 2013 11:33:26 +0530
Subject: [PATCH 013/164] [IMP]improve yml give them to appropriate access
 rights

bzr revid: sgo@tinyerp.com-20130220060326-q22mdh5yob7erh7e
---
 addons/sale/test/cancel_order.yml | 5 +++++
 addons/sale/test/delete_order.yml | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/addons/sale/test/cancel_order.yml b/addons/sale/test/cancel_order.yml
index 12b28fcb7e8..48c6b91d2c4 100644
--- a/addons/sale/test/cancel_order.yml
+++ b/addons/sale/test/cancel_order.yml
@@ -1,3 +1,8 @@
+-
+  Salesman can also cancel order therfore test with that user which have salesman rights,
+-
+  !context
+    uid: 'res_users_salesman'
 -
   In order to test the cancel sale order.
   I confirm order (with at least 2 lines)
diff --git a/addons/sale/test/delete_order.yml b/addons/sale/test/delete_order.yml
index abc68cb3af3..69c89020ad9 100644
--- a/addons/sale/test/delete_order.yml
+++ b/addons/sale/test/delete_order.yml
@@ -1,3 +1,8 @@
+-
+  Sales manager can only delete order therfore test with that user which have sales manager rights,
+-
+  !context
+    uid: 'res_users_salesmanager'
 -
   I try to delete In progress order and check Error Message.
 -

From 0dd9f460dad5bc1ef93bcf28370c08341d01bfb4 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 20 Feb 2013 12:07:25 +0530
Subject: [PATCH 014/164] [IMP] improve yml

bzr revid: fka@tinyerp.com-20130220063725-dpa9tr2j57dor16c
---
 addons/crm/security/ir.model.access.csv       |  1 +
 addons/crm/test/process/cancel_lead.yml       | 19 +++++++++++--------
 .../process/communication_with_customer.yml   |  5 +++++
 .../crm/test/process/lead2opportunity2win.yml |  2 +-
 .../lead2opportunity_assign_salesmen.yml      |  6 +++---
 addons/crm/test/ui/crm_demo.yml               | 12 ++++++++----
 addons/crm/test/ui/delete_lead.yml            |  7 ++++++-
 addons/mail/security/ir.model.access.csv      |  2 +-
 8 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 0f2cf267b47..cd460cf35d9 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -30,6 +30,7 @@ access_res_partner,res.partner.crm.user,base.model_res_partner,base.group_sale_s
 access_res_partner_category,res.partner.category.crm.user,base.model_res_partner_category,base.group_sale_salesman,1,1,1,0
 mail_mailgate_thread,mail.thread,mail.model_mail_thread,base.group_sale_salesman,1,1,1,1
 access_mail_message,mail.message,mail.model_mail_message,base.group_sale_salesman,1,1,1,0
+mail_mail_message,mail.message,mail.model_mail_message,base.group_sale_manager,1,1,1,1
 access_crm_case_categ_manager,crm.case.categ manager,model_crm_case_categ,base.group_sale_manager,1,1,1,1
 access_base_action_rule_manager,base.action.rule manager,base_action_rule.model_base_action_rule,base.group_sale_manager,1,1,1,1
 access_crm_lead_report_user,crm.lead.report user,model_crm_lead_report,base.group_sale_salesman,1,1,1,1
diff --git a/addons/crm/test/process/cancel_lead.yml b/addons/crm/test/process/cancel_lead.yml
index edaf844952a..ae2b6294c68 100644
--- a/addons/crm/test/process/cancel_lead.yml
+++ b/addons/crm/test/process/cancel_lead.yml
@@ -1,10 +1,13 @@
 -
-  I cancel unqualified lead.
+  Salesman cancel unqualified lead.
+-
+  !context
+    uid: 'crm_res_users_salesman'
 -
   !python {model: crm.lead}: |
     self.case_cancel(cr, uid, [ref("crm_case_1")])
 -
-  I check cancelled lead.
+  Salesman check cancelled lead.
 -
   !python {model: crm.lead}: |
     lead = self.browse(cr, uid, ref('crm_case_1'))
@@ -12,34 +15,34 @@
     assert lead.state == 'cancel', "Opportunity is not in 'cancel' state."
     assert lead.probability == 0.0, 'Opportunity is probably wrong and should be 0.0.'
 -
-  I reset cancelled lead into unqualified lead.
+  Salesman reset cancelled lead into unqualified lead.
 -
   !python {model: crm.lead}: |
     self.case_reset(cr, uid, [ref("crm_case_1")])
 -
-  I check unqualified lead after reset.
+  Salesman check unqualified lead after reset.
 -
   !assert {model: crm.lead, id: crm.crm_case_1, string: Lead is in draft state}:
     - state == "draft"
 -
-  I re-open the lead
+  Salesman re-open the lead
 -
   !python {model: crm.lead}: |
     self.case_open(cr, uid, [ref("crm_case_1")])
 -
- I check stage and state of the re-opened lead
+ Salesman check stage and state of the re-opened lead
 -
   !python {model: crm.lead}: |
     lead = self.browse(cr, uid, ref('crm.crm_case_1'))
     assert lead.stage_id.id == ref('crm.stage_lead2'), "Opportunity stage should be 'Qualification'."
     assert lead.state == 'open', "Opportunity should be in 'open' state."
 -
-  I escalate the lead to parent team.
+  Salesman escalate the lead to parent team.
 -
   !python {model: crm.lead}: |
     self.case_escalate(cr, uid, [ref("crm_case_1")])
 -
-  I check the lead is correctly escalated to the parent team.
+  Salesman check the lead is correctly escalated to the parent team.
 -
   !assert {model: crm.lead, id: crm.crm_case_1, string: Escalate lead to parent team}:
     - section_id.name == "Support Department"
diff --git a/addons/crm/test/process/communication_with_customer.yml b/addons/crm/test/process/communication_with_customer.yml
index 221a4ab634f..4a36aeebd02 100644
--- a/addons/crm/test/process/communication_with_customer.yml
+++ b/addons/crm/test/process/communication_with_customer.yml
@@ -1,3 +1,8 @@
+-
+  Salesman communication with customer.
+-
+  !context
+    uid: 'crm_res_users_salesman'
 -
   Customer interested in our product, so he sends request by email to get more details.
 -
diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml
index fc56b513588..c69eb09ac31 100644
--- a/addons/crm/test/process/lead2opportunity2win.yml
+++ b/addons/crm/test/process/lead2opportunity2win.yml
@@ -1,5 +1,5 @@
 -
-  Now, check the data with Salesman.
+  Salesman convert the lead into opportunity.
 -
   !context
     uid: 'crm_res_users_salesman'
diff --git a/addons/crm/test/process/lead2opportunity_assign_salesmen.yml b/addons/crm/test/process/lead2opportunity_assign_salesmen.yml
index 0d823dc87f4..9583c6034bf 100644
--- a/addons/crm/test/process/lead2opportunity_assign_salesmen.yml
+++ b/addons/crm/test/process/lead2opportunity_assign_salesmen.yml
@@ -1,5 +1,5 @@
 -
-  During a lead to opp conversion, salesmen should be assigned to leads following the round-robin method.  Start by creating 6 leads (1 to 6) and 4 salesmen (A to D).
+  During a lead to opp conversion, salesmen should be assigned to leads following the round-robin method.  Start by creating 4 salesmen (A to D) and 6 leads (1 to 6).
 -
   !record {model: res.users, id: test_res_user_01}:
     name: 'Test user A'
@@ -21,7 +21,7 @@
     login: 'tud'
     new_password: 'tud'
 -
-  Now, check the data with Salesman.
+  Salesman creates lead.
 -
   !context
     uid: 'crm_res_users_salesman'
@@ -62,7 +62,7 @@
     partner_name: 'Agrolait SuperSeed SA'
     stage_id: stage_lead1
 -
-  I create a mass convert wizard and convert all the leads.
+  Salesman create a mass convert wizard and convert all the leads.
 -
   !python {model: crm.lead2opportunity.partner.mass}: |
     context.update({'active_model': 'crm.lead', 'active_ids': [ref("test_crm_lead_01"), ref("test_crm_lead_02"), ref("test_crm_lead_03"), ref("test_crm_lead_04"), ref("test_crm_lead_05"), ref("test_crm_lead_06")], 'active_id': ref("test_crm_lead_01")})
diff --git a/addons/crm/test/ui/crm_demo.yml b/addons/crm/test/ui/crm_demo.yml
index 9154ffdf513..85ed1cf7403 100644
--- a/addons/crm/test/ui/crm_demo.yml
+++ b/addons/crm/test/ui/crm_demo.yml
@@ -1,5 +1,9 @@
+
 -
-  I create a lead record to call a partner onchange, stage onchange and mailing opt-in onchange method.
+  Sales manager create a lead record to call a partner onchange, stage onchange and mailing opt-in onchange method.
+-
+  !context
+    uid: 'crm_res_users_salesmanager'
 -
   !record {model: crm.lead, id: crm_case_25}:
     name: 'Need more info about your pc2'
@@ -8,7 +12,7 @@
     stage_id: crm.stage_lead1
     state: draft
 -
-  I create a lead record to call a mailing opt-out onchange method.
+  Sales manager create a lead record to call a mailing opt-out onchange method.
 -
   !record {model: crm.lead, id: crm_case_18}:
     name: 'Need 20 Days of Consultancy'
@@ -16,13 +20,13 @@
     state: draft
     opt_out: True
 -
-  I create a phonecall record to call a partner onchange method.
+  Sales manager create a phonecall record to call a partner onchange method.
 -
   !record {model: crm.phonecall, id: crm_phonecall_5}:
     name: 'Bad time'
     partner_id: base.res_partner_5
 -
-  I set the next stage to "New" for the lead.
+  Sales manager set the next stage to "New" for the lead.
 -
   !python {model: crm.lead}: |
     self.stage_next(cr, uid, [ref("crm_case_4")], context={'stage_type': 'lead'})
diff --git a/addons/crm/test/ui/delete_lead.yml b/addons/crm/test/ui/delete_lead.yml
index 49713039f22..f68061ba6cd 100644
--- a/addons/crm/test/ui/delete_lead.yml
+++ b/addons/crm/test/ui/delete_lead.yml
@@ -1,5 +1,10 @@
 -
-  I Unlink the Lead.
+  Sales manager can delete lead.
+-
+  !context
+    uid: 'crm_res_users_salesmanager'
+-
+  Sales manager Unlink the Lead.
 -
   !python {model: crm.lead}: |
      self.unlink(cr, uid, [ref("crm_case_4")])
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index 8faa06b0aa5..81b2356938b 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -1,7 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_mail_message_all,mail.message.all,model_mail_message,,1,0,0,0
 access_mail_message_user,mail.message.user,model_mail_message,base.group_user,1,1,1,1
-access_mail_mail_all,mail.mail.all,model_mail_mail,,1,0,0,0
+access_mail_mail_all,mail.mail.all,model_mail_mail,,1,0,1,0
 access_mail_mail_user,mail.mail.user,model_mail_mail,base.group_user,1,1,1,0
 access_mail_mail_system,mail.mail.system,model_mail_mail,base.group_system,1,1,1,1
 access_mail_followers_all,mail.followers.all,model_mail_followers,,1,0,0,0

From 99cb34cee9d978e883e2922004230a094a9037a4 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 20 Feb 2013 13:02:36 +0530
Subject: [PATCH 015/164] [IMP] add access rights in merge_opportunity.yml

bzr revid: fka@tinyerp.com-20130220073236-7v3i73ui0zua4uo9
---
 addons/crm/test/process/merge_opportunity.yml | 5 ++++-
 addons/crm/test/process/phonecalls.yml        | 2 +-
 addons/crm/test/ui/crm_access_group_users.yml | 2 +-
 addons/crm/test/ui/delete_lead.yml            | 4 +---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/crm/test/process/merge_opportunity.yml b/addons/crm/test/process/merge_opportunity.yml
index e9027e228d7..a85372bdf7b 100644
--- a/addons/crm/test/process/merge_opportunity.yml
+++ b/addons/crm/test/process/merge_opportunity.yml
@@ -1,5 +1,8 @@
 -
-  During a mixed merge (involving leads and opps), data should be handled a certain way following their type (m2o, m2m, text, ...)  Start by creating two leads and an opp.
+  During a mixed merge (involving leads and opps), data should be handled a certain way following their type (m2o, m2m, text, ...)  Start by creating two leads and an opp and giving the rights of Sales manager.
+-
+  !context
+    uid: 'crm_res_users_salesmanager'
 -
   !record {model: crm.lead, id: test_crm_lead_01}:
     type: 'lead'
diff --git a/addons/crm/test/process/phonecalls.yml b/addons/crm/test/process/phonecalls.yml
index a71bfc05e03..63df8ac89c2 100644
--- a/addons/crm/test/process/phonecalls.yml
+++ b/addons/crm/test/process/phonecalls.yml
@@ -1,5 +1,5 @@
 -
-  Now, check the data with Salesman.
+  Salesman check the phone calls data.
 -
   !context
     uid: 'crm_res_users_salesman'
diff --git a/addons/crm/test/ui/crm_access_group_users.yml b/addons/crm/test/ui/crm_access_group_users.yml
index 194c202ef15..cc5be01ee85 100644
--- a/addons/crm/test/ui/crm_access_group_users.yml
+++ b/addons/crm/test/ui/crm_access_group_users.yml
@@ -1,5 +1,5 @@
 -
-    Create a user as 'Salesmanager'
+  Create a user as 'Salesmanager'
 -
   !record {model: res.users, id: crm_res_users_salesmanager}:
     company_id: base.main_company
diff --git a/addons/crm/test/ui/delete_lead.yml b/addons/crm/test/ui/delete_lead.yml
index f68061ba6cd..10d2de82e7e 100644
--- a/addons/crm/test/ui/delete_lead.yml
+++ b/addons/crm/test/ui/delete_lead.yml
@@ -1,10 +1,8 @@
 -
-  Sales manager can delete lead.
+  Sales manager Unlink the Lead.
 -
   !context
     uid: 'crm_res_users_salesmanager'
--
-  Sales manager Unlink the Lead.
 -
   !python {model: crm.lead}: |
      self.unlink(cr, uid, [ref("crm_case_4")])

From 49ef7d89a8b525acf59fd6f69d9131ec68e2d147 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 20 Feb 2013 15:02:27 +0530
Subject: [PATCH 016/164] [IMP] add yml file & add access rights in event

bzr revid: fka@tinyerp.com-20130220093227-uf6oom9fginl2jdc
---
 addons/event/__openerp__.py                   |  2 +-
 addons/event/security/ir.model.access.csv     |  2 ++
 .../event/test/process/event_draft2done.yml   |  5 +++++
 addons/event/test/ui/event_users.yml          | 20 +++++++++++++++++++
 4 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 addons/event/test/ui/event_users.yml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 54b77c82f69..e8ecb09bf03 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -52,7 +52,7 @@ Key Features
         'email_template.xml',
     ],
     'demo': ['event_demo.xml'],
-    'test': ['test/process/event_draft2done.yml'],
+    'test': ['test/ui/event_users.yml','test/process/event_draft2done.yml'],
     'css': ['static/src/css/event.css'],
     'installable': True,
     'application': True,
diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index b6cdc4c4ec6..0801b8306f0 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -6,3 +6,5 @@ access_event_registration,event.registration,model_event_registration,event.grou
 access_report_event_registration,report.event.registration,model_report_event_registration,event.group_event_user,1,1,1,1
 access_event_event_portal,event.event,model_event_event,,1,0,0,0
 access_event_registration_portal,event.registration,model_event_registration,,1,0,0,0
+access_event_partner,res.partner,model_res_partner,event.group_event_user,1,1,1,0
+access_mail_message,mail.message,mail.model_mail_message,event.group_event_user,1,1,1,0
diff --git a/addons/event/test/process/event_draft2done.yml b/addons/event/test/process/event_draft2done.yml
index eb40340befd..e485cb5af6c 100644
--- a/addons/event/test/process/event_draft2done.yml
+++ b/addons/event/test/process/event_draft2done.yml
@@ -1,3 +1,8 @@
+-
+  give the access rights of Event user to organize an event and also do registration.
+-
+  !context
+    uid: 'res_users_eventuser'
 -
   I want to organize an event, 
   into this conference I should create two registration.
diff --git a/addons/event/test/ui/event_users.yml b/addons/event/test/ui/event_users.yml
new file mode 100644
index 00000000000..34564d6c433
--- /dev/null
+++ b/addons/event/test/ui/event_users.yml
@@ -0,0 +1,20 @@
+-
+  Create a user as 'Event manager'
+-
+  !record {model: res.users, id: res_users_eventmanager}:
+    company_id: base.main_company
+    name: Event manager
+    login: em
+    password: em
+    groups_id:
+      - event.group_event_manager
+-
+  Create a user as 'Event user'
+-
+  !record {model: res.users, id: res_users_eventuser}:
+    company_id: base.main_company
+    name: User
+    login: eu
+    password: eu
+    groups_id:
+      - event.group_event_user
\ No newline at end of file

From 96ec54e330a394a9aa0b92faad7280ec97512f98 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 20 Feb 2013 18:45:24 +0530
Subject: [PATCH 017/164] [IMP] add yml file in purchase

bzr revid: fka@tinyerp.com-20130220131524-joc0qyy5dfdc1o6j
---
 addons/purchase/__openerp__.py                               | 3 ++-
 addons/purchase/purchase_order_demo.yml                      | 5 +++++
 addons/purchase/test/process/cancel_order.yml                | 5 +++++
 .../test/process/generate_invoice_from_reception.yml         | 5 +++++
 addons/purchase/test/process/merge_order.yml                 | 5 +++++
 addons/purchase/test/ui/delete_order.yml                     | 5 +++++
 6 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index a7c66344f4a..3f3acdf9f0f 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -67,6 +67,8 @@ Dashboard / Reports for Purchase Management will include:
         'res_config_view.xml',
     ],
     'test': [
+        'test/ui/purchase_users.yml',
+        'purchase_order_demo.yml',
         'test/process/cancel_order.yml',
         'test/process/rfq2order2done.yml',
         'test/process/generate_invoice_from_reception.yml',
@@ -79,7 +81,6 @@ Dashboard / Reports for Purchase Management will include:
         'test/ui/delete_order.yml',
     ],
     'demo': [
-        'purchase_order_demo.yml',
         'purchase_demo.xml',
     ],
     'installable': True,
diff --git a/addons/purchase/purchase_order_demo.yml b/addons/purchase/purchase_order_demo.yml
index 9c83ff84406..fb49bfc1248 100644
--- a/addons/purchase/purchase_order_demo.yml
+++ b/addons/purchase/purchase_order_demo.yml
@@ -1,3 +1,8 @@
+-
+  Give access rights of Purchase user to create purchase order
+-
+  !context
+    uid: 'res_users_purchase_user'
 -
   !record {model: purchase.order, id: purchase_order_1}:
     partner_id: base.res_partner_1
diff --git a/addons/purchase/test/process/cancel_order.yml b/addons/purchase/test/process/cancel_order.yml
index 80fd7b5ff57..d3695cba6c8 100644
--- a/addons/purchase/test/process/cancel_order.yml
+++ b/addons/purchase/test/process/cancel_order.yml
@@ -1,3 +1,8 @@
+-
+  Purchase user can also cancel order therfore test with that user which have Purchase user rights.
+-
+  !context
+    uid: 'res_users_purchase_user'
 -
    In order to test the cancel flow, I start it from canceling confirmed purchase order.
 -
diff --git a/addons/purchase/test/process/generate_invoice_from_reception.yml b/addons/purchase/test/process/generate_invoice_from_reception.yml
index 6390413b418..565f52f258f 100644
--- a/addons/purchase/test/process/generate_invoice_from_reception.yml
+++ b/addons/purchase/test/process/generate_invoice_from_reception.yml
@@ -1,3 +1,8 @@
+-
+  Purchase user can create an invoice for order on receptions therfore test with that user which have Purchase user rights.
+-
+  !context
+    uid: 'res_users_purchase_user'
 -
  I confirm another order where invoice control is 'Bases on incoming shipments'.
 -
diff --git a/addons/purchase/test/process/merge_order.yml b/addons/purchase/test/process/merge_order.yml
index fb39bed310c..fdc7f0092e7 100644
--- a/addons/purchase/test/process/merge_order.yml
+++ b/addons/purchase/test/process/merge_order.yml
@@ -1,3 +1,8 @@
+-
+  Give access rights of Purchase user to merge two RFQ.
+-
+  !context
+    uid: 'res_users_purchase_user'
 -
   In order to merge RFQ, I merge two RFQ which has same supplier and check new merged order.
 -
diff --git a/addons/purchase/test/ui/delete_order.yml b/addons/purchase/test/ui/delete_order.yml
index f8795007622..6f9ba54e89d 100644
--- a/addons/purchase/test/ui/delete_order.yml
+++ b/addons/purchase/test/ui/delete_order.yml
@@ -1,3 +1,8 @@
+-
+  Give access rights of Purchase user to delete purchase order
+-
+  !context
+    uid: 'res_users_purchase_user'
 -
   In order to test to delete process on purchase order.
 -

From 5252d9ac9cdf02f6a405bbe041cb54e62d7d4428 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 21 Feb 2013 10:44:59 +0530
Subject: [PATCH 018/164] [IMP] add yml file in purchase_reqisition

bzr revid: fka@tinyerp.com-20130221051459-v20ilhc128ipw6yi
---
 addons/purchase/test/ui/purchase_users.yml    | 20 +++++++++++++++++++
 addons/purchase_requisition/__openerp__.py    |  1 +
 .../test/cancel_purchase_requisition.yml      |  5 +++++
 .../test/purchase_reqisition_users.yml        | 20 +++++++++++++++++++
 .../test/purchase_requisition.yml             |  5 +++++
 .../test/purchase_requisition_demo.yml        |  5 +++++
 6 files changed, 56 insertions(+)
 create mode 100644 addons/purchase/test/ui/purchase_users.yml
 create mode 100644 addons/purchase_requisition/test/purchase_reqisition_users.yml

diff --git a/addons/purchase/test/ui/purchase_users.yml b/addons/purchase/test/ui/purchase_users.yml
new file mode 100644
index 00000000000..e36d8140d28
--- /dev/null
+++ b/addons/purchase/test/ui/purchase_users.yml
@@ -0,0 +1,20 @@
+-
+  Create a user as 'Purchase manager'
+-
+  !record {model: res.users, id: res_users_purchase_manager}:
+    company_id: base.main_company
+    name: Purchase Manager
+    login: pm
+    password: pm
+    groups_id:
+      - purchase.group_purchase_manager
+-
+  Create a user as 'Purchase user'
+-
+  !record {model: res.users, id: res_users_purchase_user}:
+    company_id: base.main_company
+    name: Purchase User
+    login: pu
+    password: pu
+    groups_id:
+      - purchase.group_purchase_user
\ No newline at end of file
diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index 2ba0ad95e09..d2a94365318 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -43,6 +43,7 @@ keep track and order all your purchase orders.
     ],
     'auto_install': False,
     'test': [
+        'test/purchase_reqisition_users.yml',
         'test/purchase_requisition_demo.yml',
         'test/purchase_requisition.yml',
         'test/cancel_purchase_requisition.yml',
diff --git a/addons/purchase_requisition/test/cancel_purchase_requisition.yml b/addons/purchase_requisition/test/cancel_purchase_requisition.yml
index 389c328a5cf..a865cb0548a 100644
--- a/addons/purchase_requisition/test/cancel_purchase_requisition.yml
+++ b/addons/purchase_requisition/test/cancel_purchase_requisition.yml
@@ -1,3 +1,8 @@
+-
+  Give access rights of Purchase Requisition User to cancelled requisition
+-
+  !context
+    uid: 'res_users_purchase_requisition_user'
 -
   I cancel requisition.
 -
diff --git a/addons/purchase_requisition/test/purchase_reqisition_users.yml b/addons/purchase_requisition/test/purchase_reqisition_users.yml
new file mode 100644
index 00000000000..aa07e8a53f1
--- /dev/null
+++ b/addons/purchase_requisition/test/purchase_reqisition_users.yml
@@ -0,0 +1,20 @@
+-
+  Create a user as 'Purchase Reqisition Manager'
+-
+  !record {model: res.users, id: res_users_purchase_requisition_manager}:
+    company_id: base.main_company
+    name: Purchase Reqisition Manager
+    login: prm
+    password: prm
+    groups_id:
+      - purchase_reqisition.group_purchase_requisition_manager
+-
+  Create a user as 'Purchase Reqisition User'
+-
+  !record {model: res.users, id: res_users_purchase_requisition_user}:
+    company_id: base.main_company
+    name: Purchase Reqisition User
+    login: pru
+    password: pru
+    groups_id:
+      - purchase_reqisition.group_purchase_requisition_user
\ No newline at end of file
diff --git a/addons/purchase_requisition/test/purchase_requisition.yml b/addons/purchase_requisition/test/purchase_requisition.yml
index 8fd36e07d71..5477f46e18b 100644
--- a/addons/purchase_requisition/test/purchase_requisition.yml
+++ b/addons/purchase_requisition/test/purchase_requisition.yml
@@ -1,3 +1,8 @@
+-
+  Give access rights of Purchase Requisition User
+-
+  !context
+    uid: 'res_users_purchase_requisition_user'
 -
   I create the procurement order and run that procurement.
 -
diff --git a/addons/purchase_requisition/test/purchase_requisition_demo.yml b/addons/purchase_requisition/test/purchase_requisition_demo.yml
index 5e441f26ea3..8265e6c72da 100755
--- a/addons/purchase_requisition/test/purchase_requisition_demo.yml
+++ b/addons/purchase_requisition/test/purchase_requisition_demo.yml
@@ -1,3 +1,8 @@
+-
+  Give access rights of Purchase Requisition User to create requisition
+-
+  !context
+    uid: 'res_users_purchase_requisition_user'
 -
   In order to test process of the purchase requisition ,I create requisition
 - 

From 56cb7db019b771014a0a62a5b8824abe241022b4 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Thu, 21 Feb 2013 10:59:58 +0530
Subject: [PATCH 019/164] [IMP]improve yml for account

bzr revid: sgo@tinyerp.com-20130221052958-metvr090gsubdc5u
---
 addons/account/__openerp__.py                 |  1 +
 addons/account/security/account_security.xml  |  2 +-
 .../account/test/account_customer_invoice.yml |  5 +++++
 addons/account/test/account_invoice_state.yml |  5 +++++
 addons/account/test/account_test_users.yml    | 20 +++++++++++++++++++
 .../test/account_validate_account_move.yml    |  5 +++++
 6 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 addons/account/test/account_test_users.yml

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 43aaa2f58c1..d72711424f2 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -146,6 +146,7 @@ for a particular financial year and for preparation of vouchers there is a modul
         'account_unit_test.xml',
     ],
     'test': [
+        'test/account_test_users.yml',
         'test/account_customer_invoice.yml',
         'test/account_supplier_invoice.yml',
         'test/account_change_currency.yml',
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 9a2383de45b..c86e1cf5eb6 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -12,7 +12,7 @@
     <record id="group_account_user" model="res.groups">
         <field name="name">Accountant</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
-        <field name="implied_ids" eval="[(4, ref('group_account_invoice'))]"/>
+        <field name="implied_ids" eval="[(4, ref('group_account_invoice')), (4,ref('base.group_partner_manager'))]"/>
     </record>
 
     <record id="group_account_manager" model="res.groups">
diff --git a/addons/account/test/account_customer_invoice.yml b/addons/account/test/account_customer_invoice.yml
index b2d87e753de..866e8921220 100644
--- a/addons/account/test/account_customer_invoice.yml
+++ b/addons/account/test/account_customer_invoice.yml
@@ -11,6 +11,11 @@
     footer: True
     bank: base.res_bank_1
     bank_name: Reserve
+-
+  Test with that user which have rights to make Invoicing and payment and who is accountant. 
+-
+  !context
+    uid: 'res_users_account_user'
 -
   I create a customer invoice
 -
diff --git a/addons/account/test/account_invoice_state.yml b/addons/account/test/account_invoice_state.yml
index 7b995150af0..34ac53e7b85 100644
--- a/addons/account/test/account_invoice_state.yml
+++ b/addons/account/test/account_invoice_state.yml
@@ -1,3 +1,8 @@
+-
+  Test with that user which have rights to make Invoicing. 
+-
+  !context
+    uid: 'res_users_account_user'
 -
   In order to test Confirm Draft Invoice wizard I create an invoice and confirm it with this wizard
 -
diff --git a/addons/account/test/account_test_users.yml b/addons/account/test/account_test_users.yml
new file mode 100644
index 00000000000..55e57968f50
--- /dev/null
+++ b/addons/account/test/account_test_users.yml
@@ -0,0 +1,20 @@
+-
+   Create a user as 'Accountant'
+-
+  !record {model: res.users, id: res_users_account_user}:
+    company_id: base.main_company
+    name: Accountant  
+    login: acc
+    password: acc
+    groups_id:
+      - account.group_account_user
+-
+   Create a user as 'Financial Manager'
+-
+  !record {model: res.users, id: res_users_account_manager}:
+    company_id: base.main_company
+    name: Financial Manager
+    login: fm
+    password: fm
+    groups_id:
+      - account.group_account_manager
\ No newline at end of file
diff --git a/addons/account/test/account_validate_account_move.yml b/addons/account/test/account_validate_account_move.yml
index d47ee564019..a99ae3b4d43 100644
--- a/addons/account/test/account_validate_account_move.yml
+++ b/addons/account/test/account_validate_account_move.yml
@@ -1,3 +1,8 @@
+-
+  Test validate account move with user who is accountant which have its rights.' 
+-
+  !context
+    uid: 'res_users_account_user'
 -
   In order to test the account move lines in OpenERP, I create account move 
 -

From c7a417ea03e80da6f8895f6514d00d17362450e0 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 21 Feb 2013 11:47:37 +0530
Subject: [PATCH 020/164] [IMP] improve code

bzr revid: fka@tinyerp.com-20130221061737-d7vyr9lpwnas1qay
---
 addons/purchase/__openerp__.py                         |  4 ++--
 .../purchase_requisition/security/purchase_tender.xml  |  1 +
 .../test/purchase_reqisition_users.yml                 |  4 ++--
 .../purchase_requisition/test/purchase_requisition.yml | 10 +++++-----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 3f3acdf9f0f..b75c84e332b 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -67,8 +67,6 @@ Dashboard / Reports for Purchase Management will include:
         'res_config_view.xml',
     ],
     'test': [
-        'test/ui/purchase_users.yml',
-        'purchase_order_demo.yml',
         'test/process/cancel_order.yml',
         'test/process/rfq2order2done.yml',
         'test/process/generate_invoice_from_reception.yml',
@@ -81,6 +79,8 @@ Dashboard / Reports for Purchase Management will include:
         'test/ui/delete_order.yml',
     ],
     'demo': [
+        'test/ui/purchase_users.yml',
+        'purchase_order_demo.yml',
         'purchase_demo.xml',
     ],
     'installable': True,
diff --git a/addons/purchase_requisition/security/purchase_tender.xml b/addons/purchase_requisition/security/purchase_tender.xml
index e60665e202b..f365643a8fe 100644
--- a/addons/purchase_requisition/security/purchase_tender.xml
+++ b/addons/purchase_requisition/security/purchase_tender.xml
@@ -10,6 +10,7 @@
 
     <record id="group_purchase_requisition_user" model="res.groups">
         <field name="name">User</field>
+        <field name="implied_ids" eval="[(4, ref('purchase.group_purchase_user'))]"/>
         <field name="category_id" ref="module_category_purchase_requisition"/>
     </record>
 
diff --git a/addons/purchase_requisition/test/purchase_reqisition_users.yml b/addons/purchase_requisition/test/purchase_reqisition_users.yml
index aa07e8a53f1..abf62286998 100644
--- a/addons/purchase_requisition/test/purchase_reqisition_users.yml
+++ b/addons/purchase_requisition/test/purchase_reqisition_users.yml
@@ -7,7 +7,7 @@
     login: prm
     password: prm
     groups_id:
-      - purchase_reqisition.group_purchase_requisition_manager
+      - purchase_requisition.group_purchase_requisition_manager
 -
   Create a user as 'Purchase Reqisition User'
 -
@@ -17,4 +17,4 @@
     login: pru
     password: pru
     groups_id:
-      - purchase_reqisition.group_purchase_requisition_user
\ No newline at end of file
+      - purchase_requisition.group_purchase_requisition_user
\ No newline at end of file
diff --git a/addons/purchase_requisition/test/purchase_requisition.yml b/addons/purchase_requisition/test/purchase_requisition.yml
index 5477f46e18b..648425829cb 100644
--- a/addons/purchase_requisition/test/purchase_requisition.yml
+++ b/addons/purchase_requisition/test/purchase_requisition.yml
@@ -1,8 +1,3 @@
--
-  Give access rights of Purchase Requisition User
--
-  !context
-    uid: 'res_users_purchase_requisition_user'
 -
   I create the procurement order and run that procurement.
 -
@@ -35,6 +30,11 @@
         assert line.product_id.id == procurement.product_id.id, "Product is not correspond."
         assert line.product_uom_id.id == procurement.product_uom.id, "UOM is not correspond."
         assert line.product_qty == procurement.product_qty, "Quantity is not correspond."
+-
+  Give access rights of Purchase Requisition User to open requisition
+-
+  !context
+    uid: 'res_users_purchase_requisition_user'
 -
   I open another requisition.
 -

From 12701f01a66944f37d21616ad24ffbcbb48455f6 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Thu, 21 Feb 2013 12:19:44 +0530
Subject: [PATCH 021/164] [IMP]add manager in supplier invoice yml

bzr revid: sgo@tinyerp.com-20130221064944-zhgumhtnum6z21jz
---
 addons/account/test/account_supplier_invoice.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/account/test/account_supplier_invoice.yml b/addons/account/test/account_supplier_invoice.yml
index 02c3d367050..e1528abd980 100644
--- a/addons/account/test/account_supplier_invoice.yml
+++ b/addons/account/test/account_supplier_invoice.yml
@@ -1,3 +1,8 @@
+-
+  Test with that Finance manager who can only create supplier invoice. 
+-
+  !context
+    uid: 'res_users_account_manager'
 -
   In order to test account invoice I create a new supplier invoice
 -

From 794926267e07eb14e73ce3b9845e61e0910cd6d1 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 21 Feb 2013 12:31:28 +0530
Subject: [PATCH 022/164] [IMP] add hr_users.yml in hr

bzr revid: fka@tinyerp.com-20130221070128-bycahqtp3sqjm06d
---
 addons/hr/__openerp__.py                  |  1 +
 addons/hr/test/hr_demo.yml                |  5 ++++
 addons/hr/test/hr_users.yml               | 30 +++++++++++++++++++++++
 addons/hr/test/open2recruit2close_job.yml |  5 ++++
 4 files changed, 41 insertions(+)
 create mode 100644 addons/hr/test/hr_users.yml

diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index b4b8e982845..001933ad2bf 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -62,6 +62,7 @@ You can manage:
     ],
     'demo': ['hr_demo.xml'],
     'test': [
+        'test/hr_users.yml',
         'test/open2recruit2close_job.yml',
         'test/hr_demo.yml',
     ],
diff --git a/addons/hr/test/hr_demo.yml b/addons/hr/test/hr_demo.yml
index 7c184a25c52..c9de2e4ff21 100644
--- a/addons/hr/test/hr_demo.yml
+++ b/addons/hr/test/hr_demo.yml
@@ -1,3 +1,8 @@
+-
+  give the access rights of Hr Officer to create employee.
+-
+  !context
+    uid: 'res_users_hr_officer'
 -
   !record {model: hr.job, id: job_developer, view: False}:
     no_of_employee: 0.0
diff --git a/addons/hr/test/hr_users.yml b/addons/hr/test/hr_users.yml
new file mode 100644
index 00000000000..3415b20efbd
--- /dev/null
+++ b/addons/hr/test/hr_users.yml
@@ -0,0 +1,30 @@
+-
+  Create a user as 'HR Manager'
+-
+  !record {model: res.users, id: res_users_hr_manager}:
+    company_id: base.main_company
+    name: HR manager
+    login: hrm
+    password: hrm
+    groups_id:
+      - base.group_hr_manager
+-
+  Create a user as 'HR Officer'
+-
+  !record {model: res.users, id: res_users_hr_officer}:
+    company_id: base.main_company
+    name: HR Officer
+    login: hro
+    password: hro
+    groups_id:
+      - base.group_hr_user
+-
+  Create a user as 'Employee'
+-
+  !record {model: res.users, id: res_users_employee}:
+    company_id: base.main_company
+    name: Employee
+    login: emp
+    password: emp
+    groups_id:
+      - base.group_user
\ No newline at end of file
diff --git a/addons/hr/test/open2recruit2close_job.yml b/addons/hr/test/open2recruit2close_job.yml
index 5a01b55439b..66fdfa393c8 100644
--- a/addons/hr/test/open2recruit2close_job.yml
+++ b/addons/hr/test/open2recruit2close_job.yml
@@ -1,3 +1,8 @@
+-
+  give the access rights of Hr Officer to the user to test the process of Human Resource Management.
+-
+  !context
+    uid: 'res_users_hr_officer'
 -
   In order to test the process of Human Resource Management, I open Job Postion for "Developer".
 - 

From d9d8abd8b0960c26a63b2cce783fbde03a5dbca6 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 21 Feb 2013 14:33:00 +0530
Subject: [PATCH 023/164] [IMP] add access rights in hr_attendance

bzr revid: fka@tinyerp.com-20130221090300-is57aytddja1m4f5
---
 addons/hr_attendance/test/attendance_process.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/addons/hr_attendance/test/attendance_process.yml b/addons/hr_attendance/test/attendance_process.yml
index 7902bf11d9d..9f197341b55 100644
--- a/addons/hr_attendance/test/attendance_process.yml
+++ b/addons/hr_attendance/test/attendance_process.yml
@@ -1,3 +1,18 @@
+-
+  Create a user as 'HR Attendance Officer'
+-
+  !record {model: res.users, id: res_users_attendance_officer}:
+    company_id: base.main_company
+    name: HR Officer
+    login: ao
+    password: ao
+    groups_id:
+      - base.group_hr_user
+-
+  give the access rights of Hr Officer to test attendance process.
+-
+  !context
+    uid: 'res_users_attendance_officer'
 -
   In order to test attendance process in OpenERP, I entry of SignIn of employee.
 -

From 8d7669d0ade7ccd7e6cef7b0630bac6cb6dbf729 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 21 Feb 2013 16:09:22 +0530
Subject: [PATCH 024/164] [IMP] add access rights in hr_recruitment

bzr revid: fka@tinyerp.com-20130221103922-tczeru30rer8ae6e
---
 .../security/hr_recruitment_security.xml          |  3 +++
 .../hr_recruitment/test/recruitment_process.yml   | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/security/hr_recruitment_security.xml b/addons/hr_recruitment/security/hr_recruitment_security.xml
index 570b0f036cd..a85643b62ec 100644
--- a/addons/hr_recruitment/security/hr_recruitment_security.xml
+++ b/addons/hr_recruitment/security/hr_recruitment_security.xml
@@ -9,6 +9,9 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
+    <record id="base.group_hr_user" model="res.groups">
+        <field name="implied_ids" eval="[(4, ref('base.group_survey_user'))]"/>
+    </record>
 
   </data>
 </openerp>
diff --git a/addons/hr_recruitment/test/recruitment_process.yml b/addons/hr_recruitment/test/recruitment_process.yml
index f2d4e4736fa..0359f253dd9 100644
--- a/addons/hr_recruitment/test/recruitment_process.yml
+++ b/addons/hr_recruitment/test/recruitment_process.yml
@@ -1,5 +1,18 @@
 -
-  In Order to test process of Recruitment,
+  Create a user as 'HR Recruitment Officer'
+-
+  !record {model: res.users, id: res_users_hr_officer}:
+    company_id: base.main_company
+    name: HR Officer
+    login: hrro
+    password: hrro
+    groups_id:
+      - base.group_hr_user
+-
+  In Order to test process of Recruitment so giving HR officer's rights,
+-
+  !context
+    uid: 'res_users_hr_officer'
 -
   An applicant is interested in the job position. So he sends a resume by email.
 -

From fa94d5e112bb7dcce1d53fb80f6af3a25838e5d3 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Thu, 21 Feb 2013 16:47:28 +0530
Subject: [PATCH 025/164] [IMP]improve yml for account_voucher

bzr revid: sgo@tinyerp.com-20130221111728-jlvv0lf5w258ujbz
---
 addons/account_voucher/__openerp__.py         |  1 +
 .../account_voucher/test/account_voucher.yml  |  6 ++++++
 .../test/account_voucher_users.yml            | 20 +++++++++++++++++++
 addons/account_voucher/test/case_eur_usd.yml  |  5 +++++
 addons/account_voucher/test/sales_payment.yml |  5 +++++
 addons/account_voucher/test/sales_receipt.yml |  5 +++++
 6 files changed, 42 insertions(+)
 create mode 100644 addons/account_voucher/test/account_voucher_users.yml

diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 345c3378aa0..a6cbc9a3e40 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -61,6 +61,7 @@ This module manages:
         'account_voucher_data.xml',
     ],
     'test' : [
+        'test/account_voucher_users.yml',
         'test/case5_suppl_usd_usd.yml',
         'test/account_voucher.yml',
         'test/sales_receipt.yml',
diff --git a/addons/account_voucher/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml
index c9270dc695c..e2df6b8597f 100644
--- a/addons/account_voucher/test/account_voucher.yml
+++ b/addons/account_voucher/test/account_voucher.yml
@@ -1,3 +1,9 @@
+-
+  I check the voucher module with user who is accountant.
+-
+  !context
+    uid: 'res_users_account_voucher_user'
+
 -
   In order to check account voucher module in OpenERP I create a customer voucher
 -
diff --git a/addons/account_voucher/test/account_voucher_users.yml b/addons/account_voucher/test/account_voucher_users.yml
new file mode 100644
index 00000000000..e8a4fa3e612
--- /dev/null
+++ b/addons/account_voucher/test/account_voucher_users.yml
@@ -0,0 +1,20 @@
+-
+   Create a user as 'Accountant for voucher'
+-
+  !record {model: res.users, id: res_users_account_voucher_user}:
+    company_id: base.main_company
+    name: Voucher Accountant  
+    login: vacc
+    password: acc
+    groups_id:
+      - account.group_account_user
+-
+   Create a user as 'Financial Manager for account voucher'
+-
+  !record {model: res.users, id: res_users_account_voucher_manager}:
+    company_id: base.main_company
+    name: Financial Manager for voucher
+    login: fmv
+    password: fmv
+    groups_id:
+      - account.group_account_manager
\ No newline at end of file
diff --git a/addons/account_voucher/test/case_eur_usd.yml b/addons/account_voucher/test/case_eur_usd.yml
index 94f0c718980..23a35d8ad24 100644
--- a/addons/account_voucher/test/case_eur_usd.yml
+++ b/addons/account_voucher/test/case_eur_usd.yml
@@ -1,4 +1,9 @@
 ##YAML test on the account_voucher as depicted in this bug report: https://bugs.launchpad.net/openobject-addons/+bug/954155
+-
+  Only manager can create and take decision about bank and currency there I checkd this test with user who is finance manager.
+-
+  !context
+    uid: 'res_users_account_voucher_manager'
 -
   In order to check the payment with multi-currency in OpenERP, 
   I create an invoice in EUR and make payment in USD based on the currency rating.
diff --git a/addons/account_voucher/test/sales_payment.yml b/addons/account_voucher/test/sales_payment.yml
index 37264de114a..005c5cc79c3 100644
--- a/addons/account_voucher/test/sales_payment.yml
+++ b/addons/account_voucher/test/sales_payment.yml
@@ -1,3 +1,8 @@
+- 
+  I test sales payment with user who is accountant. 
+-
+  !context
+    uid: 'res_users_account_voucher_user'
 -
   Create an invoice for the partner Seagate with amount 450.0
 -
diff --git a/addons/account_voucher/test/sales_receipt.yml b/addons/account_voucher/test/sales_receipt.yml
index dc5602753fd..c637cfd8835 100644
--- a/addons/account_voucher/test/sales_receipt.yml
+++ b/addons/account_voucher/test/sales_receipt.yml
@@ -1,3 +1,8 @@
+-
+  Accountant can also be created receipt and validate it there for I checked it with that user who is accountant.
+-
+  !context
+    uid: 'res_users_account_voucher_user'
 - 
   Creating a Voucher Receipt for partner Seagate with amount 30000.0
 - 

From edc4077c54ba215228036a4316706e07a094b5df Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 22 Feb 2013 12:57:57 +0530
Subject: [PATCH 026/164] [IMP] remove access rights in mail,crm,event

bzr revid: fka@tinyerp.com-20130222072757-0fain23pzyb8dzk9
---
 addons/crm/security/crm_security.xml      | 1 +
 addons/crm/security/ir.model.access.csv   | 2 --
 addons/event/security/event_security.xml  | 1 +
 addons/event/security/ir.model.access.csv | 2 --
 addons/mail/security/ir.model.access.csv  | 6 +++---
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 2c34252209c..97bc220cf04 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -5,6 +5,7 @@
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">User: Own Leads Only</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
         <field name="comment">the user will have access to his own data in the sales application.</field>
     </record>
 
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index cd460cf35d9..74394d3c5ce 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -29,8 +29,6 @@ access_calendar_attendee_crm_manager,calendar.attendee.crm.manager,model_calenda
 access_res_partner,res.partner.crm.user,base.model_res_partner,base.group_sale_salesman,1,1,1,0
 access_res_partner_category,res.partner.category.crm.user,base.model_res_partner_category,base.group_sale_salesman,1,1,1,0
 mail_mailgate_thread,mail.thread,mail.model_mail_thread,base.group_sale_salesman,1,1,1,1
-access_mail_message,mail.message,mail.model_mail_message,base.group_sale_salesman,1,1,1,0
-mail_mail_message,mail.message,mail.model_mail_message,base.group_sale_manager,1,1,1,1
 access_crm_case_categ_manager,crm.case.categ manager,model_crm_case_categ,base.group_sale_manager,1,1,1,1
 access_base_action_rule_manager,base.action.rule manager,base_action_rule.model_base_action_rule,base.group_sale_manager,1,1,1,1
 access_crm_lead_report_user,crm.lead.report user,model_crm_lead_report,base.group_sale_salesman,1,1,1,1
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index 83039ca4686..470365dd5f0 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -10,6 +10,7 @@
 
         <record id="group_event_user" model="res.groups">
             <field name="name">User</field>
+            <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
             <field name="category_id" ref="module_category_event_management"/>
         </record>
 
diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index 0801b8306f0..b6cdc4c4ec6 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -6,5 +6,3 @@ access_event_registration,event.registration,model_event_registration,event.grou
 access_report_event_registration,report.event.registration,model_report_event_registration,event.group_event_user,1,1,1,1
 access_event_event_portal,event.event,model_event_event,,1,0,0,0
 access_event_registration_portal,event.registration,model_event_registration,,1,0,0,0
-access_event_partner,res.partner,model_res_partner,event.group_event_user,1,1,1,0
-access_mail_message,mail.message,mail.model_mail_message,event.group_event_user,1,1,1,0
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index 81b2356938b..1141a3f928d 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -1,18 +1,18 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_mail_message_all,mail.message.all,model_mail_message,,1,0,0,0
 access_mail_message_user,mail.message.user,model_mail_message,base.group_user,1,1,1,1
-access_mail_mail_all,mail.mail.all,model_mail_mail,,1,0,1,0
+access_mail_mail_all,mail.mail.all,model_mail_mail,,1,0,0,0
 access_mail_mail_user,mail.mail.user,model_mail_mail,base.group_user,1,1,1,0
 access_mail_mail_system,mail.mail.system,model_mail_mail,base.group_system,1,1,1,1
 access_mail_followers_all,mail.followers.all,model_mail_followers,,1,0,0,0
 access_mail_followers_user,mail.followers.user,model_mail_followers,base.group_user,1,1,0,0
 access_mail_followers_system,mail.followers.system,model_mail_followers,base.group_system,1,1,1,1
-access_mail_notification_all,mail.notification.all,model_mail_notification,,1,0,1,0
+access_mail_notification_all,mail.notification.all,model_mail_notification,,1,0,0,0
 access_mail_notification_user,mail.notification.user,model_mail_notification,base.group_user,1,1,1,0
 access_mail_notification_system,mail.notification.system,model_mail_notification,base.group_system,1,1,1,1
 access_mail_group_all,mail.group.all,model_mail_group,,1,0,0,0
 access_mail_group_user,mail.group.user,model_mail_group,base.group_user,1,1,1,1
-access_mail_alias_all,mail.alias.all,model_mail_alias,,1,0,1,0
+access_mail_alias_all,mail.alias.all,model_mail_alias,,1,0,0,0
 access_mail_alias_user,mail.alias.user,model_mail_alias,base.group_user,1,1,1,0
 access_mail_alias_system,mail.alias.system,model_mail_alias,base.group_system,1,1,1,1
 access_mail_message_subtype_all,mail.message.subtype.all,model_mail_message_subtype,,1,0,0,0

From bf814eb41456d692cb166581dcbda13980ecadd6 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 22 Feb 2013 15:03:15 +0530
Subject: [PATCH 027/164] [IMP] improve yml string

bzr revid: fka@tinyerp.com-20130222093315-efl5r3wjwn7wu2nd
---
 addons/crm/test/process/cancel_lead.yml                      | 2 +-
 addons/crm/test/process/communication_with_customer.yml      | 2 +-
 addons/crm/test/process/lead2opportunity2win.yml             | 2 +-
 addons/crm/test/process/lead2opportunity_assign_salesmen.yml | 2 +-
 addons/crm/test/process/phonecalls.yml                       | 2 +-
 addons/crm/test/ui/delete_lead.yml                           | 2 +-
 addons/event/test/process/event_draft2done.yml               | 2 +-
 addons/hr/test/hr_demo.yml                                   | 2 +-
 addons/hr/test/open2recruit2close_job.yml                    | 2 +-
 addons/hr_attendance/test/attendance_process.yml             | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/crm/test/process/cancel_lead.yml b/addons/crm/test/process/cancel_lead.yml
index ae2b6294c68..bbd17dc2bb0 100644
--- a/addons/crm/test/process/cancel_lead.yml
+++ b/addons/crm/test/process/cancel_lead.yml
@@ -1,5 +1,5 @@
 -
-  Salesman cancel unqualified lead.
+  Salesman can also cancelled unqualified lead and re-open lead so giving access rights of salesman.
 -
   !context
     uid: 'crm_res_users_salesman'
diff --git a/addons/crm/test/process/communication_with_customer.yml b/addons/crm/test/process/communication_with_customer.yml
index 4a36aeebd02..8cce69dada9 100644
--- a/addons/crm/test/process/communication_with_customer.yml
+++ b/addons/crm/test/process/communication_with_customer.yml
@@ -1,5 +1,5 @@
 -
-  Salesman communication with customer.
+  Give the access rights of Salesman to communicat with customer.
 -
   !context
     uid: 'crm_res_users_salesman'
diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml
index c69eb09ac31..1e42fba0e9c 100644
--- a/addons/crm/test/process/lead2opportunity2win.yml
+++ b/addons/crm/test/process/lead2opportunity2win.yml
@@ -1,5 +1,5 @@
 -
-  Salesman convert the lead into opportunity.
+  Giving access rights of salesman to convert the lead into opportunity.
 -
   !context
     uid: 'crm_res_users_salesman'
diff --git a/addons/crm/test/process/lead2opportunity_assign_salesmen.yml b/addons/crm/test/process/lead2opportunity_assign_salesmen.yml
index 9583c6034bf..5a750c94b72 100644
--- a/addons/crm/test/process/lead2opportunity_assign_salesmen.yml
+++ b/addons/crm/test/process/lead2opportunity_assign_salesmen.yml
@@ -21,7 +21,7 @@
     login: 'tud'
     new_password: 'tud'
 -
-  Salesman creates lead.
+  Salesman also creates lead so giving access rights of salesman.
 -
   !context
     uid: 'crm_res_users_salesman'
diff --git a/addons/crm/test/process/phonecalls.yml b/addons/crm/test/process/phonecalls.yml
index 63df8ac89c2..e92ae999a87 100644
--- a/addons/crm/test/process/phonecalls.yml
+++ b/addons/crm/test/process/phonecalls.yml
@@ -1,5 +1,5 @@
 -
-  Salesman check the phone calls data.
+  Salesman check the phone calls data so test with the access rights of salesman.
 -
   !context
     uid: 'crm_res_users_salesman'
diff --git a/addons/crm/test/ui/delete_lead.yml b/addons/crm/test/ui/delete_lead.yml
index 10d2de82e7e..be545e53773 100644
--- a/addons/crm/test/ui/delete_lead.yml
+++ b/addons/crm/test/ui/delete_lead.yml
@@ -1,5 +1,5 @@
 -
-  Sales manager Unlink the Lead.
+  Only Sales manager Unlink the Lead so test with Manager's access rights'.
 -
   !context
     uid: 'crm_res_users_salesmanager'
diff --git a/addons/event/test/process/event_draft2done.yml b/addons/event/test/process/event_draft2done.yml
index e485cb5af6c..2ad762682e5 100644
--- a/addons/event/test/process/event_draft2done.yml
+++ b/addons/event/test/process/event_draft2done.yml
@@ -1,5 +1,5 @@
 -
-  give the access rights of Event user to organize an event and also do registration.
+  Give the access rights of Event user to organize an event and also do registration.
 -
   !context
     uid: 'res_users_eventuser'
diff --git a/addons/hr/test/hr_demo.yml b/addons/hr/test/hr_demo.yml
index c9de2e4ff21..db0d0037c4a 100644
--- a/addons/hr/test/hr_demo.yml
+++ b/addons/hr/test/hr_demo.yml
@@ -1,5 +1,5 @@
 -
-  give the access rights of Hr Officer to create employee.
+  Give the access rights of Hr Officer to create employee.
 -
   !context
     uid: 'res_users_hr_officer'
diff --git a/addons/hr/test/open2recruit2close_job.yml b/addons/hr/test/open2recruit2close_job.yml
index 66fdfa393c8..5519635d2fc 100644
--- a/addons/hr/test/open2recruit2close_job.yml
+++ b/addons/hr/test/open2recruit2close_job.yml
@@ -1,5 +1,5 @@
 -
-  give the access rights of Hr Officer to the user to test the process of Human Resource Management.
+  Give the access rights of Hr Officer to the user to test the process of Human Resource Management.
 -
   !context
     uid: 'res_users_hr_officer'
diff --git a/addons/hr_attendance/test/attendance_process.yml b/addons/hr_attendance/test/attendance_process.yml
index 9f197341b55..8348757b63e 100644
--- a/addons/hr_attendance/test/attendance_process.yml
+++ b/addons/hr_attendance/test/attendance_process.yml
@@ -9,7 +9,7 @@
     groups_id:
       - base.group_hr_user
 -
-  give the access rights of Hr Officer to test attendance process.
+  Give the access rights of Hr Officer to test attendance process.
 -
   !context
     uid: 'res_users_attendance_officer'

From ca1bf8f8f71a9b88af89c8903199e9f4bd1356d1 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 22 Feb 2013 18:59:40 +0530
Subject: [PATCH 028/164] [IMP] add access rights of ir_property in crm

bzr revid: fka@tinyerp.com-20130222132940-2r0kuv66ul3k3pdu
---
 addons/crm/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 74394d3c5ce..3aada0d10be 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -37,3 +37,4 @@ access_crm_lead_partner_manager,crm.lead.partner.manager,model_crm_lead,base.gro
 access_crm_phonecall_partner_manager,crm.phonecall.partner.manager,model_crm_phonecall,base.group_partner_manager,1,1,1,1
 access_crm_payment_mode_user,crm.payment.mode,model_crm_payment_mode,base.group_sale_salesman,1,0,0,0
 access_crm_payment_mode,crm.payment.mode,model_crm_payment_mode,base.group_sale_manager,1,1,1,1
+access_ir_property_salesman,ir_property_salesman,base.model_ir_property,base.group_sale_salesman,1,1,1,0

From ffc81649c6c1948ac2f812cbe3b5c9175b160cd2 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 26 Feb 2013 15:20:17 +0530
Subject: [PATCH 029/164] [IMP]improve code

bzr revid: sgo@tinyerp.com-20130226095017-f7bbnnqngszfq95r
---
 addons/account/security/account_security.xml | 2 +-
 addons/account/security/ir.model.access.csv  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index c86e1cf5eb6..9a2383de45b 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -12,7 +12,7 @@
     <record id="group_account_user" model="res.groups">
         <field name="name">Accountant</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
-        <field name="implied_ids" eval="[(4, ref('group_account_invoice')), (4,ref('base.group_partner_manager'))]"/>
+        <field name="implied_ids" eval="[(4, ref('group_account_invoice'))]"/>
     </record>
 
     <record id="group_account_manager" model="res.groups">
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index d1f0bbab6b5..d164b8026ce 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -71,6 +71,7 @@ access_report_account_type_sales,report.account_type.sales,model_report_account_
 access_report_account_sales,report.account.sales,model_report_account_sales,account.group_account_manager,1,1,1,1
 access_account_invoice_report,account.invoice.report,model_account_invoice_report,account.group_account_manager,1,1,1,1
 access_res_partner_group_account_manager,res_partner group_account_manager,model_res_partner,account.group_account_manager,1,0,0,0
+access_res_partner_group_account_user,res_partner group_account_user,model_res_partner,account.group_account_user,1,1,1,0
 access_account_invoice_accountant,account.invoice accountant,model_account_invoice,account.group_account_user,1,0,0,0
 access_account_tax_code_accountant,account.tax.code accountant,model_account_tax_code,account.group_account_user,1,1,1,1
 access_account_move_line_manager,account.move.line manager,model_account_move_line,account.group_account_manager,1,0,0,0

From 345845415d0e3a507cac078c4c5b887d7ab19213 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 28 Feb 2013 10:30:26 +0530
Subject: [PATCH 030/164] [IMP] change all data of stock yml

bzr revid: fka@tinyerp.com-20130228050026-5yaf2ftrps77jlff
---
 addons/stock/__openerp__.py         |   8 +-
 addons/stock/product.py             |   5 +-
 addons/stock/stock.py               |   1 -
 addons/stock/stock_demo.yml         | 118 ++++++++++++++--------------
 addons/stock/test/opening_stock.yml |  62 +++++++--------
 addons/stock/test/shipment.yml      | 103 ++++++++++++------------
 6 files changed, 146 insertions(+), 151 deletions(-)

diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index b3d7e30f1ce..e1c96ba0c25 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -59,7 +59,6 @@ Dashboard / Reports for Warehouse Management will include:
     'sequence': 16,
     'demo': [
         'stock_demo.xml',
-#        'stock_demo.yml',
     ],
     'data': [
         'security/stock_security.xml',
@@ -91,9 +90,10 @@ Dashboard / Reports for Warehouse Management will include:
         'res_config_view.xml',
     ],
     'test': [
-#        'test/opening_stock.yml',
-#        'test/shipment.yml',
-#        'test/stock_report.yml',
+        'stock_demo.yml',
+        'test/opening_stock.yml',
+        'test/shipment.yml',
+        #'test/stock_report.yml',
     ],
     'installable': True,
     'application': True,
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 1d56ce64988..b00f8615667 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -55,15 +55,14 @@ class product_product(osv.osv):
         if context is None:
             context = {}
         product_obj = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-
         stock_input_acc = product_obj.property_stock_account_input and product_obj.property_stock_account_input.id or False
         if not stock_input_acc:
             stock_input_acc = product_obj.categ_id.property_stock_account_input_categ and product_obj.categ_id.property_stock_account_input_categ.id or False
-
+            
         stock_output_acc = product_obj.property_stock_account_output and product_obj.property_stock_account_output.id or False
         if not stock_output_acc:
             stock_output_acc = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id or False
-
+            
         journal_id = product_obj.categ_id.property_stock_journal and product_obj.categ_id.property_stock_journal.id or False
         account_valuation = product_obj.categ_id.property_stock_valuation_account_id and product_obj.categ_id.property_stock_valuation_account_id.id or False
         return {
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 8e4611dc5d0..ed2b36bd1f5 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2233,7 +2233,6 @@ class stock_move(osv.osv):
 
         acc_valuation = accounts.get('property_stock_valuation_account_id', False)
         journal_id = accounts['stock_journal']
-
         if acc_dest == acc_valuation:
             raise osv.except_osv(_('Error!'),  _('Cannot create Journal Entry, Output Account of this product and Valuation account on category of this product are same.'))
 
diff --git a/addons/stock/stock_demo.yml b/addons/stock/stock_demo.yml
index 99565f0c08c..8e9ea4977b8 100644
--- a/addons/stock/stock_demo.yml
+++ b/addons/stock/stock_demo.yml
@@ -1,99 +1,97 @@
 -
- !record {model: stock.location, id: location_refrigerator}:
-    name: Refrigerator
+ !record {model: stock.location, id: location_monitor}:
+    name: chicago shop
     usage: internal
 -
- !record {model: stock.location, id: location_delivery_counter}:
-    name: Delivery Counter
+ !record {model: stock.location, id: stock_location_output}:
+    name: Output
     usage: internal
 -
- !record {model: stock.location, id: location_refrigerator_small}:
-    name: Small Refrigerator
+ !record {model: stock.location, id: location_monitor_small}:
+    name: Small chicago shop
     usage: internal
-    location_id: location_refrigerator
+    location_id: location_monitor
 -
  !record {model: stock.location, id: location_opening}:
     name: opening
     usage: inventory
 -
- !record {model: stock.location, id: location_convenience_shop}:
-    name: Convenient Store
+ !record {model: stock.location, id: stock_location_3}:
+    name: IT Suppliers
     usage: supplier
 -
- !record {model: stock.warehouse, id: warehouse_icecream}:
-    name: Ice Cream Shop
-    lot_input_id: location_refrigerator
-    lot_stock_id: location_refrigerator
-    lot_output_id: location_delivery_counter
+ !record {model: stock.warehouse, id: stock_warehouse_shop0}:
+    name: Chicago Warehouse
+    lot_input_id: location_monitor
+    lot_stock_id: location_monitor
+    lot_output_id: stock_location_output
 -
- !record {model: product.product, id: product_icecream}:
-    default_code: 001
-    name: Ice Cream
-    type: product
-    categ_id: product.product_category_1
-    list_price: 100.0
-    standard_price: 70.0
-    uom_id: product.product_uom_kgm
-    uom_po_id: product.product_uom_kgm
-    procure_method: make_to_stock
+ !record {model: product.product, id: product_product_6}:
+    default_code: LCD15
+    name: 15” LCD Monitor
+    type: consu
+    categ_id: product.product_category_8
+    list_price: 1200.0
+    standard_price: 800.0
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
     property_stock_inventory: location_opening
     valuation: real_time
     cost_method: average
-    property_stock_account_input: account.o_expense
-    property_stock_account_output: account.o_income
-    description: Ice cream can be mass-produced and thus is widely available in developed parts of the world. Ice cream can be purchased in large cartons (vats and squrounds) from supermarkets and grocery stores, in smaller quantities from ice cream shops, convenience stores, and milk bars, and in individual servings from small carts or vans at public events.
-
+    property_stock_account_input: account.conf_o_expense
+    property_stock_account_output: account.conf_o_income
 -
- !record {model: stock.production.lot, id: lot_icecream_0}:
-    name: Lot0 for Ice cream
-    product_id: product_icecream
+ !record {model: stock.production.lot, id: lot_monitor_0}:
+    name: Lot0 for LCD Monitor
+    product_id: product_product_6
 -
- !record {model: stock.production.lot, id: lot_icecream_1}:
-    name: Lot1 for Ice cream
-    product_id: product_icecream
+ !record {model: stock.production.lot, id: lot_monitor_1}:
+    name: Lot1 for LCD Monitor
+    product_id: product_product_6
 -
- !record {model: stock.inventory, id: stock_inventory_icecream}:
-    name: Inventory for icecream
+ !record {model: stock.inventory, id: stock_inventory_0}:
+    name: Starting Inventory
+    state: draft
 -
- !record {model: stock.inventory.line, id: stock_inventory_line_icecream_lot0}:
-    product_id: product_icecream
-    product_uom: product.product_uom_kgm
-    inventory_id: stock_inventory_icecream
+ !record {model: stock.inventory.line, id: stock_inventory_line_3}:
+    product_id: product_product_6
+    product_uom: product.product_uom_unit
+    inventory_id: stock_inventory_0
     product_qty: 50.0
-    prod_lot_id: lot_icecream_0
-    location_id: location_refrigerator
+    prod_lot_id: lot_monitor_0
+    location_id: location_monitor
 -
- !record {model: stock.inventory.line, id: stock_inventory_line_icecream_lot1}:
-    product_id: product_icecream
-    product_uom: product.product_uom_kgm
-    inventory_id: stock_inventory_icecream
+ !record {model: stock.inventory.line, id: stock_inventory_line_monitor}:
+    product_id: product_product_6
+    product_uom: product.product_uom_unit
+    inventory_id: stock_inventory_0
     product_qty: 40.0
-    prod_lot_id: lot_icecream_1
-    location_id: location_refrigerator
+    prod_lot_id: lot_monitor_1
+    location_id: location_monitor
 
 -
  !record {model: stock.picking, id: outgoing_shipment}:
     type: out
-    location_dest_id: location_delivery_counter
+    location_dest_id: stock_location_output
 -
- !record {model: stock.move, id: outgoing_shipment_icecream}:
+ !record {model: stock.move, id: outgoing_shipment_monitor}:
     picking_id: outgoing_shipment
-    product_id: product_icecream
-    product_uom: product.product_uom_kgm
+    product_id: product_product_6
+    product_uom: product.product_uom_unit
     product_qty: 130.0
-    location_id: location_refrigerator
-    location_dest_id: location_delivery_counter
+    location_id: location_monitor
+    location_dest_id: stock_location_output
 -
  !record {model: stock.picking, id: incomming_shipment}:
     type: in
     invoice_state: 2binvoiced
     partner_id: base.res_partner_address_9
-    location_dest_id: location_refrigerator
+    location_dest_id: location_monitor
 -
- !record {model: stock.move, id: incomming_shipment_icecream}:
+ !record {model: stock.move, id: incomming_shipment_monitor}:
     picking_id: incomming_shipment
-    product_id: product_icecream
-    product_uom: product.product_uom_kgm
+    product_id: product_product_6
+    product_uom: product.product_uom_unit
     product_qty: 50.0
-    location_id: location_convenience_shop
-    location_dest_id: location_refrigerator
+    location_id: stock_location_3
+    location_dest_id: location_monitor
diff --git a/addons/stock/test/opening_stock.yml b/addons/stock/test/opening_stock.yml
index 2e3eaeadc74..41b906e560c 100644
--- a/addons/stock/test/opening_stock.yml
+++ b/addons/stock/test/opening_stock.yml
@@ -1,42 +1,42 @@
 -
-  I update the price of the Ice-cream.
+  I update the price of the 15” LCD Monitor.
 -
   !python {model: stock.change.standard.price}: |
-    context.update({'active_model':'product.product', 'active_id': ref('product_icecream'), 'active_ids':[ref('product_icecream')]})
+    context.update({'active_model':'product.product', 'active_id': ref('product_product_6'), 'active_ids':[ref('product_product_6')]})
 -
   !record {model: stock.change.standard.price, id: change_price}:
-    new_price: 120
+    new_price: 1500
 -
   !python {model: stock.change.standard.price}: |
     self.change_price(cr, uid, [ref('change_price')], context=context)
 -
-  I check price of Ice-cream after update price.
+  I check price of 15” LCD Monitor after update price.
 -
   !python {model: product.product}: |
-    product = self.browse(cr, uid, ref('product_icecream'), context=context)
-    assert product.standard_price == 120, "Price is not updated."
+    product = self.browse(cr, uid, ref('product_product_6'), context=context)
+    assert product.standard_price == 1500, "Price is not updated."
 -
-  I update the current stock of the Ice-cream with 10 kgm in Small Refrigerator in lot0.
+  I update the current stock of the 15” LCD Monitor with 10 unit in stock location shop1 in lot0.
 -
   !record {model: stock.change.product.qty, id: change_qty}:
-    location_id: location_refrigerator_small
+    location_id: location_monitor_small
     new_quantity: 10
-    product_id: product_icecream
-    prodlot_id: lot_icecream_1
+    product_id: product_product_6
+    prodlot_id: lot_monitor_1
 -
   !python {model: stock.change.product.qty}: |
     self.change_product_qty(cr, uid, [ref('change_qty')], context=context)
 -
-  I check available stock of Ice-cream after update stock.
+  I check available stock of 15” LCD Monitor after update stock.
 -
   !python {model: product.product}: |
-    product = self.browse(cr, uid, ref('product_icecream'), context=context)
+    product = self.browse(cr, uid, ref('product_product_6'), context=context)
     assert product.qty_available == 10, "Stock is not updated."
 -
   I merge inventory.
 -
   !python {model: stock.inventory.merge }: |
-    context.update({'active_model': 'stock.inventory', 'active_id': ref('stock_inventory_icecream'), 'active_ids': [ref('stock_inventory_icecream')]})
+    context.update({'active_model': 'stock.inventory', 'active_id': ref('stock_inventory_0'), 'active_ids': [ref('stock_inventory_0')]})
 -
   !record {model: stock.inventory.merge, id: merge_inventory}:
 -
@@ -46,22 +46,22 @@
   I cancel inventory.
 -
   !python {model: stock.inventory}: |
-   self.action_cancel_inventory(cr, uid, [ref('stock_inventory_icecream')])
+   self.action_cancel_inventory(cr, uid, [ref('stock_inventory_0')])
 -
   I reset to draft inventory.
 -
   !python {model: stock.inventory}: |
-    self.action_cancel_draft(cr, uid, [ref('stock_inventory_icecream')])
+    self.action_cancel_draft(cr, uid, [ref('stock_inventory_0')])
 -
-  I confirm physical inventory of Ice-cream which are came in different lots.
+  I confirm physical inventory of 15” LCD Monitor which are came in different lots.
 -
   !python {model: stock.inventory}: |
-    self.action_confirm(cr, uid, [ref('stock_inventory_icecream')], context=context)
+    self.action_confirm(cr, uid, [ref('stock_inventory_0')], context=context)
 -
   I check move details after confirmed physical inventory.
 -
   !python {model: stock.inventory}: |
-    inventory = self.browse(cr, uid, ref('stock_inventory_icecream'), context=context)
+    inventory = self.browse(cr, uid, ref('stock_inventory_0'), context=context)
     assert len(inventory.move_ids) == len(inventory.inventory_line_id), "moves are not correspond."
     for move_line in inventory.move_ids:
         for line in inventory.inventory_line_id:
@@ -77,15 +77,15 @@
   I split inventory line.
 -
   !python {model: stock.inventory.line.split}: |
-    context.update({'active_model': 'stock.inventory.line', 'active_id': ref('stock_inventory_line_icecream_lot0'), 'active_ids': [ref('stock_inventory_line_icecream_lot0')]})
+    context.update({'active_model': 'stock.inventory.line', 'active_id': ref('stock_inventory_line_3'), 'active_ids': [ref('stock_inventory_line_3')]})
 -
   !record {model: stock.inventory.line.split, id: split_inventory_lot0}:
     use_exist: True
     line_exist_ids:
         - quantity: 6
-          prodlot_id: lot_icecream_0
+          prodlot_id: lot_monitor_0
         - quantity: 4
-          prodlot_id: lot_icecream_0
+          prodlot_id: lot_monitor_0
 -
   !python {model: stock.inventory.line.split }: |
     self.split_lot(cr, uid, [ref('split_inventory_lot0')], context=context)
@@ -93,39 +93,39 @@
   I fill inventory line.
 -
   !python {model: stock.fill.inventory}: |
-    context.update({'active_model': 'stock.inventory', 'active_id': ref('stock_inventory_icecream'), 'active_ids': [ref('stock_inventory_icecream')]})
+    context.update({'active_model': 'stock.inventory', 'active_id': ref('stock_inventory_0'), 'active_ids': [ref('stock_inventory_0')]})
 -
   !record {model: stock.fill.inventory, id: fill_inventory}:
-    location_id: location_refrigerator
+    location_id: location_monitor
     recursive: True
 -
   !python {model: stock.fill.inventory }: |
     self.fill_inventory(cr, uid, [ref('fill_inventory')], context=context)
 
 -
-  Now I check vitual stock of Ice-cream after confirmed physical inventory.
+  Now I check vitual stock of 15” LCD Monitor after confirmed physical inventory.
 -
   !python {model: product.product}: |
-    product = self.browse(cr, uid, ref('product_icecream'), context=context)
+    product = self.browse(cr, uid, ref('product_product_6'), context=context)
     assert product.virtual_available == 100, "Vitual stock is not updated."
 -
-  I close physical inventory of Ice-cream.
+  I close physical inventory of 15” LCD Monitor.
 -
   !python {model: stock.inventory}: |
-    self.action_done(cr, uid, [ref('stock_inventory_icecream')], context=context)
+    self.action_done(cr, uid, [ref('stock_inventory_0')], context=context)
 -
-  I check closed move and real stock of Ice-cream after closed physical inventory.
+  I check closed move and real stock of 15” LCD Monitor after closed physical inventory.
 -
   !python {model: stock.inventory}: |
-    inventory = self.browse(cr, uid, ref('stock_inventory_icecream'), context=context)
+    inventory = self.browse(cr, uid, ref('stock_inventory_0'), context=context)
     assert inventory.state == 'done', "inventory is not closed."
     for move_line in inventory.move_ids:
         assert move_line.state == 'done', "Move is not closed."
-    product = self.pool.get('product.product').browse(cr, uid, ref('product_icecream'), context=context)
+    product = self.pool.get('product.product').browse(cr, uid, ref('product_product_6'), context=context)
     product.qty_available == 100, "Real stock is not updated."
 -
   I check stock in lot.
 -
   !python {model: stock.production.lot}: |
-    lot = self.browse(cr, uid, ref('lot_icecream_0'), context=context)
+    lot = self.browse(cr, uid, ref('lot_monitor_0'), context=context)
     assert lot.stock_available == 50, "Stock in lot is not correspond."
diff --git a/addons/stock/test/shipment.yml b/addons/stock/test/shipment.yml
index b30feccdacf..27d5c44d199 100644
--- a/addons/stock/test/shipment.yml
+++ b/addons/stock/test/shipment.yml
@@ -1,5 +1,5 @@
 -
-  I confirm outgoing shipment of 130 kgm Ice-cream.
+  I confirm outgoing shipment of 130 unit 15” LCD Monitor.
 -
   !workflow {model: stock.picking, action: button_confirm, ref: outgoing_shipment}
 -
@@ -12,18 +12,18 @@
         assert move_line.state == "confirmed", "Move should be confirmed."
 
 -
-  Now I check vitual stock of Ice-cream after confirmed outgoing shipment.
+  Now I check vitual stock of 15” LCD Monitor after confirmed outgoing shipment.
 -
   !python {model: product.product}: |
-    product = self.browse(cr, uid, ref('product_icecream'), context=context)
+    product = self.browse(cr, uid, ref('product_product_6'), context=context)
     product.virtual_available == -30, "Vitual stock is not updated."
 
 -
-  I confirm incomming shipment of 50 kgm Ice-cream.
+  I confirm incomming shipment of 50 unit 15” LCD Monitor.
 -
   !workflow {model: stock.picking, action: button_confirm, ref: incomming_shipment}
 -
-  I receive 40kgm Ice-cream so I make backorder of incomming shipment for 40 kgm.
+  I receive 40 unit 15” LCD Monitor so I make backorder of incomming shipment for 40 unit.
 -
   !python {model: stock.partial.picking}: |
     context.update({'active_model': 'stock.picking', 'active_id': ref('incomming_shipment'), 'active_ids': [ref('incomming_shipment')]})
@@ -31,11 +31,11 @@
   !record {model: stock.partial.picking, id: partial_incomming}:
     move_ids:
         - quantity: 40
-          product_id: product_icecream
-          product_uom: product.product_uom_kgm
-          move_id: incomming_shipment_icecream
-          location_id: location_convenience_shop
-          location_dest_id: location_refrigerator
+          product_id: product_product_6
+          product_uom: product.product_uom_unit
+          move_id: incomming_shipment_monitor
+          location_id: stock_location_3
+          location_dest_id: location_monitor
 -
   !python {model: stock.partial.picking }: |
     self.do_partial(cr, uid, [ref('partial_incomming')], context=context)
@@ -51,16 +51,16 @@
         assert move_line.product_qty == 40, "Qty in backorder does not correspond."
         assert move_line.state == 'done', "Move line of backorder should be closed."
 -
-  I receive another 10kgm Ice-cream.
+  I receive another 10 unit 15” LCD Monitor.
 -
   !record {model: stock.partial.picking, id: partial_incomming}:
     move_ids:
         - quantity: 10
-          product_id: product_icecream
-          product_uom: product.product_uom_kgm
-          move_id: incomming_shipment_icecream
-          location_id: location_convenience_shop
-          location_dest_id: location_refrigerator
+          product_id: product_product_6
+          product_uom: product.product_uom_unit
+          move_id: incomming_shipment_monitor
+          location_id: stock_location_3
+          location_dest_id: location_monitor
 -
   !python {model: stock.partial.picking }: |
     self.do_partial(cr, uid, [ref('partial_incomming')], context=context)
@@ -77,7 +77,7 @@
         assert move_line.state == 'done', "Move line should be closed."
 
 -
-  I return last incomming shipment for 10 kgm Ice-cream.
+  I return last incomming shipment for 10 unit 15” LCD Monitor.
 -
   !record {model: stock.return.picking, id: return_incomming}:
     invoice_state: none
@@ -115,11 +115,11 @@
   I check available stock after received incomming shipping.
 -
   !python {model: product.product}: |
-    product = self.browse(cr, uid, ref('product_icecream'), context=context)
+    product = self.browse(cr, uid, ref('product_product_6'), context=context)
     assert product.qty_available == 140, "Stock does not correspond."
     assert product.virtual_available == 0, "Vitual stock does not correspond."
 -
-  I split incomming shipment into lots. each lot contain 10 kgm Ice-cream.
+  I split incomming shipment into lots. each lot contain 10 unit 15” LCD Monitor.
 -
   !python {model: stock.picking}: |
     shipment = self.browse(cr, uid, ref("incomming_shipment"))
@@ -147,7 +147,7 @@
     lot = self.pool.get('stock.move.split').browse(cr, uid, ref('split_lot_incomming'), context=context)
     lot_ids = self.pool.get('stock.production.lot').search(cr, uid, [('name','in',[x.name for x in lot.line_ids])])
     assert len(lot_ids) == 4, 'lots of incomming shipment are not correspond.'
-    move_ids = self.search(cr, uid, [('location_dest_id','=',ref('location_refrigerator')),('prodlot_id','in',lot_ids)])
+    move_ids = self.search(cr, uid, [('location_dest_id','=',ref('location_monitor')),('prodlot_id','in',lot_ids)])
     assert len(move_ids) == 4, 'move lines are not correspond per prodcution lot after splited.'
     for move in self.browse(cr, uid, move_ids, context=context):
         assert move.prodlot_id.name in ['incoming_lot0', 'incoming_lot1', 'incoming_lot2', 'incoming_lot3'], "lot does not correspond." 
@@ -171,39 +171,39 @@
                 assert account_move_line.credit == 0.0, "Credit amount does not correspond."
                 assert account_move_line.debit == 800.0, "Debit amount does not correspond."
 -
-  I consume 1 kgm ice-cream from each incoming lots into internal production.
+  I consume 1 unit 15” LCD Monitor from each incoming lots into internal production.
 -
   !record {model: stock.move.consume, id: consume_lot_incomming}:
     product_qty: 1
-    location_id: location_refrigerator
+    location_id: location_monitor
 -
   !python {model: stock.move.consume}: |
     self.do_move_consume(cr, uid, [ref('consume_lot_incomming')], context=context)
 -
-  I scrap 10 gm ice-cream from each incoming lots into scrap location.
+  I scrap 1 unit 15” LCD Monitor from each incoming lots into scrap location.
 -
   !record {model: stock.move.scrap, id: scrap_lot_incomming}:
-    product_qty: 0.010
+    product_qty: 1
 -
   !python {model: stock.move.scrap}: |
     self.move_scrap(cr, uid, [ref('scrap_lot_incomming')], context=context)
 -
-  I check stock in scrap location and refrigerator location.
+  I check stock in scrap location and stock location shop0.
 -
   !python {model: stock.location}: |
-    ctx = {'product_id': ref('product_icecream')}
-    refrigerator_location = self.pool.get('stock.location').browse(cr, uid, ref('location_refrigerator'), context=ctx)
-    assert refrigerator_location.stock_real == 135.96, 'stock does not correspond in refrigerator location.'
+    ctx = {'product_id': ref('product_product_6')}
+    refrigerator_location = self.pool.get('stock.location').browse(cr, uid, ref('location_monitor'), context=ctx)
+    assert refrigerator_location.stock_real == 36.0, 'stock does not correspond in stock location shop0.'
     scrapped_location = self.browse(cr, uid, ref('stock_location_scrapped'), context=ctx)
-    assert scrapped_location.stock_real == 0.010*4, 'scraped stock does not correspond in scrap location.'
+    assert scrapped_location.stock_real == 1*4, 'scraped stock does not correspond in scrap location.'
     
 -
   I check availabile stock after consumed and scraped.
 -
   !python {model: product.product}: |
-    product = self.browse(cr, uid, ref('product_icecream'), context=context)
-    assert product.qty_available == 135.96, "Stock does not correspond."
-    assert round(product.virtual_available, 2) == -4.04, "Vitual stock does not correspond."
+    product = self.browse(cr, uid, ref('product_product_6'), context=context)
+    assert product.qty_available == 136.0, "Stock does not correspond."
+    assert round(product.virtual_available, 2) == -4.00, "Vitual stock does not correspond."
 -
   I trace all incoming lots.
 -
@@ -212,40 +212,39 @@
     lot_ids = self.search(cr, uid, [('name', 'in', [x.name for x in lot.line_ids])])
     self.action_traceability(cr, uid, lot_ids, context=context)
 -
-  I check outgoing shipment after stock availablity in refrigerator.
+  I check outgoing shipment after stock availablity in Chicago shop.
 -
   !python {model: stock.picking}: |
     shipment = self.browse(cr, uid, ref("outgoing_shipment"), context=context)
-    self.pool.get('stock.move').action_assign(cr, uid, [x.id for x in shipment.move_lines]) #TOFIX: assignment of move lines should be call before testing assigment otherwise picking never gone in assign state
-    #TOFIX: shipment should be assigned if stock available
-    #assert shipment.state == "assigned", "Shipment should be assigned."
-    #for move_line in shipment.move_lines:
-    #    assert move_line.state == "assigned", "Move should be assigned."
+    self.pool.get('stock.move').action_assign(cr, uid, [x.id for x in shipment.move_lines]) 
+    assert shipment.state == "assigned", "Shipment should be assigned."
+    for move_line in shipment.move_lines:
+        assert move_line.state == "assigned", "Move should be assigned."
     self.force_assign(cr, uid, [shipment.id])
 -
-  I deliver 5kgm Ice-cream to customer so I make partial deliver
+  I deliver 5 unit 15” LCD Monitor to customer so I make partial deliver
 -
   !python {model: stock.partial.move}: |
-    context.update({'active_model': 'stock.move', 'active_id': ref('outgoing_shipment_icecream'), 'active_ids': [ref('outgoing_shipment_icecream')]})
+    context.update({'active_model': 'stock.move', 'active_id': ref('outgoing_shipment_monitor'), 'active_ids': [ref('outgoing_shipment_monitor')]})
 -
-  !record {model: stock.partial.move, id: partial_outgoing_icecream}:
+  !record {model: stock.partial.move, id: partial_outgoing_monitor}:
     move_ids:
         - quantity: 5
-          product_id: product_icecream
-          product_uom: product.product_uom_kgm
-          move_id: outgoing_shipment_icecream
-          location_id: location_refrigerator
-          location_dest_id: location_delivery_counter
+          product_id: product_product_6
+          product_uom: product.product_uom_unit
+          move_id: outgoing_shipment_monitor
+          location_id: location_monitor
+          location_dest_id: stock_location_output
 -
   !python {model: stock.partial.move }: |
-    self.do_partial(cr, uid, [ref('partial_outgoing_icecream')], context=context)
+    self.do_partial(cr, uid, [ref('partial_outgoing_monitor')], context=context)
 
 -
-  I packing outgoing shipment into box per 10kgm with unique tracking lot.
+  I packing outgoing shipment into box per 10 unit with unique tracking lot.
 -
   !python {model: stock.move}: |
     stock_split = self.pool.get('stock.split.into')
-    move = self.browse(cr, uid, ref('outgoing_shipment_icecream'), context=context)
+    move = self.browse(cr, uid, ref('outgoing_shipment_monitor'), context=context)
     context.update({'active_model': 'stock.move', 'active_id': move.id, 'active_ids': [move.id]})
     total_qty = move.product_qty
     split_qty = 10
@@ -277,6 +276,6 @@
   I check availaible stock after deliver.
 -
   !python {model: product.product}: |
-    product = self.browse(cr, uid, ref('product_icecream'), context=context)
-    assert round(product.qty_available, 2) == 5.96, "Stock does not correspond."
-    assert round(product.virtual_available, 2) == -4.04, "Vitual stock does not correspond."
+    product = self.browse(cr, uid, ref('product_product_6'), context=context)
+    assert round(product.qty_available, 2) == 6, "Stock does not correspond."
+    assert round(product.virtual_available, 2) == -4.00, "Vitual stock does not correspond."

From 4de42a4254bb6abc30321d183c8609e04dc18009 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 28 Feb 2013 12:01:46 +0530
Subject: [PATCH 031/164] [IMP] improve stock yml

bzr revid: fka@tinyerp.com-20130228063146-kfy538aq3p1hh029
---
 addons/stock/stock_demo.yml    | 4 ++--
 addons/stock/test/shipment.yml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/stock/stock_demo.yml b/addons/stock/stock_demo.yml
index 8e9ea4977b8..b79fd68d509 100644
--- a/addons/stock/stock_demo.yml
+++ b/addons/stock/stock_demo.yml
@@ -38,8 +38,8 @@
     property_stock_inventory: location_opening
     valuation: real_time
     cost_method: average
-    property_stock_account_input: account.conf_o_expense
-    property_stock_account_output: account.conf_o_income
+    property_stock_account_input: account.conf_o_income
+    property_stock_account_output: account.conf_o_expense
 -
  !record {model: stock.production.lot, id: lot_monitor_0}:
     name: Lot0 for LCD Monitor
diff --git a/addons/stock/test/shipment.yml b/addons/stock/test/shipment.yml
index 27d5c44d199..4622e0072bc 100644
--- a/addons/stock/test/shipment.yml
+++ b/addons/stock/test/shipment.yml
@@ -165,11 +165,11 @@
     for account_move_line in account_move.line_id:
         for stock_move in incomming_shipment.move_lines:
             if account_move_line.account_id.id == stock_move.product_id.property_stock_account_input.id:
-                assert account_move_line.credit == 800.0, "Credit amount does not correspond."
+                assert account_move_line.credit == 10000.0, "Credit amount does not correspond."
                 assert account_move_line.debit == 0.0, "Debit amount does not correspond."
             else:
                 assert account_move_line.credit == 0.0, "Credit amount does not correspond."
-                assert account_move_line.debit == 800.0, "Debit amount does not correspond."
+                assert account_move_line.debit == 10000.0, "Debit amount does not correspond."
 -
   I consume 1 unit 15” LCD Monitor from each incoming lots into internal production.
 -
@@ -193,7 +193,7 @@
   !python {model: stock.location}: |
     ctx = {'product_id': ref('product_product_6')}
     refrigerator_location = self.pool.get('stock.location').browse(cr, uid, ref('location_monitor'), context=ctx)
-    assert refrigerator_location.stock_real == 36.0, 'stock does not correspond in stock location shop0.'
+    assert refrigerator_location.stock_real == 136.0, 'stock does not correspond in stock location shop0.'
     scrapped_location = self.browse(cr, uid, ref('stock_location_scrapped'), context=ctx)
     assert scrapped_location.stock_real == 1*4, 'scraped stock does not correspond in scrap location.'
     

From 506b7c9c64f5e0022aa15aeab05d18ca6b766fed Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 28 Feb 2013 12:13:38 +0530
Subject: [PATCH 032/164] [IMP] change data of stock_report.yml

bzr revid: fka@tinyerp.com-20130228064338-r93gtraqgrfc76mc
---
 addons/stock/__openerp__.py        | 2 +-
 addons/stock/test/shipment.yml     | 4 ++--
 addons/stock/test/stock_report.yml | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index e1c96ba0c25..323fac889be 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -93,7 +93,7 @@ Dashboard / Reports for Warehouse Management will include:
         'stock_demo.yml',
         'test/opening_stock.yml',
         'test/shipment.yml',
-        #'test/stock_report.yml',
+        'test/stock_report.yml',
     ],
     'installable': True,
     'application': True,
diff --git a/addons/stock/test/shipment.yml b/addons/stock/test/shipment.yml
index 4622e0072bc..96273a081b7 100644
--- a/addons/stock/test/shipment.yml
+++ b/addons/stock/test/shipment.yml
@@ -192,8 +192,8 @@
 -
   !python {model: stock.location}: |
     ctx = {'product_id': ref('product_product_6')}
-    refrigerator_location = self.pool.get('stock.location').browse(cr, uid, ref('location_monitor'), context=ctx)
-    assert refrigerator_location.stock_real == 136.0, 'stock does not correspond in stock location shop0.'
+    monitor_location = self.pool.get('stock.location').browse(cr, uid, ref('location_monitor'), context=ctx)
+    assert monitor_location.stock_real == 136.0, 'stock does not correspond in stock location shop0.'
     scrapped_location = self.browse(cr, uid, ref('stock_location_scrapped'), context=ctx)
     assert scrapped_location.stock_real == 1*4, 'scraped stock does not correspond in scrap location.'
     
diff --git a/addons/stock/test/stock_report.yml b/addons/stock/test/stock_report.yml
index b1590a4d819..b16ade8a085 100644
--- a/addons/stock/test/stock_report.yml
+++ b/addons/stock/test/stock_report.yml
@@ -4,7 +4,7 @@
   !python {model: stock.location}: |
     import os
     from openerp import netsvc, tools
-    (data, format) = netsvc.LocalService('report.lot.stock.overview').create(cr, uid, [ref('location_refrigerator')], {}, {})
+    (data, format) = netsvc.LocalService('report.lot.stock.overview').create(cr, uid, [ref('location_monitor')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'stock-overview'+format), 'wb+').write(data)
 -
@@ -13,7 +13,7 @@
   !python {model: stock.location}: |
     import os
     from openerp import netsvc, tools
-    (data, format) = netsvc.LocalService('report.lot.stock.overview_all').create(cr, uid, [ref('location_refrigerator')], {}, {})
+    (data, format) = netsvc.LocalService('report.lot.stock.overview_all').create(cr, uid, [ref('location_monitor')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'stock-overviewall'+format), 'wb+').write(data)
 -
@@ -22,7 +22,7 @@
   !python {model: stock.inventory}: |
     import os
     from openerp import netsvc, tools
-    (data, format) = netsvc.LocalService('report.stock.inventory.move').create(cr, uid, [ref('stock_inventory_icecream')], {}, {})
+    (data, format) = netsvc.LocalService('report.stock.inventory.move').create(cr, uid, [ref('stock_inventory_0')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'stock-stock_inventory_move.'+format), 'wb+').write(data)
 -
@@ -40,7 +40,7 @@
   !python {model: product.product}: |
     import os
     from openerp import netsvc, tools
-    (data, format) = netsvc.LocalService('report.stock.product.history').create(cr, uid, [ref('product_icecream')], {}, {})
+    (data, format) = netsvc.LocalService('report.stock.product.history').create(cr, uid, [ref('product_product_6')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'stock-product_stock_report.'+format), 'wb+').write(data)
 

From 721daed4c6bdd35ae44476ad9ae0c3edbb823e89 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 28 Feb 2013 14:35:06 +0530
Subject: [PATCH 033/164] [IMP] add stock_users.yml file in stock for test
 access rights

bzr revid: fka@tinyerp.com-20130228090506-esh7d6nycoqqymay
---
 addons/stock/__openerp__.py       |  1 +
 addons/stock/stock_demo.yml       | 10 ++++++++++
 addons/stock/test/stock_users.yml | 20 ++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 addons/stock/test/stock_users.yml

diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 323fac889be..dd2a996f6dd 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -90,6 +90,7 @@ Dashboard / Reports for Warehouse Management will include:
         'res_config_view.xml',
     ],
     'test': [
+        'test/stock_users.yml',
         'stock_demo.yml',
         'test/opening_stock.yml',
         'test/shipment.yml',
diff --git a/addons/stock/stock_demo.yml b/addons/stock/stock_demo.yml
index b79fd68d509..64be92f8d06 100644
--- a/addons/stock/stock_demo.yml
+++ b/addons/stock/stock_demo.yml
@@ -1,3 +1,8 @@
+-
+  Only stock manager can create location,warehouse and product, so let's check data with giving the access rights of manager
+-
+  !context
+    uid: 'res_users_stock_manager'
 -
  !record {model: stock.location, id: location_monitor}:
     name: chicago shop
@@ -40,6 +45,11 @@
     cost_method: average
     property_stock_account_input: account.conf_o_income
     property_stock_account_output: account.conf_o_expense
+-
+  Stock user can handled production lot,inventory and picking, so let's check data with giving the access rights of user
+-
+  !context
+    uid: 'res_users_stock_user'
 -
  !record {model: stock.production.lot, id: lot_monitor_0}:
     name: Lot0 for LCD Monitor
diff --git a/addons/stock/test/stock_users.yml b/addons/stock/test/stock_users.yml
new file mode 100644
index 00000000000..82d48197b0d
--- /dev/null
+++ b/addons/stock/test/stock_users.yml
@@ -0,0 +1,20 @@
+-
+   Create a user as 'Stock Manager'
+-
+  !record {model: res.users, id: res_users_stock_manager}:
+    company_id: base.main_company
+    name: Stock Manager
+    login: sam
+    password: sam
+    groups_id:
+      - stock.group_stock_manager
+-
+   Create a user as 'Stock User'
+-
+  !record {model: res.users, id: res_users_stock_user}:
+    company_id: base.main_company
+    name: Stock User
+    login: sau
+    password: sau
+    groups_id:
+      - stock.group_stock_user

From 8009999e2981260e73fd11e11bacfa8a1fd84e2f Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 28 Feb 2013 18:58:36 +0530
Subject: [PATCH 034/164] [IMP] give access rights to the user in stock ymls

bzr revid: fka@tinyerp.com-20130228132836-e2f7rknoodpqix0p
---
 addons/stock/security/stock_security.xml |  2 +-
 addons/stock/test/opening_stock.yml      | 30 ++++++++++++++++++++++++
 addons/stock/test/stock_report.yml       |  5 ++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 10ae6a16d59..e51f20c67c9 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -10,7 +10,7 @@
     <record id="group_stock_manager" model="res.groups">
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_warehouse_management"/>
-        <field name="implied_ids" eval="[(4, ref('group_stock_user'))]"/>
+        <field name="implied_ids" eval="[(4, ref('group_stock_user')), (4, ref('account.group_account_user'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
diff --git a/addons/stock/test/opening_stock.yml b/addons/stock/test/opening_stock.yml
index 41b906e560c..9efcfd3af99 100644
--- a/addons/stock/test/opening_stock.yml
+++ b/addons/stock/test/opening_stock.yml
@@ -1,3 +1,8 @@
+-
+  Only stock manager can change the price and update stock of products, so let's check data with giving the access rights of manager
+-
+  !context
+    uid: 'res_users_stock_manager'
 -
   I update the price of the 15” LCD Monitor.
 -
@@ -32,6 +37,11 @@
   !python {model: product.product}: |
     product = self.browse(cr, uid, ref('product_product_6'), context=context)
     assert product.qty_available == 10, "Stock is not updated."
+-
+  Stock user can merge inventory, so let's check data with giving the access rights of user.
+-
+  !context
+    uid: 'res_users_stock_user'
 -
   I merge inventory.
 -
@@ -42,11 +52,21 @@
 -
   !python {model: stock.inventory.merge }: |
     self.do_merge(cr, uid, [ref('merge_inventory')], context=context)
+-
+  Only stock manager cancelled inventory, so let's check data with giving the access rights of manager
+-
+  !context
+    uid: 'res_users_stock_manager'
 -
   I cancel inventory.
 -
   !python {model: stock.inventory}: |
    self.action_cancel_inventory(cr, uid, [ref('stock_inventory_0')])
+-
+  stock user can reset inventory, so let's check data with giving the access rights of user
+-
+  !context
+    uid: 'res_users_stock_user'
 -
   I reset to draft inventory.
 -
@@ -108,11 +128,21 @@
   !python {model: product.product}: |
     product = self.browse(cr, uid, ref('product_product_6'), context=context)
     assert product.virtual_available == 100, "Vitual stock is not updated."
+-
+  Only stock manager can close physical inventory, so let's check data with giving the access rights of manager
+-
+  !context
+    uid: 'res_users_stock_manager'
 -
   I close physical inventory of 15” LCD Monitor.
 -
   !python {model: stock.inventory}: |
     self.action_done(cr, uid, [ref('stock_inventory_0')], context=context)
+-
+  Stock user can check closed move and real stock, so let's check data with giving the access rights of user
+-
+  !context
+    uid: 'res_users_stock_user'
 -
   I check closed move and real stock of 15” LCD Monitor after closed physical inventory.
 -
diff --git a/addons/stock/test/stock_report.yml b/addons/stock/test/stock_report.yml
index b16ade8a085..f1a31f23d93 100644
--- a/addons/stock/test/stock_report.yml
+++ b/addons/stock/test/stock_report.yml
@@ -1,3 +1,8 @@
+-
+  Stock user can print all reports related to stock, so let's check data with giving the access rights of user.
+-
+  !context
+    uid: 'res_users_stock_user'
 -
   I print a stock overview report of location.
 -

From 8eb3f28c28d54a7cca27ac274f78054db9185991 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 1 Mar 2013 11:12:53 +0530
Subject: [PATCH 035/164] [IMP] remove space

bzr revid: fka@tinyerp.com-20130301054253-qbep31elzopq6xa4
---
 addons/stock/product.py | 5 +++--
 addons/stock/stock.py   | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index b00f8615667..254eb53d255 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -55,14 +55,15 @@ class product_product(osv.osv):
         if context is None:
             context = {}
         product_obj = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        
         stock_input_acc = product_obj.property_stock_account_input and product_obj.property_stock_account_input.id or False
         if not stock_input_acc:
             stock_input_acc = product_obj.categ_id.property_stock_account_input_categ and product_obj.categ_id.property_stock_account_input_categ.id or False
-            
+        
         stock_output_acc = product_obj.property_stock_account_output and product_obj.property_stock_account_output.id or False
         if not stock_output_acc:
             stock_output_acc = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id or False
-            
+        
         journal_id = product_obj.categ_id.property_stock_journal and product_obj.categ_id.property_stock_journal.id or False
         account_valuation = product_obj.categ_id.property_stock_valuation_account_id and product_obj.categ_id.property_stock_valuation_account_id.id or False
         return {
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index ed2b36bd1f5..8e4611dc5d0 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2233,6 +2233,7 @@ class stock_move(osv.osv):
 
         acc_valuation = accounts.get('property_stock_valuation_account_id', False)
         journal_id = accounts['stock_journal']
+
         if acc_dest == acc_valuation:
             raise osv.except_osv(_('Error!'),  _('Cannot create Journal Entry, Output Account of this product and Valuation account on category of this product are same.'))
 

From b6cbd45d01274615bdb1ee17a831dbddc4fdc091 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 1 Mar 2013 11:17:45 +0530
Subject: [PATCH 036/164] [IMP] remove space

bzr revid: fka@tinyerp.com-20130301054745-52t0n0mh8b3xo4qt
---
 addons/stock/product.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index 254eb53d255..1d56ce64988 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -55,15 +55,15 @@ class product_product(osv.osv):
         if context is None:
             context = {}
         product_obj = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-        
+
         stock_input_acc = product_obj.property_stock_account_input and product_obj.property_stock_account_input.id or False
         if not stock_input_acc:
             stock_input_acc = product_obj.categ_id.property_stock_account_input_categ and product_obj.categ_id.property_stock_account_input_categ.id or False
-        
+
         stock_output_acc = product_obj.property_stock_account_output and product_obj.property_stock_account_output.id or False
         if not stock_output_acc:
             stock_output_acc = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id or False
-        
+
         journal_id = product_obj.categ_id.property_stock_journal and product_obj.categ_id.property_stock_journal.id or False
         account_valuation = product_obj.categ_id.property_stock_valuation_account_id and product_obj.categ_id.property_stock_valuation_account_id.id or False
         return {

From ab83bc5d851b6339806c56804adb0eee151816a0 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 1 Mar 2013 14:58:05 +0530
Subject: [PATCH 037/164] [IMP] add yml of mrp_users and give access rights

bzr revid: fka@tinyerp.com-20130301092805-56z3lzm8obeon6re
---
 addons/mrp/__openerp__.py               |  7 ++++---
 addons/mrp/security/ir.model.access.csv |  1 +
 addons/mrp/security/mrp_security.xml    |  1 +
 addons/mrp/test/cancel_order.yml        |  5 +++++
 addons/mrp/test/mrp_users.yml           | 20 ++++++++++++++++++++
 addons/mrp/test/order_demo.yml          |  5 +++++
 addons/mrp/test/order_process.yml       |  5 +++++
 7 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 addons/mrp/test/mrp_users.yml

diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index 6e025ae2d90..5f5ded337a7 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -77,9 +77,10 @@ Dashboard / Reports for MRP will include:
     #TODO: This yml tests are needed to be completely reviewed again because the product wood panel is removed in product demo as it does not suit for new demo context of computer and consultant company
     # so the ymls are too complex to change at this stage
     'test': [
-#         'test/order_demo.yml',
-#         'test/order_process.yml',
-#         'test/cancel_order.yml',
+         'test/mrp_users.yml',
+         'test/order_demo.yml',
+         'test/order_process.yml',
+         'test/cancel_order.yml',
     ],
     'installable': True,
     'application': True,
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 7a94b1a660c..2d0a478c33d 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -1,4 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_analytic_line_user,account.analytic.line,account.model_account_analytic_line,group_mrp_user,1,1,1,0
 access_mrp_workcenter,mrp.workcenter,model_mrp_workcenter,mrp.group_mrp_user,1,0,0,0
 access_mrp_routing,mrp.routing,model_mrp_routing,mrp.group_mrp_user,1,0,0,0
 access_mrp_routing_workcenter,mrp.routing.workcenter,model_mrp_routing_workcenter,mrp.group_mrp_user,1,0,0,0
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index 35aae42b53d..9e5dc919720 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -4,6 +4,7 @@
 
     <record id="group_mrp_user" model="res.groups">
         <field name="name">User</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
         <field name="category_id" ref="base.module_category_manufacturing"/>
     </record>
     <record id="group_mrp_manager" model="res.groups">
diff --git a/addons/mrp/test/cancel_order.yml b/addons/mrp/test/cancel_order.yml
index 9e197156b15..2f721b6c653 100644
--- a/addons/mrp/test/cancel_order.yml
+++ b/addons/mrp/test/cancel_order.yml
@@ -1,3 +1,8 @@
+-
+  MRP user can cancelled Production Order, so let's check data with giving the access rights of user.
+-
+  !context
+    uid: 'res_users_mrp_user'
 -
   I first confirm order for PC Assemble SC349.
 -
diff --git a/addons/mrp/test/mrp_users.yml b/addons/mrp/test/mrp_users.yml
new file mode 100644
index 00000000000..d18cc51e8e6
--- /dev/null
+++ b/addons/mrp/test/mrp_users.yml
@@ -0,0 +1,20 @@
+-
+   Create a user as 'MRP Manager'
+-
+  !record {model: res.users, id: res_users_mrp_manager}:
+    company_id: base.main_company
+    name: MRP Manager
+    login: mam
+    password: mam
+    groups_id:
+      - mrp.group_mrp_manager
+-
+   Create a user as 'MRP User'
+-
+  !record {model: res.users, id: res_users_mrp_user}:
+    company_id: base.main_company
+    name: MRP User
+    login: mau
+    password: mau
+    groups_id:
+      - mrp.group_mrp_user
diff --git a/addons/mrp/test/order_demo.yml b/addons/mrp/test/order_demo.yml
index ee21fee96df..0e4914390fb 100644
--- a/addons/mrp/test/order_demo.yml
+++ b/addons/mrp/test/order_demo.yml
@@ -1,3 +1,8 @@
+-
+  MRP user can create Production Order, so let's check data with giving the access rights of user.
+-
+  !context
+    uid: 'res_users_mrp_user'
 -
   I create Production Order of PC Assemble SC349 to produce 5.0 Unit.
 -
diff --git a/addons/mrp/test/order_process.yml b/addons/mrp/test/order_process.yml
index 89331d5c255..8aa408483e9 100644
--- a/addons/mrp/test/order_process.yml
+++ b/addons/mrp/test/order_process.yml
@@ -1,3 +1,8 @@
+-
+  MRP user can doing all process related to Production Order, so let's check data with giving the access rights of user.
+-
+  !context
+    uid: 'res_users_mrp_user'
 -
   I compute the production order.
 -

From b98082337bae437ac615465e40226a4f42838575 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 12 Mar 2013 14:09:55 +0530
Subject: [PATCH 038/164] [IMP]Improve yml and make work with purchase user

bzr revid: sgo@tinyerp.com-20130312083955-la478tbdpfqtv1wr
---
 addons/purchase/test/process/invoice_on_poline.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/purchase/test/process/invoice_on_poline.yml b/addons/purchase/test/process/invoice_on_poline.yml
index 8a391b13ebb..d31b371f009 100644
--- a/addons/purchase/test/process/invoice_on_poline.yml
+++ b/addons/purchase/test/process/invoice_on_poline.yml
@@ -1,3 +1,8 @@
+-
+   Purchase User confirm the order and create invoice based on purchase order line.
+-
+  !context
+    uid: 'res_users_purchase_user'
 -
    I confirm purchase order which has invoicing control method "Based on Purchase Order Lines".
 -
@@ -17,10 +22,4 @@
    !python {model: purchase.order}: |
      purchase_order = self.browse(cr, uid, ref("purchase_order_6"))
      for purchase_line in purchase_order.order_line:
-       assert len(purchase_order.invoice_ids) == 1, "Invoice should be generated."
--
-  I set the default invoicing control method "Based on Purchase Order Lines".
--
-  !python {model: purchase.config.settings}: |
-    new_id = self.create(cr, uid, {'default_invoice_method': 'manual'})
-    self.execute(cr, uid, [new_id])
+       assert len(purchase_order.invoice_ids) == 1, "Invoice should be generated."
\ No newline at end of file

From 15f6bea1e9eacbe97b90b38337105a1c4219d757 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 12 Mar 2013 16:57:00 +0530
Subject: [PATCH 039/164] [IMP]improve yml for project and add access rights as
 needed

bzr revid: sgo@tinyerp.com-20130312112700-zamjzcjp5d9nv5n0
---
 addons/project/__openerp__.py                |  1 +
 addons/project/security/ir.model.access.csv  |  1 +
 addons/project/security/project_security.xml |  1 +
 addons/project/test/project_demo.yml         | 23 +++++++++----
 addons/project/test/project_process.yml      |  5 +++
 addons/project/test/project_users.yml        | 20 +++++++++++
 addons/project/test/task_process.yml         | 35 +++++++++++---------
 7 files changed, 65 insertions(+), 21 deletions(-)
 create mode 100644 addons/project/test/project_users.yml

diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index c0a516cf555..94761835656 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -79,6 +79,7 @@ Dashboard / Reports for Project Management will include:
     ],
     'demo': ['project_demo.xml'],
     'test': [
+        'test/project_users.yml',
         'test/project_demo.yml',
         'test/project_process.yml',
         'test/task_process.yml',
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index a76faa0fcce..1428f445e43 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -19,6 +19,7 @@ access_project_task_history,project.task.history project,project.model_project_t
 access_project_task_history_cumulative,project.task.history project,project.model_project_task_history_cumulative,project.group_project_manager,1,0,0,0
 access_project_task_history_cumulative,project.task.history project,project.model_project_task_history_cumulative,project.group_project_user,1,0,0,0
 access_resource_calendar,project.resource_calendar manager,resource.model_resource_calendar,project.group_project_manager,1,0,0,0
+access_resource_calendar_leaves,project.resource_calendar_leaves manager,resource.model_resource_calendar_leaves,project.group_project_manager,1,0,0,0
 access_project_category,project.project_category,model_project_category,,1,0,0,0
 access_project_category_manager,project.project_category,model_project_category,project.group_project_manager,1,1,1,1
 access_mail_alias,mail.alias,mail.model_mail_alias,project.group_project_manager,1,1,1,1
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index f1d8c7e760f..f17c781d702 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -4,6 +4,7 @@
 
     <record id="group_project_user" model="res.groups">
         <field name="name">User</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
         <field name="category_id" ref="base.module_category_project_management"/>
     </record>
 
diff --git a/addons/project/test/project_demo.yml b/addons/project/test/project_demo.yml
index 5f6acbb913e..21d0af324ff 100644
--- a/addons/project/test/project_demo.yml
+++ b/addons/project/test/project_demo.yml
@@ -1,12 +1,23 @@
+-
+  I Update project and create the new task with project manager
+-
+  !context
+    uid: 'res_users_project_manager'
+-
+  Change partner for The Jackson Group's Project
 -
   !record {model: project.project, id: project_project_1, view: False}:
     partner_id: base.res_partner_2
 -
-  !record {model: project.task, id: project_task_1, view: False}:
+  I create task for The Jackson Group's Project project user can create task. 
+-
+  !context
+    uid: 'res_users_project_user'
+-
+  !record {model: project.task, id: project_task_for_project1}:
+    name: Worked on new specification
+    user_id: res_users_project_user
     remaining_hours: 10.00
--
-  !record {model: project.task, id: project_task_1, view: False}:
     planned_hours: 10.00
--
-  !record {model: project.task, id: project_task_1, view: False}:
-    project_id: project_project_1
\ No newline at end of file
+    project_id: project_project_1
+    stage_id: project_tt_specification
\ No newline at end of file
diff --git a/addons/project/test/project_process.yml b/addons/project/test/project_process.yml
index c2a5c072e9d..9ef488a07b4 100644
--- a/addons/project/test/project_process.yml
+++ b/addons/project/test/project_process.yml
@@ -1,3 +1,8 @@
+-
+  Test the whole project process with project manager.
+-
+  !context
+    uid: 'res_users_project_manager'
 -
   In order to Test Process of Project Management,
 -
diff --git a/addons/project/test/project_users.yml b/addons/project/test/project_users.yml
new file mode 100644
index 00000000000..b23ab0fc7f6
--- /dev/null
+++ b/addons/project/test/project_users.yml
@@ -0,0 +1,20 @@
+-
+  Create a user as 'Project manager'
+-
+  !record {model: res.users, id: res_users_project_manager}:
+    company_id: base.main_company
+    name: Project Manager
+    login: prm
+    password: prm
+    groups_id:
+      - project.group_project_manager
+-
+  Create a user as 'Project user'
+-
+  !record {model: res.users, id: res_users_project_user}:
+    company_id: base.main_company
+    name: Project User
+    login: pru
+    password: pru
+    groups_id:
+      - project.group_project_user
\ No newline at end of file
diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml
index e37b2116714..664f0b1563e 100644
--- a/addons/project/test/task_process.yml
+++ b/addons/project/test/task_process.yml
@@ -1,46 +1,51 @@
+-
+  Test the whole task process with project user.
+-
+  !context
+    uid: 'res_users_project_user'
 -
   I put task in pending due to specification is not clear.
 -
   !python {model: project.task}: |
-    self.do_pending(cr, uid, [ref("project_task_1")])
-    context.update({"active_id": ref("project_task_1")})
+    self.do_pending(cr, uid, [ref("project_task_for_project1")])
+    context.update({"active_id": ref("project_task_for_project1")})
 -
   I check state  of task after put in pending.
 -
-  !assert {model: project.task, id: project_task_1, severity: error, string: task should be in pending state}:
+  !assert {model: project.task, id: project_task_for_project1, severity: error, string: task should be in pending state}:
     - state == "pending"
 -
   !record {model: project.task.delegate, id: delegate_id}:
-    user_id: base.user_demo
+    user_id: res_users_project_user
     planned_hours: 12.0
     planned_hours_me: 2.0
 -
   Now I delegate task to team member.
 -
   !python {model: project.task.delegate}: |
-    self.delegate(cr, uid, [ref("delegate_id")], {"active_id": ref("project_task_1")})
+    self.delegate(cr, uid, [ref("delegate_id")], {"active_id": ref("project_task_for_project1")})
 -
   I check delegated task details.
 -
   !python {model: project.task}: |
-    task = self.browse(cr, uid, ref("project_task_1"), context=context)
+    task = self.browse(cr, uid, ref("project_task_for_project1"), context=context)
     assert task.planned_hours == 2.0, "Planning hours is not correct after delegated."
     assert task.state == "pending", "Task should be in Pending after delegated."
 -
   I re-open the task.
 -
   !python {model: project.task}: |
-    self.do_reopen(cr, uid, [ref("project_task_1")])
+    self.do_reopen(cr, uid, [ref("project_task_for_project1")])
 -
   I check reopened task details.
 -
-  !assert {model: project.task, id: project_task_1, severity: error, string: task should be open.}:
+  !assert {model: project.task, id: project_task_for_project1, severity: error, string: task should be open.}:
     - state == "open"
 -
   I change the stage of task to next stage.
 -
   !python {model: project.task}: |
-    self.stage_next(cr, uid, [ref("project_task_1")])
+    self.stage_next(cr, uid, [ref("project_task_for_project1")])
 -
   !record {model: project.task.reevaluate, id: reevaluate_id}:
     remaining_hours : 120
@@ -48,29 +53,29 @@
   I reevaluate task with remaining hours.
 -
   !python {model: project.task.reevaluate}: |
-    self.compute_hours(cr, uid, [ref("reevaluate_id")], {"active_id": ref("project_task_1")})
+    self.compute_hours(cr, uid, [ref("reevaluate_id")], {"active_id": ref("project_task_for_project1")})
 -
   I check remaining hours after reevaluated task.
 -
-  !assert {model: project.task, id: project_task_1, severity: error, string: task should be reevaluated}:
+  !assert {model: project.task, id: project_task_for_project1, severity: error, string: task should be reevaluated}:
     - remaining_hours == 120.0
 -
   I close the task.
 -
   !python {model: project.task}: |
-    self.action_close(cr, uid, [ref("project_task_1")])
+    self.action_close(cr, uid, [ref("project_task_for_project1")])
 -
   I check state after closed.
 -
-  !assert {model: project.task, id: project_task_1, severity: error, string: task is in open state}:
+  !assert {model: project.task, id: project_task_for_project1, severity: error, string: task is in open state}:
     - state == "done"
 -
   I change the stage of task to previous stage.
 -
   !python {model: project.task}: |
-    self.stage_previous(cr, uid, [ref("project_task_1")])
+    self.stage_previous(cr, uid, [ref("project_task_for_project1")])
 -
   I cancel Task.
 -
   !python {model: project.task}: |
-    self.do_cancel(cr, uid, [ref("project_task_2")])
+    self.do_cancel(cr, uid, [ref("project_task_for_project1")])

From 6bc66196127703dfc15245872fa99ee23dc91946 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 14 Mar 2013 15:11:01 +0530
Subject: [PATCH 040/164] [IMP] give access rights in project issue

bzr revid: fka@tinyerp.com-20130314094101-3n3mkiw1msm0vyrc
---
 addons/project_issue/__openerp__.py           |  1 +
 addons/project_issue/test/cancel_issue.yml    |  5 +++++
 addons/project_issue/test/issue_demo.yml      |  5 +++++
 addons/project_issue/test/issue_process.yml   | 15 ++++++++++++++
 addons/project_issue/test/issue_users.yml     | 20 +++++++++++++++++++
 addons/project_issue/test/subscribe_issue.yml |  7 ++++++-
 6 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 addons/project_issue/test/issue_users.yml

diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 2c5f311c044..553268ca224 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -53,6 +53,7 @@ It allows the manager to quickly check the issues, assign them and decide on the
      ],
     'demo': ['project_issue_demo.xml'],
     'test': [
+        'test/issue_users.yml',
         'test/subscribe_issue.yml',
         'test/issue_process.yml',
         'test/cancel_issue.yml',
diff --git a/addons/project_issue/test/cancel_issue.yml b/addons/project_issue/test/cancel_issue.yml
index 76ffa212638..b69f95675c6 100644
--- a/addons/project_issue/test/cancel_issue.yml
+++ b/addons/project_issue/test/cancel_issue.yml
@@ -1,3 +1,8 @@
+-
+  Project user can cancelled issue, so let's check data with giving the access rights of user.
+-
+  !context
+    uid: 'res_users_project_issue_user'
 -
   In order to test process of issue tracking in OpenERP, I cancel the unqualified Issue.
 -
diff --git a/addons/project_issue/test/issue_demo.yml b/addons/project_issue/test/issue_demo.yml
index 4e3790361e5..7040b631f46 100644
--- a/addons/project_issue/test/issue_demo.yml
+++ b/addons/project_issue/test/issue_demo.yml
@@ -1,3 +1,8 @@
+-
+  Test the whole create project issue with project user.
+-
+  !context
+    uid: 'res_users_project_issue_user'
 -
   !record {model: project.issue, id: project_task_1, view: False}:
    task_id: 'project.project_task_17'
diff --git a/addons/project_issue/test/issue_process.yml b/addons/project_issue/test/issue_process.yml
index afb68a9b6c2..b5fe763fb43 100644
--- a/addons/project_issue/test/issue_process.yml
+++ b/addons/project_issue/test/issue_process.yml
@@ -1,3 +1,8 @@
+-
+  Project user can subscribe issue, so let's check data with giving the access rights of user.
+-
+  !context
+    uid: 'res_users_project_issue_user'
 -
   In order to test process of issue tracking in OpenERP, I Open the Issue.
 -
@@ -40,11 +45,21 @@
 -
   !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in open state}:
     - state == 'open'   
+-
+  Only project manager can create Task for Issue, so let's check data with giving the access rights of manager.
+-
+  !context
+    uid: 'res_users_project_issue_manager'
 -
   I create Task for Issue.
 -
   !python {model: project.issue}: |
     self.convert_issue_task(cr, uid, [ref("crm_case_buginaccountsmodule0")])
+-
+  After resolving Issue Project user can close issue, so let's check data with giving the access rights of user.
+-
+  !context
+    uid: 'res_users_project_issue_user'
 -
   I close Issue after resolving it
 -
diff --git a/addons/project_issue/test/issue_users.yml b/addons/project_issue/test/issue_users.yml
new file mode 100644
index 00000000000..3493ac58ffc
--- /dev/null
+++ b/addons/project_issue/test/issue_users.yml
@@ -0,0 +1,20 @@
+-
+  Create a user as 'Project manager'
+-
+  !record {model: res.users, id: res_users_project_issue_manager}:
+    company_id: base.main_company
+    name: Project Manager
+    login: prim
+    password: prim
+    groups_id:
+      - project.group_project_manager
+-
+  Create a user as 'Project user'
+-
+  !record {model: res.users, id: res_users_project_issue_user}:
+    company_id: base.main_company
+    name: Project User
+    login: priu
+    password: priu
+    groups_id:
+      - project.group_project_user
\ No newline at end of file
diff --git a/addons/project_issue/test/subscribe_issue.yml b/addons/project_issue/test/subscribe_issue.yml
index 9f16dc80b97..e07c8704a14 100644
--- a/addons/project_issue/test/subscribe_issue.yml
+++ b/addons/project_issue/test/subscribe_issue.yml
@@ -1,5 +1,10 @@
 -
-  In Order to test process of  Issue in OpenERP, Custmer send the issue by email.
+  Project user can subscribe issue, so let's check data with giving the access rights of user.
+-
+  !context
+    uid: 'res_users_project_issue_user'
+-
+  In Order to test process of  Issue in OpenERP, Customer send the issue by email.
 -
   !python {model: mail.thread}: |
     from openerp import addons

From 6f4588cc62f212ba1f0040f83ab21b0546c62989 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 14 Mar 2013 15:44:49 +0530
Subject: [PATCH 041/164] [IMP] give access rights in yml of mrp operations

bzr revid: fka@tinyerp.com-20130314101449-a51uxlekaod33s8f
---
 addons/mrp_operations/__openerp__.py          |  2 +-
 .../test/workcenter_operations.yml            | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py
index 7fedb426edd..12d86e0b532 100644
--- a/addons/mrp_operations/__openerp__.py
+++ b/addons/mrp_operations/__openerp__.py
@@ -70,7 +70,7 @@ So, that we can compare the theoretic delay and real delay.
              'mrp_operations_demo.yml'
     ],
     'test': [ 
-#        'test/workcenter_operations.yml',
+        'test/workcenter_operations.yml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/mrp_operations/test/workcenter_operations.yml b/addons/mrp_operations/test/workcenter_operations.yml
index 4754bb463ff..3bcdc77ecab 100644
--- a/addons/mrp_operations/test/workcenter_operations.yml
+++ b/addons/mrp_operations/test/workcenter_operations.yml
@@ -1,6 +1,19 @@
+-
+   Create a user as 'MRP User'
+-
+  !record {model: res.users, id: res_mrp_operation_user}:
+    company_id: base.main_company
+    name: MRP User
+    login: maou
+    password: maou
+    groups_id:
+      - mrp.group_mrp_user
 -
   In order to test mrp_operations with OpenERP, I refer created production order of PC Assemble SC349
-  with routing - Manual Component's Assembly to test complete production process with respect of workcenter.
+  with routing - Manual Component's Assembly to test complete production process with respect of workcenter with giving access rights of MRP User.
+-
+  !context
+    uid: 'res_mrp_operation_user'
 -
   I compute the production order.
 -
@@ -92,7 +105,7 @@
   I print a Barcode Report of Operation line.
 -
   !python {model: mrp_operations.operation.code}: |
-    import netsvc, tools, os
+    from openerp import netsvc, tools
     (data, format) = netsvc.LocalService('report.mrp.code.barcode').create(cr, uid, [ref('mrp_operations.mrp_op_1'),ref('mrp_operations.mrp_op_2'),ref('mrp_operations.mrp_op_3'),ref('mrp_operations.mrp_op_4'),ref('mrp_operations.mrp_op_5')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'mrp_operations-barcode_report.'+format), 'wb+').write(data)
@@ -101,7 +114,7 @@
   I print Workcenter's Barcode Report.
 -
   !python {model: mrp.workcenter}: |
-    import netsvc, tools, os
+    from openerp import netsvc, tools
     (data, format) = netsvc.LocalService('report.mrp.wc.barcode').create(cr, uid, [ref('mrp.mrp_workcenter_0'),ref('mrp.mrp_workcenter_1')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'mrp_operations-workcenter_barcode_report.'+format), 'wb+').write(data)

From d3905268bc08f08db34669b8e90045fc2fb6f8f6 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 14 Mar 2013 16:24:11 +0530
Subject: [PATCH 042/164] [IMP] give access rights in yml of mrp repair

bzr revid: fka@tinyerp.com-20130314105411-cgqik9a6grk0pqjl
---
 addons/mrp_repair/__openerp__.py              |  3 ++-
 addons/mrp_repair/test/mrp_repair_users.yml   | 20 +++++++++++++++++++
 .../test/test_mrp_repair_afterinv.yml         |  5 ++++-
 .../mrp_repair/test/test_mrp_repair_b4inv.yml |  5 ++++-
 .../test/test_mrp_repair_cancel.yml           |  5 ++++-
 .../test/test_mrp_repair_noneinv.yml          |  5 ++++-
 6 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 addons/mrp_repair/test/mrp_repair_users.yml

diff --git a/addons/mrp_repair/__openerp__.py b/addons/mrp_repair/__openerp__.py
index 26480e975ce..a274cbc3ef4 100644
--- a/addons/mrp_repair/__openerp__.py
+++ b/addons/mrp_repair/__openerp__.py
@@ -52,7 +52,8 @@ The following topics should be covered by this module:
         'mrp_repair_report.xml',
     ],
     'demo': ['mrp_repair_demo.yml'],
-    'test': ['test/test_mrp_repair_noneinv.yml',
+    'test': ['test/mrp_repair_users.yml',
+             'test/test_mrp_repair_noneinv.yml',
              'test/test_mrp_repair_b4inv.yml',
              'test/test_mrp_repair_afterinv.yml',
              'test/test_mrp_repair_cancel.yml',
diff --git a/addons/mrp_repair/test/mrp_repair_users.yml b/addons/mrp_repair/test/mrp_repair_users.yml
new file mode 100644
index 00000000000..dee61653209
--- /dev/null
+++ b/addons/mrp_repair/test/mrp_repair_users.yml
@@ -0,0 +1,20 @@
+-
+   Create a user as 'MRP Repair Manager'
+-
+  !record {model: res.users, id: res_mrp_repair_manager}:
+    company_id: base.main_company
+    name: MRP Manager
+    login: marm
+    password: marm
+    groups_id:
+      - mrp.group_mrp_manager
+-
+   Create a user as 'MRP Repair User'
+-
+  !record {model: res.users, id: res_mrp_repair_user}:
+    company_id: base.main_company
+    name: MRP User
+    login: maru
+    password: maru
+    groups_id:
+      - mrp.group_mrp_user
\ No newline at end of file
diff --git a/addons/mrp_repair/test/test_mrp_repair_afterinv.yml b/addons/mrp_repair/test/test_mrp_repair_afterinv.yml
index 5ceb3f9b02b..583518ee7de 100644
--- a/addons/mrp_repair/test/test_mrp_repair_afterinv.yml
+++ b/addons/mrp_repair/test/test_mrp_repair_afterinv.yml
@@ -1,5 +1,8 @@
 -
-  In order to test Invoice Method 'After Repair'.
+  In order to test Invoice Method 'After Repair' with giving the access rights of mrp user.
+-
+  !context
+    uid: 'res_mrp_repair_user'
 -
   I confirm Repair order taking Invoice Method 'After Repair'.
 -
diff --git a/addons/mrp_repair/test/test_mrp_repair_b4inv.yml b/addons/mrp_repair/test/test_mrp_repair_b4inv.yml
index 47e301cd0bd..0b31c3970de 100644
--- a/addons/mrp_repair/test/test_mrp_repair_b4inv.yml
+++ b/addons/mrp_repair/test/test_mrp_repair_b4inv.yml
@@ -1,5 +1,8 @@
 -
-  Now I test for Invoice Method 'Before Repair'.
+  Now I test for Invoice Method 'Before Repair' with giving the access rights of mrp user.
+-
+  !context
+    uid: 'res_mrp_repair_user'
 -
   I confirm Repair order for Invoice Method 'Before Repair'.
 -
diff --git a/addons/mrp_repair/test/test_mrp_repair_cancel.yml b/addons/mrp_repair/test/test_mrp_repair_cancel.yml
index ee0e9c379e7..83a8b901fd3 100644
--- a/addons/mrp_repair/test/test_mrp_repair_cancel.yml
+++ b/addons/mrp_repair/test/test_mrp_repair_cancel.yml
@@ -1,6 +1,9 @@
 -
   In order to test the cancel flow of mrp_repair module,
-  I start by creating new copy Repair order for "PC Assemble SC234" product.
+  I start by creating new copy Repair order for "PC Assemble SC234" product with giving access rights of mrp user.
+-
+  !context
+    uid: 'res_mrp_repair_user'
 -
   !python {model: mrp.repair}: |
     copy_id = self.copy(cr, uid, ref("mrp_repair_rmrp1"))
diff --git a/addons/mrp_repair/test/test_mrp_repair_noneinv.yml b/addons/mrp_repair/test/test_mrp_repair_noneinv.yml
index 4334af01958..1e411e45605 100644
--- a/addons/mrp_repair/test/test_mrp_repair_noneinv.yml
+++ b/addons/mrp_repair/test/test_mrp_repair_noneinv.yml
@@ -1,5 +1,8 @@
 -
-  In order to test "mrp_repair" module, I start with confirm state, and start repair.
+  In order to test "mrp_repair" module, I start with confirm state, and start repair with giving the access rights of mrp user.
+-
+  !context
+    uid: 'res_mrp_repair_user'
 -
   I confirm Repair order for Invoice Method 'No Invoice'.
 -

From 541a46fb877043ccb0f65768178495e8a30900c9 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 14 Mar 2013 16:50:18 +0530
Subject: [PATCH 043/164] [IMP] give access rights in yml of hr_timesheet

bzr revid: fka@tinyerp.com-20130314112018-oy0m2lhwc0euq3nh
---
 addons/hr_timesheet/__openerp__.py            |  1 +
 .../hr_timesheet/test/hr_timesheet_demo.yml   |  5 ++++
 .../hr_timesheet/test/hr_timesheet_users.yml  | 30 +++++++++++++++++++
 .../hr_timesheet/test/test_hr_timesheet.yml   | 10 +++++++
 4 files changed, 46 insertions(+)
 create mode 100644 addons/hr_timesheet/test/hr_timesheet_users.yml

diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index bff25e8e55d..3c026ac2d07 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -57,6 +57,7 @@ up a management by affair.
     ],
     'demo': ['hr_timesheet_demo.xml'],
     'test': [
+        'test/hr_timesheet_users.yml',
         'test/test_hr_timesheet.yml',
         'test/hr_timesheet_report.yml',
         'test/hr_timesheet_demo.yml',
diff --git a/addons/hr_timesheet/test/hr_timesheet_demo.yml b/addons/hr_timesheet/test/hr_timesheet_demo.yml
index a868be2d710..723e3a1a08c 100644
--- a/addons/hr_timesheet/test/hr_timesheet_demo.yml
+++ b/addons/hr_timesheet/test/hr_timesheet_demo.yml
@@ -1,3 +1,8 @@
+-
+  Give the access rights of Hr Officer to create employee.
+-
+  !context
+    uid: 'res_hr_timesheet_officer'
 -
   !record {model: hr.analytic.timesheet, id: working_hours_coding, view: False}:
     user_id: base.user_demo
diff --git a/addons/hr_timesheet/test/hr_timesheet_users.yml b/addons/hr_timesheet/test/hr_timesheet_users.yml
new file mode 100644
index 00000000000..428c1b7c40f
--- /dev/null
+++ b/addons/hr_timesheet/test/hr_timesheet_users.yml
@@ -0,0 +1,30 @@
+-
+  Create a user as 'HR Manager'
+-
+  !record {model: res.users, id: res_hr_timesheet_manager}:
+    company_id: base.main_company
+    name: HR manager
+    login: hrtm
+    password: hrtm
+    groups_id:
+      - base.group_hr_manager
+-
+  Create a user as 'HR Officer'
+-
+  !record {model: res.users, id: res_hr_timesheet_officer}:
+    company_id: base.main_company
+    name: HR Officer
+    login: hrto
+    password: hrto
+    groups_id:
+      - base.group_hr_user
+-
+  Create a user as 'Employee'
+-
+  !record {model: res.users, id: res_hr_timesheet_employee}:
+    company_id: base.main_company
+    name: Employee
+    login: empt
+    password: empt
+    groups_id:
+      - base.group_user
\ No newline at end of file
diff --git a/addons/hr_timesheet/test/test_hr_timesheet.yml b/addons/hr_timesheet/test/test_hr_timesheet.yml
index 59d688f183b..b9010ce5e53 100644
--- a/addons/hr_timesheet/test/test_hr_timesheet.yml
+++ b/addons/hr_timesheet/test/test_hr_timesheet.yml
@@ -1,6 +1,11 @@
 -
   In order to test hr_timesheet Module in OpenERP, I make "Sign In/Sign Out for Project" to encode and
   track time spent on the different projects.
+-
+  Give the access rights of Hr Officer to create employee.
+-
+  !context
+    uid: 'res_hr_timesheet_officer'
 -
   I create employee "Quentin Paolino" as "User".
 -
@@ -9,6 +14,11 @@
     name: Quentin Paolino
     parent_id: 'hr.employee_al'
     user_id: 'base.user_demo'
+-
+  Give the access rights of Employee to Sign In/Sign Out in  Project.
+-
+  !context
+    uid: 'res_hr_timesheet_employee'
 -
   On "Sign In/Sign Out by Project" wizard i click on "Sign In/Sign Out" button of this wizard.
 -

From 5a3acd71ed1aba2817189d4e8ffef72099c1148b Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 14 Mar 2013 19:07:50 +0530
Subject: [PATCH 044/164] [IMP] give access rights in yml of sale_stock

bzr revid: fka@tinyerp.com-20130314133750-r034ygbcna6l49m6
---
 addons/sale_stock/__openerp__.py              |  3 +-
 .../test/cancel_order_sale_stock.yml          | 17 +++++++-
 .../sale_stock/test/picking_order_policy.yml  | 25 ++++++++++-
 .../sale_stock/test/prepaid_order_policy.yml  |  5 ++-
 .../sale_stock/test/sale_order_onchange.yml   |  5 +++
 addons/sale_stock/test/sale_stock_users.yml   | 41 +++++++++++++++++++
 6 files changed, 91 insertions(+), 5 deletions(-)
 create mode 100644 addons/sale_stock/test/sale_stock_users.yml

diff --git a/addons/sale_stock/__openerp__.py b/addons/sale_stock/__openerp__.py
index a849df295d4..a1941524868 100644
--- a/addons/sale_stock/__openerp__.py
+++ b/addons/sale_stock/__openerp__.py
@@ -59,7 +59,8 @@ You can choose flexible invoicing methods:
                    ],
    'data': ['sale_stock_data.xml'],
    'demo_xml': ['sale_stock_demo.xml'],
-    'test': ['test/cancel_order_sale_stock.yml',
+    'test': ['test/sale_stock_users.yml',
+             'test/cancel_order_sale_stock.yml',
              'test/picking_order_policy.yml',
              'test/prepaid_order_policy.yml',
              'test/sale_order_onchange.yml',
diff --git a/addons/sale_stock/test/cancel_order_sale_stock.yml b/addons/sale_stock/test/cancel_order_sale_stock.yml
index 9081cac9fa3..397bc0e49fe 100644
--- a/addons/sale_stock/test/cancel_order_sale_stock.yml
+++ b/addons/sale_stock/test/cancel_order_sale_stock.yml
@@ -1,6 +1,9 @@
 -
-  In order to test the cancel sale order.
+  In order to test the cancel sale order with that user which have salesman rights.
   First I confirm order.
+-
+  !context
+    uid: 'res_sale_stock_salesman'
 -
   !workflow {model: sale.order, action: order_confirm, ref: sale.sale_order_8}
 -
@@ -8,7 +11,7 @@
 -
   !python {model: stock.picking}: |
     delivery_orders = self.search(cr, uid, [('sale_id','=',ref("sale.sale_order_8"))])
-    first_picking = self.browse(cr, uid, delivery_orders[0], context=context)
+    first_picking = self.browse(cr, uid, delivery_orders[0], context=None)
     if first_picking.force_assign(cr, uid, first_picking):
       first_move = first_picking.move_lines[0]
       values = {'move%s'%(first_move.id): {'product_qty': 2, 'product_uom':ref('product.product_uom_unit')}}
@@ -20,12 +23,22 @@
     delivery_orders = self.search(cr, uid, [('sale_id','=',ref("sale.sale_order_8"))])
     last_delivery_order_id = delivery_orders[0]
     self.pool.get('stock.picking').signal_button_cancel(cr, uid, [last_delivery_order_id])
+-
+  Only Stock User can change data related warehouse therfore test with that user which have stcok user rights,
+-
+  !context
+    uid: 'res_stock_user'
 -
   I run the scheduler.
 -
   !python {model: procurement.order}: |
 
      self.run_scheduler(cr, uid)
+-
+  Salesman can also check order therfore test with that user which have salesman rights,
+-
+  !context
+    uid: 'res_sale_stock_salesman'
 -
   I check order status in "Ship Exception".
 -
diff --git a/addons/sale_stock/test/picking_order_policy.yml b/addons/sale_stock/test/picking_order_policy.yml
index f761dfb65db..003bfbc1f30 100644
--- a/addons/sale_stock/test/picking_order_policy.yml
+++ b/addons/sale_stock/test/picking_order_policy.yml
@@ -1,5 +1,8 @@
 -
-  In order to test process of the Sale Order,
+  In order to test process of the Sale Order with access rights of saleman,
+-
+  !context
+    uid: 'res_sale_stock_salesman'
 -
   First I check the total amount of the Quotation before Approved.
 -
@@ -33,11 +36,21 @@
         assert procurement.product_qty == order_line.product_uom_qty, "Qty is not correspond."
         assert procurement.product_uom.id == order_line.product_uom.id, "UOM is not correspond."
         assert procurement.procure_method == order_line.type, "Procurement method is not correspond."
+-
+  Only Stock User can change data related warehouse therfore test with that user which have stcok user rights,
+-
+  !context
+    uid: 'res_stock_user'
 -
   I run the scheduler.
 -
   !python {model: procurement.order}: |
     self.run_scheduler(cr, uid)
+-
+  Salesman can also check order therfore test with that user which have salesman rights,
+-
+  !context
+    uid: 'res_sale_stock_salesman'
 -
   I check the details of delivery order after confirmed quotation.
 -
@@ -128,6 +141,11 @@
         assert inv_line.price_unit == so_line.price_unit , "Price Unit is not correspond."
         assert inv_line.quantity == (so_line.product_uos and so_line.product_uos_qty) or so_line.product_uom_qty , "Product qty is not correspond."
         assert inv_line.price_subtotal == so_line.price_subtotal, "Price sub total is not correspond."
+-
+  Only Stock manager can open the Invoice therfore test with that user which have stock manager rights,
+-
+  !context
+    uid: 'res_stock_manager'
 -
   I open the Invoice.
 -
@@ -149,6 +167,11 @@
             journal_ids[0], ref('account.cash'),
             ref('account.period_8'), journal_ids[0],
             name='test')
+-
+  To test process of the Sale Order with access rights of saleman,
+-
+  !context
+    uid: 'res_sale_stock_salesman'
 -
   I check the order after paid invoice.
 -
diff --git a/addons/sale_stock/test/prepaid_order_policy.yml b/addons/sale_stock/test/prepaid_order_policy.yml
index e35a9a82cf9..0e0345868d0 100644
--- a/addons/sale_stock/test/prepaid_order_policy.yml
+++ b/addons/sale_stock/test/prepaid_order_policy.yml
@@ -1,5 +1,8 @@
 -
-  Now I confirm the Quotation with "Pay before delivery" policy.
+  Now I confirm the Quotation with "Pay before delivery" policy with access rights of salesman.
+-
+  !context
+    uid: 'res_sale_stock_salesman'
 -
   !workflow {model: sale.order, action: order_confirm, ref: sale.sale_order_4}
 -
diff --git a/addons/sale_stock/test/sale_order_onchange.yml b/addons/sale_stock/test/sale_order_onchange.yml
index 1026e5627c3..d37dd74e1ef 100644
--- a/addons/sale_stock/test/sale_order_onchange.yml
+++ b/addons/sale_stock/test/sale_order_onchange.yml
@@ -1,3 +1,8 @@
+-
+  In sale order to test process of onchange of Sale Order with access rights of salemanager,
+-
+  !context
+    uid: 'res_sale_stock_salesmanager'
 -
   In order to test the onchange of the Sale Order, I create a product
 -
diff --git a/addons/sale_stock/test/sale_stock_users.yml b/addons/sale_stock/test/sale_stock_users.yml
new file mode 100644
index 00000000000..f9bd1cf1727
--- /dev/null
+++ b/addons/sale_stock/test/sale_stock_users.yml
@@ -0,0 +1,41 @@
+-
+   Create a user as 'Salesmanager'
+-
+  !record {model: res.users, id: res_sale_stock_salesmanager}:
+    company_id: base.main_company
+    name: Sales manager
+    login: ssm
+    password: ssm
+    groups_id:
+      - base.group_sale_manager
+-
+   Create a user as 'Salesman'
+-
+  !record {model: res.users, id: res_sale_stock_salesman}:
+    company_id: base.main_company
+    name: Salesman
+    login: ssu
+    password: ssu
+    groups_id:
+      - base.group_sale_salesman_all_leads
+-
+   Create a user as 'Stock User'
+-
+  !record {model: res.users, id: res_stock_user}:
+    company_id: base.main_company
+    name: Stock User
+    login: sau
+    password: sau
+    groups_id:
+      - stock.group_stock_user
+-
+   Create a user as 'Stock Manager'
+-
+  !record {model: res.users, id: res_stock_manager}:
+    company_id: base.main_company
+    name: Stock Manager
+    login: sam
+    password: sam
+    email: admin@portal.example.com
+    groups_id:
+      - stock.group_stock_manager
\ No newline at end of file

From 093f0f771abf94e4ec5896cf6d9b9a9572a162a9 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 15 Mar 2013 10:57:29 +0530
Subject: [PATCH 045/164] [IMP] improve yml of sale_stock

bzr revid: fka@tinyerp.com-20130315052729-31z589lryen4wcy0
---
 addons/sale_stock/test/sale_order_onchange.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/sale_stock/test/sale_order_onchange.yml b/addons/sale_stock/test/sale_order_onchange.yml
index d37dd74e1ef..f21f88c9eb7 100644
--- a/addons/sale_stock/test/sale_order_onchange.yml
+++ b/addons/sale_stock/test/sale_order_onchange.yml
@@ -1,5 +1,5 @@
 -
-  In sale order to test process of onchange of Sale Order with access rights of salemanager,
+  Only sales manager Creates product so let's check with access rights of salemanager.
 -
   !context
     uid: 'res_sale_stock_salesmanager'
@@ -10,6 +10,11 @@
     name: 'Devil Worship Book'
     list_price: 66.6
     procure_method: 'make_to_order'
+-
+  In sale order to test process of onchange of Sale Order with access rights of saleman.
+-
+  !context
+    uid: 'res_sale_stock_salesman'
 -
   Now i create a sale order that uses my new product
 -

From 2496811ec42cc6b06fa9293ff97123c85e593433 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Mon, 18 Mar 2013 11:24:12 +0530
Subject: [PATCH 046/164] [IMP] improve yml strings

bzr revid: fka@tinyerp.com-20130318055412-se3c890mlckxd8ty
---
 addons/sale/test/cancel_order.yml                  | 2 +-
 addons/sale/test/delete_order.yml                  | 2 +-
 addons/sale_stock/test/cancel_order_sale_stock.yml | 6 +++---
 addons/sale_stock/test/picking_order_policy.yml    | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/sale/test/cancel_order.yml b/addons/sale/test/cancel_order.yml
index 48c6b91d2c4..a2c62e16031 100644
--- a/addons/sale/test/cancel_order.yml
+++ b/addons/sale/test/cancel_order.yml
@@ -1,5 +1,5 @@
 -
-  Salesman can also cancel order therfore test with that user which have salesman rights,
+  Salesman can also cancel order therefore test with that user which have salesman rights,
 -
   !context
     uid: 'res_users_salesman'
diff --git a/addons/sale/test/delete_order.yml b/addons/sale/test/delete_order.yml
index 69c89020ad9..9d8db337d5b 100644
--- a/addons/sale/test/delete_order.yml
+++ b/addons/sale/test/delete_order.yml
@@ -1,5 +1,5 @@
 -
-  Sales manager can only delete order therfore test with that user which have sales manager rights,
+  Sales manager can only delete order therefore test with that user which have sales manager rights,
 -
   !context
     uid: 'res_users_salesmanager'
diff --git a/addons/sale_stock/test/cancel_order_sale_stock.yml b/addons/sale_stock/test/cancel_order_sale_stock.yml
index 397bc0e49fe..1109124705c 100644
--- a/addons/sale_stock/test/cancel_order_sale_stock.yml
+++ b/addons/sale_stock/test/cancel_order_sale_stock.yml
@@ -11,7 +11,7 @@
 -
   !python {model: stock.picking}: |
     delivery_orders = self.search(cr, uid, [('sale_id','=',ref("sale.sale_order_8"))])
-    first_picking = self.browse(cr, uid, delivery_orders[0], context=None)
+    first_picking = self.browse(cr, uid, delivery_orders[0])
     if first_picking.force_assign(cr, uid, first_picking):
       first_move = first_picking.move_lines[0]
       values = {'move%s'%(first_move.id): {'product_qty': 2, 'product_uom':ref('product.product_uom_unit')}}
@@ -24,7 +24,7 @@
     last_delivery_order_id = delivery_orders[0]
     self.pool.get('stock.picking').signal_button_cancel(cr, uid, [last_delivery_order_id])
 -
-  Only Stock User can change data related warehouse therfore test with that user which have stcok user rights,
+  Only Stock User can change data related warehouse therefore test with that user which have stcok user rights,
 -
   !context
     uid: 'res_stock_user'
@@ -35,7 +35,7 @@
 
      self.run_scheduler(cr, uid)
 -
-  Salesman can also check order therfore test with that user which have salesman rights,
+  Salesman can also check order therefore test with that user which have salesman rights,
 -
   !context
     uid: 'res_sale_stock_salesman'
diff --git a/addons/sale_stock/test/picking_order_policy.yml b/addons/sale_stock/test/picking_order_policy.yml
index 003bfbc1f30..50d79058764 100644
--- a/addons/sale_stock/test/picking_order_policy.yml
+++ b/addons/sale_stock/test/picking_order_policy.yml
@@ -37,7 +37,7 @@
         assert procurement.product_uom.id == order_line.product_uom.id, "UOM is not correspond."
         assert procurement.procure_method == order_line.type, "Procurement method is not correspond."
 -
-  Only Stock User can change data related warehouse therfore test with that user which have stcok user rights,
+  Only Stock User can change data related warehouse therefore test with that user which have stcok user rights,
 -
   !context
     uid: 'res_stock_user'
@@ -47,7 +47,7 @@
   !python {model: procurement.order}: |
     self.run_scheduler(cr, uid)
 -
-  Salesman can also check order therfore test with that user which have salesman rights,
+  Salesman can also check order therefore test with that user which have salesman rights,
 -
   !context
     uid: 'res_sale_stock_salesman'
@@ -142,7 +142,7 @@
         assert inv_line.quantity == (so_line.product_uos and so_line.product_uos_qty) or so_line.product_uom_qty , "Product qty is not correspond."
         assert inv_line.price_subtotal == so_line.price_subtotal, "Price sub total is not correspond."
 -
-  Only Stock manager can open the Invoice therfore test with that user which have stock manager rights,
+  Only Stock manager can open the Invoice therefore test with that user which have stock manager rights,
 -
   !context
     uid: 'res_stock_manager'

From f748568f3c32f7c48c98518119bc19de056df36f Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Mon, 18 Mar 2013 17:19:12 +0530
Subject: [PATCH 047/164] [IMP]add access rights for create, read and write to
 acccount.journal and res.partner.bank

bzr revid: sgo@tinyerp.com-20130318114912-klopr2dtalsgbp4g
---
 addons/account/security/ir.model.access.csv      |  2 ++
 addons/account/test/account_customer_invoice.yml | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index d164b8026ce..d6ba955aabc 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -37,6 +37,7 @@ access_account_payment_term_manager,account.payment.term,model_account_payment_t
 access_account_payment_term_line_manager,account.payment.term.line,model_account_payment_term_line,account.group_account_manager,1,1,1,1
 access_account_tax_manager,account.tax,model_account_tax,account.group_account_manager,1,1,1,1
 access_account_journal_manager,account.journal,model_account_journal,account.group_account_manager,1,1,1,1
+access_account_journal_user,account.journal,model_account_journal,account.group_account_user,1,1,1,0
 access_account_journal_invoice,account.journal invoice,model_account_journal,account.group_account_invoice,1,0,0,0
 access_account_period_manager,account.period,model_account_period,account.group_account_manager,1,1,1,1
 access_account_period_invoice,account.period invoice,model_account_period,account.group_account_invoice,1,0,0,0
@@ -99,3 +100,4 @@ access_account_sequence_fiscal_year_sale_manager,account.sequence.fiscalyear.sal
 access_account_treasury_report_manager,account.treasury.report.manager,model_account_treasury_report,account.group_account_manager,1,0,0,0
 access_account_financial_report,account.financial.report,model_account_financial_report,account.group_account_user,1,1,1,1
 access_account_financial_report_invoice,account.financial.report invoice,model_account_financial_report,account.group_account_invoice,1,0,0,0
+access_res_partner_bank,res.partner.bank,model_res_partner_bank,account.group_account_user,1,1,1,0
diff --git a/addons/account/test/account_customer_invoice.yml b/addons/account/test/account_customer_invoice.yml
index 866e8921220..a41ca9bbfe4 100644
--- a/addons/account/test/account_customer_invoice.yml
+++ b/addons/account/test/account_customer_invoice.yml
@@ -1,3 +1,8 @@
+-
+  Test with that user which have rights to make Invoicing and payment and who is accountant. 
+-
+  !context
+    uid: 'res_users_account_user'
 -
   In order to test account invoice I create a new customer invoice
 -
@@ -11,11 +16,6 @@
     footer: True
     bank: base.res_bank_1
     bank_name: Reserve
--
-  Test with that user which have rights to make Invoicing and payment and who is accountant. 
--
-  !context
-    uid: 'res_users_account_user'
 -
   I create a customer invoice
 -

From 1c52635020820ebe927d400c26825d350da9262d Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 19 Mar 2013 14:28:54 +0530
Subject: [PATCH 048/164] [IMP] add user group in context

bzr revid: fka@tinyerp.com-20130319085854-norcgk7smiz37fs8
---
 addons/crm/test/ui/crm_access_group_users.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/crm/test/ui/crm_access_group_users.yml b/addons/crm/test/ui/crm_access_group_users.yml
index cc5be01ee85..407eb8007e5 100644
--- a/addons/crm/test/ui/crm_access_group_users.yml
+++ b/addons/crm/test/ui/crm_access_group_users.yml
@@ -1,20 +1,22 @@
 -
   Create a user as 'Salesmanager'
+-
+  !context
+    default_groups_ref: ['base.group_sale_manager']
 -
   !record {model: res.users, id: crm_res_users_salesmanager}:
     company_id: base.main_company
     name: Sales manager
     login: csm
     password: csm
-    groups_id:
-      - base.group_sale_manager
 -
   Create a user as 'Salesman'
+-
+  !context
+    default_groups_ref: ['base.group_sale_salesman_all_leads']
 -
   !record {model: res.users, id: crm_res_users_salesman}:
     company_id: base.main_company
     name: Salesman
     login: csu
     password: csu
-    groups_id:
-      - base.group_sale_salesman_all_leads

From b358bcd430399d9f0801903434ede39879f23cba Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 19 Mar 2013 14:44:40 +0530
Subject: [PATCH 049/164] [IMP] add user group in context of project &
 project_issue yml files

bzr revid: fka@tinyerp.com-20130319091440-i6xrkrxzdskeayvs
---
 addons/project/test/project_users.yml     | 10 ++++++----
 addons/project_issue/test/issue_users.yml | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/addons/project/test/project_users.yml b/addons/project/test/project_users.yml
index b23ab0fc7f6..ad8503d5f76 100644
--- a/addons/project/test/project_users.yml
+++ b/addons/project/test/project_users.yml
@@ -1,20 +1,22 @@
 -
   Create a user as 'Project manager'
+-
+  !context
+    default_groups_ref: ['project.group_project_manager']
 -
   !record {model: res.users, id: res_users_project_manager}:
     company_id: base.main_company
     name: Project Manager
     login: prm
     password: prm
-    groups_id:
-      - project.group_project_manager
 -
   Create a user as 'Project user'
+-
+  !context
+    default_groups_ref: ['project.group_project_user']
 -
   !record {model: res.users, id: res_users_project_user}:
     company_id: base.main_company
     name: Project User
     login: pru
     password: pru
-    groups_id:
-      - project.group_project_user
\ No newline at end of file
diff --git a/addons/project_issue/test/issue_users.yml b/addons/project_issue/test/issue_users.yml
index 3493ac58ffc..04789eb6334 100644
--- a/addons/project_issue/test/issue_users.yml
+++ b/addons/project_issue/test/issue_users.yml
@@ -1,20 +1,22 @@
 -
   Create a user as 'Project manager'
+-
+  !context
+    default_groups_ref: ['project.group_project_manager']
 -
   !record {model: res.users, id: res_users_project_issue_manager}:
     company_id: base.main_company
     name: Project Manager
     login: prim
     password: prim
-    groups_id:
-      - project.group_project_manager
 -
   Create a user as 'Project user'
+-
+  !context
+    default_groups_ref: ['project.group_project_user']
 -
   !record {model: res.users, id: res_users_project_issue_user}:
     company_id: base.main_company
     name: Project User
     login: priu
     password: priu
-    groups_id:
-      - project.group_project_user
\ No newline at end of file

From 4d2f294a1287443f242f2fd3ada2e89014e7ceff Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 19 Mar 2013 15:03:08 +0530
Subject: [PATCH 050/164] [IMP] add user group in context of hr &
 hr_recruitment yml files

bzr revid: fka@tinyerp.com-20130319093308-mjopwflkzi8tasf4
---
 addons/hr/test/hr_users.yml                       | 15 +++++++++------
 .../hr_recruitment/test/recruitment_process.yml   |  5 +++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/addons/hr/test/hr_users.yml b/addons/hr/test/hr_users.yml
index 3415b20efbd..265482ca457 100644
--- a/addons/hr/test/hr_users.yml
+++ b/addons/hr/test/hr_users.yml
@@ -1,30 +1,33 @@
 -
   Create a user as 'HR Manager'
+-
+  !context
+    default_groups_ref: [base.group_hr_manager]
 -
   !record {model: res.users, id: res_users_hr_manager}:
     company_id: base.main_company
     name: HR manager
     login: hrm
     password: hrm
-    groups_id:
-      - base.group_hr_manager
 -
   Create a user as 'HR Officer'
+-
+  !context
+    default_groups_ref: [base.group_hr_user]
 -
   !record {model: res.users, id: res_users_hr_officer}:
     company_id: base.main_company
     name: HR Officer
     login: hro
     password: hro
-    groups_id:
-      - base.group_hr_user
 -
   Create a user as 'Employee'
+-
+  !context
+    default_groups_ref: [base.group_user]
 -
   !record {model: res.users, id: res_users_employee}:
     company_id: base.main_company
     name: Employee
     login: emp
     password: emp
-    groups_id:
-      - base.group_user
\ No newline at end of file
diff --git a/addons/hr_recruitment/test/recruitment_process.yml b/addons/hr_recruitment/test/recruitment_process.yml
index 0359f253dd9..c284aeb2181 100644
--- a/addons/hr_recruitment/test/recruitment_process.yml
+++ b/addons/hr_recruitment/test/recruitment_process.yml
@@ -1,13 +1,14 @@
 -
   Create a user as 'HR Recruitment Officer'
+-
+  !context
+    default_groups_ref: [base.group_hr_user]
 -
   !record {model: res.users, id: res_users_hr_officer}:
     company_id: base.main_company
     name: HR Officer
     login: hrro
     password: hrro
-    groups_id:
-      - base.group_hr_user
 -
   In Order to test process of Recruitment so giving HR officer's rights,
 -

From 8b123b8d744633693cdf8ce3d3e8b72a0a1cde4d Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 19 Mar 2013 15:32:52 +0530
Subject: [PATCH 051/164] [IMP] add user group in context of event &
 hr_timesheet yml files

bzr revid: fka@tinyerp.com-20130319100252-74kzr5qc41gj6d2t
---
 addons/event/test/ui/event_users.yml             | 10 ++++++----
 addons/hr_attendance/test/attendance_process.yml |  5 +++--
 addons/hr_timesheet/test/hr_timesheet_users.yml  | 15 +++++++++------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/addons/event/test/ui/event_users.yml b/addons/event/test/ui/event_users.yml
index 34564d6c433..e08464bdfd8 100644
--- a/addons/event/test/ui/event_users.yml
+++ b/addons/event/test/ui/event_users.yml
@@ -1,20 +1,22 @@
 -
   Create a user as 'Event manager'
+-
+  !context
+    default_groups_ref: [event.group_event_manager]
 -
   !record {model: res.users, id: res_users_eventmanager}:
     company_id: base.main_company
     name: Event manager
     login: em
     password: em
-    groups_id:
-      - event.group_event_manager
 -
   Create a user as 'Event user'
+-
+  !context
+    default_groups_ref: [event.group_event_user]
 -
   !record {model: res.users, id: res_users_eventuser}:
     company_id: base.main_company
     name: User
     login: eu
     password: eu
-    groups_id:
-      - event.group_event_user
\ No newline at end of file
diff --git a/addons/hr_attendance/test/attendance_process.yml b/addons/hr_attendance/test/attendance_process.yml
index 8348757b63e..383cf209bd4 100644
--- a/addons/hr_attendance/test/attendance_process.yml
+++ b/addons/hr_attendance/test/attendance_process.yml
@@ -1,13 +1,14 @@
 -
   Create a user as 'HR Attendance Officer'
+-
+  !context
+    default_groups_ref: [base.group_hr_user]
 -
   !record {model: res.users, id: res_users_attendance_officer}:
     company_id: base.main_company
     name: HR Officer
     login: ao
     password: ao
-    groups_id:
-      - base.group_hr_user
 -
   Give the access rights of Hr Officer to test attendance process.
 -
diff --git a/addons/hr_timesheet/test/hr_timesheet_users.yml b/addons/hr_timesheet/test/hr_timesheet_users.yml
index 428c1b7c40f..4a557bff44f 100644
--- a/addons/hr_timesheet/test/hr_timesheet_users.yml
+++ b/addons/hr_timesheet/test/hr_timesheet_users.yml
@@ -1,30 +1,33 @@
 -
   Create a user as 'HR Manager'
+-
+  !context
+    default_groups_ref: [base.group_hr_manager]
 -
   !record {model: res.users, id: res_hr_timesheet_manager}:
     company_id: base.main_company
     name: HR manager
     login: hrtm
     password: hrtm
-    groups_id:
-      - base.group_hr_manager
 -
   Create a user as 'HR Officer'
+-
+  !context
+    default_groups_ref: [base.group_hr_user]
 -
   !record {model: res.users, id: res_hr_timesheet_officer}:
     company_id: base.main_company
     name: HR Officer
     login: hrto
     password: hrto
-    groups_id:
-      - base.group_hr_user
 -
   Create a user as 'Employee'
+-
+  !context
+    default_groups_ref: [base.group_user]
 -
   !record {model: res.users, id: res_hr_timesheet_employee}:
     company_id: base.main_company
     name: Employee
     login: empt
     password: empt
-    groups_id:
-      - base.group_user
\ No newline at end of file

From eff57d769b8e0792e937353525d291d4f7db53da Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 19 Mar 2013 16:24:35 +0530
Subject: [PATCH 052/164] [IMP]add user access rights as per new improvement

bzr revid: sgo@tinyerp.com-20130319105435-es76c9arqghz2rys
---
 addons/account/test/account_test_users.yml            | 10 ++++++----
 addons/account_voucher/test/account_voucher_users.yml | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/addons/account/test/account_test_users.yml b/addons/account/test/account_test_users.yml
index 55e57968f50..7f4ccf1ed09 100644
--- a/addons/account/test/account_test_users.yml
+++ b/addons/account/test/account_test_users.yml
@@ -1,20 +1,22 @@
 -
    Create a user as 'Accountant'
+-
+  !context
+    default_groups_ref: [account.group_account_user]
 -
   !record {model: res.users, id: res_users_account_user}:
     company_id: base.main_company
     name: Accountant  
     login: acc
     password: acc
-    groups_id:
-      - account.group_account_user
 -
    Create a user as 'Financial Manager'
+-
+  !context
+    default_groups_ref: [account.group_account_manager]
 -
   !record {model: res.users, id: res_users_account_manager}:
     company_id: base.main_company
     name: Financial Manager
     login: fm
     password: fm
-    groups_id:
-      - account.group_account_manager
\ No newline at end of file
diff --git a/addons/account_voucher/test/account_voucher_users.yml b/addons/account_voucher/test/account_voucher_users.yml
index e8a4fa3e612..c1ecb7f59f2 100644
--- a/addons/account_voucher/test/account_voucher_users.yml
+++ b/addons/account_voucher/test/account_voucher_users.yml
@@ -1,20 +1,22 @@
 -
    Create a user as 'Accountant for voucher'
+-
+  !context
+    default_groups_ref: [account.group_account_user]
 -
   !record {model: res.users, id: res_users_account_voucher_user}:
     company_id: base.main_company
     name: Voucher Accountant  
     login: vacc
     password: acc
-    groups_id:
-      - account.group_account_user
 -
    Create a user as 'Financial Manager for account voucher'
+-
+  !context
+    default_groups_ref: [account.group_account_manager]
 -
   !record {model: res.users, id: res_users_account_voucher_manager}:
     company_id: base.main_company
     name: Financial Manager for voucher
     login: fmv
     password: fmv
-    groups_id:
-      - account.group_account_manager
\ No newline at end of file

From 5823dc85635d5817d8cb244a9b496d73ff64b8ac Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 19 Mar 2013 16:56:21 +0530
Subject: [PATCH 053/164] [IMP] add user group in context in all yml files

bzr revid: fka@tinyerp.com-20130319112621-ohy33bgzwmtmw8kl
---
 addons/mrp/test/mrp_users.yml                 | 10 ++++++----
 .../test/workcenter_operations.yml            |  5 +++--
 addons/mrp_repair/test/mrp_repair_users.yml   | 10 ++++++----
 addons/purchase/test/ui/purchase_users.yml    | 10 ++++++----
 .../test/purchase_reqisition_users.yml        | 10 ++++++----
 addons/sale/test/create_sale_users.yml        | 10 ++++++----
 addons/sale_stock/test/sale_stock_users.yml   | 20 +++++++++++--------
 addons/stock/test/stock_users.yml             | 10 ++++++----
 8 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/addons/mrp/test/mrp_users.yml b/addons/mrp/test/mrp_users.yml
index d18cc51e8e6..ccbb37e133c 100644
--- a/addons/mrp/test/mrp_users.yml
+++ b/addons/mrp/test/mrp_users.yml
@@ -1,20 +1,22 @@
 -
    Create a user as 'MRP Manager'
+-
+  !context
+    default_groups_ref: [mrp.group_mrp_manager]
 -
   !record {model: res.users, id: res_users_mrp_manager}:
     company_id: base.main_company
     name: MRP Manager
     login: mam
     password: mam
-    groups_id:
-      - mrp.group_mrp_manager
 -
    Create a user as 'MRP User'
+-
+  !context
+    default_groups_ref: [mrp.group_mrp_user]
 -
   !record {model: res.users, id: res_users_mrp_user}:
     company_id: base.main_company
     name: MRP User
     login: mau
     password: mau
-    groups_id:
-      - mrp.group_mrp_user
diff --git a/addons/mrp_operations/test/workcenter_operations.yml b/addons/mrp_operations/test/workcenter_operations.yml
index 3bcdc77ecab..14eab36e345 100644
--- a/addons/mrp_operations/test/workcenter_operations.yml
+++ b/addons/mrp_operations/test/workcenter_operations.yml
@@ -1,13 +1,14 @@
 -
    Create a user as 'MRP User'
+-
+  !context
+    default_groups_ref: [mrp.group_mrp_user]
 -
   !record {model: res.users, id: res_mrp_operation_user}:
     company_id: base.main_company
     name: MRP User
     login: maou
     password: maou
-    groups_id:
-      - mrp.group_mrp_user
 -
   In order to test mrp_operations with OpenERP, I refer created production order of PC Assemble SC349
   with routing - Manual Component's Assembly to test complete production process with respect of workcenter with giving access rights of MRP User.
diff --git a/addons/mrp_repair/test/mrp_repair_users.yml b/addons/mrp_repair/test/mrp_repair_users.yml
index dee61653209..986320ed941 100644
--- a/addons/mrp_repair/test/mrp_repair_users.yml
+++ b/addons/mrp_repair/test/mrp_repair_users.yml
@@ -1,20 +1,22 @@
 -
    Create a user as 'MRP Repair Manager'
+-
+  !context
+    default_groups_ref: [mrp.group_mrp_manager]
 -
   !record {model: res.users, id: res_mrp_repair_manager}:
     company_id: base.main_company
     name: MRP Manager
     login: marm
     password: marm
-    groups_id:
-      - mrp.group_mrp_manager
 -
    Create a user as 'MRP Repair User'
+-
+  !context
+    default_groups_ref: [mrp.group_mrp_user]
 -
   !record {model: res.users, id: res_mrp_repair_user}:
     company_id: base.main_company
     name: MRP User
     login: maru
     password: maru
-    groups_id:
-      - mrp.group_mrp_user
\ No newline at end of file
diff --git a/addons/purchase/test/ui/purchase_users.yml b/addons/purchase/test/ui/purchase_users.yml
index e36d8140d28..c0a60955d99 100644
--- a/addons/purchase/test/ui/purchase_users.yml
+++ b/addons/purchase/test/ui/purchase_users.yml
@@ -1,20 +1,22 @@
 -
   Create a user as 'Purchase manager'
+-
+  !context
+    default_groups_ref: ['purchase.group_purchase_manager']
 -
   !record {model: res.users, id: res_users_purchase_manager}:
     company_id: base.main_company
     name: Purchase Manager
     login: pm
     password: pm
-    groups_id:
-      - purchase.group_purchase_manager
 -
   Create a user as 'Purchase user'
+-
+  !context
+    default_groups_ref: ['purchase.group_purchase_user']
 -
   !record {model: res.users, id: res_users_purchase_user}:
     company_id: base.main_company
     name: Purchase User
     login: pu
     password: pu
-    groups_id:
-      - purchase.group_purchase_user
\ No newline at end of file
diff --git a/addons/purchase_requisition/test/purchase_reqisition_users.yml b/addons/purchase_requisition/test/purchase_reqisition_users.yml
index abf62286998..9a903cde306 100644
--- a/addons/purchase_requisition/test/purchase_reqisition_users.yml
+++ b/addons/purchase_requisition/test/purchase_reqisition_users.yml
@@ -1,20 +1,22 @@
 -
   Create a user as 'Purchase Reqisition Manager'
+-
+  !context
+    default_groups_ref: ['purchase_requisition.group_purchase_requisition_manager']
 -
   !record {model: res.users, id: res_users_purchase_requisition_manager}:
     company_id: base.main_company
     name: Purchase Reqisition Manager
     login: prm
     password: prm
-    groups_id:
-      - purchase_requisition.group_purchase_requisition_manager
 -
   Create a user as 'Purchase Reqisition User'
+-
+  !context
+    default_groups_ref: ['purchase_requisition.group_purchase_requisition_user']
 -
   !record {model: res.users, id: res_users_purchase_requisition_user}:
     company_id: base.main_company
     name: Purchase Reqisition User
     login: pru
     password: pru
-    groups_id:
-      - purchase_requisition.group_purchase_requisition_user
\ No newline at end of file
diff --git a/addons/sale/test/create_sale_users.yml b/addons/sale/test/create_sale_users.yml
index a61c4bd7c99..29e09b38b80 100644
--- a/addons/sale/test/create_sale_users.yml
+++ b/addons/sale/test/create_sale_users.yml
@@ -1,20 +1,22 @@
 -
    Create a user as 'Salesmanager'
+-
+  !context
+    default_groups_ref: ['base.group_sale_manager']
 -
   !record {model: res.users, id: res_users_salesmanager}:
     company_id: base.main_company
     name: Sales manager
     login: sm
     password: sm
-    groups_id:
-      - base.group_sale_manager
 -
    Create a user as 'Salesman'
+-
+  !context
+    default_groups_ref: ['base.group_sale_salesman_all_leads']
 -
   !record {model: res.users, id: res_users_salesman}:
     company_id: base.main_company
     name: Salesman
     login: su
     password: su
-    groups_id:
-      - base.group_sale_salesman_all_leads
diff --git a/addons/sale_stock/test/sale_stock_users.yml b/addons/sale_stock/test/sale_stock_users.yml
index f9bd1cf1727..d64fcac2503 100644
--- a/addons/sale_stock/test/sale_stock_users.yml
+++ b/addons/sale_stock/test/sale_stock_users.yml
@@ -1,35 +1,41 @@
 -
    Create a user as 'Salesmanager'
+-
+  !context
+    default_groups_ref: ['base.group_sale_manager']
 -
   !record {model: res.users, id: res_sale_stock_salesmanager}:
     company_id: base.main_company
     name: Sales manager
     login: ssm
     password: ssm
-    groups_id:
-      - base.group_sale_manager
 -
    Create a user as 'Salesman'
+-
+  !context
+    default_groups_ref: ['base.group_sale_salesman_all_leads']
 -
   !record {model: res.users, id: res_sale_stock_salesman}:
     company_id: base.main_company
     name: Salesman
     login: ssu
     password: ssu
-    groups_id:
-      - base.group_sale_salesman_all_leads
 -
    Create a user as 'Stock User'
+-
+  !context
+    default_groups_ref: ['stock.group_stock_user']
 -
   !record {model: res.users, id: res_stock_user}:
     company_id: base.main_company
     name: Stock User
     login: sau
     password: sau
-    groups_id:
-      - stock.group_stock_user
 -
    Create a user as 'Stock Manager'
+-
+  !context
+    default_groups_ref: ['stock.group_stock_manager']
 -
   !record {model: res.users, id: res_stock_manager}:
     company_id: base.main_company
@@ -37,5 +43,3 @@
     login: sam
     password: sam
     email: admin@portal.example.com
-    groups_id:
-      - stock.group_stock_manager
\ No newline at end of file
diff --git a/addons/stock/test/stock_users.yml b/addons/stock/test/stock_users.yml
index 82d48197b0d..13074d752f3 100644
--- a/addons/stock/test/stock_users.yml
+++ b/addons/stock/test/stock_users.yml
@@ -1,20 +1,22 @@
 -
    Create a user as 'Stock Manager'
+-
+  !context
+    default_groups_ref: ['stock.group_stock_manager']
 -
   !record {model: res.users, id: res_users_stock_manager}:
     company_id: base.main_company
     name: Stock Manager
     login: sam
     password: sam
-    groups_id:
-      - stock.group_stock_manager
 -
    Create a user as 'Stock User'
+-
+  !context
+    default_groups_ref: ['stock.group_stock_user']
 -
   !record {model: res.users, id: res_users_stock_user}:
     company_id: base.main_company
     name: Stock User
     login: sau
     password: sau
-    groups_id:
-      - stock.group_stock_user

From 1e14b224351b5a784479de09ef51fd2306ec19b3 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Wed, 20 Mar 2013 11:10:49 +0530
Subject: [PATCH 054/164] [IMP]add email to user as per new improvement

bzr revid: sgo@tinyerp.com-20130320054049-4cr1a52dlpfw2lgf
---
 addons/account/test/account_test_users.yml                  | 2 ++
 addons/account_voucher/test/account_voucher_users.yml       | 2 ++
 addons/crm/test/ui/crm_access_group_users.yml               | 2 ++
 addons/event/test/ui/event_users.yml                        | 2 ++
 addons/hr_recruitment/test/recruitment_process.yml          | 1 +
 addons/mrp/test/mrp_users.yml                               | 2 ++
 addons/mrp_operations/test/workcenter_operations.yml        | 1 +
 addons/mrp_repair/test/mrp_repair_users.yml                 | 2 ++
 addons/project/test/project_users.yml                       | 2 ++
 addons/project_issue/test/issue_users.yml                   | 2 ++
 addons/purchase/test/ui/purchase_users.yml                  | 2 ++
 addons/purchase_requisition/__openerp__.py                  | 2 +-
 ..._reqisition_users.yml => purchase_requisition_users.yml} | 6 ++++--
 addons/sale/test/create_sale_users.yml                      | 2 ++
 addons/sale_stock/test/sale_stock_users.yml                 | 5 +++++
 addons/stock/test/stock_users.yml                           | 2 ++
 16 files changed, 34 insertions(+), 3 deletions(-)
 rename addons/purchase_requisition/test/{purchase_reqisition_users.yml => purchase_requisition_users.yml} (77%)

diff --git a/addons/account/test/account_test_users.yml b/addons/account/test/account_test_users.yml
index 7f4ccf1ed09..322bc527ad7 100644
--- a/addons/account/test/account_test_users.yml
+++ b/addons/account/test/account_test_users.yml
@@ -9,6 +9,7 @@
     name: Accountant  
     login: acc
     password: acc
+    email: accountuser@yourcompany.com
 -
    Create a user as 'Financial Manager'
 -
@@ -20,3 +21,4 @@
     name: Financial Manager
     login: fm
     password: fm
+    email: accountmanager@yourcompany.com
diff --git a/addons/account_voucher/test/account_voucher_users.yml b/addons/account_voucher/test/account_voucher_users.yml
index c1ecb7f59f2..8888885f476 100644
--- a/addons/account_voucher/test/account_voucher_users.yml
+++ b/addons/account_voucher/test/account_voucher_users.yml
@@ -9,6 +9,7 @@
     name: Voucher Accountant  
     login: vacc
     password: acc
+    email: accountant@yourcompany.com
 -
    Create a user as 'Financial Manager for account voucher'
 -
@@ -20,3 +21,4 @@
     name: Financial Manager for voucher
     login: fmv
     password: fmv
+    email: finmanager@yourcompany.com
diff --git a/addons/crm/test/ui/crm_access_group_users.yml b/addons/crm/test/ui/crm_access_group_users.yml
index 407eb8007e5..158a11b5881 100644
--- a/addons/crm/test/ui/crm_access_group_users.yml
+++ b/addons/crm/test/ui/crm_access_group_users.yml
@@ -9,6 +9,7 @@
     name: Sales manager
     login: csm
     password: csm
+    email: crmmanager@yourcompany.com
 -
   Create a user as 'Salesman'
 -
@@ -20,3 +21,4 @@
     name: Salesman
     login: csu
     password: csu
+    email: crmuser@yourcompany.com
diff --git a/addons/event/test/ui/event_users.yml b/addons/event/test/ui/event_users.yml
index e08464bdfd8..92c8316a5d9 100644
--- a/addons/event/test/ui/event_users.yml
+++ b/addons/event/test/ui/event_users.yml
@@ -9,6 +9,7 @@
     name: Event manager
     login: em
     password: em
+    email: eventmanager@yourcompany.com
 -
   Create a user as 'Event user'
 -
@@ -20,3 +21,4 @@
     name: User
     login: eu
     password: eu
+    email: eventuser@yourcompany.com
diff --git a/addons/hr_recruitment/test/recruitment_process.yml b/addons/hr_recruitment/test/recruitment_process.yml
index c284aeb2181..930f95039f8 100644
--- a/addons/hr_recruitment/test/recruitment_process.yml
+++ b/addons/hr_recruitment/test/recruitment_process.yml
@@ -9,6 +9,7 @@
     name: HR Officer
     login: hrro
     password: hrro
+    email: hrofcr@yourcompany.com
 -
   In Order to test process of Recruitment so giving HR officer's rights,
 -
diff --git a/addons/mrp/test/mrp_users.yml b/addons/mrp/test/mrp_users.yml
index ccbb37e133c..965a809eddc 100644
--- a/addons/mrp/test/mrp_users.yml
+++ b/addons/mrp/test/mrp_users.yml
@@ -9,6 +9,7 @@
     name: MRP Manager
     login: mam
     password: mam
+    email: mrp_manager@yourcompany.com
 -
    Create a user as 'MRP User'
 -
@@ -20,3 +21,4 @@
     name: MRP User
     login: mau
     password: mau
+    email: mrp_user@yourcompany.com
diff --git a/addons/mrp_operations/test/workcenter_operations.yml b/addons/mrp_operations/test/workcenter_operations.yml
index 14eab36e345..3fc5b332d18 100644
--- a/addons/mrp_operations/test/workcenter_operations.yml
+++ b/addons/mrp_operations/test/workcenter_operations.yml
@@ -9,6 +9,7 @@
     name: MRP User
     login: maou
     password: maou
+    email: mrp_operation_user@yourcompany.com
 -
   In order to test mrp_operations with OpenERP, I refer created production order of PC Assemble SC349
   with routing - Manual Component's Assembly to test complete production process with respect of workcenter with giving access rights of MRP User.
diff --git a/addons/mrp_repair/test/mrp_repair_users.yml b/addons/mrp_repair/test/mrp_repair_users.yml
index 986320ed941..f7ee95314e2 100644
--- a/addons/mrp_repair/test/mrp_repair_users.yml
+++ b/addons/mrp_repair/test/mrp_repair_users.yml
@@ -9,6 +9,7 @@
     name: MRP Manager
     login: marm
     password: marm
+    email: mrp_repair_manager@yourcompany.com
 -
    Create a user as 'MRP Repair User'
 -
@@ -20,3 +21,4 @@
     name: MRP User
     login: maru
     password: maru
+    email: mrp_repair_user@yourcompany.com
diff --git a/addons/project/test/project_users.yml b/addons/project/test/project_users.yml
index ad8503d5f76..8ae3c23dca1 100644
--- a/addons/project/test/project_users.yml
+++ b/addons/project/test/project_users.yml
@@ -9,6 +9,7 @@
     name: Project Manager
     login: prm
     password: prm
+    email: projectmanager@yourcompany.com
 -
   Create a user as 'Project user'
 -
@@ -20,3 +21,4 @@
     name: Project User
     login: pru
     password: pru
+    email: projectuser@yourcompany.com
diff --git a/addons/project_issue/test/issue_users.yml b/addons/project_issue/test/issue_users.yml
index 04789eb6334..402478b1c54 100644
--- a/addons/project_issue/test/issue_users.yml
+++ b/addons/project_issue/test/issue_users.yml
@@ -9,6 +9,7 @@
     name: Project Manager
     login: prim
     password: prim
+    email: issuemanager@yourcompany.com
 -
   Create a user as 'Project user'
 -
@@ -20,3 +21,4 @@
     name: Project User
     login: priu
     password: priu
+    email: issueuser@yourcompany.com
diff --git a/addons/purchase/test/ui/purchase_users.yml b/addons/purchase/test/ui/purchase_users.yml
index c0a60955d99..9dd5e9c0195 100644
--- a/addons/purchase/test/ui/purchase_users.yml
+++ b/addons/purchase/test/ui/purchase_users.yml
@@ -9,6 +9,7 @@
     name: Purchase Manager
     login: pm
     password: pm
+    email: purchasemanager@yourcompany.com
 -
   Create a user as 'Purchase user'
 -
@@ -20,3 +21,4 @@
     name: Purchase User
     login: pu
     password: pu
+    email: purchaseuser@yourcompany.com
diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index d2a94365318..3f5fce3e8cc 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -43,7 +43,7 @@ keep track and order all your purchase orders.
     ],
     'auto_install': False,
     'test': [
-        'test/purchase_reqisition_users.yml',
+        'test/purchase_requisition_users.yml',
         'test/purchase_requisition_demo.yml',
         'test/purchase_requisition.yml',
         'test/cancel_purchase_requisition.yml',
diff --git a/addons/purchase_requisition/test/purchase_reqisition_users.yml b/addons/purchase_requisition/test/purchase_requisition_users.yml
similarity index 77%
rename from addons/purchase_requisition/test/purchase_reqisition_users.yml
rename to addons/purchase_requisition/test/purchase_requisition_users.yml
index 9a903cde306..41bc7cd318e 100644
--- a/addons/purchase_requisition/test/purchase_reqisition_users.yml
+++ b/addons/purchase_requisition/test/purchase_requisition_users.yml
@@ -6,9 +6,10 @@
 -
   !record {model: res.users, id: res_users_purchase_requisition_manager}:
     company_id: base.main_company
-    name: Purchase Reqisition Manager
+    name: Purchase requisition Manager
     login: prm
     password: prm
+    email: requisition_manager@yourcompany.com
 -
   Create a user as 'Purchase Reqisition User'
 -
@@ -17,6 +18,7 @@
 -
   !record {model: res.users, id: res_users_purchase_requisition_user}:
     company_id: base.main_company
-    name: Purchase Reqisition User
+    name: Purchase requisition User
     login: pru
     password: pru
+    email: requisition_user@yourcompany.com
diff --git a/addons/sale/test/create_sale_users.yml b/addons/sale/test/create_sale_users.yml
index 29e09b38b80..ed575073f5d 100644
--- a/addons/sale/test/create_sale_users.yml
+++ b/addons/sale/test/create_sale_users.yml
@@ -9,6 +9,7 @@
     name: Sales manager
     login: sm
     password: sm
+    email: salesmanager@yourcompany.com
 -
    Create a user as 'Salesman'
 -
@@ -20,3 +21,4 @@
     name: Salesman
     login: su
     password: su
+    email: salesman@yourcompany.com
diff --git a/addons/sale_stock/test/sale_stock_users.yml b/addons/sale_stock/test/sale_stock_users.yml
index d64fcac2503..c1ebd54392c 100644
--- a/addons/sale_stock/test/sale_stock_users.yml
+++ b/addons/sale_stock/test/sale_stock_users.yml
@@ -9,6 +9,7 @@
     name: Sales manager
     login: ssm
     password: ssm
+    email: ss_salesmanager@yourcompany.com
 -
    Create a user as 'Salesman'
 -
@@ -20,6 +21,7 @@
     name: Salesman
     login: ssu
     password: ssu
+    email: ss_salesman@yourcompany.com
 -
    Create a user as 'Stock User'
 -
@@ -31,6 +33,8 @@
     name: Stock User
     login: sau
     password: sau
+    email: stock_user@yourcompany.com
+    
 -
    Create a user as 'Stock Manager'
 -
@@ -43,3 +47,4 @@
     login: sam
     password: sam
     email: admin@portal.example.com
+    email: stock_manager@yourcompany.com
diff --git a/addons/stock/test/stock_users.yml b/addons/stock/test/stock_users.yml
index 13074d752f3..b8fe0783ca1 100644
--- a/addons/stock/test/stock_users.yml
+++ b/addons/stock/test/stock_users.yml
@@ -9,6 +9,7 @@
     name: Stock Manager
     login: sam
     password: sam
+    email: stockmanager@yourcompany.com
 -
    Create a user as 'Stock User'
 -
@@ -20,3 +21,4 @@
     name: Stock User
     login: sau
     password: sau
+    email: stockuser@yourcompany.com

From 21c4fee43dde9587a42527fbb7a809f1a45b1df0 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Thu, 28 Mar 2013 17:28:01 +0530
Subject: [PATCH 055/164] [IMP]improve mrp yaml

bzr revid: sgo@tinyerp.com-20130328115801-kh4k8ctnh3x5oae2
---
 addons/mrp/test/order_process.yml | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/addons/mrp/test/order_process.yml b/addons/mrp/test/order_process.yml
index 8aa408483e9..d5cc6dee964 100644
--- a/addons/mrp/test/order_process.yml
+++ b/addons/mrp/test/order_process.yml
@@ -1,8 +1,3 @@
--
-  MRP user can doing all process related to Production Order, so let's check data with giving the access rights of user.
--
-  !context
-    uid: 'res_users_mrp_user'
 -
   I compute the production order.
 -
@@ -28,6 +23,7 @@
   I confirm the Production Order.
 -
   !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_test1}
+  
 -
   I check details of Produce Move of Production Order to trace Final Product.
 -
@@ -63,6 +59,16 @@
                     assert move_line.product_uos.id == order_line.product_uos.id, "UOS is not correspond in 'To consume line'."
                 assert move_line.location_id.id == routing_loc or order.location_src_id.id, "Source location is not correspond in 'To consume line'."
                 assert move_line.location_dest_id.id == source_location_id, "Destination Location is not correspond in 'To consume line'."
+-
+  I consume raw materials and put one material in scrap location due to waste it.
+-
+  !python {model: mrp.production}: |
+    scrap_location_ids = self.pool.get('stock.location').search(cr, uid, [('scrap_location','=',True)])
+    scrap_location_id = scrap_location_ids[0]
+    order = self.browse(cr, uid, ref("mrp_production_test1"))
+    for move in order.move_lines:
+        if move.product_id.id == ref("product.product_product_6"):
+            move.action_scrap(5.0, scrap_location_id)
 -
   I check details of an Internal Shipment after confirmed production order to bring components in Raw Materials Location.
 -
@@ -154,17 +160,6 @@
   !python {model: mrp.production}: |
     order = self.browse(cr, uid, ref("mrp_production_test1"))
     assert order.state == 'in_production', 'Production order should be in production State.'
--
-  I consume raw materials and put one material in scrap location due to waste it.
--
-  !python {model: mrp.production}: |
-    scrap_location_ids = self.pool.get('stock.location').search(cr, uid, [('scrap_location','=',True)])
-    scrap_location_id = scrap_location_ids[0]
-    order = self.browse(cr, uid, ref("mrp_production_test1"))
-    for move in order.move_lines:
-        move.action_consume(move.product_qty)
-        if move.product_id.id == ref("product.product_product_6"):
-            move.action_scrap(5.0, scrap_location_id)
 -
   I produce product.
 -

From 037f2f590d8da0cdfda22738a727e2beaa1edcdd Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Thu, 28 Mar 2013 18:29:39 +0530
Subject: [PATCH 056/164] [IMP]improve stock shipment.yml

bzr revid: sgo@tinyerp.com-20130328125939-06de8aj23spjc5uu
---
 addons/stock/test/shipment.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/stock/test/shipment.yml b/addons/stock/test/shipment.yml
index 96273a081b7..4c715584756 100644
--- a/addons/stock/test/shipment.yml
+++ b/addons/stock/test/shipment.yml
@@ -193,7 +193,7 @@
   !python {model: stock.location}: |
     ctx = {'product_id': ref('product_product_6')}
     monitor_location = self.pool.get('stock.location').browse(cr, uid, ref('location_monitor'), context=ctx)
-    assert monitor_location.stock_real == 136.0, 'stock does not correspond in stock location shop0.'
+    assert monitor_location.stock_real == 132.0, 'stock does not correspond in stock location shop0.'
     scrapped_location = self.browse(cr, uid, ref('stock_location_scrapped'), context=ctx)
     assert scrapped_location.stock_real == 1*4, 'scraped stock does not correspond in scrap location.'
     
@@ -202,8 +202,8 @@
 -
   !python {model: product.product}: |
     product = self.browse(cr, uid, ref('product_product_6'), context=context)
-    assert product.qty_available == 136.0, "Stock does not correspond."
-    assert round(product.virtual_available, 2) == -4.00, "Vitual stock does not correspond."
+    assert product.qty_available == 132.0, "Stock does not correspond."
+    assert round(product.virtual_available, 2) == -8.00, "Vitual stock does not correspond."
 -
   I trace all incoming lots.
 -
@@ -277,5 +277,5 @@
 -
   !python {model: product.product}: |
     product = self.browse(cr, uid, ref('product_product_6'), context=context)
-    assert round(product.qty_available, 2) == 6, "Stock does not correspond."
-    assert round(product.virtual_available, 2) == -4.00, "Vitual stock does not correspond."
+    assert round(product.qty_available, 2) == 2, "Stock does not correspond."
+    assert round(product.virtual_available, 2) == -8.00, "Vitual stock does not correspond."

From 412efcda33bbf48aaff3c94dff5c5b8863cfa9cf Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Thu, 28 Mar 2013 18:37:43 +0530
Subject: [PATCH 057/164] [IMP]improve mrp yaml minor changes

bzr revid: sgo@tinyerp.com-20130328130743-ky1hz52gskju1q7t
---
 addons/mrp/test/order_process.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/mrp/test/order_process.yml b/addons/mrp/test/order_process.yml
index d5cc6dee964..aac6064443d 100644
--- a/addons/mrp/test/order_process.yml
+++ b/addons/mrp/test/order_process.yml
@@ -1,3 +1,8 @@
+-
+    MRP user can doing all process related to Production Order, so let's check data with giving the access rights of user.
+-
+  !context
+    uid: 'res_users_mrp_user'
 -
   I compute the production order.
 -

From 94c7156ebe4218836df56f0407c8853345f66827 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Fri, 29 Mar 2013 14:35:58 +0530
Subject: [PATCH 058/164] [IMP]improve stock  shipment yml and add test with
 manager

bzr revid: sgo@tinyerp.com-20130329090558-ksv44h3cakskf57l
---
 addons/stock/test/shipment.yml | 87 ++++------------------------------
 1 file changed, 8 insertions(+), 79 deletions(-)

diff --git a/addons/stock/test/shipment.yml b/addons/stock/test/shipment.yml
index 4c715584756..59b6a6aad48 100644
--- a/addons/stock/test/shipment.yml
+++ b/addons/stock/test/shipment.yml
@@ -1,3 +1,8 @@
+-
+  Only stock manager can confirm shipment and picking, so let's check data with giving the access rights of manager
+-
+  !context
+    uid: 'res_users_stock_manager'
 -
   I confirm outgoing shipment of 130 unit 15” LCD Monitor.
 -
@@ -91,7 +96,7 @@
   !python {model: stock.picking}: |
     # the cancel is not on the return, but on the incomming shipment (which now has a quantity of 10, thanks to the 
     # backorder). This situation is a little weird as we returned a move that we finally cancelled... As result, only
-    # 30Kg from the original 50Kg will be counted in the stock (50 - 10 (cancelled quantity) - 10 (returned quantity))
+    # 30Unit from the original 50Unit will be counted in the stock (50 - 10 (cancelled quantity) - 10 (returned quantity))
     self.action_cancel(cr, uid, [ref("incomming_shipment")], context=context)
 -
   I make invoice of backorder of incomming shipment.
@@ -118,41 +123,6 @@
     product = self.browse(cr, uid, ref('product_product_6'), context=context)
     assert product.qty_available == 140, "Stock does not correspond."
     assert product.virtual_available == 0, "Vitual stock does not correspond."
--
-  I split incomming shipment into lots. each lot contain 10 unit 15” LCD Monitor.
--
-  !python {model: stock.picking}: |
-    shipment = self.browse(cr, uid, ref("incomming_shipment"))
-    move_ids = [x.id for x in shipment.backorder_id.move_lines]
-    context.update({'active_model': 'stock.move', 'active_id': move_ids[0], 'active_ids': move_ids})
--
-  !record {model: stock.move.split, id: split_lot_incomming}:
-    line_ids:
-        - name: incoming_lot0
-          quantity: 10
-        - name: incoming_lot1
-          quantity: 10
-        - name: incoming_lot2
-          quantity: 10
-        - name: incoming_lot3
-          quantity: 10
-        
--
- !python {model: stock.move.split }: |
-    self.split_lot(cr, uid, [ref('split_lot_incomming')], context=context)
--
-  I check move lines after spliting
--
-  !python {model: stock.move}: |
-    lot = self.pool.get('stock.move.split').browse(cr, uid, ref('split_lot_incomming'), context=context)
-    lot_ids = self.pool.get('stock.production.lot').search(cr, uid, [('name','in',[x.name for x in lot.line_ids])])
-    assert len(lot_ids) == 4, 'lots of incomming shipment are not correspond.'
-    move_ids = self.search(cr, uid, [('location_dest_id','=',ref('location_monitor')),('prodlot_id','in',lot_ids)])
-    assert len(move_ids) == 4, 'move lines are not correspond per prodcution lot after splited.'
-    for move in self.browse(cr, uid, move_ids, context=context):
-        assert move.prodlot_id.name in ['incoming_lot0', 'incoming_lot1', 'incoming_lot2', 'incoming_lot3'], "lot does not correspond." 
-        assert move.product_qty == 10, "qty does not correspond per production lot."
-    context.update({'active_model':'stock.move', 'active_id':move_ids[0],'active_ids': move_ids})
 -
   I check the stock valuation account entries.
 -
@@ -170,47 +140,6 @@
             else:
                 assert account_move_line.credit == 0.0, "Credit amount does not correspond."
                 assert account_move_line.debit == 10000.0, "Debit amount does not correspond."
--
-  I consume 1 unit 15” LCD Monitor from each incoming lots into internal production.
--
-  !record {model: stock.move.consume, id: consume_lot_incomming}:
-    product_qty: 1
-    location_id: location_monitor
--
-  !python {model: stock.move.consume}: |
-    self.do_move_consume(cr, uid, [ref('consume_lot_incomming')], context=context)
--
-  I scrap 1 unit 15” LCD Monitor from each incoming lots into scrap location.
--
-  !record {model: stock.move.scrap, id: scrap_lot_incomming}:
-    product_qty: 1
--
-  !python {model: stock.move.scrap}: |
-    self.move_scrap(cr, uid, [ref('scrap_lot_incomming')], context=context)
--
-  I check stock in scrap location and stock location shop0.
--
-  !python {model: stock.location}: |
-    ctx = {'product_id': ref('product_product_6')}
-    monitor_location = self.pool.get('stock.location').browse(cr, uid, ref('location_monitor'), context=ctx)
-    assert monitor_location.stock_real == 132.0, 'stock does not correspond in stock location shop0.'
-    scrapped_location = self.browse(cr, uid, ref('stock_location_scrapped'), context=ctx)
-    assert scrapped_location.stock_real == 1*4, 'scraped stock does not correspond in scrap location.'
-    
--
-  I check availabile stock after consumed and scraped.
--
-  !python {model: product.product}: |
-    product = self.browse(cr, uid, ref('product_product_6'), context=context)
-    assert product.qty_available == 132.0, "Stock does not correspond."
-    assert round(product.virtual_available, 2) == -8.00, "Vitual stock does not correspond."
--
-  I trace all incoming lots.
--
-  !python {model: stock.production.lot }: |
-    lot = self.pool.get('stock.move.split').browse(cr, uid, ref('split_lot_incomming'), context=context)
-    lot_ids = self.search(cr, uid, [('name', 'in', [x.name for x in lot.line_ids])])
-    self.action_traceability(cr, uid, lot_ids, context=context)
 -
   I check outgoing shipment after stock availablity in Chicago shop.
 -
@@ -277,5 +206,5 @@
 -
   !python {model: product.product}: |
     product = self.browse(cr, uid, ref('product_product_6'), context=context)
-    assert round(product.qty_available, 2) == 2, "Stock does not correspond."
-    assert round(product.virtual_available, 2) == -8.00, "Vitual stock does not correspond."
+    assert round(product.qty_available, 2) == 10, "Stock does not correspond."
+   

From 382171d4174379567a1abe535a0cb3348ccbe089 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 29 Mar 2013 21:04:03 +0530
Subject: [PATCH 059/164] [IMP]: stock: Improved shipment.yml for split lot
 problem for stock manager

bzr revid: rpa@tinyerp.com-20130329153403-n85d6kwk6edrplor
---
 addons/stock/stock_demo.yml    |   2 +-
 addons/stock/test/shipment.yml | 191 +++++++++++++++++----------------
 2 files changed, 100 insertions(+), 93 deletions(-)

diff --git a/addons/stock/stock_demo.yml b/addons/stock/stock_demo.yml
index 64be92f8d06..d925ba4dc8e 100644
--- a/addons/stock/stock_demo.yml
+++ b/addons/stock/stock_demo.yml
@@ -44,7 +44,7 @@
     valuation: real_time
     cost_method: average
     property_stock_account_input: account.conf_o_income
-    property_stock_account_output: account.conf_o_expense
+    property_stock_account_output: account.a_expense
 -
   Stock user can handled production lot,inventory and picking, so let's check data with giving the access rights of user
 -
diff --git a/addons/stock/test/shipment.yml b/addons/stock/test/shipment.yml
index 4c715584756..909050d0483 100644
--- a/addons/stock/test/shipment.yml
+++ b/addons/stock/test/shipment.yml
@@ -1,3 +1,6 @@
+-
+  !context
+    uid: 'res_users_stock_manager'
 -
   I confirm outgoing shipment of 130 unit 15” LCD Monitor.
 -
@@ -16,29 +19,68 @@
 -
   !python {model: product.product}: |
     product = self.browse(cr, uid, ref('product_product_6'), context=context)
-    product.virtual_available == -30, "Vitual stock is not updated."
+    assert product.virtual_available == -30, "Vitual stock is not updated."
 
 -
   I confirm incomming shipment of 50 unit 15” LCD Monitor.
 -
   !workflow {model: stock.picking, action: button_confirm, ref: incomming_shipment}
+-
+  I split incomming shipment into lots. each lot contain 10 unit 15” LCD Monitor.
+-
+  !python {model: stock.picking}: |
+    shipment = self.browse(cr, uid, ref("incomming_shipment"))
+    move_ids = [x.id for x in shipment.move_lines]
+    context.update({'active_model': 'stock.move', 'active_id': move_ids[0], 'active_ids': move_ids})
+-
+  !record {model: stock.move.split, id: split_lot_incomming}:
+    line_ids:
+        - name: incoming_lot0
+          quantity: 10
+        - name: incoming_lot1
+          quantity: 10
+        - name: incoming_lot2
+          quantity: 10
+        - name: incoming_lot3
+          quantity: 10
+-
+ !python {model: stock.move.split }: |
+    self.split_lot(cr, uid, [ref('split_lot_incomming')], context=context)
+-
+  I check move lines after spliting
+-
+  !python {model: stock.move}: |
+    mm = self.browse(cr, uid, ref("incomming_shipment_monitor"))
+    lot = self.pool.get('stock.move.split').browse(cr, uid, ref('split_lot_incomming'), context=context)
+    lot_ids = self.pool.get('stock.production.lot').search(cr, uid, [('name','in',[x.name for x in lot.line_ids])])
+    assert len(lot_ids) == 4, 'lots of incomming shipment are not correspond.'
+    move_ids = self.search(cr, uid, [('location_dest_id','=',ref('location_monitor')),('prodlot_id','in',lot_ids)])
+    assert len(move_ids) == 4, 'move lines are not correspond per prodcution lot after splited.'
+    for move in self.browse(cr, uid, move_ids, context=context):
+        assert move.prodlot_id.name in ['incoming_lot0', 'incoming_lot1', 'incoming_lot2', 'incoming_lot3'], "lot does not correspond." 
+        assert move.product_qty == 10, "qty does not correspond per production lot."
 -
   I receive 40 unit 15” LCD Monitor so I make backorder of incomming shipment for 40 unit.
 -
   !python {model: stock.partial.picking}: |
     context.update({'active_model': 'stock.picking', 'active_id': ref('incomming_shipment'), 'active_ids': [ref('incomming_shipment')]})
 -
-  !record {model: stock.partial.picking, id: partial_incomming}:
-    move_ids:
-        - quantity: 40
-          product_id: product_product_6
-          product_uom: product.product_uom_unit
-          move_id: incomming_shipment_monitor
-          location_id: stock_location_3
-          location_dest_id: location_monitor
--
-  !python {model: stock.partial.picking }: |
-    self.do_partial(cr, uid, [ref('partial_incomming')], context=context)
+  !python {model: stock.partial.picking}: |
+    partial = []
+    for move in self.pool.get('stock.picking').browse(cr, uid, ref("incomming_shipment")).move_lines:
+        if move.prodlot_id:
+            partial.append((0, 0, {
+              'quantity': move.product_qty,
+              'product_id': move.product_id.id,
+              'product_uom': move.product_uom.id,
+              'move_id': move.id,
+              'location_id': move.location_id.id,
+              'location_dest_id': move.location_dest_id.id,
+              'prodlot_id': move.prodlot_id.id,
+              'cost': move.product_id.standard_price
+            }))
+    partial_id = self.create(cr, uid, {'move_ids': partial}, context=context)
+    self.do_partial(cr, uid, [partial_id], context=context)
 -
   I check backorder shipment after received partial shipment.
 -
@@ -46,10 +88,12 @@
     shipment = self.browse(cr, uid, ref("incomming_shipment"))
     backorder = shipment.backorder_id
     assert backorder, "Backorder should be created after partial shipment."
-    assert backorder.state == 'done', "Backorder should be close after received."
+    assert backorder.state == 'done', "Backorder should be closed after received."
+    qty = 0
     for move_line in backorder.move_lines:
-        assert move_line.product_qty == 40, "Qty in backorder does not correspond."
         assert move_line.state == 'done', "Move line of backorder should be closed."
+        qty += move_line.product_qty
+    assert qty == 40, "Qty in backorder does not correspond."
 -
   I receive another 10 unit 15” LCD Monitor.
 -
@@ -64,18 +108,16 @@
 -
   !python {model: stock.partial.picking }: |
     self.do_partial(cr, uid, [ref('partial_incomming')], context=context)
-
 -
-  I check incomming shipment after received.
+  I check incomming shipment after receiving it.
 -
   !python {model: stock.picking}: |
     shipment = self.browse(cr, uid, ref("incomming_shipment"))
-    assert shipment.state == 'done', "shipment should be close after received."
+    assert shipment.state == 'done', "shipment should be closed after receiving."
     for move_line in shipment.move_lines:
         assert move_line.product_qty == 10, "Qty does not correspond."
         assert move_line.product_id.virtual_available == 20, "Virtual stock does not correspond."
         assert move_line.state == 'done', "Move line should be closed."
-
 -
   I return last incomming shipment for 10 unit 15” LCD Monitor.
 -
@@ -91,7 +133,7 @@
   !python {model: stock.picking}: |
     # the cancel is not on the return, but on the incomming shipment (which now has a quantity of 10, thanks to the 
     # backorder). This situation is a little weird as we returned a move that we finally cancelled... As result, only
-    # 30Kg from the original 50Kg will be counted in the stock (50 - 10 (cancelled quantity) - 10 (returned quantity))
+    # 30Unit from the original 50Unit will be counted in the stock (50 - 10 (cancelled quantity) - 10 (returned quantity))
     self.action_cancel(cr, uid, [ref("incomming_shipment")], context=context)
 -
   I make invoice of backorder of incomming shipment.
@@ -118,41 +160,6 @@
     product = self.browse(cr, uid, ref('product_product_6'), context=context)
     assert product.qty_available == 140, "Stock does not correspond."
     assert product.virtual_available == 0, "Vitual stock does not correspond."
--
-  I split incomming shipment into lots. each lot contain 10 unit 15” LCD Monitor.
--
-  !python {model: stock.picking}: |
-    shipment = self.browse(cr, uid, ref("incomming_shipment"))
-    move_ids = [x.id for x in shipment.backorder_id.move_lines]
-    context.update({'active_model': 'stock.move', 'active_id': move_ids[0], 'active_ids': move_ids})
--
-  !record {model: stock.move.split, id: split_lot_incomming}:
-    line_ids:
-        - name: incoming_lot0
-          quantity: 10
-        - name: incoming_lot1
-          quantity: 10
-        - name: incoming_lot2
-          quantity: 10
-        - name: incoming_lot3
-          quantity: 10
-        
--
- !python {model: stock.move.split }: |
-    self.split_lot(cr, uid, [ref('split_lot_incomming')], context=context)
--
-  I check move lines after spliting
--
-  !python {model: stock.move}: |
-    lot = self.pool.get('stock.move.split').browse(cr, uid, ref('split_lot_incomming'), context=context)
-    lot_ids = self.pool.get('stock.production.lot').search(cr, uid, [('name','in',[x.name for x in lot.line_ids])])
-    assert len(lot_ids) == 4, 'lots of incomming shipment are not correspond.'
-    move_ids = self.search(cr, uid, [('location_dest_id','=',ref('location_monitor')),('prodlot_id','in',lot_ids)])
-    assert len(move_ids) == 4, 'move lines are not correspond per prodcution lot after splited.'
-    for move in self.browse(cr, uid, move_ids, context=context):
-        assert move.prodlot_id.name in ['incoming_lot0', 'incoming_lot1', 'incoming_lot2', 'incoming_lot3'], "lot does not correspond." 
-        assert move.product_qty == 10, "qty does not correspond per production lot."
-    context.update({'active_model':'stock.move', 'active_id':move_ids[0],'active_ids': move_ids})
 -
   I check the stock valuation account entries.
 -
@@ -165,45 +172,11 @@
     for account_move_line in account_move.line_id:
         for stock_move in incomming_shipment.move_lines:
             if account_move_line.account_id.id == stock_move.product_id.property_stock_account_input.id:
-                assert account_move_line.credit == 10000.0, "Credit amount does not correspond."
+                assert account_move_line.credit == 14000.0, "Credit amount does not correspond."
                 assert account_move_line.debit == 0.0, "Debit amount does not correspond."
             else:
                 assert account_move_line.credit == 0.0, "Credit amount does not correspond."
-                assert account_move_line.debit == 10000.0, "Debit amount does not correspond."
--
-  I consume 1 unit 15” LCD Monitor from each incoming lots into internal production.
--
-  !record {model: stock.move.consume, id: consume_lot_incomming}:
-    product_qty: 1
-    location_id: location_monitor
--
-  !python {model: stock.move.consume}: |
-    self.do_move_consume(cr, uid, [ref('consume_lot_incomming')], context=context)
--
-  I scrap 1 unit 15” LCD Monitor from each incoming lots into scrap location.
--
-  !record {model: stock.move.scrap, id: scrap_lot_incomming}:
-    product_qty: 1
--
-  !python {model: stock.move.scrap}: |
-    self.move_scrap(cr, uid, [ref('scrap_lot_incomming')], context=context)
--
-  I check stock in scrap location and stock location shop0.
--
-  !python {model: stock.location}: |
-    ctx = {'product_id': ref('product_product_6')}
-    monitor_location = self.pool.get('stock.location').browse(cr, uid, ref('location_monitor'), context=ctx)
-    assert monitor_location.stock_real == 132.0, 'stock does not correspond in stock location shop0.'
-    scrapped_location = self.browse(cr, uid, ref('stock_location_scrapped'), context=ctx)
-    assert scrapped_location.stock_real == 1*4, 'scraped stock does not correspond in scrap location.'
-    
--
-  I check availabile stock after consumed and scraped.
--
-  !python {model: product.product}: |
-    product = self.browse(cr, uid, ref('product_product_6'), context=context)
-    assert product.qty_available == 132.0, "Stock does not correspond."
-    assert round(product.virtual_available, 2) == -8.00, "Vitual stock does not correspond."
+                assert account_move_line.debit == 14000.0, "Debit amount does not correspond."
 -
   I trace all incoming lots.
 -
@@ -221,6 +194,40 @@
     for move_line in shipment.move_lines:
         assert move_line.state == "assigned", "Move should be assigned."
     self.force_assign(cr, uid, [shipment.id])
+    context.update({'active_model':'stock.move', 'active_id':shipment.move_lines[0].id,'active_ids': [shipment.move_lines[0].id]})
+-
+  I scrap 4 units of 15” LCD Monitor into scrap location.
+-
+  !record {model: stock.move.scrap, id: scrap_monitor1}:
+    product_qty: 4
+-
+  !python {model: stock.move.scrap}: |
+    self.move_scrap(cr, uid, [ref('scrap_monitor1')], context=context)
+-
+  I consume 4 units of 15” LCD Monitor.
+-
+  !record {model: stock.move.consume, id: consume_monitor1}:
+    product_qty: 4
+    location_id: location_monitor
+-
+  !python {model: stock.move.consume}: |
+    self.do_move_consume(cr, uid, [ref('consume_monitor1')], context=context)
+-
+  I check stock in scrap location and stock location shop0.
+-
+  !python {model: stock.location}: |
+    ctx = {'product_id': ref('product_product_6')}
+    monitor_location = self.pool.get('stock.location').browse(cr, uid, ref('location_monitor'), context=ctx)
+    assert monitor_location.stock_real == 132.0, 'stock does not correspond in stock location shop0.'
+    scrapped_location = self.browse(cr, uid, ref('stock_location_scrapped'), context=ctx)
+    assert scrapped_location.stock_real == 4, 'scraped stock does not correspond in scrap location.'
+-
+  I check availabile stock after consumed and scraped.
+-
+  !python {model: product.product}: |
+    product = self.browse(cr, uid, ref('product_product_6'), context=context)
+    assert product.qty_available == 132.0, "Stock does not correspond."
+    assert round(product.virtual_available, 2) == -4.00, "Vitual stock does not correspond."
 -
   I deliver 5 unit 15” LCD Monitor to customer so I make partial deliver
 -
@@ -277,5 +284,5 @@
 -
   !python {model: product.product}: |
     product = self.browse(cr, uid, ref('product_product_6'), context=context)
-    assert round(product.qty_available, 2) == 2, "Stock does not correspond."
-    assert round(product.virtual_available, 2) == -8.00, "Vitual stock does not correspond."
+    assert round(product.qty_available, 2) == 6, "Stock does not correspond."
+    assert round(product.virtual_available, 2) == -4.00, "Vitual stock does not correspond."

From 70995ec63dce5ca4191d1e3326b9961a6c38c8e0 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 29 Mar 2013 21:13:18 +0530
Subject: [PATCH 060/164] [FIX]: stock: Fixed typo and grammar in shipment.yml

bzr revid: rpa@tinyerp.com-20130329154318-2wswvugrl17ncy9l
---
 addons/stock/test/shipment.yml | 112 ++++++++++++++++-----------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/addons/stock/test/shipment.yml b/addons/stock/test/shipment.yml
index 909050d0483..75249aea842 100644
--- a/addons/stock/test/shipment.yml
+++ b/addons/stock/test/shipment.yml
@@ -2,11 +2,11 @@
   !context
     uid: 'res_users_stock_manager'
 -
-  I confirm outgoing shipment of 130 unit 15” LCD Monitor.
+  I confirm outgoing shipment of 130 Unit 15” LCD Monitor.
 -
   !workflow {model: stock.picking, action: button_confirm, ref: outgoing_shipment}
 -
-  I check shipment details after confirmed.
+  I check shipment details after confirmation.
 -
   !python {model: stock.picking}: |
     shipment = self.browse(cr, uid, ref("outgoing_shipment"))
@@ -15,25 +15,25 @@
         assert move_line.state == "confirmed", "Move should be confirmed."
 
 -
-  Now I check vitual stock of 15” LCD Monitor after confirmed outgoing shipment.
+  Now, I check virtual stock of 15” LCD Monitor after confirming outgoing shipment.
 -
   !python {model: product.product}: |
     product = self.browse(cr, uid, ref('product_product_6'), context=context)
-    assert product.virtual_available == -30, "Vitual stock is not updated."
+    assert product.virtual_available == -30, "Virtual stock is not updated."
 
 -
-  I confirm incomming shipment of 50 unit 15” LCD Monitor.
+  I confirm incoming shipment of 50 Unit 15” LCD Monitor.
 -
-  !workflow {model: stock.picking, action: button_confirm, ref: incomming_shipment}
+  !workflow {model: stock.picking, action: button_confirm, ref: incoming_shipment}
 -
-  I split incomming shipment into lots. each lot contain 10 unit 15” LCD Monitor.
+  I split incoming shipment into lots. each lot contain 10 Unit 15” LCD Monitor.
 -
   !python {model: stock.picking}: |
-    shipment = self.browse(cr, uid, ref("incomming_shipment"))
+    shipment = self.browse(cr, uid, ref("incoming_shipment"))
     move_ids = [x.id for x in shipment.move_lines]
     context.update({'active_model': 'stock.move', 'active_id': move_ids[0], 'active_ids': move_ids})
 -
-  !record {model: stock.move.split, id: split_lot_incomming}:
+  !record {model: stock.move.split, id: split_lot_incoming}:
     line_ids:
         - name: incoming_lot0
           quantity: 10
@@ -45,29 +45,29 @@
           quantity: 10
 -
  !python {model: stock.move.split }: |
-    self.split_lot(cr, uid, [ref('split_lot_incomming')], context=context)
+    self.split_lot(cr, uid, [ref('split_lot_incoming')], context=context)
 -
-  I check move lines after spliting
+  I check move lines after splitting.
 -
   !python {model: stock.move}: |
-    mm = self.browse(cr, uid, ref("incomming_shipment_monitor"))
-    lot = self.pool.get('stock.move.split').browse(cr, uid, ref('split_lot_incomming'), context=context)
+    mm = self.browse(cr, uid, ref("incoming_shipment_monitor"))
+    lot = self.pool.get('stock.move.split').browse(cr, uid, ref('split_lot_incoming'), context=context)
     lot_ids = self.pool.get('stock.production.lot').search(cr, uid, [('name','in',[x.name for x in lot.line_ids])])
-    assert len(lot_ids) == 4, 'lots of incomming shipment are not correspond.'
+    assert len(lot_ids) == 4, 'lots of incoming shipment are not correspond.'
     move_ids = self.search(cr, uid, [('location_dest_id','=',ref('location_monitor')),('prodlot_id','in',lot_ids)])
-    assert len(move_ids) == 4, 'move lines are not correspond per prodcution lot after splited.'
+    assert len(move_ids) == 4, 'move lines are not correspond per production lot after splitting.'
     for move in self.browse(cr, uid, move_ids, context=context):
         assert move.prodlot_id.name in ['incoming_lot0', 'incoming_lot1', 'incoming_lot2', 'incoming_lot3'], "lot does not correspond." 
         assert move.product_qty == 10, "qty does not correspond per production lot."
 -
-  I receive 40 unit 15” LCD Monitor so I make backorder of incomming shipment for 40 unit.
+  I receive 40 units of  15” LCD Monitor.
 -
   !python {model: stock.partial.picking}: |
-    context.update({'active_model': 'stock.picking', 'active_id': ref('incomming_shipment'), 'active_ids': [ref('incomming_shipment')]})
+    context.update({'active_model': 'stock.picking', 'active_id': ref('incoming_shipment'), 'active_ids': [ref('incoming_shipment')]})
 -
   !python {model: stock.partial.picking}: |
     partial = []
-    for move in self.pool.get('stock.picking').browse(cr, uid, ref("incomming_shipment")).move_lines:
+    for move in self.pool.get('stock.picking').browse(cr, uid, ref("incoming_shipment")).move_lines:
         if move.prodlot_id:
             partial.append((0, 0, {
               'quantity': move.product_qty,
@@ -82,10 +82,10 @@
     partial_id = self.create(cr, uid, {'move_ids': partial}, context=context)
     self.do_partial(cr, uid, [partial_id], context=context)
 -
-  I check backorder shipment after received partial shipment.
+  I check backorder shipment after receiving partial shipment.
 -
   !python {model: stock.picking}: |
-    shipment = self.browse(cr, uid, ref("incomming_shipment"))
+    shipment = self.browse(cr, uid, ref("incoming_shipment"))
     backorder = shipment.backorder_id
     assert backorder, "Backorder should be created after partial shipment."
     assert backorder.state == 'done', "Backorder should be closed after received."
@@ -95,82 +95,82 @@
         qty += move_line.product_qty
     assert qty == 40, "Qty in backorder does not correspond."
 -
-  I receive another 10 unit 15” LCD Monitor.
+  I receive another 10 units of 15” LCD Monitor.
 -
-  !record {model: stock.partial.picking, id: partial_incomming}:
+  !record {model: stock.partial.picking, id: partial_incoming}:
     move_ids:
         - quantity: 10
           product_id: product_product_6
           product_uom: product.product_uom_unit
-          move_id: incomming_shipment_monitor
+          move_id: incoming_shipment_monitor
           location_id: stock_location_3
           location_dest_id: location_monitor
 -
   !python {model: stock.partial.picking }: |
-    self.do_partial(cr, uid, [ref('partial_incomming')], context=context)
+    self.do_partial(cr, uid, [ref('partial_incoming')], context=context)
 -
-  I check incomming shipment after receiving it.
+  I check incoming shipment after receiving it.
 -
   !python {model: stock.picking}: |
-    shipment = self.browse(cr, uid, ref("incomming_shipment"))
+    shipment = self.browse(cr, uid, ref("incoming_shipment"))
     assert shipment.state == 'done', "shipment should be closed after receiving."
     for move_line in shipment.move_lines:
         assert move_line.product_qty == 10, "Qty does not correspond."
         assert move_line.product_id.virtual_available == 20, "Virtual stock does not correspond."
         assert move_line.state == 'done', "Move line should be closed."
 -
-  I return last incomming shipment for 10 unit 15” LCD Monitor.
+  I return last incoming shipment for 10 Unit 15” LCD Monitor.
 -
-  !record {model: stock.return.picking, id: return_incomming}:
+  !record {model: stock.return.picking, id: return_incoming}:
     invoice_state: none
 -
   !python {model: stock.return.picking }: |
     # this work without giving the id of the picking to return, magically, thanks to the context
-    self.create_returns(cr, uid, [ref('return_incomming')], context=context)
+    self.create_returns(cr, uid, [ref('return_incoming')], context=context)
 -
-  I cancel incomming shipment after return it.
+  I cancel incoming shipment after returning it.
 -
   !python {model: stock.picking}: |
-    # the cancel is not on the return, but on the incomming shipment (which now has a quantity of 10, thanks to the 
+    # the cancel is not on the return, but on the incoming shipment (which now has a quantity of 10, thanks to the 
     # backorder). This situation is a little weird as we returned a move that we finally cancelled... As result, only
     # 30Unit from the original 50Unit will be counted in the stock (50 - 10 (cancelled quantity) - 10 (returned quantity))
-    self.action_cancel(cr, uid, [ref("incomming_shipment")], context=context)
+    self.action_cancel(cr, uid, [ref("incoming_shipment")], context=context)
 -
-  I make invoice of backorder of incomming shipment.
+  I make invoice of backorder of incoming shipment.
 -
   !python {model: stock.invoice.onshipping}: |
-    shipment = self.pool.get('stock.picking').browse(cr, uid, ref("incomming_shipment"))
+    shipment = self.pool.get('stock.picking').browse(cr, uid, ref("incoming_shipment"))
     context.update({'active_model': 'stock.picking', 'active_id': shipment.backorder_id.id, 'active_ids': [shipment.backorder_id.id]})
 -
-  !record {model: stock.invoice.onshipping, id: invoice_incomming}:
+  !record {model: stock.invoice.onshipping, id: invoice_incoming}:
     group: False
 -
   !python {model: stock.invoice.onshipping }: |
-    self.create_invoice(cr, uid, [ref('invoice_incomming')], context=context)
+    self.create_invoice(cr, uid, [ref('invoice_incoming')], context=context)
 -
-  I check invoice state of backorder of incomming shipment.
+  I check invoice status of backorder of incoming shipment.
 -
   !python {model: stock.picking}: |
-    shipment = self.browse(cr, uid, ref("incomming_shipment"))
-    assert shipment.backorder_id.invoice_state == 'invoiced', 'Invoice state is not upadted.'
+    shipment = self.browse(cr, uid, ref("incoming_shipment"))
+    assert shipment.backorder_id.invoice_state == 'invoiced', 'Invoice state is not updated.'
 -
-  I check available stock after received incomming shipping.
+  I check available stock after receiving incoming shipping.
 -
   !python {model: product.product}: |
     product = self.browse(cr, uid, ref('product_product_6'), context=context)
     assert product.qty_available == 140, "Stock does not correspond."
-    assert product.virtual_available == 0, "Vitual stock does not correspond."
+    assert product.virtual_available == 0, "Virtual stock does not correspond."
 -
   I check the stock valuation account entries.
 -
   !python {model: account.move}: |
-    incomming_shipment = self.pool.get('stock.picking').browse(cr, uid, ref('incomming_shipment'), context=context)
-    account_move_ids = self.search(cr, uid, [('ref','=',incomming_shipment.name)])
+    incoming_shipment = self.pool.get('stock.picking').browse(cr, uid, ref('incoming_shipment'), context=context)
+    account_move_ids = self.search(cr, uid, [('ref','=',incoming_shipment.name)])
     assert len(account_move_ids), "account move should be created."
     account_move = self.browse(cr, uid, account_move_ids[0], context=context)
-    assert len(account_move.line_id) == len(incomming_shipment.move_lines) + 1, 'accuont entries are not correspond.'
+    assert len(account_move.line_id) == len(incoming_shipment.move_lines) + 1, 'Accounting entries does not correspond.'
     for account_move_line in account_move.line_id:
-        for stock_move in incomming_shipment.move_lines:
+        for stock_move in incoming_shipment.move_lines:
             if account_move_line.account_id.id == stock_move.product_id.property_stock_account_input.id:
                 assert account_move_line.credit == 14000.0, "Credit amount does not correspond."
                 assert account_move_line.debit == 0.0, "Debit amount does not correspond."
@@ -181,11 +181,11 @@
   I trace all incoming lots.
 -
   !python {model: stock.production.lot }: |
-    lot = self.pool.get('stock.move.split').browse(cr, uid, ref('split_lot_incomming'), context=context)
+    lot = self.pool.get('stock.move.split').browse(cr, uid, ref('split_lot_incoming'), context=context)
     lot_ids = self.search(cr, uid, [('name', 'in', [x.name for x in lot.line_ids])])
     self.action_traceability(cr, uid, lot_ids, context=context)
 -
-  I check outgoing shipment after stock availablity in Chicago shop.
+  I check outgoing shipment after stock availability in Chicago shop.
 -
   !python {model: stock.picking}: |
     shipment = self.browse(cr, uid, ref("outgoing_shipment"), context=context)
@@ -213,7 +213,7 @@
   !python {model: stock.move.consume}: |
     self.do_move_consume(cr, uid, [ref('consume_monitor1')], context=context)
 -
-  I check stock in scrap location and stock location shop0.
+  I check stock in scrap location and stock location.
 -
   !python {model: stock.location}: |
     ctx = {'product_id': ref('product_product_6')}
@@ -222,14 +222,14 @@
     scrapped_location = self.browse(cr, uid, ref('stock_location_scrapped'), context=ctx)
     assert scrapped_location.stock_real == 4, 'scraped stock does not correspond in scrap location.'
 -
-  I check availabile stock after consumed and scraped.
+  I check available stock after consumed and scraped move.
 -
   !python {model: product.product}: |
     product = self.browse(cr, uid, ref('product_product_6'), context=context)
     assert product.qty_available == 132.0, "Stock does not correspond."
-    assert round(product.virtual_available, 2) == -4.00, "Vitual stock does not correspond."
+    assert round(product.virtual_available, 2) == -4.00, "Virtual stock does not correspond."
 -
-  I deliver 5 unit 15” LCD Monitor to customer so I make partial deliver
+  I deliver 5 Unit 15” LCD Monitor to customer partially.
 -
   !python {model: stock.partial.move}: |
     context.update({'active_model': 'stock.move', 'active_id': ref('outgoing_shipment_monitor'), 'active_ids': [ref('outgoing_shipment_monitor')]})
@@ -247,7 +247,7 @@
     self.do_partial(cr, uid, [ref('partial_outgoing_monitor')], context=context)
 
 -
-  I packing outgoing shipment into box per 10 unit with unique tracking lot.
+  I pack outgoing shipment into box of 10 Unit with unique tracking lot.
 -
   !python {model: stock.move}: |
     stock_split = self.pool.get('stock.split.into')
@@ -260,7 +260,7 @@
         stock_split.split(cr, uid, [split_id], context=context)
         total_qty -= split_qty
 -
-  I deliver outgoing shipment.
+  I deliver the outgoing shipment.
 -
   !python {model: stock.partial.picking}: |
     context.update({'active_model': 'stock.picking', 'active_id': ref('outgoing_shipment'), 'active_ids': [ref('outgoing_shipment')]})
@@ -272,7 +272,7 @@
     self.do_partial(cr, uid, [ref('partial_outgoing')], context=context)
 
 -
-  I check outgoing shipment after deliver.
+  I check outgoing shipment after delivery.
 -
   !python {model: stock.picking}: |
     shipment = self.browse(cr, uid, ref("outgoing_shipment"), context=context)
@@ -280,9 +280,9 @@
     for move_line in shipment.move_lines:
         assert move_line.state == "done", "Move should be closed."
 -
-  I check availaible stock after deliver.
+  I check available stock after delivery.
 -
   !python {model: product.product}: |
     product = self.browse(cr, uid, ref('product_product_6'), context=context)
     assert round(product.qty_available, 2) == 6, "Stock does not correspond."
-    assert round(product.virtual_available, 2) == -4.00, "Vitual stock does not correspond."
+    assert round(product.virtual_available, 2) == -4.00, "Virtual stock does not correspond."

From 5848f817fbb7fed0d3cddfec27886952a2a03ff2 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Mon, 1 Apr 2013 12:13:59 +0530
Subject: [PATCH 061/164] [IMP]add string in shipment yml

bzr revid: sgo@tinyerp.com-20130401064359-40s1a4azsvd2099v
---
 addons/stock/test/shipment.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/stock/test/shipment.yml b/addons/stock/test/shipment.yml
index 86b4a092108..5f2f4686621 100644
--- a/addons/stock/test/shipment.yml
+++ b/addons/stock/test/shipment.yml
@@ -1,3 +1,5 @@
+-
+   Stock manager can only test whole process related to Shipment, so let's check data with stock manager.
 -
   !context
     uid: 'res_users_stock_manager'

From 2a7bb9a9100011088d1f7240ea265881ba1410de Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Wed, 17 Apr 2013 16:05:44 +0530
Subject: [PATCH 062/164] [IMP]Improve yml for issue demo which creates
 duplicate issue and improve code

bzr revid: sgo@tinyerp.com-20130417103544-df29vwms1lc5xq6t
---
 addons/project_issue/test/issue_demo.yml      | 4 ----
 addons/project_issue/test/subscribe_issue.yml | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/addons/project_issue/test/issue_demo.yml b/addons/project_issue/test/issue_demo.yml
index 7040b631f46..b7342b435ab 100644
--- a/addons/project_issue/test/issue_demo.yml
+++ b/addons/project_issue/test/issue_demo.yml
@@ -3,10 +3,6 @@
 -
   !context
     uid: 'res_users_project_issue_user'
--
-  !record {model: project.issue, id: project_task_1, view: False}:
-   task_id: 'project.project_task_17'
-   name: 'Error in account module'
 -
   !record {model: project.issue, id: project01, view: False}:
    project_id: 'project.project_project_2'
diff --git a/addons/project_issue/test/subscribe_issue.yml b/addons/project_issue/test/subscribe_issue.yml
index e07c8704a14..8d7b038dccc 100644
--- a/addons/project_issue/test/subscribe_issue.yml
+++ b/addons/project_issue/test/subscribe_issue.yml
@@ -1,8 +1,3 @@
--
-  Project user can subscribe issue, so let's check data with giving the access rights of user.
--
-  !context
-    uid: 'res_users_project_issue_user'
 -
   In Order to test process of  Issue in OpenERP, Customer send the issue by email.
 -

From bbd2c2ea5e939e6db529742754093def84e9a84c Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Mon, 29 Apr 2013 16:10:42 +0530
Subject: [PATCH 063/164] [IMP]give access rights for contact creation

bzr revid: sgo@tinyerp.com-20130429104042-1elyyf00shx03rsk
---
 addons/account/test/account_test_users.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/test/account_test_users.yml b/addons/account/test/account_test_users.yml
index 322bc527ad7..be89afefdd1 100644
--- a/addons/account/test/account_test_users.yml
+++ b/addons/account/test/account_test_users.yml
@@ -2,7 +2,7 @@
    Create a user as 'Accountant'
 -
   !context
-    default_groups_ref: [account.group_account_user]
+    default_groups_ref: [base.group_partner_manager,account.group_account_user]
 -
   !record {model: res.users, id: res_users_account_user}:
     company_id: base.main_company

From 2f19755c2a46a1c03af81279390013bf333ad4ca Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Mon, 29 Apr 2013 16:57:39 +0530
Subject: [PATCH 064/164] [IMP]give access rights for contact creation in
 account voucher yml user

bzr revid: sgo@tinyerp.com-20130429112739-f06w3v6g7q9wi2fh
---
 addons/account_voucher/test/account_voucher_users.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/test/account_voucher_users.yml b/addons/account_voucher/test/account_voucher_users.yml
index 8888885f476..0dd8fa528b5 100644
--- a/addons/account_voucher/test/account_voucher_users.yml
+++ b/addons/account_voucher/test/account_voucher_users.yml
@@ -2,7 +2,7 @@
    Create a user as 'Accountant for voucher'
 -
   !context
-    default_groups_ref: [account.group_account_user]
+    default_groups_ref: [base.group_partner_manager,account.group_account_user]
 -
   !record {model: res.users, id: res_users_account_voucher_user}:
     company_id: base.main_company
@@ -14,7 +14,7 @@
    Create a user as 'Financial Manager for account voucher'
 -
   !context
-    default_groups_ref: [account.group_account_manager]
+    default_groups_ref: [base.group_partner_manager,account.group_account_manager]
 -
   !record {model: res.users, id: res_users_account_voucher_manager}:
     company_id: base.main_company

From d947b32b96e4e5934483ce2a3b57d4a0697daa85 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 30 Apr 2013 16:20:12 +0530
Subject: [PATCH 065/164] [IMP]remove delete access rights from ir_model_data
 for all user which are not needed

bzr revid: sgo@tinyerp.com-20130430105012-damnh3zqdr9wdap1
---
 openerp/addons/base/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv
index 3a29108d61e..e104f485a51 100644
--- a/openerp/addons/base/security/ir.model.access.csv
+++ b/openerp/addons/base/security/ir.model.access.csv
@@ -17,7 +17,7 @@
 "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,1,1,1
+"access_ir_model_data_all","ir_model_data all","model_ir_model_data",,1,1,1,0
 "access_ir_model_fields_all","ir_model_fields all","model_ir_model_fields",,1,0,0,0
 "access_ir_module_category_group_user","ir_module_category group_user","model_ir_module_category",,1,0,0,0
 "access_ir_module_module_group_user","ir_module_module group_user","model_ir_module_module","group_system",1,1,1,1

From ed220968a3f02ee43b5ca542053eae28864f9ad6 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Mon, 6 May 2013 15:09:10 +0530
Subject: [PATCH 066/164] [MERGE]put yml in test from demo in purchase

bzr revid: sgo@tinyerp.com-20130506093910-mlyc8a1a1hz4y433
---
 addons/purchase/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index b75c84e332b..9d72579cc77 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -67,6 +67,7 @@ Dashboard / Reports for Purchase Management will include:
         'res_config_view.xml',
     ],
     'test': [
+        'test/ui/purchase_users.yml',
         'test/process/cancel_order.yml',
         'test/process/rfq2order2done.yml',
         'test/process/generate_invoice_from_reception.yml',
@@ -79,7 +80,6 @@ Dashboard / Reports for Purchase Management will include:
         'test/ui/delete_order.yml',
     ],
     'demo': [
-        'test/ui/purchase_users.yml',
         'purchase_order_demo.yml',
         'purchase_demo.xml',
     ],

From ca60821869332c95d0959e8645f16865d66be531 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Mon, 6 May 2013 17:05:57 +0530
Subject: [PATCH 067/164] [IMP]improve yml code

bzr revid: sgo@tinyerp.com-20130506113557-mh99n29zv2ve5pv3
---
 addons/purchase/purchase_order_demo.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/purchase/purchase_order_demo.yml b/addons/purchase/purchase_order_demo.yml
index fb49bfc1248..7a0fae7ef68 100644
--- a/addons/purchase/purchase_order_demo.yml
+++ b/addons/purchase/purchase_order_demo.yml
@@ -1,8 +1,5 @@
 -
   Give access rights of Purchase user to create purchase order
--
-  !context
-    uid: 'res_users_purchase_user'
 -
   !record {model: purchase.order, id: purchase_order_1}:
     partner_id: base.res_partner_1

From 5f203720edba35397296bdea2262706b2c3ebeb7 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 7 May 2013 11:59:14 +0530
Subject: [PATCH 068/164] [IMP]remove default_groups_ref and added to groups_id
 in yml in account and account_Voucher

bzr revid: sgo@tinyerp.com-20130507062914-t8bmem3auvjob5bl
---
 addons/account/test/account_test_users.yml    | 19 +++++++++++-----
 .../test/account_voucher_users.yml            | 22 +++++++++++++------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/addons/account/test/account_test_users.yml b/addons/account/test/account_test_users.yml
index be89afefdd1..3b0fd72f0bf 100644
--- a/addons/account/test/account_test_users.yml
+++ b/addons/account/test/account_test_users.yml
@@ -1,8 +1,5 @@
 -
    Create a user as 'Accountant'
--
-  !context
-    default_groups_ref: [base.group_partner_manager,account.group_account_user]
 -
   !record {model: res.users, id: res_users_account_user}:
     company_id: base.main_company
@@ -11,10 +8,14 @@
     password: acc
     email: accountuser@yourcompany.com
 -
-   Create a user as 'Financial Manager'
+  I added groups for Accountant which needed.
 -
-  !context
-    default_groups_ref: [account.group_account_manager]
+  !record {model: res.users, id: res_users_account_user}:
+    groups_id:
+      - account.group_account_user
+      - base.group_partner_manager
+-
+   Create a user as 'Financial Manager'
 -
   !record {model: res.users, id: res_users_account_manager}:
     company_id: base.main_company
@@ -22,3 +23,9 @@
     login: fm
     password: fm
     email: accountmanager@yourcompany.com
+-
+  I added groups for Financial Manager which needed.
+-
+  !record {model: res.users, id: res_users_account_manager}:
+    groups_id:
+      - account.group_account_manager
\ No newline at end of file
diff --git a/addons/account_voucher/test/account_voucher_users.yml b/addons/account_voucher/test/account_voucher_users.yml
index 0dd8fa528b5..feb19c0e3fb 100644
--- a/addons/account_voucher/test/account_voucher_users.yml
+++ b/addons/account_voucher/test/account_voucher_users.yml
@@ -1,8 +1,5 @@
 -
-   Create a user as 'Accountant for voucher'
--
-  !context
-    default_groups_ref: [base.group_partner_manager,account.group_account_user]
+   Create a user as 'Accountant for account voucher'
 -
   !record {model: res.users, id: res_users_account_voucher_user}:
     company_id: base.main_company
@@ -11,10 +8,14 @@
     password: acc
     email: accountant@yourcompany.com
 -
-   Create a user as 'Financial Manager for account voucher'
+  I added groups to Accountant for account voucher which needed.
 -
-  !context
-    default_groups_ref: [base.group_partner_manager,account.group_account_manager]
+  !record {model: res.users, id: res_users_account_voucher_user}:
+    groups_id:
+      - base.group_partner_manager
+      - account.group_account_user
+-
+   Create a user as 'Financial Manager for account voucher'
 -
   !record {model: res.users, id: res_users_account_voucher_manager}:
     company_id: base.main_company
@@ -22,3 +23,10 @@
     login: fmv
     password: fmv
     email: finmanager@yourcompany.com
+-
+  I added groups to Financial Manager for account voucher which needed.
+-
+  !record {model: res.users, id: res_users_account_voucher_manager}:
+    groups_id:
+      - base.group_partner_manager
+      - account.group_account_manager

From 0f312151471b625c7ade63004d8293eb8ad950f2 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 7 May 2013 12:34:46 +0530
Subject: [PATCH 069/164] [IMP]done changes as per new yml changes in crm

bzr revid: sgo@tinyerp.com-20130507070446-ejlju0cnui74vy21
---
 addons/crm/__openerp__.py                           | 2 +-
 addons/crm/test/{ui => }/crm_access_group_users.yml | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename addons/crm/test/{ui => }/crm_access_group_users.yml (100%)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index ac0a06a384c..bc74c3350ac 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -106,7 +106,7 @@ Dashboard for CRM will include:
         'crm_action_rule_demo.xml',
     ],
     'test': [
-        'test/ui/crm_access_group_users.yml',
+        'test/crm_access_group_users.yml',
         'test/crm_lead_message.yml',
         'test/lead2opportunity2win.yml',
         'test/lead2opportunity_assign_salesmen.yml',
diff --git a/addons/crm/test/ui/crm_access_group_users.yml b/addons/crm/test/crm_access_group_users.yml
similarity index 100%
rename from addons/crm/test/ui/crm_access_group_users.yml
rename to addons/crm/test/crm_access_group_users.yml

From 1373b5cda00c791b3c9a229dd0ef10a28c723679 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 7 May 2013 12:49:59 +0530
Subject: [PATCH 070/164] [IMP]improve string and add groups in groups_id in
 crm and event

bzr revid: sgo@tinyerp.com-20130507071959-kwqmv7wwy7gqcsfj
---
 addons/account/test/account_test_users.yml     |  4 ++--
 .../test/account_voucher_users.yml             |  4 ++--
 addons/crm/test/crm_access_group_users.yml     | 18 ++++++++++++------
 addons/event/test/ui/event_users.yml           | 18 ++++++++++++------
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/addons/account/test/account_test_users.yml b/addons/account/test/account_test_users.yml
index 3b0fd72f0bf..b257feedff8 100644
--- a/addons/account/test/account_test_users.yml
+++ b/addons/account/test/account_test_users.yml
@@ -8,7 +8,7 @@
     password: acc
     email: accountuser@yourcompany.com
 -
-  I added groups for Accountant which needed.
+  I added groups for Accountant.
 -
   !record {model: res.users, id: res_users_account_user}:
     groups_id:
@@ -24,7 +24,7 @@
     password: fm
     email: accountmanager@yourcompany.com
 -
-  I added groups for Financial Manager which needed.
+  I added groups for Financial Manager.
 -
   !record {model: res.users, id: res_users_account_manager}:
     groups_id:
diff --git a/addons/account_voucher/test/account_voucher_users.yml b/addons/account_voucher/test/account_voucher_users.yml
index feb19c0e3fb..c96645f0190 100644
--- a/addons/account_voucher/test/account_voucher_users.yml
+++ b/addons/account_voucher/test/account_voucher_users.yml
@@ -8,7 +8,7 @@
     password: acc
     email: accountant@yourcompany.com
 -
-  I added groups to Accountant for account voucher which needed.
+  I added groups to Accountant for account voucher.
 -
   !record {model: res.users, id: res_users_account_voucher_user}:
     groups_id:
@@ -24,7 +24,7 @@
     password: fmv
     email: finmanager@yourcompany.com
 -
-  I added groups to Financial Manager for account voucher which needed.
+  I added groups to Financial Manager for account voucher.
 -
   !record {model: res.users, id: res_users_account_voucher_manager}:
     groups_id:
diff --git a/addons/crm/test/crm_access_group_users.yml b/addons/crm/test/crm_access_group_users.yml
index 158a11b5881..50ee9ed5367 100644
--- a/addons/crm/test/crm_access_group_users.yml
+++ b/addons/crm/test/crm_access_group_users.yml
@@ -1,8 +1,5 @@
 -
   Create a user as 'Salesmanager'
--
-  !context
-    default_groups_ref: ['base.group_sale_manager']
 -
   !record {model: res.users, id: crm_res_users_salesmanager}:
     company_id: base.main_company
@@ -11,10 +8,13 @@
     password: csm
     email: crmmanager@yourcompany.com
 -
-  Create a user as 'Salesman'
+  I added groups for Salesmanager.
 -
-  !context
-    default_groups_ref: ['base.group_sale_salesman_all_leads']
+  !record {model: res.users, id: crm_res_users_salesmanager}:
+    groups_id:
+      - base.group_sale_manager
+-
+  Create a user as 'Salesman'
 -
   !record {model: res.users, id: crm_res_users_salesman}:
     company_id: base.main_company
@@ -22,3 +22,9 @@
     login: csu
     password: csu
     email: crmuser@yourcompany.com
+-
+  I added groups for Salesman.
+-
+  !record {model: res.users, id: crm_res_users_salesman}:
+    groups_id:
+      - base.group_sale_salesman_all_leads
diff --git a/addons/event/test/ui/event_users.yml b/addons/event/test/ui/event_users.yml
index 92c8316a5d9..b6927dbdaa6 100644
--- a/addons/event/test/ui/event_users.yml
+++ b/addons/event/test/ui/event_users.yml
@@ -1,8 +1,5 @@
 -
   Create a user as 'Event manager'
--
-  !context
-    default_groups_ref: [event.group_event_manager]
 -
   !record {model: res.users, id: res_users_eventmanager}:
     company_id: base.main_company
@@ -11,10 +8,13 @@
     password: em
     email: eventmanager@yourcompany.com
 -
-  Create a user as 'Event user'
+  I added groups for Event manager.
 -
-  !context
-    default_groups_ref: [event.group_event_user]
+  !record {model: res.users, id: res_users_eventmanager}:
+    groups_id:
+      - event.group_event_manager
+-
+  Create a user as 'Event user'
 -
   !record {model: res.users, id: res_users_eventuser}:
     company_id: base.main_company
@@ -22,3 +22,9 @@
     login: eu
     password: eu
     email: eventuser@yourcompany.com
+-
+  I added groups for Event manager.
+-
+  !record {model: res.users, id: res_users_eventuser}:
+    groups_id:
+      - event.group_event_user

From 5f629a2f0bb5a582d366097927eae36321959b95 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 7 May 2013 12:57:22 +0530
Subject: [PATCH 071/164] [IMP]improve string

bzr revid: sgo@tinyerp.com-20130507072722-jf0912rfbakddo36
---
 addons/event/test/ui/event_users.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/test/ui/event_users.yml b/addons/event/test/ui/event_users.yml
index b6927dbdaa6..cda4ebda750 100644
--- a/addons/event/test/ui/event_users.yml
+++ b/addons/event/test/ui/event_users.yml
@@ -23,7 +23,7 @@
     password: eu
     email: eventuser@yourcompany.com
 -
-  I added groups for Event manager.
+  I added groups for Event user.
 -
   !record {model: res.users, id: res_users_eventuser}:
     groups_id:

From fbfd8a4b423c232269c6abfafede527bd26ee7e3 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 7 May 2013 14:13:16 +0530
Subject: [PATCH 072/164] [IMP]improve string and add groups in groups_id in
 sale and sale stock

bzr revid: sgo@tinyerp.com-20130507084316-v1tiw294n8imfj1v
---
 addons/crm/test/crm_access_group_users.yml  | 12 +++---
 addons/sale/test/create_sale_users.yml      | 18 ++++++---
 addons/sale_stock/test/sale_stock_users.yml | 43 +++++++++++++--------
 3 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/addons/crm/test/crm_access_group_users.yml b/addons/crm/test/crm_access_group_users.yml
index 50ee9ed5367..c9080ee530e 100644
--- a/addons/crm/test/crm_access_group_users.yml
+++ b/addons/crm/test/crm_access_group_users.yml
@@ -1,29 +1,29 @@
 -
-  Create a user as 'Salesmanager'
+  Create a user as 'Crm Salesmanager'
 -
   !record {model: res.users, id: crm_res_users_salesmanager}:
     company_id: base.main_company
-    name: Sales manager
+    name: Crm Sales manager
     login: csm
     password: csm
     email: crmmanager@yourcompany.com
 -
-  I added groups for Salesmanager.
+  I added groups for Crm Salesmanager.
 -
   !record {model: res.users, id: crm_res_users_salesmanager}:
     groups_id:
       - base.group_sale_manager
 -
-  Create a user as 'Salesman'
+  Create a user as 'Crm Salesman'
 -
   !record {model: res.users, id: crm_res_users_salesman}:
     company_id: base.main_company
-    name: Salesman
+    name: Crm Salesman
     login: csu
     password: csu
     email: crmuser@yourcompany.com
 -
-  I added groups for Salesman.
+  I added groups for Crm Salesman.
 -
   !record {model: res.users, id: crm_res_users_salesman}:
     groups_id:
diff --git a/addons/sale/test/create_sale_users.yml b/addons/sale/test/create_sale_users.yml
index ed575073f5d..e86fbc8ebfe 100644
--- a/addons/sale/test/create_sale_users.yml
+++ b/addons/sale/test/create_sale_users.yml
@@ -1,8 +1,5 @@
 -
    Create a user as 'Salesmanager'
--
-  !context
-    default_groups_ref: ['base.group_sale_manager']
 -
   !record {model: res.users, id: res_users_salesmanager}:
     company_id: base.main_company
@@ -11,10 +8,13 @@
     password: sm
     email: salesmanager@yourcompany.com
 -
-   Create a user as 'Salesman'
+  I added groups for Salesmanager.
 -
-  !context
-    default_groups_ref: ['base.group_sale_salesman_all_leads']
+  !record {model: res.users, id: res_users_salesmanager}:
+    groups_id:
+      - base.group_sale_manager
+-
+   Create a user as 'Salesman'
 -
   !record {model: res.users, id: res_users_salesman}:
     company_id: base.main_company
@@ -22,3 +22,9 @@
     login: su
     password: su
     email: salesman@yourcompany.com
+-
+  I added groups for Salesman.
+-
+  !record {model: res.users, id: res_users_salesman}:
+    groups_id:
+      - base.group_sale_salesman_all_leads
diff --git a/addons/sale_stock/test/sale_stock_users.yml b/addons/sale_stock/test/sale_stock_users.yml
index c1ebd54392c..594cbe42240 100644
--- a/addons/sale_stock/test/sale_stock_users.yml
+++ b/addons/sale_stock/test/sale_stock_users.yml
@@ -1,32 +1,35 @@
 -
-   Create a user as 'Salesmanager'
--
-  !context
-    default_groups_ref: ['base.group_sale_manager']
+   Create a user as 'Stock Salesmanager'
 -
   !record {model: res.users, id: res_sale_stock_salesmanager}:
     company_id: base.main_company
-    name: Sales manager
+    name: Stock Sales manager
     login: ssm
     password: ssm
     email: ss_salesmanager@yourcompany.com
 -
-   Create a user as 'Salesman'
+  I added groups for Salesmanager.
 -
-  !context
-    default_groups_ref: ['base.group_sale_salesman_all_leads']
+  !record {model: res.users, id: res_sale_stock_salesmanager}:
+    groups_id:
+      - base.group_sale_manager
+-
+   Create a user as 'Stock Salesman'
 -
   !record {model: res.users, id: res_sale_stock_salesman}:
     company_id: base.main_company
-    name: Salesman
+    name: Stock Salesman
     login: ssu
     password: ssu
     email: ss_salesman@yourcompany.com
 -
-   Create a user as 'Stock User'
+  I added groups for Stock Salesman.
 -
-  !context
-    default_groups_ref: ['stock.group_stock_user']
+  !record {model: res.users, id: res_sale_stock_salesman}:
+    groups_id:
+      - base.group_sale_salesman_all_leads
+-
+   Create a user as 'Stock User'
 -
   !record {model: res.users, id: res_stock_user}:
     company_id: base.main_company
@@ -34,12 +37,14 @@
     login: sau
     password: sau
     email: stock_user@yourcompany.com
-    
+-
+  I added groups for Stock User.
+-
+  !record {model: res.users, id: res_stock_user}:
+    groups_id:
+      - stock.group_stock_user
 -
    Create a user as 'Stock Manager'
--
-  !context
-    default_groups_ref: ['stock.group_stock_manager']
 -
   !record {model: res.users, id: res_stock_manager}:
     company_id: base.main_company
@@ -48,3 +53,9 @@
     password: sam
     email: admin@portal.example.com
     email: stock_manager@yourcompany.com
+-
+  I added groups for Stock Manager.
+-
+  !record {model: res.users, id: res_stock_manager}:
+    groups_id:
+      - stock.group_stock_manager

From 76451bef7680e6d309b2c95722587f7c667e1f1a Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 7 May 2013 14:19:01 +0530
Subject: [PATCH 073/164] [IMP]add groups in groups_id in purchase and
 purchase_requisition

bzr revid: sgo@tinyerp.com-20130507084901-c4n3scfvt7vrs0gg
---
 addons/purchase/test/ui/purchase_users.yml    | 18 +++++++++++------
 .../test/purchase_requisition_users.yml       | 20 ++++++++++++-------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/addons/purchase/test/ui/purchase_users.yml b/addons/purchase/test/ui/purchase_users.yml
index 9dd5e9c0195..bfff922bf83 100644
--- a/addons/purchase/test/ui/purchase_users.yml
+++ b/addons/purchase/test/ui/purchase_users.yml
@@ -1,8 +1,5 @@
 -
   Create a user as 'Purchase manager'
--
-  !context
-    default_groups_ref: ['purchase.group_purchase_manager']
 -
   !record {model: res.users, id: res_users_purchase_manager}:
     company_id: base.main_company
@@ -11,10 +8,13 @@
     password: pm
     email: purchasemanager@yourcompany.com
 -
-  Create a user as 'Purchase user'
+  I added groups for Purchase manager.
 -
-  !context
-    default_groups_ref: ['purchase.group_purchase_user']
+  !record {model: res.users, id: res_users_purchase_manager}:
+    groups_id:
+      - purchase.group_purchase_manager
+-
+  Create a user as 'Purchase user'
 -
   !record {model: res.users, id: res_users_purchase_user}:
     company_id: base.main_company
@@ -22,3 +22,9 @@
     login: pu
     password: pu
     email: purchaseuser@yourcompany.com
+-
+  I added groups for Purchase user.
+-
+  !record {model: res.users, id: res_users_purchase_user}:
+    groups_id:
+      - purchase.group_purchase_user
diff --git a/addons/purchase_requisition/test/purchase_requisition_users.yml b/addons/purchase_requisition/test/purchase_requisition_users.yml
index 41bc7cd318e..5b5e6d5e8cb 100644
--- a/addons/purchase_requisition/test/purchase_requisition_users.yml
+++ b/addons/purchase_requisition/test/purchase_requisition_users.yml
@@ -1,8 +1,5 @@
 -
-  Create a user as 'Purchase Reqisition Manager'
--
-  !context
-    default_groups_ref: ['purchase_requisition.group_purchase_requisition_manager']
+  Create a user as 'Purchase Requisition Manager'
 -
   !record {model: res.users, id: res_users_purchase_requisition_manager}:
     company_id: base.main_company
@@ -11,10 +8,13 @@
     password: prm
     email: requisition_manager@yourcompany.com
 -
-  Create a user as 'Purchase Reqisition User'
+  I added groups for Purchase Requisition Manager.
 -
-  !context
-    default_groups_ref: ['purchase_requisition.group_purchase_requisition_user']
+  !record {model: res.users, id: res_users_purchase_requisition_manager}:
+    groups_id:
+      - purchase_requisition.group_purchase_requisition_manager
+-
+  Create a user as 'Purchase Requisition User'
 -
   !record {model: res.users, id: res_users_purchase_requisition_user}:
     company_id: base.main_company
@@ -22,3 +22,9 @@
     login: pru
     password: pru
     email: requisition_user@yourcompany.com
+-
+  I added groups for Purchase Requisition User.
+-
+  !record {model: res.users, id: res_users_purchase_requisition_user}:
+    groups_id:
+      - purchase_requisition.group_purchase_requisition_user
\ No newline at end of file

From df013f64025f72f0770abcf67d76518a2ae2c6b6 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 7 May 2013 14:32:04 +0530
Subject: [PATCH 074/164] [IMP]add groups in groups_id for hr, hr_attandance
 and recruitment

bzr revid: sgo@tinyerp.com-20130507090204-13gkyryyn3lxtz8z
---
 addons/hr/test/hr_users.yml                   | 27 ++++++++++++-------
 .../hr_attendance/test/attendance_process.yml |  9 ++++---
 .../test/recruitment_process.yml              | 13 +++++----
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/addons/hr/test/hr_users.yml b/addons/hr/test/hr_users.yml
index 265482ca457..115924d5c1c 100644
--- a/addons/hr/test/hr_users.yml
+++ b/addons/hr/test/hr_users.yml
@@ -1,8 +1,5 @@
 -
   Create a user as 'HR Manager'
--
-  !context
-    default_groups_ref: [base.group_hr_manager]
 -
   !record {model: res.users, id: res_users_hr_manager}:
     company_id: base.main_company
@@ -10,10 +7,13 @@
     login: hrm
     password: hrm
 -
-  Create a user as 'HR Officer'
+  I added groups for HR Manager.
 -
-  !context
-    default_groups_ref: [base.group_hr_user]
+  !record {model: res.users, id: res_users_hr_manager}:
+    groups_id:
+      - base.group_hr_manager
+-
+  Create a user as 'HR Officer'
 -
   !record {model: res.users, id: res_users_hr_officer}:
     company_id: base.main_company
@@ -21,13 +21,22 @@
     login: hro
     password: hro
 -
-  Create a user as 'Employee'
+  I added groups for HR Officer.
 -
-  !context
-    default_groups_ref: [base.group_user]
+  !record {model: res.users, id: res_users_hr_officer}:
+    groups_id:
+      - base.group_hr_user
+-
+  Create a user as 'Employee'
 -
   !record {model: res.users, id: res_users_employee}:
     company_id: base.main_company
     name: Employee
     login: emp
     password: emp
+-
+  I added groups for Employee.
+-
+  !record {model: res.users, id: res_users_employee}:
+    groups_id:
+      - base.group_user
diff --git a/addons/hr_attendance/test/attendance_process.yml b/addons/hr_attendance/test/attendance_process.yml
index 383cf209bd4..814f0ee9b8a 100644
--- a/addons/hr_attendance/test/attendance_process.yml
+++ b/addons/hr_attendance/test/attendance_process.yml
@@ -1,14 +1,17 @@
 -
   Create a user as 'HR Attendance Officer'
--
-  !context
-    default_groups_ref: [base.group_hr_user]
 -
   !record {model: res.users, id: res_users_attendance_officer}:
     company_id: base.main_company
     name: HR Officer
     login: ao
     password: ao
+-
+  I added groups for HR Attendance Officer.
+-
+  !record {model: res.users, id: res_users_attendance_officer}:
+    groups_id:
+      - base.group_hr_user
 -
   Give the access rights of Hr Officer to test attendance process.
 -
diff --git a/addons/hr_recruitment/test/recruitment_process.yml b/addons/hr_recruitment/test/recruitment_process.yml
index 2b7c534c270..8cf924b5d05 100644
--- a/addons/hr_recruitment/test/recruitment_process.yml
+++ b/addons/hr_recruitment/test/recruitment_process.yml
@@ -1,15 +1,18 @@
 -
   Create a user as 'HR Recruitment Officer'
 -
-  !context
-    default_groups_ref: [base.group_hr_user]
--
-  !record {model: res.users, id: res_users_hr_officer}:
+  !record {model: res.users, id: res_users_hr_recruitment_officer}:
     company_id: base.main_company
-    name: HR Officer
+    name: HR Recruitment Officer
     login: hrro
     password: hrro
     email: hrofcr@yourcompany.com
+-
+  I added groups for HR Recruitment Officer.
+-
+  !record {model: res.users, id: res_users_hr_recruitment_officer}:
+    groups_id:
+      - base.group_hr_user
 -
   In Order to test process of Recruitment so giving HR officer's rights,
 -

From a28d4d7cad0a55c4c4f1d97ca17035a2e01c8d07 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 7 May 2013 14:39:44 +0530
Subject: [PATCH 075/164] [IMP] add group_id in project and project_issue for
 assign groups

bzr revid: fka@tinyerp.com-20130507090944-m8oqqxx7wekyh09c
---
 addons/project/test/project_users.yml     | 18 ++++++++++++------
 addons/project_issue/test/issue_users.yml | 18 ++++++++++++------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/addons/project/test/project_users.yml b/addons/project/test/project_users.yml
index 8ae3c23dca1..f61d2042b6b 100644
--- a/addons/project/test/project_users.yml
+++ b/addons/project/test/project_users.yml
@@ -1,8 +1,5 @@
 -
   Create a user as 'Project manager'
--
-  !context
-    default_groups_ref: ['project.group_project_manager']
 -
   !record {model: res.users, id: res_users_project_manager}:
     company_id: base.main_company
@@ -11,10 +8,13 @@
     password: prm
     email: projectmanager@yourcompany.com
 -
-  Create a user as 'Project user'
+  I added groups for Project manager.
 -
-  !context
-    default_groups_ref: ['project.group_project_user']
+  !record {model: res.users, id: res_users_project_manager}:
+    groups_id:
+      - project.group_project_manager
+-
+  Create a user as 'Project user'
 -
   !record {model: res.users, id: res_users_project_user}:
     company_id: base.main_company
@@ -22,3 +22,9 @@
     login: pru
     password: pru
     email: projectuser@yourcompany.com
+-
+  I added groups for Project user.
+-
+  !record {model: res.users, id: res_users_project_user}:
+    groups_id:
+      - project.group_project_user
\ No newline at end of file
diff --git a/addons/project_issue/test/issue_users.yml b/addons/project_issue/test/issue_users.yml
index 402478b1c54..c40d142684a 100644
--- a/addons/project_issue/test/issue_users.yml
+++ b/addons/project_issue/test/issue_users.yml
@@ -1,8 +1,5 @@
 -
   Create a user as 'Project manager'
--
-  !context
-    default_groups_ref: ['project.group_project_manager']
 -
   !record {model: res.users, id: res_users_project_issue_manager}:
     company_id: base.main_company
@@ -11,10 +8,13 @@
     password: prim
     email: issuemanager@yourcompany.com
 -
-  Create a user as 'Project user'
+  I added groups for Project manager.
 -
-  !context
-    default_groups_ref: ['project.group_project_user']
+  !record {model: res.users, id: res_users_project_issue_manager}:
+    groups_id:
+      - project.group_project_manager
+-
+  Create a user as 'Project user'
 -
   !record {model: res.users, id: res_users_project_issue_user}:
     company_id: base.main_company
@@ -22,3 +22,9 @@
     login: priu
     password: priu
     email: issueuser@yourcompany.com
+-
+  I added groups for Project user.
+-
+  !record {model: res.users, id: res_users_project_issue_user}:
+    groups_id:
+      - project.group_project_user
\ No newline at end of file

From de7fdad10fe952cb26c4213e3fc0e3c2437dda77 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 7 May 2013 14:40:56 +0530
Subject: [PATCH 076/164] [IMP]add groups in groups_id for hr timesheet

bzr revid: sgo@tinyerp.com-20130507091056-ume659zsu3q2fgig
---
 .../hr_timesheet/test/hr_timesheet_users.yml  | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/addons/hr_timesheet/test/hr_timesheet_users.yml b/addons/hr_timesheet/test/hr_timesheet_users.yml
index 4a557bff44f..8b8b799e503 100644
--- a/addons/hr_timesheet/test/hr_timesheet_users.yml
+++ b/addons/hr_timesheet/test/hr_timesheet_users.yml
@@ -1,33 +1,45 @@
 -
-  Create a user as 'HR Manager'
--
-  !context
-    default_groups_ref: [base.group_hr_manager]
+  Create a user as 'HR timesheet Manager'
 -
   !record {model: res.users, id: res_hr_timesheet_manager}:
     company_id: base.main_company
-    name: HR manager
+    name: HR timesheet manager
     login: hrtm
     password: hrtm
 -
-  Create a user as 'HR Officer'
+  I added groups for HR timesheet Manager.
+-
+  !record {model: res.users, id: res_hr_timesheet_manager}:
+    groups_id:
+      - base.group_hr_manager
+-
+  Create a user as 'HR timesheet Officer'
 -
   !context
     default_groups_ref: [base.group_hr_user]
 -
   !record {model: res.users, id: res_hr_timesheet_officer}:
     company_id: base.main_company
-    name: HR Officer
+    name: HR timesheet Officer
     login: hrto
     password: hrto
 -
-  Create a user as 'Employee'
+  I added groups for HR timesheet Officer.
 -
-  !context
-    default_groups_ref: [base.group_user]
+  !record {model: res.users, id: res_hr_timesheet_officer}:
+    groups_id:
+      - base.group_hr_user
+-
+  Create a user as 'Timesheet Employee'
 -
   !record {model: res.users, id: res_hr_timesheet_employee}:
     company_id: base.main_company
-    name: Employee
+    name: Timesheet Employee
     login: empt
     password: empt
+-
+  I added groups for Timesheet Employee.
+-
+  !record {model: res.users, id: res_hr_timesheet_employee}:
+    groups_id:
+      - base.group_user

From f0ecb9c56a6b4eb850fc67256c5b54ba9a263ee2 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 7 May 2013 14:43:12 +0530
Subject: [PATCH 077/164] [IMP]add groups in groups_id for stock

bzr revid: sgo@tinyerp.com-20130507091312-gnrhyr0osq56ddb1
---
 addons/stock/test/stock_users.yml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/addons/stock/test/stock_users.yml b/addons/stock/test/stock_users.yml
index b8fe0783ca1..d0c09dc745d 100644
--- a/addons/stock/test/stock_users.yml
+++ b/addons/stock/test/stock_users.yml
@@ -1,8 +1,5 @@
 -
    Create a user as 'Stock Manager'
--
-  !context
-    default_groups_ref: ['stock.group_stock_manager']
 -
   !record {model: res.users, id: res_users_stock_manager}:
     company_id: base.main_company
@@ -11,10 +8,13 @@
     password: sam
     email: stockmanager@yourcompany.com
 -
-   Create a user as 'Stock User'
+  I added groups for Stock Manager.
 -
-  !context
-    default_groups_ref: ['stock.group_stock_user']
+  !record {model: res.users, id: res_users_stock_manager}:
+    groups_id:
+      - stock.group_stock_manager
+-
+   Create a user as 'Stock User'
 -
   !record {model: res.users, id: res_users_stock_user}:
     company_id: base.main_company
@@ -22,3 +22,9 @@
     login: sau
     password: sau
     email: stockuser@yourcompany.com
+-
+  I added groups for Stock User.
+-
+  !record {model: res.users, id: res_users_stock_user}:
+    groups_id:
+      - stock.group_stock_user

From 693e52e928d76c13d3c814e2b91615fcffbc593c Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 7 May 2013 15:04:13 +0530
Subject: [PATCH 078/164] [IMP]improve code

bzr revid: sgo@tinyerp.com-20130507093413-42qiuvslavp0w4n1
---
 addons/hr_recruitment/test/recruitment_process.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/test/recruitment_process.yml b/addons/hr_recruitment/test/recruitment_process.yml
index 8cf924b5d05..1fa59328ef4 100644
--- a/addons/hr_recruitment/test/recruitment_process.yml
+++ b/addons/hr_recruitment/test/recruitment_process.yml
@@ -17,7 +17,7 @@
   In Order to test process of Recruitment so giving HR officer's rights,
 -
   !context
-    uid: 'res_users_hr_officer'
+    uid: 'res_users_hr_recruitment_officer'
 -
   An applicant is interested in the job position. So he sends a resume by email.
 -

From 2126f36ad127802dba5d46f4b04431e3eb7a8a9f Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 7 May 2013 15:08:48 +0530
Subject: [PATCH 079/164] [IMP] add group_id in MRP,mrp_repair and
 mrp_operations for assign groups

bzr revid: fka@tinyerp.com-20130507093848-lrpqfao6kumlgepy
---
 addons/mrp/test/mrp_users.yml                  | 18 ++++++++++++------
 .../test/workcenter_operations.yml             |  9 ++++++---
 addons/mrp_repair/test/mrp_repair_users.yml    | 18 ++++++++++++------
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/addons/mrp/test/mrp_users.yml b/addons/mrp/test/mrp_users.yml
index 965a809eddc..b01f4f975bd 100644
--- a/addons/mrp/test/mrp_users.yml
+++ b/addons/mrp/test/mrp_users.yml
@@ -1,8 +1,5 @@
 -
    Create a user as 'MRP Manager'
--
-  !context
-    default_groups_ref: [mrp.group_mrp_manager]
 -
   !record {model: res.users, id: res_users_mrp_manager}:
     company_id: base.main_company
@@ -11,10 +8,13 @@
     password: mam
     email: mrp_manager@yourcompany.com
 -
-   Create a user as 'MRP User'
+  I added groups for MRP Manager.
 -
-  !context
-    default_groups_ref: [mrp.group_mrp_user]
+  !record {model: res.users, id: res_users_mrp_manager}:
+    groups_id:
+      - mrp.group_mrp_manager
+-
+   Create a user as 'MRP User'
 -
   !record {model: res.users, id: res_users_mrp_user}:
     company_id: base.main_company
@@ -22,3 +22,9 @@
     login: mau
     password: mau
     email: mrp_user@yourcompany.com
+-
+  I added groups for MRP User.
+-
+  !record {model: res.users, id: res_users_mrp_user}:
+    groups_id:
+      - mrp.group_mrp_user
\ No newline at end of file
diff --git a/addons/mrp_operations/test/workcenter_operations.yml b/addons/mrp_operations/test/workcenter_operations.yml
index 3fc5b332d18..588ad639659 100644
--- a/addons/mrp_operations/test/workcenter_operations.yml
+++ b/addons/mrp_operations/test/workcenter_operations.yml
@@ -1,8 +1,5 @@
 -
    Create a user as 'MRP User'
--
-  !context
-    default_groups_ref: [mrp.group_mrp_user]
 -
   !record {model: res.users, id: res_mrp_operation_user}:
     company_id: base.main_company
@@ -10,6 +7,12 @@
     login: maou
     password: maou
     email: mrp_operation_user@yourcompany.com
+-
+  I added groups for MRP User.
+-
+  !record {model: res.users, id: res_mrp_operation_user}:
+    groups_id:
+      - mrp.group_mrp_user
 -
   In order to test mrp_operations with OpenERP, I refer created production order of PC Assemble SC349
   with routing - Manual Component's Assembly to test complete production process with respect of workcenter with giving access rights of MRP User.
diff --git a/addons/mrp_repair/test/mrp_repair_users.yml b/addons/mrp_repair/test/mrp_repair_users.yml
index f7ee95314e2..d5762e69b27 100644
--- a/addons/mrp_repair/test/mrp_repair_users.yml
+++ b/addons/mrp_repair/test/mrp_repair_users.yml
@@ -1,8 +1,5 @@
 -
    Create a user as 'MRP Repair Manager'
--
-  !context
-    default_groups_ref: [mrp.group_mrp_manager]
 -
   !record {model: res.users, id: res_mrp_repair_manager}:
     company_id: base.main_company
@@ -11,10 +8,13 @@
     password: marm
     email: mrp_repair_manager@yourcompany.com
 -
-   Create a user as 'MRP Repair User'
+  I added groups for MRP Repair Manager.
 -
-  !context
-    default_groups_ref: [mrp.group_mrp_user]
+  !record {model: res.users, id: res_mrp_repair_manager}:
+    groups_id:
+      - mrp.group_mrp_manager
+-
+   Create a user as 'MRP Repair User'
 -
   !record {model: res.users, id: res_mrp_repair_user}:
     company_id: base.main_company
@@ -22,3 +22,9 @@
     login: maru
     password: maru
     email: mrp_repair_user@yourcompany.com
+-
+  I added groups for MRP Repair User.
+-
+  !record {model: res.users, id: res_mrp_repair_user}:
+    groups_id:
+      - mrp.group_mrp_user
\ No newline at end of file

From 5d267f4b41654b98afabf2551574b46768f8d553 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 7 May 2013 15:51:00 +0530
Subject: [PATCH 080/164] [IMP]improve code remove unused code

bzr revid: sgo@tinyerp.com-20130507102100-7x01f5hglnw37jwb
---
 addons/hr_timesheet/test/hr_timesheet_users.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/hr_timesheet/test/hr_timesheet_users.yml b/addons/hr_timesheet/test/hr_timesheet_users.yml
index 8b8b799e503..cb59f77df69 100644
--- a/addons/hr_timesheet/test/hr_timesheet_users.yml
+++ b/addons/hr_timesheet/test/hr_timesheet_users.yml
@@ -14,9 +14,6 @@
       - base.group_hr_manager
 -
   Create a user as 'HR timesheet Officer'
--
-  !context
-    default_groups_ref: [base.group_hr_user]
 -
   !record {model: res.users, id: res_hr_timesheet_officer}:
     company_id: base.main_company

From c9271122b24b96198ff62485809d08f0f005cbfc Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 7 May 2013 16:46:57 +0530
Subject: [PATCH 081/164] [IMP]remove access rights of account user and improve
 code

bzr revid: sgo@tinyerp.com-20130507111657-gg47ca2206q3knd7
---
 addons/account/security/ir.model.access.csv      |  3 ---
 addons/account/test/account_customer_invoice.yml | 15 +++++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index d6ba955aabc..d1f0bbab6b5 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -37,7 +37,6 @@ access_account_payment_term_manager,account.payment.term,model_account_payment_t
 access_account_payment_term_line_manager,account.payment.term.line,model_account_payment_term_line,account.group_account_manager,1,1,1,1
 access_account_tax_manager,account.tax,model_account_tax,account.group_account_manager,1,1,1,1
 access_account_journal_manager,account.journal,model_account_journal,account.group_account_manager,1,1,1,1
-access_account_journal_user,account.journal,model_account_journal,account.group_account_user,1,1,1,0
 access_account_journal_invoice,account.journal invoice,model_account_journal,account.group_account_invoice,1,0,0,0
 access_account_period_manager,account.period,model_account_period,account.group_account_manager,1,1,1,1
 access_account_period_invoice,account.period invoice,model_account_period,account.group_account_invoice,1,0,0,0
@@ -72,7 +71,6 @@ access_report_account_type_sales,report.account_type.sales,model_report_account_
 access_report_account_sales,report.account.sales,model_report_account_sales,account.group_account_manager,1,1,1,1
 access_account_invoice_report,account.invoice.report,model_account_invoice_report,account.group_account_manager,1,1,1,1
 access_res_partner_group_account_manager,res_partner group_account_manager,model_res_partner,account.group_account_manager,1,0,0,0
-access_res_partner_group_account_user,res_partner group_account_user,model_res_partner,account.group_account_user,1,1,1,0
 access_account_invoice_accountant,account.invoice accountant,model_account_invoice,account.group_account_user,1,0,0,0
 access_account_tax_code_accountant,account.tax.code accountant,model_account_tax_code,account.group_account_user,1,1,1,1
 access_account_move_line_manager,account.move.line manager,model_account_move_line,account.group_account_manager,1,0,0,0
@@ -100,4 +98,3 @@ access_account_sequence_fiscal_year_sale_manager,account.sequence.fiscalyear.sal
 access_account_treasury_report_manager,account.treasury.report.manager,model_account_treasury_report,account.group_account_manager,1,0,0,0
 access_account_financial_report,account.financial.report,model_account_financial_report,account.group_account_user,1,1,1,1
 access_account_financial_report_invoice,account.financial.report invoice,model_account_financial_report,account.group_account_invoice,1,0,0,0
-access_res_partner_bank,res.partner.bank,model_res_partner_bank,account.group_account_user,1,1,1,0
diff --git a/addons/account/test/account_customer_invoice.yml b/addons/account/test/account_customer_invoice.yml
index a41ca9bbfe4..d0b445fcff5 100644
--- a/addons/account/test/account_customer_invoice.yml
+++ b/addons/account/test/account_customer_invoice.yml
@@ -1,12 +1,10 @@
--
-  Test with that user which have rights to make Invoicing and payment and who is accountant. 
--
-  !context
-    uid: 'res_users_account_user'
 -
   In order to test account invoice I create a new customer invoice
 -
-  I will create bank detail
+  I will create bank detail with using manager access rights because account manager can only create bank details. 
+-
+  !context
+    uid: 'res_users_account_manager'
 -
   !record {model: res.partner.bank, id: res_partner_bank_0}:
     state: bank
@@ -16,6 +14,11 @@
     footer: True
     bank: base.res_bank_1
     bank_name: Reserve
+-
+  Test with that user which have rights to make Invoicing and payment and who is accountant. 
+-
+  !context
+    uid: 'res_users_account_user'
 -
   I create a customer invoice
 -

From c9688c9d5d503df98e58f15632a075247837f2cf Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 7 May 2013 17:04:19 +0530
Subject: [PATCH 082/164] [IMP] improve code

bzr revid: sgo@tinyerp.com-20130507113419-hvk6cc9u3fxbpjl5
---
 addons/account/test/account_test_users.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account/test/account_test_users.yml b/addons/account/test/account_test_users.yml
index b257feedff8..143e8bb5473 100644
--- a/addons/account/test/account_test_users.yml
+++ b/addons/account/test/account_test_users.yml
@@ -28,4 +28,5 @@
 -
   !record {model: res.users, id: res_users_account_manager}:
     groups_id:
-      - account.group_account_manager
\ No newline at end of file
+      - account.group_account_manager
+      - base.group_partner_manager
\ No newline at end of file

From bdc2be1aa4a6d348e30acab83ed975e18f494cf3 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 7 May 2013 18:11:54 +0530
Subject: [PATCH 083/164] [IMP]remove access rights of crm user and improve
 code

bzr revid: sgo@tinyerp.com-20130507124154-4mrcpbocuafv4ny7
---
 addons/crm/security/ir.model.access.csv    | 1 -
 addons/crm/test/crm_access_group_users.yml | 1 +
 addons/crm/test/crm_lead_message.yml       | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 1589b50c016..b09c201df2b 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -35,6 +35,5 @@ access_crm_lead_partner_manager,crm.lead.partner.manager,model_crm_lead,base.gro
 access_crm_phonecall_partner_manager,crm.phonecall.partner.manager,model_crm_phonecall,base.group_partner_manager,1,1,1,1
 access_crm_payment_mode_user,crm.payment.mode,model_crm_payment_mode,base.group_sale_salesman,1,0,0,0
 access_crm_payment_mode,crm.payment.mode,model_crm_payment_mode,base.group_sale_manager,1,1,1,1
-access_ir_property_salesman,ir_property_salesman,base.model_ir_property,base.group_sale_salesman,1,1,1,0
 access_base_partner_merge_line_manager,base_partner_merge_line.manager,model_base_partner_merge_line,base.group_system,1,1,1,1
 access_base_partner_merge_manager,base_partner_merge.manager,model_base_partner_merge_automatic_wizard,base.group_system,1,1,1,1
diff --git a/addons/crm/test/crm_access_group_users.yml b/addons/crm/test/crm_access_group_users.yml
index c9080ee530e..51cf52c0abc 100644
--- a/addons/crm/test/crm_access_group_users.yml
+++ b/addons/crm/test/crm_access_group_users.yml
@@ -28,3 +28,4 @@
   !record {model: res.users, id: crm_res_users_salesman}:
     groups_id:
       - base.group_sale_salesman_all_leads
+      - base.group_partner_manager
diff --git a/addons/crm/test/crm_lead_message.yml b/addons/crm/test/crm_lead_message.yml
index f2463bab255..fcfe658a8f5 100644
--- a/addons/crm/test/crm_lead_message.yml
+++ b/addons/crm/test/crm_lead_message.yml
@@ -1,5 +1,5 @@
 -
-  Give the access rights of Salesman to communicat with customer.
+  Give the access rights of Salesman to communicate with customer.
 -
   !context
     uid: 'crm_res_users_salesman'

From c697009dea09da447564095d4b0a7df0b6c6bfdc Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 14 May 2013 15:26:29 +0200
Subject: [PATCH 084/164] [IMP]mrp: avoid adding account rights to users and
 create lines with superuser_id

bzr revid: mat@openerp.com-20130514132629-91qrc32j04a1t5he
---
 addons/mrp/mrp.py                       | 9 ++++++---
 addons/mrp/security/ir.model.access.csv | 1 -
 addons/mrp/test/mrp_users.yml           | 1 +
 addons/mrp/test/order_process.yml       | 8 +++++++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 7fb40ce12af..f3b89a86d65 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -27,7 +27,7 @@ from openerp.osv import fields, osv
 from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP
 from openerp.tools import float_compare
 from openerp.tools.translate import _
-from openerp import tools
+from openerp import tools, SUPERUSER_ID
 
 #----------------------------------------------------------
 # Work Centers
@@ -803,7 +803,10 @@ class mrp_production(osv.osv):
                 account = wc.costs_hour_account_id.id
                 if value and account:
                     amount += value
-                    analytic_line_obj.create(cr, uid, {
+                    # we user SUPERUSER_ID as we do not garantee an mrp user
+                    # has access to account analytic lines but still should be
+                    # able to produce orders
+                    analytic_line_obj.create(cr, SUPERUSER_ID, {
                         'name': wc_line.name + ' (H)',
                         'amount': value,
                         'account_id': account,
@@ -819,7 +822,7 @@ class mrp_production(osv.osv):
                 account = wc.costs_cycle_account_id.id
                 if value and account:
                     amount += value
-                    analytic_line_obj.create(cr, uid, {
+                    analytic_line_obj.create(cr, SUPERUSER_ID, {
                         'name': wc_line.name+' (C)',
                         'amount': value,
                         'account_id': account,
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 2d0a478c33d..7a94b1a660c 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -1,5 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_account_analytic_line_user,account.analytic.line,account.model_account_analytic_line,group_mrp_user,1,1,1,0
 access_mrp_workcenter,mrp.workcenter,model_mrp_workcenter,mrp.group_mrp_user,1,0,0,0
 access_mrp_routing,mrp.routing,model_mrp_routing,mrp.group_mrp_user,1,0,0,0
 access_mrp_routing_workcenter,mrp.routing.workcenter,model_mrp_routing_workcenter,mrp.group_mrp_user,1,0,0,0
diff --git a/addons/mrp/test/mrp_users.yml b/addons/mrp/test/mrp_users.yml
index b01f4f975bd..05c4889cf28 100644
--- a/addons/mrp/test/mrp_users.yml
+++ b/addons/mrp/test/mrp_users.yml
@@ -13,6 +13,7 @@
   !record {model: res.users, id: res_users_mrp_manager}:
     groups_id:
       - mrp.group_mrp_manager
+      - account.group_account_user
 -
    Create a user as 'MRP User'
 -
diff --git a/addons/mrp/test/order_process.yml b/addons/mrp/test/order_process.yml
index 4d45b1d0968..ba4e1b79d66 100644
--- a/addons/mrp/test/order_process.yml
+++ b/addons/mrp/test/order_process.yml
@@ -183,7 +183,10 @@
     order = self.browse(cr, uid, ref("mrp_production_test1"))
     assert order.state == 'done', "Production order should be closed."
 -
-  I check Total Costs at End of Production.
+  I check Total Costs at End of Production as a manager.
+-
+  !context
+    uid: 'res_users_mrp_manager'
 -
   !python {model: mrp.production}: |
     order = self.browse(cr, uid, ref("mrp_production_test1"))
@@ -217,6 +220,9 @@
                 assert line.product_uom_id.id == wc.product_id.uom_id.id, "UOM is not correspond."
 -
   I print a "BOM Structure".
+-
+  !context
+    uid: 'res_users_mrp_user'
 -
   !python {model: mrp.production}: |
     import os

From 143b485baf8adb7936d7784e314ccd405d1b8c14 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 14 May 2013 15:42:27 +0200
Subject: [PATCH 085/164] [IMP]resource: avoid better permissions on
 calendar_leaves

bzr revid: mat@openerp.com-20130514134227-xnvyzjikwph8bp5k
---
 addons/project/security/ir.model.access.csv    |  1 -
 addons/resource/__openerp__.py                 |  1 +
 addons/resource/security/ir.model.access.csv   |  1 +
 addons/resource/security/resource_security.xml | 16 ++++++++++++++++
 4 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 addons/resource/security/resource_security.xml

diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 1428f445e43..a76faa0fcce 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -19,7 +19,6 @@ access_project_task_history,project.task.history project,project.model_project_t
 access_project_task_history_cumulative,project.task.history project,project.model_project_task_history_cumulative,project.group_project_manager,1,0,0,0
 access_project_task_history_cumulative,project.task.history project,project.model_project_task_history_cumulative,project.group_project_user,1,0,0,0
 access_resource_calendar,project.resource_calendar manager,resource.model_resource_calendar,project.group_project_manager,1,0,0,0
-access_resource_calendar_leaves,project.resource_calendar_leaves manager,resource.model_resource_calendar_leaves,project.group_project_manager,1,0,0,0
 access_project_category,project.project_category,model_project_category,,1,0,0,0
 access_project_category_manager,project.project_category,model_project_category,project.group_project_manager,1,1,1,1
 access_mail_alias,mail.alias,mail.model_mail_alias,project.group_project_manager,1,1,1,1
diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py
index b8a9f57c910..806e02e8c2b 100644
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -38,6 +38,7 @@ associated to every resource. It also manages the leaves of every resource.
     'depends': ['process'],
     'data': [
         'security/ir.model.access.csv',
+        'security/resource_security.xml',
         'resource_view.xml',
     ],
     'demo': ['resource_demo.xml'],
diff --git a/addons/resource/security/ir.model.access.csv b/addons/resource/security/ir.model.access.csv
index 533ad419274..058626831c6 100644
--- a/addons/resource/security/ir.model.access.csv
+++ b/addons/resource/security/ir.model.access.csv
@@ -3,4 +3,5 @@ access_resource_calendar,resource.calendar,model_resource_calendar,base.group_sy
 access_resource_calendar_attendance,resource.calendar.attendance,model_resource_calendar_attendance,base.group_system,1,1,1,1
 access_resource_resource,resource.resource,model_resource_resource,base.group_system,1,0,0,0
 access_resource_resource_all,resource.resource all,model_resource_resource,,1,0,0,0
+access_resource_calendar_leaves_all,resource.calendar.leaves,model_resource_calendar_leaves,,1,0,0,0
 access_resource_calendar_leaves,resource.calendar.leaves,model_resource_calendar_leaves,base.group_system,1,1,1,1
diff --git a/addons/resource/security/resource_security.xml b/addons/resource/security/resource_security.xml
new file mode 100644
index 00000000000..77d9a11751a
--- /dev/null
+++ b/addons/resource/security/resource_security.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="1">
+
+    <record model="ir.rule" id="resource_own_leaves">
+        <field name="name">Resource: see own leaves</field>
+        <field name="model_id" ref="model_resource_calendar_leaves"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',
+                                        ('resource_id', '=', False),
+                                        ('resource_id.user_id', '=', user.id),
+                                    ]</field>
+    </record>
+
+</data>
+</openerp>

From ff73b066ed6adee1cd00b70241a17394d55f7436 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Wed, 26 Jun 2013 17:29:47 +0530
Subject: [PATCH 086/164] [IMP]only manager can cancel lead so give access
 rights of manager for test

bzr revid: sgo@tinyerp.com-20130626115947-idn10u0vtvkrvtb8
---
 addons/crm/test/crm_lead_cancel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/test/crm_lead_cancel.yml b/addons/crm/test/crm_lead_cancel.yml
index 13c3c18ed26..4d9b2e82925 100644
--- a/addons/crm/test/crm_lead_cancel.yml
+++ b/addons/crm/test/crm_lead_cancel.yml
@@ -2,7 +2,7 @@
   I set a new sale team (with Marketing at parent) and I cancel unqualified lead giving access rights of salesman.
 -
   !context
-    uid: 'crm_res_users_salesman'
+    uid: 'crm_res_users_salesmanager'
 -
   !python {model: crm.lead}: |
     section_id = self.pool.get('crm.case.section').create(cr, uid, {'name': "Phone Marketing", 'parent_id': ref("crm.crm_case_section_2")})

From 7ec16a69c4e13b9b3223bfc752d699addf6f0b9c Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Mon, 1 Jul 2013 16:12:29 +0530
Subject: [PATCH 087/164] [IMP]only manager can create issue

bzr revid: sgo@tinyerp.com-20130701104229-2xq8pyxkbymhdtfh
---
 addons/project_issue/test/issue_demo.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/project_issue/test/issue_demo.yml b/addons/project_issue/test/issue_demo.yml
index b7342b435ab..f84c716baeb 100644
--- a/addons/project_issue/test/issue_demo.yml
+++ b/addons/project_issue/test/issue_demo.yml
@@ -1,9 +1,14 @@
 -
-  Test the whole create project issue with project user.
+  Test the whole create project issue with project manager.
 -
   !context
-    uid: 'res_users_project_issue_user'
+    uid: 'res_users_project_issue_manager'
+-
+  !record {model: project.issue, id: project_task_1, view: False}:
+   task_id: 'project.project_task_17'
+   name: 'Error in account module'
 -
   !record {model: project.issue, id: project01, view: False}:
    project_id: 'project.project_project_2'
    name: 'OpenERP Integration'
+

From 9349ba848497b9c5b7ded809a4db6b1e3b26b6a6 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Mon, 1 Jul 2013 17:16:25 +0530
Subject: [PATCH 088/164] [IMP]define context to yml function

bzr revid: sgo@tinyerp.com-20130701114625-vshpugzujnvgdf5x
---
 addons/sale_stock/test/cancel_order_sale_stock.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/sale_stock/test/cancel_order_sale_stock.yml b/addons/sale_stock/test/cancel_order_sale_stock.yml
index 0278bd52713..29581b944bf 100644
--- a/addons/sale_stock/test/cancel_order_sale_stock.yml
+++ b/addons/sale_stock/test/cancel_order_sale_stock.yml
@@ -10,6 +10,7 @@
   I send delivery in two shipments, so I am doing a partial delivery order.
 -
   !python {model: stock.picking}: |
+    context={}
     delivery_orders = self.search(cr, uid, [('sale_id','=',ref("sale.sale_order_8"))])
     first_picking = self.browse(cr, uid, delivery_orders[-1], context=context)
     if first_picking.force_assign(cr, uid, first_picking):

From 497ba7dab96a15c965e1e2824d9111772a98210b Mon Sep 17 00:00:00 2001
From: "Mansi Kariya (OpenERP Trainee)" <mansi.mk.179@gmail.com>
Date: Tue, 30 Jul 2013 17:17:45 +0530
Subject: [PATCH 089/164] [IMP] purchases Configuration menus location and name
 changed

bzr revid: mansi.mk.179@gmail.com-20130730114745-o2xzb0h63ze29stq
---
 addons/purchase/purchase_view.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index dffe1ed54ff..0463527461e 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -14,9 +14,6 @@
         <menuitem id="menu_purchase_config_purchase" name="Configuration"
             groups="group_purchase_manager"
             parent="base.menu_purchase_root" sequence="100"/>
-        <menuitem
-            action="product.product_pricelist_action_for_purchase" id="menu_product_pricelist_action2_purchase"
-            parent="menu_purchase_config_purchase" sequence="10" groups="product.group_purchase_pricelist" />
 
         <record id="purchase_pricelist_version_action" model="ir.actions.act_window">
             <field name="name">Pricelist Versions</field>
@@ -36,14 +33,18 @@
               </p>
             </field>
         </record>
+
         <menuitem
             id="menu_purchase_config_pricelist" name="Pricelists"
             parent="menu_purchase_config_purchase" sequence="50" groups="product.group_purchase_pricelist"/>
 
+	<menuitem
+		    action="product.product_pricelist_action_for_purchase" id="menu_product_pricelist_action2_purchase"
+		    parent="menu_purchase_config_pricelist" sequence="1" groups="product.group_purchase_pricelist" />
+
         <menuitem
             action="purchase_pricelist_version_action" id="menu_purchase_pricelist_version_action"
             parent="menu_purchase_config_pricelist" sequence="2" groups="product.group_purchase_pricelist"/>
-
         
         <menuitem
             action="product.product_price_type_action" id="menu_product_pricelist_action2_purchase_type"
@@ -73,7 +74,7 @@
             parent="menu_purchase_config_purchase"/>
 
         <menuitem
-            action="base.action_partner_category_form" id="menu_partner_categories_in_form" name="Partner Categories"
+            action="base.action_partner_category_form" id="menu_partner_categories_in_form" name="Partner Tags"
             parent="purchase.menu_purchase_partner_cat" groups="base.group_no_one"/>
 
     <!--Supplier menu-->

From d1e7ad9be6f01644567df0fb8d0e68e6c40aff5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 6 Aug 2013 17:10:18 +0200
Subject: [PATCH 090/164] [IMP] tools: added a regex for bounce email addresses

bzr revid: tde@openerp.com-20130806151018-0uom07dbr8b7ycb3
---
 openerp/tools/mail.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py
index 5970ce47040..36a4c1610c4 100644
--- a/openerp/tools/mail.py
+++ b/openerp/tools/mail.py
@@ -297,6 +297,11 @@ command_re = re.compile("^Set-([a-z]+) *: *(.+)$", re.I + re.UNICODE)
 # group(1) = the record ID ; group(2) = the model (if any) ; group(3) = the domain
 reference_re = re.compile("<.*-open(?:object|erp)-(\\d+)(?:-([\w.]+))?.*@(.*)>", re.UNICODE)
 
+# Bounce regex
+# Typical form of bounce is bounce-128-crm.lead-34@domain
+# group(1) = the mail ID; group(2) = the model (if any); group(3) = the record ID
+bounce_re = re.compile("[\w]+-(\d+)-?([\w.]+)?-?(\d+)?", re.UNICODE)
+
 def generate_tracking_message_id(res_id):
     """Returns a string that can be used in the Message-ID RFC822 header field
 

From 38a534dee0bf15a56a97874a01172cb67cd6b94a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 6 Aug 2013 17:11:43 +0200
Subject: [PATCH 091/164] [IMP] mail: first implementation of tracking and
 bounce management. Added 2 fields on mail_mail to count read/bounce. Added
 bounce alias bounce-mail_id-model-res_id. Added message_receive_bounce method
 that try to incremetn message_bounce field.

bzr revid: tde@openerp.com-20130806151143-7dw6xlj8n7mh0nqe
---
 addons/crm/crm_lead.py          |  2 +
 addons/crm/crm_lead_view.xml    |  1 +
 addons/mail/controllers/main.py | 21 ++++++---
 addons/mail/data/mail_data.xml  |  6 +++
 addons/mail/mail_mail.py        | 83 ++++++++++++++++++++++++---------
 addons/mail/mail_mail_view.xml  | 40 ++++++++++------
 addons/mail/mail_thread.py      | 28 +++++++++++
 7 files changed, 136 insertions(+), 45 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index c0f003f9792..52987de00e1 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -273,6 +273,8 @@ class crm_lead(format_address, osv.osv):
                 selection=crm.AVAILABLE_STATES, string="Status", readonly=True,
                 help='The Status is set to \'Draft\', when a case is created. If the case is in progress the Status is set to \'Open\'. When the case is over, the Status is set to \'Done\'. If the case needs to be reviewed then the Status is  set to \'Pending\'.'),
 
+        # Messaging and marketing
+        'message_bounce': fields.integer('Bounce'),
         # Only used for type opportunity
         'probability': fields.float('Success Rate (%)',group_operator="avg"),
         'planned_revenue': fields.float('Expected Revenue', track_visibility='always'),
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index aa5aac76b9d..113355eea83 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -182,6 +182,7 @@
                             </group>
                             <group string="Mailings">
                                 <field name="opt_out"/>
+                                <field name="message_bounce"/>
                             </group>
                             <group string="Misc">
                                 <field name="active"/>
diff --git a/addons/mail/controllers/main.py b/addons/mail/controllers/main.py
index ef3a60987d6..27373c34add 100644
--- a/addons/mail/controllers/main.py
+++ b/addons/mail/controllers/main.py
@@ -1,17 +1,17 @@
 import base64
+import psycopg2
 
 import openerp
 from openerp import SUPERUSER_ID
-import openerp.addons.web.http as oeweb
+import openerp.addons.web.http as http
 from openerp.addons.web.controllers.main import content_disposition
+from openerp.addons.web.http import request
 
-#----------------------------------------------------------
-# Controller
-#----------------------------------------------------------
-class MailController(oeweb.Controller):
+
+class MailController(http.Controller):
     _cp_path = '/mail'
 
-    @oeweb.httprequest
+    @http.httprequest
     def download_attachment(self, req, model, id, method, attachment_id, **kw):
         Model = req.session.model(model)
         res = getattr(Model, method)(int(id), int(attachment_id))
@@ -24,7 +24,7 @@ class MailController(oeweb.Controller):
                             ('Content-Disposition', content_disposition(filename, req))])
         return req.not_found()
 
-    @oeweb.jsonrequest
+    @http.jsonrequest
     def receive(self, req):
         """ End-point to receive mail from an external SMTP server. """
         dbs = req.jsonrequest.get('databases')
@@ -38,3 +38,10 @@ class MailController(oeweb.Controller):
             except psycopg2.Error:
                 pass
         return True
+
+    @http.route('/mail/track/<int:mail_id>/blank.gif', type='http', auth='admin')
+    def track_read_email(self, mail_id):
+        """ Email tracking. """
+        mail_mail = request.registry.get('mail.mail')
+        mail_mail.set_opened(request.cr, request.uid, [mail_id])
+        return False
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index 4e935e4aa88..8ba92a8205c 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -46,6 +46,12 @@
             <field name="value">catchall</field>
         </record>
 
+        <!-- Bounce Email Alias -->
+        <record id="icp_mail_bounce_alias" model="ir.config_parameter">
+            <field name="key">mail.bounce.alias</field>
+            <field name="value">bounce</field>
+        </record>
+
         <!-- Discussion subtype for messaging / Chatter -->
         <record id="mt_comment" model="mail.message.subtype">
             <field name="name">Discussions</field>
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index bf76216e7e4..5548608aeeb 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -61,15 +61,16 @@ class mail_mail(osv.Model):
         # Auto-detected based on create() - if 'mail_message_id' was passed then this mail is a notification
         # and during unlink() we will not cascade delete the parent and its attachments
         'notification': fields.boolean('Is Notification',
-            help='Mail has been created to notify people of an existing mail.message')
+            help='Mail has been created to notify people of an existing mail.message'),
+        # Bounce and tracking
+        'opened': fields.integer(
+            'Opened',
+            help='Number of times this email has been seen, using the OpenERP tracking.'),
+        'replied': fields.integer(
+            'Reply Received',
+            help='If checked, a reply to this email has been received.'),
     }
 
-    def _get_default_from(self, cr, uid, context=None):
-        """ Kept for compatibility
-            TDE TODO: remove me in 8.0
-        """
-        return self.pool['mail.message']._get_default_from(cr, uid, context=context)
-
     _defaults = {
         'state': 'outgoing',
     }
@@ -158,6 +159,18 @@ class mail_mail(osv.Model):
     def cancel(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
 
+    def set_opened(self, cr, uid, ids, context=None):
+        """ Increment opened counter """
+        for mail in self.browse(cr, uid, ids, context=context):
+            self.write(cr, uid, [mail.id], {'opened': (mail.opened + 1)}, context=context)
+        return True
+
+    def set_replied(self, cr, uid, ids, context=None):
+        """ Increment replied counter """
+        for mail in self.browse(cr, uid, ids, context=context):
+            self.write(cr, uid, [mail.id], {'replied': (mail.replied + 1)}, context=context)
+        return True
+
     def process_email_queue(self, cr, uid, ids=None, context=None):
         """Send immediately queued messages, committing after each
            message is sent - this is not transactional and should
@@ -226,13 +239,22 @@ class mail_mail(osv.Model):
             }
             if mail.notification:
                 fragment.update({
-                        'message_id': mail.mail_message_id.id,
-                    })
+                    'message_id': mail.mail_message_id.id,
+                })
             url = urljoin(base_url, "?%s#%s" % (urlencode(query), urlencode(fragment)))
             return _("""<small>Access your messages and documents <a style='color:inherit' href="%s">in OpenERP</a></small>""") % url
         else:
             return None
 
+    def _get_tracking_url(self, cr, uid, mail, partner=None, context=None):
+        if not mail.auto_delete:
+            base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+            track_url = urljoin(base_url, 'mail/track/%d/blank.gif' % mail.id)
+            print base_url, track_url
+            return '<img src="%s" alt=""/>' % track_url
+        else:
+            return ''
+
     def send_get_mail_subject(self, cr, uid, mail, force=False, partner=None, context=None):
         """ If subject is void and record_name defined: '<Author> posted on <Resource>'
 
@@ -257,8 +279,11 @@ class mail_mail(osv.Model):
 
         # generate footer
         link = self._get_partner_access_link(cr, uid, mail, partner, context=context)
+        tracking_url = self._get_tracking_url(cr, uid, mail, partner, context=context)
         if link:
             body = tools.append_content_to_html(body, link, plaintext=False, container_tag='div')
+        if tracking_url:
+            body = tools.append_content_to_html(body, tracking_url, plaintext=False, container_tag='div')
         return body
 
     def send_get_email_dict(self, cr, uid, mail, partner=None, context=None):
@@ -319,25 +344,37 @@ class mail_mail(osv.Model):
                     email_list.append(self.send_get_email_dict(cr, uid, mail, context=context))
                 for partner in mail.recipient_ids:
                     email_list.append(self.send_get_email_dict(cr, uid, mail, partner=partner, context=context))
+                # headers
+                headers = {}
+                bounce_alias = self.pool['ir.config_parameter'].get_param(cr, uid, "mail.bounce.alias", context=context)
+                catchall_domain = self.pool['ir.config_parameter'].get_param(cr, uid, "mail.catchall.domain", context=context)
+                if bounce_alias and catchall_domain:
+                    if mail.model and mail.res_id:
+                        headers['Return-Path'] = '%s-%d-%s-%d@%s' % (bounce_alias, mail.id, mail.model, mail.res_id, catchall_domain)
+                    else:
+                        headers['Return-Path'] = '%s-%d@%s' % (bounce_alias, mail.id, catchall_domain)
 
                 # build an RFC2822 email.message.Message object and send it without queuing
+                res = None
                 for email in email_list:
                     msg = ir_mail_server.build_email(
-                        email_from = mail.email_from,
-                        email_to = email.get('email_to'),
-                        subject = email.get('subject'),
-                        body = email.get('body'),
-                        body_alternative = email.get('body_alternative'),
-                        email_cc = tools.email_split(mail.email_cc),
-                        reply_to = mail.reply_to,
-                        attachments = attachments,
-                        message_id = mail.message_id,
-                        references = mail.references,
-                        object_id = mail.res_id and ('%s-%s' % (mail.res_id, mail.model)),
-                        subtype = 'html',
-                        subtype_alternative = 'plain')
+                        email_from=mail.email_from,
+                        email_to=email.get('email_to'),
+                        subject=email.get('subject'),
+                        body=email.get('body'),
+                        body_alternative=email.get('body_alternative'),
+                        email_cc=tools.email_split(mail.email_cc),
+                        reply_to=mail.reply_to,
+                        attachments=attachments,
+                        message_id=mail.message_id,
+                        references=mail.references,
+                        object_id=mail.res_id and ('%s-%s' % (mail.res_id, mail.model)),
+                        subtype='html',
+                        subtype_alternative='plain',
+                        headers=headers)
                     res = ir_mail_server.send_email(cr, uid, msg,
-                        mail_server_id=mail.mail_server_id.id, context=context)
+                                                    mail_server_id=mail.mail_server_id.id,
+                                                    context=context)
                 if res:
                     mail.write({'state': 'sent', 'message_id': res})
                     mail_sent = True
diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index f3728d4653a..3901a192225 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -14,7 +14,7 @@
                     <sheet>
                         <label for="subject" class="oe_edit_only"/>
                         <h2><field name="subject"/></h2>
-                        <div>
+                        <div style="vertical-align: top;">
                             by <field name="author_id" class="oe_inline" string="User"/> on <field name="date" class="oe_inline"/>
                             <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
                                 context="{'default_composition_mode':'reply', 'default_parent_id': active_id}" states='received,sent,exception,cancel'/>
@@ -32,20 +32,30 @@
                             </page>
                             <page string="Advanced" groups="base.group_no_one">
                                 <group>
-                                    <group>
-                                        <field name="auto_delete"/>
-                                        <field name="type"/>
-                                        <field name="state"/>
-                                        <field name="mail_server_id"/>
-                                        <field name="model"/>
-                                        <field name="res_id"/>
-                                    </group>
-                                    <group>
-                                        <field name="message_id"/>
-                                        <field name="references"/>
-                                        <field name="partner_ids" widget="many2many_tags"/>
-                                        <field name="notified_partner_ids" widget="many2many_tags"/>
-                                    </group>
+                                    <div>
+                                        <group string="Status">
+                                            <field name="auto_delete"/>
+                                            <field name="type"/>
+                                            <field name="state"/>
+                                            <field name="mail_server_id"/>
+                                            <field name="model"/>
+                                            <field name="res_id"/>
+                                        </group>
+                                        <group string="Tracking">
+                                            <field name="opened"/>
+                                            <field name="replied"/>
+                                        </group>
+                                    </div>
+                                    <div>
+                                        <group string="Headers">
+                                            <field name="message_id"/>
+                                            <field name="references"/>
+                                        </group>
+                                        <group string="Recipients">
+                                            <field name="partner_ids" widget="many2many_tags"/>
+                                            <field name="notified_partner_ids" widget="many2many_tags"/>
+                                        </group>
+                                    </div>
                                 </group>
                             </page>
                             <page string="Attachments">
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 306e5fd5905..89a9a4694b6 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -772,6 +772,7 @@ class mail_thread(osv.AbstractModel):
         """
         assert isinstance(message, Message), 'message must be an email.message.Message at this point'
         fallback_model = model
+        bounce_alias = self.pool['ir.config_parameter'].get_param(cr, uid, "mail.bounce.alias", context=context)
 
         # Get email.message.Message variables for future processing
         message_id = message.get('Message-Id')
@@ -780,6 +781,24 @@ class mail_thread(osv.AbstractModel):
         references = decode_header(message, 'References')
         in_reply_to = decode_header(message, 'In-Reply-To')
 
+        # 0. Verify whether this is a bounced email (wrong destination,...) -> use it to collect data, such as dead leads
+        if bounce_alias in email_to:
+            bounce_match = tools.bounce_re.search(email_to)
+            if bounce_match:
+                bounced_mail_id = bounce_match.group(1)
+                if self.pool['mail.mail'].exists(cr, uid, bounced_mail_id):
+                    mail = self.pool['mail.mail'].browse(cr, uid, bounced_mail_id, context=context)
+                    bounced_model = mail.model
+                    bounced_thread_id = mail.res_id
+                else:
+                    bounced_model = bounce_match.group(2)
+                    bounced_thread_id = int(bounce_match.group(3)) if bounce_match.group(3) else 0
+                _logger.info('Routing mail from %s to %s with Message-Id %s: bounced mail from mail %s, model: %s, thread_id: %s',
+                             email_from, email_to, message_id, bounced_mail_id, bounced_model, bounced_thread_id)
+                if bounced_model and bounced_model in self.pool and hasattr(self.pool[bounced_model], 'message_receive_bounce'):
+                    self.pool[bounced_model].message_receive_bounce(cr, uid, [bounced_thread_id], mail_id=bounced_mail_id, context=context)
+                return []
+
         # 1. Verify if this is a reply to an existing thread
         thread_references = references or in_reply_to
         ref_match = thread_references and tools.reference_re.search(thread_references)
@@ -1018,6 +1037,15 @@ class mail_thread(osv.AbstractModel):
             self.write(cr, uid, ids, update_vals, context=context)
         return True
 
+    def message_receive_bounce(self, cr, uid, ids, mail_id=None, context=None):
+        """Called by ``message_process`` when a bounce email (such as Undelivered
+        Mail Returned to Sender) is received for an existing thread. The default
+        behavior is to check is an integer  ``message_bounce`` column exists.
+        If it is the case, its content is incremented. """
+        if self._all_columns.get('message_bounce'):
+            for obj in self.browse(cr, uid, ids, context=context):
+                self.write(cr, uid, [obj.id], {'message_bounce': obj.message_bounce + 1}, context=context)
+
     def _message_extract_payload(self, message, save_original=False):
         """Extract body as HTML and attachments from the mail message"""
         attachments = []

From fd100054ccdb4cedcb2411bdf38a7388338ea814 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 Aug 2013 15:01:18 +0200
Subject: [PATCH 092/164] [FIX] mail_mail: fixed reply_to computation (before
 create was leading to a wrong message_id to the embedded mail_message);
 mail_thread; fixed private discussion not going through the route checking;
 improved replying through mailgateway now incrementing the replied field of
 mail_mail.

bzr revid: tde@openerp.com-20130807130118-yggvmontssofxt0q
---
 addons/mail/mail_mail.py   | 11 +++++++++--
 addons/mail/mail_thread.py | 18 ++++++++++++------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 5548608aeeb..130e63deefd 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -140,10 +140,17 @@ class mail_mail(osv.Model):
         # notification field: if not set, set if mail comes from an existing mail.message
         if 'notification' not in values and values.get('mail_message_id'):
             values['notification'] = True
+        mail_id = super(mail_mail, self).create(cr, uid, values, context=context)
+
         # reply_to: if not set, set with default values that require creation values
+        # but delegate after creation because of mail_message.message_id automatic
+        # creation using existence of reply_to
         if not values.get('reply_to'):
-            values['reply_to'] = self._get_reply_to(cr, uid, values, context=context)
-        return super(mail_mail, self).create(cr, uid, values, context=context)
+            reply_to = self._get_reply_to(cr, uid, values, context=context)
+            if reply_to:
+                self.write(cr, uid, [mail_id], {'reply_to': reply_to}, context=context)
+
+        return mail_id
 
     def unlink(self, cr, uid, ids, context=None):
         # cascade-delete the parent message for all mails that are not created for a notification
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 89a9a4694b6..f03f1239bd8 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -706,7 +706,7 @@ class mail_thread(osv.AbstractModel):
                 return ()
 
         # New Document: check model accepts the mailgateway
-        if not thread_id and not hasattr(model_pool, 'message_new'):
+        if not thread_id and model and not hasattr(model_pool, 'message_new'):
             if assert_model:
                 assert hasattr(model_pool, 'message_new'), 'Model %s does not accept document creation, crashing' % model
             _warn('model %s does not accept document creation, skipping' % model)
@@ -817,16 +817,16 @@ class mail_thread(osv.AbstractModel):
 
         # 2. Reply to a private message
         if in_reply_to:
-            message_ids = self.pool.get('mail.message').search(cr, uid, [
+            mail_message_ids = self.pool.get('mail.message').search(cr, uid, [
                                 ('message_id', '=', in_reply_to),
                                 '!', ('message_id', 'ilike', 'reply_to')
                             ], limit=1, context=context)
-            if message_ids:
-                message = self.pool.get('mail.message').browse(cr, uid, message_ids[0], context=context)
+            if mail_message_ids:
+                mail_message = self.pool.get('mail.message').browse(cr, uid, mail_message_ids[0], context=context)
                 _logger.info('Routing mail from %s to %s with Message-Id %s: direct reply to a private message: %s, custom_values: %s, uid: %s',
-                                email_from, email_to, message_id, message.id, custom_values, uid)
+                                email_from, email_to, message_id, mail_message.id, custom_values, uid)
                 route = self.message_route_verify(cr, uid, message, message_dict,
-                                (message.model, message.res_id, custom_values, uid, None),
+                                (mail_message.model, mail_message.res_id, custom_values, uid, None),
                                 update_author=True, assert_model=True, create_fallback=True, context=context)
                 return route and [route] or []
 
@@ -1415,6 +1415,12 @@ class mail_thread(osv.AbstractModel):
             parent_id = message_ids and message_ids[0] or False
         # we want to set a parent: force to set the parent_id to the oldest ancestor, to avoid having more than 1 level of thread
         elif parent_id:
+            # update original mail_mail if exists
+            if type == 'email':
+                mail_mail_ids = self.pool['mail.mail'].search(cr, SUPERUSER_ID, [('mail_message_id', '=', parent_id)], context=context)
+                for mail in self.pool['mail.mail'].browse(cr, SUPERUSER_ID, mail_mail_ids, context=context):
+                    self.pool['mail.mail'].write(cr, SUPERUSER_ID, [mail.id], {'replied': mail.replied + 1}, context=context)
+
             message_ids = mail_message.search(cr, SUPERUSER_ID, [('id', '=', parent_id), ('parent_id', '!=', False)], context=context)
             # avoid loops when finding ancestors
             processed_list = []

From 33fd9e01d6f50d7d6a3e379fd8544bb069a5d21d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 Aug 2013 15:03:34 +0200
Subject: [PATCH 093/164] [ADD] mass_mailing: added module for mass mailign
 campaigns. First draft of new module : simple mass mailing campaign model,
 linked to emails, compute some statistics mail.compose.message updated to the
 mass mailing campaigns in mass mail mode

bzr revid: tde@openerp.com-20130807130334-nwd34fgsz4lc6lt1
---
 addons/mass_mailing/__init__.py               | 24 ++++++
 addons/mass_mailing/__openerp__.py            | 39 +++++++++
 addons/mass_mailing/mail_mail.py              | 35 ++++++++
 addons/mass_mailing/mail_mail_view.xml        | 18 ++++
 addons/mass_mailing/mass_mailing.py           | 84 +++++++++++++++++++
 addons/mass_mailing/mass_mailing_view.xml     | 48 +++++++++++
 .../mass_mailing/security/ir.model.access.csv |  3 +
 addons/mass_mailing/wizard/__init__.py        | 22 +++++
 .../wizard/mail_compose_message.py            | 51 +++++++++++
 .../wizard/mail_compose_message_view.xml      | 20 +++++
 10 files changed, 344 insertions(+)
 create mode 100644 addons/mass_mailing/__init__.py
 create mode 100644 addons/mass_mailing/__openerp__.py
 create mode 100644 addons/mass_mailing/mail_mail.py
 create mode 100644 addons/mass_mailing/mail_mail_view.xml
 create mode 100644 addons/mass_mailing/mass_mailing.py
 create mode 100644 addons/mass_mailing/mass_mailing_view.xml
 create mode 100644 addons/mass_mailing/security/ir.model.access.csv
 create mode 100644 addons/mass_mailing/wizard/__init__.py
 create mode 100644 addons/mass_mailing/wizard/mail_compose_message.py
 create mode 100644 addons/mass_mailing/wizard/mail_compose_message_view.xml

diff --git a/addons/mass_mailing/__init__.py b/addons/mass_mailing/__init__.py
new file mode 100644
index 00000000000..37f3850306a
--- /dev/null
+++ b/addons/mass_mailing/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 mass_mailing
+import mail_mail
+import wizard
diff --git a/addons/mass_mailing/__openerp__.py b/addons/mass_mailing/__openerp__.py
new file mode 100644
index 00000000000..e6fbb42e886
--- /dev/null
+++ b/addons/mass_mailing/__openerp__.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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': 'Mass Mailing Campaigns',
+    'version': '1.0',
+    'author': 'OpenERP',
+    'website': 'http://www.openerp.com',
+    'category': 'Marketing',
+    'depends': ['mail', 'email_template'],
+    'description': """TODO""",
+    'data': [
+        'mass_mailing_view.xml',
+        'mail_mail_view.xml',
+        'wizard/mail_compose_message_view.xml',
+        'security/ir.model.access.csv',
+    ],
+    'demo': [],
+    'installable': True,
+    'auto_install': False,
+}
diff --git a/addons/mass_mailing/mail_mail.py b/addons/mass_mailing/mail_mail.py
new file mode 100644
index 00000000000..d7f46446b56
--- /dev/null
+++ b/addons/mass_mailing/mail_mail.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 openerp.osv import osv, fields
+
+
+class MailMail(osv.Model):
+    """Add the mass mailing campaign data to mail"""
+    _name = 'mail.mail'
+    _inherit = ['mail.mail']
+
+    _columns = {
+        'mass_mailing_campaign_id': fields.many2one(
+            'mail.mass_mailing.campaign', 'Mass Mailing Campaign',
+            ondelete='set null',
+        ),
+    }
diff --git a/addons/mass_mailing/mail_mail_view.xml b/addons/mass_mailing/mail_mail_view.xml
new file mode 100644
index 00000000000..dd66aede66f
--- /dev/null
+++ b/addons/mass_mailing/mail_mail_view.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <!--  FOLLOWERS !-->
+        <record model="ir.ui.view" id="mail_mail_form_mass_mailing">
+            <field name="name">mail.mail.form.mass_mailing</field>
+            <field name="model">mail.mail</field>
+            <field name="inherit_id" ref="mail.view_mail_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='opened']" position="before">
+                    <field name="mass_mailing_campaign_id"/>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/mass_mailing/mass_mailing.py b/addons/mass_mailing/mass_mailing.py
new file mode 100644
index 00000000000..91392759b0e
--- /dev/null
+++ b/addons/mass_mailing/mass_mailing.py
@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 openerp.osv import osv, fields
+
+
+class MassMailingCampaign(osv.Model):
+    """Model of mass mailing campaigns.
+    """
+    _name = "mail.mass_mailing.campaign"
+    _description = 'Mass Mailing Campaign'
+
+    def _get_statistics(self, cr, uid, ids, name, arg, context=None):
+        """ Compute statistics of the mass mailing campaign """
+        results = dict.fromkeys(ids, False)
+        for campaign in self.browse(cr, uid, ids, context=context):
+            if not campaign.mail_ids:
+                results[campaign.id] = {
+                    'sent': 0,
+                    'opened_ratio': 0.0,
+                    'replied_ratio': 0.0,
+                    'bounce_ratio': 0.0,
+                }
+                continue
+            results[campaign.id] = {
+                'sent': len(campaign.mail_ids),
+                'opened_ratio': len([mail for mail in campaign.mail_ids if mail.opened]) * 1.0 / len(campaign.mail_ids),
+                'replied_ratio': len([mail for mail in campaign.mail_ids if mail.replied]) * 1.0 / len(campaign.mail_ids),
+                'bounce_ratio': 0.0,
+            }
+        return results
+
+    _columns = {
+        'name': fields.char(
+            'Campaign Name', required=True,
+        ),
+        'template_id': fields.many2one(
+            'email.template', 'Email Template',
+            ondelete='set null',
+        ),
+        'mail_ids': fields.one2many(
+            'mail.mail', 'mass_mailing_campaign_id',
+            'Send Emails',
+        ),
+        # stat fields
+        'sent': fields.function(
+            _get_statistics,
+            string='Sent Emails',
+            type='integer', multi='_get_statistics'
+        ),
+        'opened_ratio': fields.function(
+            _get_statistics,
+            string='Opened Ratio',
+            type='float', multi='_get_statistics',
+        ),
+        'replied_ratio': fields.function(
+            _get_statistics,
+            string='Replied Ratio',
+            type='float', multi='_get_statistics'
+        ),
+        'bounce_ratio': fields.function(
+            _get_statistics,
+            string='Bounce Ratio',
+            type='float', multi='_get_statistics'
+        ),
+    }
diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
new file mode 100644
index 00000000000..bc28827343d
--- /dev/null
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <!--  MASS MAILING CAMPAIGNS !-->
+        <record model="ir.ui.view" id="view_followers_tree">
+            <field name="name">mail.mass_mailing.campaign.tree</field>
+            <field name="model">mail.mass_mailing.campaign</field>
+            <field name="priority">10</field>
+            <field name="arch" type="xml">
+                <tree string="Mass Mailing Campaigns">
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_mail_subscription_form">
+            <field name="name">mail.mass_mailing.campaign.form</field>
+            <field name="model">mail.mass_mailing.campaign</field>
+            <field name="arch" type="xml">
+                <form string="Mass Mailing Campaign" version="7.0">
+                    <sheet>
+                        <group>
+                            <field name="name"/>
+                            <field name="template_id"/>
+                            <field name="sent"/>
+                            <field name="opened_ratio"/>
+                            <field name="replied_ratio"/>
+                            <field name="bounce_ratio"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_view_mass_mailing_campaigns" model="ir.actions.act_window">
+            <field name="name">Mass Mailing Campaigns</field>
+            <field name="res_model">mail.mass_mailing.campaign</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <!-- Add followers related menu entries in Settings/Email -->
+        <menuitem name="Mass mailing campaigns" id="menu_email_campaigns" parent="base.menu_email"
+                    action="action_view_mass_mailing_campaigns" sequence="60" groups="base.group_no_one"/>
+
+    </data>
+</openerp>
diff --git a/addons/mass_mailing/security/ir.model.access.csv b/addons/mass_mailing/security/ir.model.access.csv
new file mode 100644
index 00000000000..af6eaa7bb06
--- /dev/null
+++ b/addons/mass_mailing/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_mass_mailing_campaign,mail.mass_mailing.campaign.template,model_mail_mass_mailing_campaign,,1,1,1,0
+access_mass_mailing_campaign_system,mail.mass_mailing.campaign.system,model_mail_mass_mailing_campaign,base.group_system,1,1,1,1
diff --git a/addons/mass_mailing/wizard/__init__.py b/addons/mass_mailing/wizard/__init__.py
new file mode 100644
index 00000000000..155849362cd
--- /dev/null
+++ b/addons/mass_mailing/wizard/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 mail_compose_message
diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py
new file mode 100644
index 00000000000..2f74ef2c732
--- /dev/null
+++ b/addons/mass_mailing/wizard/mail_compose_message.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 openerp.osv import osv, fields
+
+
+class MailComposeMessage(osv.TransientModel):
+    """Add concept of mass mailing campaign to the mail.compose.message wizard
+    """
+    _inherit = 'mail.compose.message'
+
+    _columns = {
+        'mass_mail_campaign_id': fields.many2one(
+            'mail.mass_mailing.campaign', 'Mass mailing campaign'
+        ),
+    }
+
+    def onchange_mass_mail_campaign_id(self, cr, uid, ids, mass_mail_campaign_id, context=None):
+        values = {}
+        if mass_mail_campaign_id:
+            campaign = self.pool['mail.mass_mailing.campaign'].browse(cr, uid, mass_mail_campaign_id, context=context)
+            if campaign and campaign.template_id:
+                values['template_id'] = campaign.template_id.id
+        return {'value': values}
+
+    def render_message(self, cr, uid, wizard, res_id, context=None):
+        """ Override method that generated the mail content by adding the mass
+        mailing campaign, when doing pure email mass mailing. """
+        res = super(MailComposeMessage, self).render_message(cr, uid, wizard, res_id, context=context)
+        print res, wizard.mass_mail_campaign_id
+        if wizard.composition_mode == 'mass_mail' and wizard.mass_mail_campaign_id:  # TODO: which kind of mass mailing ?
+            res['mass_mailing_campaign_id'] = wizard.mass_mail_campaign_id.id
+        return res
diff --git a/addons/mass_mailing/wizard/mail_compose_message_view.xml b/addons/mass_mailing/wizard/mail_compose_message_view.xml
new file mode 100644
index 00000000000..bc5f1a9eb6a
--- /dev/null
+++ b/addons/mass_mailing/wizard/mail_compose_message_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- Add mass mail campaign to the mail.compose.message form view -->
+        <record model="ir.ui.view" id="email_compose_form_mass_mailing">
+            <field name="name">mail.compose.message.form.mass_mailing</field>
+            <field name="model">mail.compose.message</field>
+            <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='subject']" position="after">
+                    <field name="mass_mail_campaign_id"
+                            on_change="onchange_mass_mail_campaign_id(mass_mail_campaign_id)"
+                            attrs="{'invisible': [('composition_mode', '!=', 'mass_mail')]}"/>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>

From 70d2a3859240498816682418ab173dd9af89c4ac Mon Sep 17 00:00:00 2001
From: "Mansi Kariya (OpenERP Trainee)" <mansi.mk.179@gmail.com>
Date: Mon, 12 Aug 2013 14:43:21 +0530
Subject: [PATCH 094/164] [IMP] Optimized code

bzr revid: mansi.mk.179@gmail.com-20130812091321-o6ql1csd9sq78vs7
---
 addons/purchase/purchase_view.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 0463527461e..ab32eb0372f 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -33,14 +33,13 @@
               </p>
             </field>
         </record>
-
         <menuitem
             id="menu_purchase_config_pricelist" name="Pricelists"
             parent="menu_purchase_config_purchase" sequence="50" groups="product.group_purchase_pricelist"/>
 
 	<menuitem
-		    action="product.product_pricelist_action_for_purchase" id="menu_product_pricelist_action2_purchase"
-		    parent="menu_purchase_config_pricelist" sequence="1" groups="product.group_purchase_pricelist" />
+	    action="product.product_pricelist_action_for_purchase" id="menu_product_pricelist_action2_purchase"
+	    parent="menu_purchase_config_pricelist" sequence="1" groups="product.group_purchase_pricelist" />
 
         <menuitem
             action="purchase_pricelist_version_action" id="menu_purchase_pricelist_version_action"

From 3a67d7dc992963c27a993010ab355cc3b6d88a78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 26 Aug 2013 11:56:00 +0200
Subject: [PATCH 095/164] [FIX] crm: fixed a bug introduced when merging trunk

bzr revid: tde@openerp.com-20130826095600-bgvdzah9nwb2vu0l
---
 addons/crm/crm_lead_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index acbec848da0..da3d91491b4 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -173,8 +173,7 @@
                             <group string="Categorization" groups="base.group_multi_company,base.group_no_one" name="categorization">
                                 <field name="company_id"
                                     groups="base.group_multi_company"
-                                    widget="selection" colspan="2"/>
-                                <field name="state" groups="base.group_no_one"/>
+                                    widget="selection"/>
                             </group>
                             <group string="Mailings">
                                 <field name="opt_out"/>

From b35a44f66d947b03542b8eb3899fcd3adcf476ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 27 Aug 2013 15:30:58 +0200
Subject: [PATCH 096/164] [IMP] mail_mail, mail_message: various improvements
 to try to improve message creation time Replaced some read by browse Moved
 get_reply_to from mail_mail to mail_message Hint: specifying email_from,
 reply_to help to enhance computation time

[REF] mail: cleaned some tests, renamed a file, moved mail_group tests into a dedicated file

bzr revid: tde@openerp.com-20130827133058-ko0g0ib0f0jihmdk
---
 addons/email_template/tests/test_mail.py      |   4 +-
 addons/mail/mail_mail.py                      |  70 +------
 addons/mail/mail_message.py                   |  99 +++++++---
 addons/mail/tests/__init__.py                 |   3 +-
 .../tests/{test_mail_base.py => common.py}    |  58 +++++-
 addons/mail/tests/test_invite.py              |   4 +-
 addons/mail/tests/test_mail_features.py       |   4 +-
 addons/mail/tests/test_mail_gateway.py        | 174 +----------------
 addons/mail/tests/test_mail_group.py          |  71 +++++++
 addons/mail/tests/test_mail_message.py        | 179 +++++++++++++-----
 addons/mail/tests/test_message_read.py        |   4 +-
 addons/portal/tests/test_portal.py            |   4 +-
 addons/project/tests/test_project_base.py     |   4 +-
 13 files changed, 346 insertions(+), 332 deletions(-)
 rename addons/mail/tests/{test_mail_base.py => common.py} (66%)
 create mode 100644 addons/mail/tests/test_mail_group.py

diff --git a/addons/email_template/tests/test_mail.py b/addons/email_template/tests/test_mail.py
index d5feea9ebc4..adb550aa617 100644
--- a/addons/email_template/tests/test_mail.py
+++ b/addons/email_template/tests/test_mail.py
@@ -20,10 +20,10 @@
 ##############################################################################
 
 import base64
-from openerp.addons.mail.tests.test_mail_base import TestMailBase
+from openerp.addons.mail.tests.common import TestMail
 
 
-class test_message_compose(TestMailBase):
+class test_message_compose(TestMail):
 
     def setUp(self):
         super(test_message_compose, self).setUp()
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index f3cf5ce9e57..e5cb2b56eb3 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -82,74 +82,11 @@ class mail_mail(osv.Model):
             context = dict(context, default_type=None)
         return super(mail_mail, self).default_get(cr, uid, fields, context=context)
 
-    def _get_reply_to(self, cr, uid, values, context=None):
-        """ Return a specific reply_to: alias of the document through message_get_reply_to
-            or take the email_from
-        """
-        # if value specified: directly return it
-        if values.get('reply_to'):
-            return values.get('reply_to')
-        format_name = True  # whether to use a 'Followers of Pigs <pigs@openerp.com' format
-        email_reply_to = None
-
-        ir_config_parameter = self.pool.get("ir.config_parameter")
-        catchall_domain = ir_config_parameter.get_param(cr, uid, "mail.catchall.domain", context=context)
-
-        # model, res_id, email_from: comes from values OR related message
-        model, res_id, email_from = values.get('model'), values.get('res_id'), values.get('email_from')
-        if values.get('mail_message_id'):
-            message = self.pool.get('mail.message').browse(cr, uid, values.get('mail_message_id'), context=context)
-            if message.reply_to:
-                email_reply_to = message.reply_to
-                format_name = False
-            if not model:
-                model = message.model
-            if not res_id:
-                res_id = message.res_id
-            if not email_from:
-                email_from = message.email_from
-
-        # if model and res_id: try to use ``message_get_reply_to`` that returns the document alias
-        if not email_reply_to and model and res_id and hasattr(self.pool[model], 'message_get_reply_to'):
-            email_reply_to = self.pool[model].message_get_reply_to(cr, uid, [res_id], context=context)[0]
-        # no alias reply_to -> catchall alias
-        if not email_reply_to:
-            catchall_alias = ir_config_parameter.get_param(cr, uid, "mail.catchall.alias", context=context)
-            if catchall_domain and catchall_alias:
-                email_reply_to = '%s@%s' % (catchall_alias, catchall_domain)
-
-        # still no reply_to -> reply_to will be the email_from
-        if not email_reply_to and email_from:
-            email_reply_to = email_from
-
-        # format 'Document name <email_address>'
-        if email_reply_to and model and res_id and format_name:
-            emails = tools.email_split(email_reply_to)
-            if emails:
-                email_reply_to = emails[0]
-            document_name = self.pool[model].name_get(cr, SUPERUSER_ID, [res_id], context=context)[0]
-            if document_name:
-                # sanitize document name
-                sanitized_doc_name = re.sub(r'[^\w+.]+', '-', document_name[1])
-                # generate reply to
-                email_reply_to = _('"Followers of %s" <%s>') % (sanitized_doc_name, email_reply_to)
-
-        return email_reply_to
-
     def create(self, cr, uid, values, context=None):
         # notification field: if not set, set if mail comes from an existing mail.message
         if 'notification' not in values and values.get('mail_message_id'):
             values['notification'] = True
-        mail_id = super(mail_mail, self).create(cr, uid, values, context=context)
-
-        # reply_to: if not set, set with default values that require creation values
-        # but delegate after creation because of mail_message.message_id automatic
-        # creation using existence of reply_to
-        if not values.get('reply_to'):
-            reply_to = self._get_reply_to(cr, uid, values, context=context)
-            if reply_to:
-                self.write(cr, uid, [mail_id], {'reply_to': reply_to}, context=context)
-        return mail_id
+        return super(mail_mail, self).create(cr, uid, values, context=context)
 
     def unlink(self, cr, uid, ids, context=None):
         # cascade-delete the parent message for all mails that are not created for a notification
@@ -226,11 +163,6 @@ class mail_mail(osv.Model):
     # mail_mail formatting, tools and send mechanism
     #------------------------------------------------------
 
-    # TODO in 8.0(+): maybe factorize this to enable in modules link generation
-    # independently of mail_mail model
-    # TODO in 8.0(+): factorize doc name sanitized and 'Followers of ...' formatting
-    # because it begins to appear everywhere
-
     def _get_partner_access_link(self, cr, uid, mail, partner=None, context=None):
         """ Generate URLs for links in mails:
             - partner is an user and has read access to the document: direct link to document with model, res_id
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index bcb66433964..d63025b0912 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -20,6 +20,8 @@
 ##############################################################################
 
 import logging
+import re
+
 from openerp import tools
 
 from email.header import decode_header
@@ -87,6 +89,7 @@ class mail_message(osv.Model):
     def _get_record_name(self, cr, uid, ids, name, arg, context=None):
         """ Return the related document name, using name_get. It is done using
             SUPERUSER_ID, to be sure to have the record name correctly stored. """
+        # return dict.fromkeys(ids, False)
         # TDE note: regroup by model/ids, to have less queries to perform
         result = dict.fromkeys(ids, False)
         for message in self.read(cr, uid, ids, ['model', 'res_id'], context=context):
@@ -206,11 +209,11 @@ class mail_message(osv.Model):
         raise osv.except_osv(_('Invalid Action!'), _("Unable to send email, please configure the sender's email address or alias."))
 
     def _get_default_author(self, cr, uid, context=None):
-        return self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+        return self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context).partner_id.id
 
     _defaults = {
         'type': 'email',
-        'date': lambda *a: fields.datetime.now(),
+        'date': fields.datetime.now(),
         'author_id': lambda self, cr, uid, ctx=None: self._get_default_author(cr, uid, ctx),
         'body': '',
         'email_from': lambda self, cr, uid, ctx=None: self._get_default_from(cr, uid, ctx),
@@ -645,7 +648,8 @@ class mail_message(osv.Model):
         elif not ids:
             return ids
 
-        pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'])['partner_id'][0]
+        # pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'])['partner_id'][0]
+        pid = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id.id
         author_ids, partner_ids, allowed_ids = set([]), set([]), set([])
         model_ids = {}
 
@@ -705,7 +709,7 @@ class mail_message(osv.Model):
             ids = [ids]
         not_obj = self.pool.get('mail.notification')
         fol_obj = self.pool.get('mail.followers')
-        partner_id = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=None)['partner_id'][0]
+        partner_id = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=None).partner_id.id
 
         # Read mail_message.ids to have their values
         message_values = dict.fromkeys(ids)
@@ -774,17 +778,66 @@ class mail_message(osv.Model):
                             _('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % \
                             (self._description, operation))
 
+    def _get_reply_to(self, cr, uid, values, context=None):
+        """ Return a specific reply_to: alias of the document through message_get_reply_to
+            or take the email_from
+        """
+        email_reply_to = None
+
+        ir_config_parameter = self.pool.get("ir.config_parameter")
+        catchall_domain = ir_config_parameter.get_param(cr, uid, "mail.catchall.domain", context=context)
+
+        # model, res_id, email_from: comes from values OR related message
+        model, res_id, email_from = values.get('model'), values.get('res_id'), values.get('email_from')
+
+        # if model and res_id: try to use ``message_get_reply_to`` that returns the document alias
+        if not email_reply_to and model and res_id and catchall_domain and hasattr(self.pool[model], 'message_get_reply_to'):
+            email_reply_to = self.pool[model].message_get_reply_to(cr, uid, [res_id], context=context)[0]
+        # no alias reply_to -> catchall alias
+        if not email_reply_to and catchall_domain:
+            catchall_alias = ir_config_parameter.get_param(cr, uid, "mail.catchall.alias", context=context)
+            if catchall_alias:
+                email_reply_to = '%s@%s' % (catchall_alias, catchall_domain)
+        # still no reply_to -> reply_to will be the email_from
+        if not email_reply_to and email_from:
+            email_reply_to = email_from
+
+        # format 'Document name <email_address>'
+        if email_reply_to and model and res_id:
+            emails = tools.email_split(email_reply_to)
+            if emails:
+                email_reply_to = emails[0]
+            document_name = self.pool[model].name_get(cr, SUPERUSER_ID, [res_id], context=context)[0]
+            if document_name:
+                # sanitize document name
+                sanitized_doc_name = re.sub(r'[^\w+.]+', '-', document_name[1])
+                # generate reply to
+                email_reply_to = _('"Followers of %s" <%s>') % (sanitized_doc_name, email_reply_to)
+
+        return email_reply_to
+
+    def _get_message_id(self, cr, uid, values, context=None):
+        message_id = None
+        if not values.get('message_id') and values.get('reply_to'):
+            message_id = tools.generate_tracking_message_id('reply_to')
+        elif not values.get('message_id') and values.get('res_id') and values.get('model'):
+            message_id = tools.generate_tracking_message_id('%(res_id)s-%(model)s' % values)
+        elif not values.get('message_id'):
+            message_id = tools.generate_tracking_message_id('private')
+        return message_id
+
     def create(self, cr, uid, values, context=None):
         if context is None:
             context = {}
         default_starred = context.pop('default_starred', False)
-        # generate message_id, to redirect answers to the right discussion thread
-        if not values.get('message_id') and values.get('reply_to'):
-            values['message_id'] = tools.generate_tracking_message_id('reply_to')
-        elif not values.get('message_id') and values.get('res_id') and values.get('model'):
-            values['message_id'] = tools.generate_tracking_message_id('%(res_id)s-%(model)s' % values)
-        elif not values.get('message_id'):
-            values['message_id'] = tools.generate_tracking_message_id('private')
+
+        if not values.get('email_from'):  # needed to compute reply_to
+            values['email_from'] = self._get_default_from(cr, uid, context=context)
+        if not values.get('message_id'):
+            values['message_id'] = self._get_message_id(cr, uid, values, context=context)
+        if not values.get('reply_to'):
+            values['reply_to'] = self._get_reply_to(cr, uid, values, context=context)
+
         newid = super(mail_message, self).create(cr, uid, values, context)
         self._notify(cr, uid, newid, context=context,
                      force_send=context.get('mail_notify_force_send', True),
@@ -914,26 +967,28 @@ class mail_message(osv.Model):
         if message.subtype_id and message.model and message.res_id:
             fol_obj = self.pool.get("mail.followers")
             # browse as SUPERUSER because rules could restrict the search results
-            fol_ids = fol_obj.search(cr, SUPERUSER_ID, [
-                ('res_model', '=', message.model),
-                ('res_id', '=', message.res_id),
-                ('subtype_ids', 'in', message.subtype_id.id)
+            fol_ids = fol_obj.search(
+                cr, SUPERUSER_ID, [
+                    ('res_model', '=', message.model),
+                    ('res_id', '=', message.res_id),
+                    ('subtype_ids', 'in', message.subtype_id.id)
                 ], context=context)
-            partners_to_notify |= set(fo.partner_id for fo in fol_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context))
+            partners_to_notify |= set(fo.partner_id.id for fo in fol_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context))
         # remove me from notified partners, unless the message is written on my own wall
         if message.subtype_id and message.author_id and message.model == "res.partner" and message.res_id == message.author_id.id:
-            partners_to_notify |= set([message.author_id])
+            partners_to_notify |= set([message.author_id.id])
         elif message.author_id:
-            partners_to_notify -= set([message.author_id])
+            partners_to_notify -= set([message.author_id.id])
 
         # all partner_ids of the mail.message have to be notified regardless of the above (even the author if explicitly added!)
         if message.partner_ids:
-            partners_to_notify |= set(message.partner_ids)
+            partners_to_notify |= set([p.id for p in message.partner_ids])
 
         # notify
-        if partners_to_notify:
-            notification_obj._notify(cr, uid, newid, partners_to_notify=[p.id for p in partners_to_notify], context=context,
-                                            force_send=force_send, user_signature=user_signature)
+        notification_obj._notify(
+            cr, uid, newid, partners_to_notify=list(partners_to_notify), context=context,
+            force_send=force_send, user_signature=user_signature
+        )
         message.refresh()
 
         # An error appear when a user receive a notification without notifying
diff --git a/addons/mail/tests/__init__.py b/addons/mail/tests/__init__.py
index ff1080b0580..242beb60bf1 100644
--- a/addons/mail/tests/__init__.py
+++ b/addons/mail/tests/__init__.py
@@ -19,9 +19,10 @@
 #
 ##############################################################################
 
-from . import test_mail_message, test_mail_features, test_mail_gateway, test_message_read, test_invite
+from . import test_mail_group, test_mail_message, test_mail_features, test_mail_gateway, test_message_read, test_invite
 
 checks = [
+    test_mail_group,
     test_mail_message,
     test_mail_features,
     test_mail_gateway,
diff --git a/addons/mail/tests/test_mail_base.py b/addons/mail/tests/common.py
similarity index 66%
rename from addons/mail/tests/test_mail_base.py
rename to addons/mail/tests/common.py
index b0f9f72b6f7..68a329e043a 100644
--- a/addons/mail/tests/test_mail_base.py
+++ b/addons/mail/tests/common.py
@@ -22,7 +22,7 @@
 from openerp.tests import common
 
 
-class TestMailBase(common.TransactionCase):
+class TestMail(common.TransactionCase):
 
     def _mock_smtp_gateway(self, *args, **kwargs):
         return args[2]['Message-Id']
@@ -39,7 +39,7 @@ class TestMailBase(common.TransactionCase):
         return self._build_email(*args, **kwargs)
 
     def setUp(self):
-        super(TestMailBase, self).setUp()
+        super(TestMail, self).setUp()
         cr, uid = self.cr, self.uid
 
         # Install mock SMTP gateway
@@ -68,12 +68,46 @@ class TestMailBase(common.TransactionCase):
         group_employee_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
         self.group_employee_id = group_employee_ref and group_employee_ref[1] or False
 
+        # Partner Data
+
+        # User Data: employee, noone
+        self.user_employee_id = self.res_users.create(cr, uid, {
+            'name': 'Ernest Employee',
+            'login': 'ernest',
+            'alias_name': 'ernest',
+            'email': 'e.e@example.com',
+            'signature': '--\nErnest',
+            'notification_email_send': 'comment',
+            'groups_id': [(6, 0, [self.group_employee_id])]
+        }, {'no_reset_password': True})
+        self.user_noone_id = self.res_users.create(cr, uid, {
+            'name': 'Noemie NoOne',
+            'login': 'noemie',
+            'alias_name': 'noemie',
+            'email': 'n.n@example.com',
+            'signature': '--\nNoemie',
+            'notification_email_send': 'comment',
+            'groups_id': [(6, 0, [])]
+        }, {'no_reset_password': True})
+
         # Test users to use through the various tests
         self.res_users.write(cr, uid, uid, {'name': 'Administrator'})
-        self.user_raoul_id = self.res_users.create(cr, uid,
-            {'name': 'Raoul Grosbedon', 'signature': 'SignRaoul', 'email': 'raoul@raoul.fr', 'login': 'raoul', 'alias_name': 'raoul', 'groups_id': [(6, 0, [self.group_employee_id])]})
-        self.user_bert_id = self.res_users.create(cr, uid,
-            {'name': 'Bert Tartignole', 'signature': 'SignBert', 'email': 'bert@bert.fr', 'login': 'bert', 'alias_name': 'bert', 'groups_id': [(6, 0, [])]})
+        self.user_raoul_id = self.res_users.create(cr, uid, {
+            'name': 'Raoul Grosbedon',
+            'signature': 'SignRaoul',
+            'email': 'raoul@raoul.fr',
+            'login': 'raoul',
+            'alias_name': 'raoul',
+            'groups_id': [(6, 0, [self.group_employee_id])]
+        })
+        self.user_bert_id = self.res_users.create(cr, uid, {
+            'name': 'Bert Tartignole',
+            'signature': 'SignBert',
+            'email': 'bert@bert.fr',
+            'login': 'bert',
+            'alias_name': 'bert',
+            'groups_id': [(6, 0, [])]
+        })
         self.user_raoul = self.res_users.browse(cr, uid, self.user_raoul_id)
         self.user_bert = self.res_users.browse(cr, uid, self.user_bert_id)
         self.user_admin = self.res_users.browse(cr, uid, uid)
@@ -82,13 +116,19 @@ class TestMailBase(common.TransactionCase):
         self.partner_bert_id = self.user_bert.partner_id.id
 
         # Test 'pigs' group to use through the various tests
-        self.group_pigs_id = self.mail_group.create(cr, uid,
+        self.group_pigs_id = self.mail_group.create(
+            cr, uid,
             {'name': 'Pigs', 'description': 'Fans of Pigs, unite !', 'alias_name': 'group+pigs'},
-            {'mail_create_nolog': True})
+            {'mail_create_nolog': True}
+        )
         self.group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+        # Test mail.group: public to provide access to everyone
+        self.group_jobs_id = self.mail_group.create(cr, uid, {'name': 'Jobs', 'public': 'public'})
+        # Test mail.group: private to restrict access
+        self.group_priv_id = self.mail_group.create(cr, uid, {'name': 'Private', 'public': 'private'})
 
     def tearDown(self):
         # Remove mocks
         self.registry('ir.mail_server').build_email = self._build_email
         self.registry('ir.mail_server').send_email = self._send_email
-        super(TestMailBase, self).tearDown()
+        super(TestMail, self).tearDown()
diff --git a/addons/mail/tests/test_invite.py b/addons/mail/tests/test_invite.py
index faa9fd55793..c4484d254bb 100644
--- a/addons/mail/tests/test_invite.py
+++ b/addons/mail/tests/test_invite.py
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.addons.mail.tests.test_mail_base import TestMailBase
+from openerp.addons.mail.tests.common import TestMail
 
 
-class test_invite(TestMailBase):
+class test_invite(TestMail):
 
     def test_00_basic_invite(self):
         cr, uid = self.cr, self.uid
diff --git a/addons/mail/tests/test_mail_features.py b/addons/mail/tests/test_mail_features.py
index e9563e19246..970f07f519e 100644
--- a/addons/mail/tests/test_mail_features.py
+++ b/addons/mail/tests/test_mail_features.py
@@ -21,12 +21,12 @@
 
 from openerp.addons.mail.mail_mail import mail_mail
 from openerp.addons.mail.mail_thread import mail_thread
-from openerp.addons.mail.tests.test_mail_base import TestMailBase
+from openerp.addons.mail.tests.common import TestMail
 from openerp.tools import mute_logger, email_split
 from openerp.tools.mail import html_sanitize
 
 
-class test_mail(TestMailBase):
+class test_mail(TestMail):
 
     def test_000_alias_setup(self):
         """ Test basic mail.alias setup works, before trying to use them for routing """
diff --git a/addons/mail/tests/test_mail_gateway.py b/addons/mail/tests/test_mail_gateway.py
index 3fd8ebd3101..b2a1c3250aa 100644
--- a/addons/mail/tests/test_mail_gateway.py
+++ b/addons/mail/tests/test_mail_gateway.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.addons.mail.tests.test_mail_base import TestMailBase
+from openerp.addons.mail.tests.common import TestMail
 from openerp.tools import mute_logger
 
 MAIL_TEMPLATE = """Return-Path: <whatever-2a840@postmaster.twitter.com>
@@ -143,173 +143,9 @@ dGVzdAo=
 --089e01536c4ed4d17204e49b8e96--"""
 
 
-class TestMailgateway(TestMailBase):
+class TestMailgateway(TestMail):
 
-    def test_00_partner_find_from_email(self):
-        """ Tests designed for partner fetch based on emails. """
-        cr, uid, user_raoul, group_pigs = self.cr, self.uid, self.user_raoul, self.group_pigs
-
-        # --------------------------------------------------
-        # Data creation
-        # --------------------------------------------------
-        # 1 - Partner ARaoul
-        p_a_id = self.res_partner.create(cr, uid, {'name': 'ARaoul', 'email': 'test@test.fr'})
-
-        # --------------------------------------------------
-        # CASE1: without object
-        # --------------------------------------------------
-
-        # Do: find partner with email -> first partner should be found
-        partner_info = self.mail_thread.message_partner_info_from_emails(cr, uid, None, ['Maybe Raoul <test@test.fr>'], link_mail=False)[0]
-        self.assertEqual(partner_info['full_name'], 'Maybe Raoul <test@test.fr>',
-                         'mail_thread: message_partner_info_from_emails did not handle email')
-        self.assertEqual(partner_info['partner_id'], p_a_id,
-                         'mail_thread: message_partner_info_from_emails wrong partner found')
-
-        # Data: add some data about partners
-        # 2 - User BRaoul
-        p_b_id = self.res_partner.create(cr, uid, {'name': 'BRaoul', 'email': 'test@test.fr', 'user_ids': [(4, user_raoul.id)]})
-
-        # Do: find partner with email -> first user should be found
-        partner_info = self.mail_thread.message_partner_info_from_emails(cr, uid, None, ['Maybe Raoul <test@test.fr>'], link_mail=False)[0]
-        self.assertEqual(partner_info['partner_id'], p_b_id,
-                         'mail_thread: message_partner_info_from_emails wrong partner found')
-
-        # --------------------------------------------------
-        # CASE1: with object
-        # --------------------------------------------------
-
-        # Do: find partner in group where there is a follower with the email -> should be taken
-        self.mail_group.message_subscribe(cr, uid, [group_pigs.id], [p_b_id])
-        partner_info = self.mail_group.message_partner_info_from_emails(cr, uid, group_pigs.id, ['Maybe Raoul <test@test.fr>'], link_mail=False)[0]
-        self.assertEqual(partner_info['partner_id'], p_b_id,
-                         'mail_thread: message_partner_info_from_emails wrong partner found')
-
-    def test_05_mail_message_mail_mail(self):
-        """ Tests designed for testing email values based on mail.message, aliases, ... """
-        cr, uid, user_raoul_id = self.cr, self.uid, self.user_raoul_id
-
-        # Data: update + generic variables
-        reply_to1 = '_reply_to1@example.com'
-        reply_to2 = '_reply_to2@example.com'
-        email_from1 = 'from@example.com'
-        alias_domain = 'schlouby.fr'
-        raoul_from = 'Raoul Grosbedon <raoul@raoul.fr>'
-        raoul_from_alias = 'Raoul Grosbedon <raoul@schlouby.fr>'
-        raoul_reply = '"Followers of Pigs" <raoul@raoul.fr>'
-        raoul_reply_alias = '"Followers of Pigs" <group+pigs@schlouby.fr>'
-        # Data: remove alias_domain to see emails with alias
-        param_ids = self.registry('ir.config_parameter').search(cr, uid, [('key', '=', 'mail.catchall.domain')])
-        self.registry('ir.config_parameter').unlink(cr, uid, param_ids)
-
-        # Do: free message; specified values > default values
-        msg_id = self.mail_message.create(cr, user_raoul_id, {'reply_to': reply_to1, 'email_from': email_from1})
-        msg = self.mail_message.browse(cr, user_raoul_id, msg_id)
-        # Test: message content
-        self.assertIn('reply_to', msg.message_id,
-                      'mail_message: message_id should be specific to a mail_message with a given reply_to')
-        self.assertEqual(msg.reply_to, reply_to1,
-                         'mail_message: incorrect reply_to: should come from values')
-        self.assertEqual(msg.email_from, email_from1,
-                         'mail_message: incorrect email_from: should come from values')
-        # Do: create a mail_mail with the previous mail_message
-        mail_id = self.mail_mail.create(cr, user_raoul_id, {'mail_message_id': msg_id, 'state': 'cancel'})
-        mail = self.mail_mail.browse(cr, user_raoul_id, mail_id)
-        # Test: mail_mail content
-        self.assertEqual(mail.reply_to, reply_to1,
-                         'mail_mail: incorrect reply_to: should come from mail.message')
-        self.assertEqual(mail.email_from, email_from1,
-                         'mail_mail: incorrect email_from: should come from mail.message')
-        # Do: create a mail_mail with the previous mail_message + specified reply_to
-        mail_id = self.mail_mail.create(cr, user_raoul_id, {'mail_message_id': msg_id, 'state': 'cancel', 'reply_to': reply_to2})
-        mail = self.mail_mail.browse(cr, user_raoul_id, mail_id)
-        # Test: mail_mail content
-        self.assertEqual(mail.reply_to, reply_to2,
-                         'mail_mail: incorrect reply_to: should come from values')
-        self.assertEqual(mail.email_from, email_from1,
-                         'mail_mail: incorrect email_from: should come from mail.message')
-
-        # Do: mail_message attached to a document
-        msg_id = self.mail_message.create(cr, user_raoul_id, {'model': 'mail.group', 'res_id': self.group_pigs_id})
-        msg = self.mail_message.browse(cr, user_raoul_id, msg_id)
-        # Test: message content
-        self.assertIn('mail.group', msg.message_id,
-                      'mail_message: message_id should contain model')
-        self.assertIn('%s' % self.group_pigs_id, msg.message_id,
-                      'mail_message: message_id should contain res_id')
-        self.assertFalse(msg.reply_to,
-                         'mail_message: incorrect reply_to: should not be generated if not specified')
-        self.assertEqual(msg.email_from, raoul_from,
-                         'mail_message: incorrect email_from: should be Raoul')
-        # Do: create a mail_mail based on the previous mail_message
-        mail_id = self.mail_mail.create(cr, user_raoul_id, {'mail_message_id': msg_id, 'state': 'cancel'})
-        mail = self.mail_mail.browse(cr, user_raoul_id, mail_id)
-        # Test: mail_mail content
-        self.assertEqual(mail.reply_to, raoul_reply,
-                         'mail_mail: incorrect reply_to: should be Raoul')
-
-        # Data: set catchall domain
-        self.registry('ir.config_parameter').set_param(cr, uid, 'mail.catchall.domain', alias_domain)
-        self.registry('ir.config_parameter').unlink(cr, uid, self.registry('ir.config_parameter').search(cr, uid, [('key', '=', 'mail.catchall.alias')]))
-
-        # Update message
-        self.mail_message.write(cr, user_raoul_id, [msg_id], {'email_from': False, 'reply_to': False})
-        msg.refresh()
-        # Do: create a mail_mail based on the previous mail_message
-        mail_id = self.mail_mail.create(cr, user_raoul_id, {'mail_message_id': msg_id, 'state': 'cancel'})
-        mail = self.mail_mail.browse(cr, user_raoul_id, mail_id)
-        # Test: mail_mail content
-        self.assertEqual(mail.reply_to, raoul_reply_alias,
-                         'mail_mail: incorrect reply_to: should be Pigs alias')
-
-        # Update message: test alias on email_from
-        msg_id = self.mail_message.create(cr, user_raoul_id, {})
-        msg = self.mail_message.browse(cr, user_raoul_id, msg_id)
-        # Do: create a mail_mail based on the previous mail_message
-        mail_id = self.mail_mail.create(cr, user_raoul_id, {'mail_message_id': msg_id, 'state': 'cancel'})
-        mail = self.mail_mail.browse(cr, user_raoul_id, mail_id)
-        # Test: mail_mail content
-        self.assertEqual(mail.reply_to, raoul_from_alias,
-                         'mail_mail: incorrect reply_to: should be message email_from using Raoul alias')
-
-        # Update message
-        self.mail_message.write(cr, user_raoul_id, [msg_id], {'res_id': False, 'email_from': 'someone@schlouby.fr', 'reply_to': False})
-        msg.refresh()
-        # Do: create a mail_mail based on the previous mail_message
-        mail_id = self.mail_mail.create(cr, user_raoul_id, {'mail_message_id': msg_id, 'state': 'cancel'})
-        mail = self.mail_mail.browse(cr, user_raoul_id, mail_id)
-        # Test: mail_mail content
-        self.assertEqual(mail.reply_to, msg.email_from,
-                         'mail_mail: incorrect reply_to: should be message email_from')
-
-        # Data: set catchall alias
-        self.registry('ir.config_parameter').set_param(self.cr, self.uid, 'mail.catchall.alias', 'gateway')
-
-        # Update message
-        self.mail_message.write(cr, uid, [msg_id], {'email_from': False, 'reply_to': False})
-        msg.refresh()
-        # Do: create a mail_mail based on the previous mail_message
-        mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'state': 'cancel'})
-        mail = self.mail_mail.browse(cr, uid, mail_id)
-        # Test: mail_mail Content-Type
-        self.assertEqual(mail.reply_to, 'gateway@schlouby.fr',
-                         'mail_mail: reply_to should equal the catchall email alias')
-
-        # Do: create a mail_mail
-        mail_id = self.mail_mail.create(cr, uid, {'state': 'cancel'})
-        mail = self.mail_mail.browse(cr, uid, mail_id)
-        # Test: mail_mail content
-        self.assertEqual(mail.reply_to, 'gateway@schlouby.fr',
-                         'mail_mail: reply_to should equal the catchall email alias')
-
-        # Do: create a mail_mail
-        mail_id = self.mail_mail.create(cr, uid, {'state': 'cancel', 'reply_to': 'someone@example.com'})
-        mail = self.mail_mail.browse(cr, uid, mail_id)
-        # Test: mail_mail content
-        self.assertEqual(mail.reply_to, 'someone@example.com',
-                         'mail_mail: reply_to should equal the rpely_to given to create')
-
-    def test_09_message_parse(self):
+    def test_00_message_parse(self):
         """ Testing incoming emails parsing """
         cr, uid = self.cr, self.uid
 
@@ -738,9 +574,7 @@ class TestMailgateway(TestMailBase):
                          'message_post: private discussion: incorrect notified recipients')
         self.assertEqual(msg.model, False,
                          'message_post: private discussion: context key "thread_model" not correctly ignored when having no res_id')
-        # Test: message reply_to and message-id
-        self.assertFalse(msg.reply_to,
-                         'message_post: private discussion: initial message should not have any reply_to specified')
+        # Test: message-id
         self.assertIn('openerp-private', msg.message_id,
                       'message_post: private discussion: message-id should contain the private keyword')
 
diff --git a/addons/mail/tests/test_mail_group.py b/addons/mail/tests/test_mail_group.py
new file mode 100644
index 00000000000..c1512441b13
--- /dev/null
+++ b/addons/mail/tests/test_mail_group.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.addons.mail.tests.common import TestMail
+from openerp.osv.orm import except_orm
+from openerp.tools import mute_logger
+
+
+class TestMailGroup(TestMail):
+
+    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.osv.orm')
+    def test_00_mail_group_access_rights(self):
+        """ Testing mail_group access rights and basic mail_thread features """
+        cr, uid, user_noone_id, user_employee_id = self.cr, self.uid, self.user_noone_id, self.user_employee_id
+
+        # Do: Bert reads Jobs -> ok, public
+        self.mail_group.read(cr, user_noone_id, [self.group_jobs_id])
+        # Do: Bert read Pigs -> ko, restricted to employees
+        with self.assertRaises(except_orm):
+            self.mail_group.read(cr, user_noone_id, [self.group_pigs_id])
+        # Do: Raoul read Pigs -> ok, belong to employees
+        self.mail_group.read(cr, user_employee_id, [self.group_pigs_id])
+
+        # Do: Bert creates a group -> ko, no access rights
+        with self.assertRaises(except_orm):
+            self.mail_group.create(cr, user_noone_id, {'name': 'Test'})
+        # Do: Raoul creates a restricted group -> ok
+        new_group_id = self.mail_group.create(cr, user_employee_id, {'name': 'Test'})
+        # Do: Bert added in followers, read -> ok, in followers
+        self.mail_group.message_subscribe_users(cr, uid, [new_group_id], [user_noone_id])
+        self.mail_group.read(cr, user_noone_id, [new_group_id])
+
+        # Do: Raoul reads Priv -> ko, private
+        with self.assertRaises(except_orm):
+            self.mail_group.read(cr, user_employee_id, [self.group_priv_id])
+        # Do: Raoul added in follower, read -> ok, in followers
+        self.mail_group.message_subscribe_users(cr, uid, [self.group_priv_id], [user_employee_id])
+        self.mail_group.read(cr, user_employee_id, [self.group_priv_id])
+
+        # Do: Raoul write on Jobs -> ok
+        self.mail_group.write(cr, user_employee_id, [self.group_priv_id], {'name': 'modified'})
+        # Do: Bert cannot write on Private -> ko (read but no write)
+        with self.assertRaises(except_orm):
+            self.mail_group.write(cr, user_noone_id, [self.group_priv_id], {'name': 're-modified'})
+        # Test: Bert cannot unlink the group
+        with self.assertRaises(except_orm):
+            self.mail_group.unlink(cr, user_noone_id, [self.group_priv_id])
+        # Do: Raoul unlinks the group, there are no followers and messages left
+        self.mail_group.unlink(cr, user_employee_id, [self.group_priv_id])
+        fol_ids = self.mail_followers.search(cr, uid, [('res_model', '=', 'mail.group'), ('res_id', '=', self.group_priv_id)])
+        self.assertFalse(fol_ids, 'unlinked document should not have any followers left')
+        msg_ids = self.mail_message.search(cr, uid, [('model', '=', 'mail.group'), ('res_id', '=', self.group_priv_id)])
+        self.assertFalse(msg_ids, 'unlinked document should not have any followers left')
diff --git a/addons/mail/tests/test_mail_message.py b/addons/mail/tests/test_mail_message.py
index f422219000c..5dc5e9e247d 100644
--- a/addons/mail/tests/test_mail_message.py
+++ b/addons/mail/tests/test_mail_message.py
@@ -19,66 +19,147 @@
 #
 ##############################################################################
 
-from openerp.addons.mail.tests.test_mail_base import TestMailBase
+from openerp.addons.mail.tests.common import TestMail
 from openerp.osv.orm import except_orm
 from openerp.tools import mute_logger
 
 
-class test_mail_access_rights(TestMailBase):
+class TestMailMail(TestMail):
 
-    def setUp(self):
-        super(test_mail_access_rights, self).setUp()
-        cr, uid = self.cr, self.uid
+    def test_00_partner_find_from_email(self):
+        """ Tests designed for partner fetch based on emails. """
+        cr, uid, user_raoul, group_pigs = self.cr, self.uid, self.user_raoul, self.group_pigs
 
-        # Test mail.group: public to provide access to everyone
-        self.group_jobs_id = self.mail_group.create(cr, uid, {'name': 'Jobs', 'public': 'public'})
-        # Test mail.group: private to restrict access
-        self.group_priv_id = self.mail_group.create(cr, uid, {'name': 'Private', 'public': 'private'})
+        # --------------------------------------------------
+        # Data creation
+        # --------------------------------------------------
+        # 1 - Partner ARaoul
+        p_a_id = self.res_partner.create(cr, uid, {'name': 'ARaoul', 'email': 'test@test.fr'})
 
-    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.osv.orm')
-    def test_00_mail_group_access_rights(self):
-        """ Testing mail_group access rights and basic mail_thread features """
-        cr, uid, user_bert_id, user_raoul_id = self.cr, self.uid, self.user_bert_id, self.user_raoul_id
+        # --------------------------------------------------
+        # CASE1: without object
+        # --------------------------------------------------
 
-        # Do: Bert reads Jobs -> ok, public
-        self.mail_group.read(cr, user_bert_id, [self.group_jobs_id])
-        # Do: Bert read Pigs -> ko, restricted to employees
-        self.assertRaises(except_orm, self.mail_group.read,
-            cr, user_bert_id, [self.group_pigs_id])
-        # Do: Raoul read Pigs -> ok, belong to employees
-        self.mail_group.read(cr, user_raoul_id, [self.group_pigs_id])
+        # Do: find partner with email -> first partner should be found
+        partner_info = self.mail_thread.message_partner_info_from_emails(cr, uid, None, ['Maybe Raoul <test@test.fr>'], link_mail=False)[0]
+        self.assertEqual(partner_info['full_name'], 'Maybe Raoul <test@test.fr>',
+                         'mail_thread: message_partner_info_from_emails did not handle email')
+        self.assertEqual(partner_info['partner_id'], p_a_id,
+                         'mail_thread: message_partner_info_from_emails wrong partner found')
 
-        # Do: Bert creates a group -> ko, no access rights
-        self.assertRaises(except_orm, self.mail_group.create,
-            cr, user_bert_id, {'name': 'Test'})
-        # Do: Raoul creates a restricted group -> ok
-        new_group_id = self.mail_group.create(cr, user_raoul_id, {'name': 'Test'})
-        # Do: Bert added in followers, read -> ok, in followers
-        self.mail_group.message_subscribe_users(cr, uid, [new_group_id], [user_bert_id])
-        self.mail_group.read(cr, user_bert_id, [new_group_id])
+        # Data: add some data about partners
+        # 2 - User BRaoul
+        p_b_id = self.res_partner.create(cr, uid, {'name': 'BRaoul', 'email': 'test@test.fr', 'user_ids': [(4, user_raoul.id)]})
 
-        # Do: Raoul reads Priv -> ko, private
-        self.assertRaises(except_orm, self.mail_group.read,
-            cr, user_raoul_id, [self.group_priv_id])
-        # Do: Raoul added in follower, read -> ok, in followers
-        self.mail_group.message_subscribe_users(cr, uid, [self.group_priv_id], [user_raoul_id])
-        self.mail_group.read(cr, user_raoul_id, [self.group_priv_id])
+        # Do: find partner with email -> first user should be found
+        partner_info = self.mail_thread.message_partner_info_from_emails(cr, uid, None, ['Maybe Raoul <test@test.fr>'], link_mail=False)[0]
+        self.assertEqual(partner_info['partner_id'], p_b_id,
+                         'mail_thread: message_partner_info_from_emails wrong partner found')
 
-        # Do: Raoul write on Jobs -> ok
-        self.mail_group.write(cr, user_raoul_id, [self.group_priv_id], {'name': 'modified'})
-        # Do: Bert cannot write on Private -> ko (read but no write)
-        self.assertRaises(except_orm, self.mail_group.write,
-            cr, user_bert_id, [self.group_priv_id], {'name': 're-modified'})
-        # Test: Bert cannot unlink the group
-        self.assertRaises(except_orm,
-            self.mail_group.unlink,
-            cr, user_bert_id, [self.group_priv_id])
-        # Do: Raoul unlinks the group, there are no followers and messages left
-        self.mail_group.unlink(cr, user_raoul_id, [self.group_priv_id])
-        fol_ids = self.mail_followers.search(cr, uid, [('res_model', '=', 'mail.group'), ('res_id', '=', self.group_priv_id)])
-        self.assertFalse(fol_ids, 'unlinked document should not have any followers left')
-        msg_ids = self.mail_message.search(cr, uid, [('model', '=', 'mail.group'), ('res_id', '=', self.group_priv_id)])
-        self.assertFalse(msg_ids, 'unlinked document should not have any followers left')
+        # --------------------------------------------------
+        # CASE1: with object
+        # --------------------------------------------------
+
+        # Do: find partner in group where there is a follower with the email -> should be taken
+        self.mail_group.message_subscribe(cr, uid, [group_pigs.id], [p_b_id])
+        partner_info = self.mail_group.message_partner_info_from_emails(cr, uid, group_pigs.id, ['Maybe Raoul <test@test.fr>'], link_mail=False)[0]
+        self.assertEqual(partner_info['partner_id'], p_b_id,
+                         'mail_thread: message_partner_info_from_emails wrong partner found')
+
+
+class TestMailMessage(TestMail):
+
+    def test_00_mail_message_values(self):
+        """ Tests designed for testing email values based on mail.message, aliases, ... """
+        cr, uid, user_raoul_id = self.cr, self.uid, self.user_raoul_id
+
+        # Data: update + generic variables
+        reply_to1 = '_reply_to1@example.com'
+        reply_to2 = '_reply_to2@example.com'
+        email_from1 = 'from@example.com'
+        alias_domain = 'schlouby.fr'
+        raoul_from = 'Raoul Grosbedon <raoul@raoul.fr>'
+        raoul_from_alias = 'Raoul Grosbedon <raoul@schlouby.fr>'
+        raoul_reply = '"Followers of Pigs" <raoul@raoul.fr>'
+        raoul_reply_alias = '"Followers of Pigs" <group+pigs@schlouby.fr>'
+
+        # --------------------------------------------------
+        # Case1: without alias_domain
+        # --------------------------------------------------
+        param_ids = self.registry('ir.config_parameter').search(cr, uid, [('key', '=', 'mail.catchall.domain')])
+        self.registry('ir.config_parameter').unlink(cr, uid, param_ids)
+
+        # Do: free message; specified values > default values
+        msg_id = self.mail_message.create(cr, user_raoul_id, {'reply_to': reply_to1, 'email_from': email_from1})
+        msg = self.mail_message.browse(cr, user_raoul_id, msg_id)
+        # Test: message content
+        self.assertIn('reply_to', msg.message_id,
+                      'mail_message: message_id should be specific to a mail_message with a given reply_to')
+        self.assertEqual(msg.reply_to, reply_to1,
+                         'mail_message: incorrect reply_to: should come from values')
+        self.assertEqual(msg.email_from, email_from1,
+                         'mail_message: incorrect email_from: should come from values')
+
+        # Do: create a mail_mail with the previous mail_message + specified reply_to
+        mail_id = self.mail_mail.create(cr, user_raoul_id, {'mail_message_id': msg_id, 'state': 'cancel', 'reply_to': reply_to2})
+        mail = self.mail_mail.browse(cr, user_raoul_id, mail_id)
+        # Test: mail_mail content
+        self.assertEqual(mail.reply_to, reply_to2,
+                         'mail_mail: incorrect reply_to: should come from values')
+        self.assertEqual(mail.email_from, email_from1,
+                         'mail_mail: incorrect email_from: should come from mail.message')
+
+        # Do: mail_message attached to a document
+        msg_id = self.mail_message.create(cr, user_raoul_id, {'model': 'mail.group', 'res_id': self.group_pigs_id})
+        msg = self.mail_message.browse(cr, user_raoul_id, msg_id)
+        # Test: message content
+        self.assertIn('mail.group', msg.message_id,
+                      'mail_message: message_id should contain model')
+        self.assertIn('%s' % self.group_pigs_id, msg.message_id,
+                      'mail_message: message_id should contain res_id')
+        self.assertEqual(msg.reply_to, raoul_reply,
+                         'mail_message: incorrect reply_to: should be Raoul')
+        self.assertEqual(msg.email_from, raoul_from,
+                         'mail_message: incorrect email_from: should be Raoul')
+
+        # --------------------------------------------------
+        # Case2: with alias_domain, without catchall alias
+        # --------------------------------------------------
+        self.registry('ir.config_parameter').set_param(cr, uid, 'mail.catchall.domain', alias_domain)
+        self.registry('ir.config_parameter').unlink(cr, uid, self.registry('ir.config_parameter').search(cr, uid, [('key', '=', 'mail.catchall.alias')]))
+
+        # Update message
+        msg_id = self.mail_message.create(cr, user_raoul_id, {'model': 'mail.group', 'res_id': self.group_pigs_id})
+        msg = self.mail_message.browse(cr, user_raoul_id, msg_id)
+        # Test: generated reply_to
+        self.assertEqual(msg.reply_to, raoul_reply_alias,
+                         'mail_mail: incorrect reply_to: should be Pigs alias')
+
+        # Update message: test alias on email_from
+        msg_id = self.mail_message.create(cr, user_raoul_id, {})
+        msg = self.mail_message.browse(cr, user_raoul_id, msg_id)
+        # Test: generated reply_to
+        self.assertEqual(msg.reply_to, raoul_from_alias,
+                         'mail_mail: incorrect reply_to: should be message email_from using Raoul alias')
+
+        # --------------------------------------------------
+        # Case2: with alias_domain and  catchall alias
+        # --------------------------------------------------
+        self.registry('ir.config_parameter').set_param(self.cr, self.uid, 'mail.catchall.alias', 'gateway')
+
+        # Update message
+        msg_id = self.mail_message.create(cr, user_raoul_id, {})
+        msg = self.mail_message.browse(cr, user_raoul_id, msg_id)
+        # Test: generated reply_to
+        self.assertEqual(msg.reply_to, 'gateway@schlouby.fr',
+                         'mail_mail: reply_to should equal the catchall email alias')
+
+        # Do: create a mail_mail
+        mail_id = self.mail_mail.create(cr, uid, {'state': 'cancel', 'reply_to': 'someone@example.com'})
+        mail = self.mail_mail.browse(cr, uid, mail_id)
+        # Test: mail_mail content
+        self.assertEqual(mail.reply_to, 'someone@example.com',
+                         'mail_mail: reply_to should equal the rpely_to given to create')
 
     @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.osv.orm')
     def test_10_mail_message_search_access_rights(self):
diff --git a/addons/mail/tests/test_message_read.py b/addons/mail/tests/test_message_read.py
index a4ff3685788..c02e9a32278 100644
--- a/addons/mail/tests/test_message_read.py
+++ b/addons/mail/tests/test_message_read.py
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.addons.mail.tests.test_mail_base import TestMailBase
+from openerp.addons.mail.tests.common import TestMail
 
 
-class test_mail_access_rights(TestMailBase):
+class test_mail_access_rights(TestMail):
 
     def test_00_message_read(self):
         """ Tests for message_read and expandables. """
diff --git a/addons/portal/tests/test_portal.py b/addons/portal/tests/test_portal.py
index e2b66e65af6..4d301458365 100644
--- a/addons/portal/tests/test_portal.py
+++ b/addons/portal/tests/test_portal.py
@@ -19,12 +19,12 @@
 #
 ##############################################################################
 
-from openerp.addons.mail.tests.test_mail_base import TestMailBase
+from openerp.addons.mail.tests.common import TestMail
 from openerp.osv.orm import except_orm
 from openerp.tools.misc import mute_logger
 
 
-class test_portal(TestMailBase):
+class test_portal(TestMail):
 
     def setUp(self):
         super(test_portal, self).setUp()
diff --git a/addons/project/tests/test_project_base.py b/addons/project/tests/test_project_base.py
index f82561766fe..70f8b59812f 100644
--- a/addons/project/tests/test_project_base.py
+++ b/addons/project/tests/test_project_base.py
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.addons.mail.tests.test_mail_base import TestMailBase
+from openerp.addons.mail.tests.common import TestMail
 
 
-class TestProjectBase(TestMailBase):
+class TestProjectBase(TestMail):
 
     def setUp(self):
         super(TestProjectBase, self).setUp()

From 4779df339eb8d7790cb7c6ac61d32f4d1d193f43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 27 Aug 2013 17:38:40 +0200
Subject: [PATCH 097/164] [REF] mail_followers: cleaned notify methods,
 lessening the number of queries.

bzr revid: tde@openerp.com-20130827153840-fo9s2lc35fvld3fb
---
 addons/mail/mail_followers.py | 118 +++++++++++++++++-----------------
 addons/mail/mail_message.py   |   1 -
 2 files changed, 60 insertions(+), 59 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index ac350810aa6..0059df90530 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -77,7 +77,7 @@ class mail_notification(osv.Model):
         if not cr.fetchone():
             cr.execute('CREATE INDEX mail_notification_partner_id_read_starred_message_id ON mail_notification (partner_id, read, starred, message_id)')
 
-    def get_partners_to_notify(self, cr, uid, message, partners_to_notify=None, context=None):
+    def get_partners_to_email(self, cr, uid, ids, message, context=None):
         """ Return the list of partners to notify, based on their preferences.
 
             :param browse_record message: mail.message to notify
@@ -85,13 +85,10 @@ class mail_notification(osv.Model):
                 the notifications to process
         """
         notify_pids = []
-        for notification in message.notification_ids:
+        for notification in self.browse(cr, uid, ids, context=context):
             if notification.read:
                 continue
             partner = notification.partner_id
-            # If partners_to_notify specified: restrict to them
-            if partners_to_notify is not None and partner.id not in partners_to_notify:
-                continue
             # Do not send to partners without email address defined
             if not partner.email:
                 continue
@@ -143,14 +140,62 @@ class mail_notification(osv.Model):
             company = user.company_id.name
         sent_by = _('Sent by %(company)s using %(openerp)s.')
         signature_company = '<small>%s</small>' % (sent_by % {
-                'company': company,
-                'openerp': "<a style='color:inherit' href='https://www.openerp.com/'>OpenERP</a>"
-            })
+            'company': company,
+            'openerp': "<a style='color:inherit' href='https://www.openerp.com/'>OpenERP</a>"
+        })
         footer = tools.append_content_to_html(footer, signature_company, plaintext=False, container_tag='div')
 
         return footer
 
-    def _notify(self, cr, uid, msg_id, partners_to_notify=None, context=None,
+    def update_message_notification(self, cr, uid, ids, message_id, partner_ids, context=None):
+        existing_pids = set()
+        new_pids = set()
+        new_notif_ids = []
+
+        for notification in self.browse(cr, uid, ids, context=context):
+            existing_pids.add(notification.partner_id.id)
+
+        # update existing notifications
+        self.write(cr, uid, ids, {'read': False}, context=context)
+
+        # create new notifications
+        new_pids = set(partner_ids) - existing_pids
+        for new_pid in new_pids:
+            new_notif_ids.append(self.create(cr, uid, {'message_id': message_id, 'partner_id': new_pid, 'read': False}, context=context))
+        return new_notif_ids
+
+    def _notify_email(self, cr, uid, ids, message_id, force_send=False, user_signature=True, context=None):
+        message = self.pool['mail.message'].browse(cr, SUPERUSER_ID, message_id, context=context)
+
+        # compute partners
+        email_pids = self.get_partners_to_email(cr, uid, ids, message, context=None)
+        if not email_pids:
+            return True
+
+        # compute email body (signature, company data)
+        body_html = message.body
+        user_id = message.author_id and message.author_id.user_ids and message.author_id.user_ids[0] and message.author_id.user_ids[0].id or None
+        if user_signature:
+            signature_company = self.get_signature_footer(cr, uid, user_id, res_model=message.model, res_id=message.res_id, context=context)
+            body_html = tools.append_content_to_html(body_html, signature_company, plaintext=False, container_tag='div')
+
+        # compute email references
+        references = message.parent_id.message_id if message.parent_id else False
+
+        # create email values
+        mail_values = {
+            'mail_message_id': message.id,
+            'auto_delete': True,
+            'body_html': body_html,
+            'recipient_ids': [(4, id) for id in email_pids],
+            'references': references,
+        }
+        email_notif_id = self.pool.get('mail.mail').create(cr, uid, mail_values, context=context)
+        if force_send:
+            self.pool.get('mail.mail').send(cr, uid, [email_notif_id], context=context)
+        return True
+
+    def _notify(self, cr, uid, message_id, partners_to_notify=None, context=None,
                 force_send=False, user_signature=True):
         """ Send by email the notification depending on the user preferences
 
@@ -162,57 +207,14 @@ class mail_notification(osv.Model):
             :param bool user_signature: if True, the generated mail.mail body is
                 the body of the related mail.message with the author's signature
         """
-        if context is None:
-            context = {}
-        mail_message_obj = self.pool.get('mail.message')
+        notif_ids = self.search(cr, SUPERUSER_ID, [('message_id', '=', message_id), ('partner_id', 'in', partners_to_notify)], context=context)
 
-        # optional list of partners to notify: subscribe them if not already done or update the notification
-        if partners_to_notify:
-            notifications_to_update = []
-            notified_partners = []
-            notif_ids = self.search(cr, SUPERUSER_ID, [('message_id', '=', msg_id), ('partner_id', 'in', partners_to_notify)], context=context)
-            for notification in self.browse(cr, SUPERUSER_ID, notif_ids, context=context):
-                notified_partners.append(notification.partner_id.id)
-                notifications_to_update.append(notification.id)
-            partners_to_notify = filter(lambda item: item not in notified_partners, partners_to_notify)
-            if notifications_to_update:
-                self.write(cr, SUPERUSER_ID, notifications_to_update, {'read': False}, context=context)
-            mail_message_obj.write(cr, uid, msg_id, {'notified_partner_ids': [(4, id) for id in partners_to_notify]}, context=context)
+        # update or create notifications
+        new_notif_ids = self.update_message_notification(cr, SUPERUSER_ID, notif_ids, message_id, partners_to_notify, context=context)
 
         # mail_notify_noemail (do not send email) or no partner_ids: do not send, return
-        if context.get('mail_notify_noemail'):
+        if context and context.get('mail_notify_noemail'):
             return True
+
         # browse as SUPERUSER_ID because of access to res_partner not necessarily allowed
-        msg = self.pool.get('mail.message').browse(cr, SUPERUSER_ID, msg_id, context=context)
-        notify_partner_ids = self.get_partners_to_notify(cr, uid, msg, partners_to_notify=partners_to_notify, context=context)
-        if not notify_partner_ids:
-            return True
-
-        # add the context in the email
-        # TDE FIXME: commented, to be improved in a future branch
-        # quote_context = self.pool.get('mail.message').message_quote_context(cr, uid, msg_id, context=context)
-
-        # add signature
-        body_html = msg.body
-        user_id = msg.author_id and msg.author_id.user_ids and msg.author_id.user_ids[0] and msg.author_id.user_ids[0].id or None
-        if user_signature:
-            signature_company = self.get_signature_footer(cr, uid, user_id, res_model=msg.model, res_id=msg.res_id, context=context)
-            body_html = tools.append_content_to_html(body_html, signature_company, plaintext=False, container_tag='div')
-
-        references = False
-        if msg.parent_id:
-            references = msg.parent_id.message_id
-
-        mail_values = {
-            'mail_message_id': msg.id,
-            'auto_delete': True,
-            'body_html': body_html,
-            'recipient_ids': [(4, id) for id in notify_partner_ids],
-            'references': references,
-        }
-        mail_mail = self.pool.get('mail.mail')
-        email_notif_id = mail_mail.create(cr, uid, mail_values, context=context)
-
-        if force_send:
-            mail_mail.send(cr, uid, [email_notif_id], context=context)
-        return True
+        self._notify_email(cr, SUPERUSER_ID, new_notif_ids, message_id, force_send, user_signature, context=context)
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index d63025b0912..e3a1ae93342 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -89,7 +89,6 @@ class mail_message(osv.Model):
     def _get_record_name(self, cr, uid, ids, name, arg, context=None):
         """ Return the related document name, using name_get. It is done using
             SUPERUSER_ID, to be sure to have the record name correctly stored. """
-        # return dict.fromkeys(ids, False)
         # TDE note: regroup by model/ids, to have less queries to perform
         result = dict.fromkeys(ids, False)
         for message in self.read(cr, uid, ids, ['model', 'res_id'], context=context):

From 0dfe3a2e677aad8a4c03e215a81787f299707d98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 27 Aug 2013 18:18:01 +0200
Subject: [PATCH 098/164] [FIX] crm: fixed regression in merge_notify, due to a
 cleaning in opportunities merging a few months ago

bzr revid: tde@openerp.com-20130827161801-d8i11n5uq7n4v9r8
---
 addons/crm/crm_lead.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 6e8e966f5b0..9d17526c19f 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -636,7 +636,7 @@ class crm_lead(format_address, osv.osv):
         # Merge notifications about loss of information
         opportunities = [highest]
         opportunities.extend(opportunities_rest)
-        self._merge_notify(cr, uid, highest, opportunities, context=context)
+        self._merge_notify(cr, uid, highest.id, opportunities, context=context)
         # Check if the stage is in the stages of the sales team. If not, assign the stage with the lowest sequence
         if merged_data.get('section_id'):
             section_stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('section_ids', 'in', merged_data['section_id']), ('type', '=', merged_data.get('type'))], order='sequence', context=context)

From eaf07ae5c45be7ee3e55bf405556aa50d8a59091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 28 Aug 2013 16:08:45 +0200
Subject: [PATCH 099/164] [FIX] mail_message: fixed reply_to and email_from
 computation in create: take also False values, only undefined values trigger
 the default one

bzr revid: tde@openerp.com-20130828140845-uuv8ouoto4q7g96j
---
 addons/mail/mail_message.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index e3a1ae93342..ef3b70bed13 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -91,6 +91,7 @@ class mail_message(osv.Model):
             SUPERUSER_ID, to be sure to have the record name correctly stored. """
         # TDE note: regroup by model/ids, to have less queries to perform
         result = dict.fromkeys(ids, False)
+        # return result
         for message in self.read(cr, uid, ids, ['model', 'res_id'], context=context):
             if not message.get('model') or not message.get('res_id') or message['model'] not in self.pool:
                 continue
@@ -830,11 +831,11 @@ class mail_message(osv.Model):
             context = {}
         default_starred = context.pop('default_starred', False)
 
-        if not values.get('email_from'):  # needed to compute reply_to
+        if 'email_from' not in values:  # needed to compute reply_to
             values['email_from'] = self._get_default_from(cr, uid, context=context)
         if not values.get('message_id'):
             values['message_id'] = self._get_message_id(cr, uid, values, context=context)
-        if not values.get('reply_to'):
+        if 'reply_to' not in values:
             values['reply_to'] = self._get_reply_to(cr, uid, values, context=context)
 
         newid = super(mail_message, self).create(cr, uid, values, context)

From 9ef46123a6c7c7dc1c136bbfcf9eb522cc4cf78c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 28 Aug 2013 16:09:29 +0200
Subject: [PATCH 100/164] [IMP] mail.compose.message, email.template: rendering
 is now done in batch.

Also refactored send_mail in mail.compose.message in order to be able to override
mail values without having to intefere with the send_mail behavior.

bzr revid: tde@openerp.com-20130828140929-xe9hbmbo6jxgs9mh
---
 addons/email_template/email_template.py       | 197 +++++++++++-------
 .../wizard/mail_compose_message.py            |  69 +++---
 addons/mail/wizard/mail_compose_message.py    | 184 ++++++++++------
 3 files changed, 272 insertions(+), 178 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 2e3405ed079..2e1c52d0ef9 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -67,7 +67,7 @@ class email_template(osv.osv):
     _description = 'Email Templates'
     _order = 'name'
 
-    def render_template(self, cr, uid, template, model, res_id, context=None):
+    def render_template_batch(self, cr, uid, template, model, res_ids, context=None):
         """Render the given template text, replace mako expressions ``${expr}``
            with the result of evaluating these expressions with
            an evaluation context containing:
@@ -79,46 +79,60 @@ class email_template(osv.osv):
 
            :param str template: the template text to render
            :param str model: model name of the document record this mail is related to.
-           :param int res_id: id of the document record this mail is related to.
+           :param int res_ids: list of ids of document records those mails are related to.
         """
-        if not template:
-            return u""
         if context is None:
             context = {}
-        try:
-            template = tools.ustr(template)
-            record = None
-            if res_id:
-                record = self.pool[model].browse(cr, uid, res_id, context=context)
-            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-            variables = {
-                'object': record,
-                'user': user,
-                'ctx': context,     # context kw would clash with mako internals
-            }
-            result = mako_template_env.from_string(template).render(variables)
-            if result == u"False":
-                result = u""
-            return result
-        except Exception:
-            _logger.exception("failed to render mako template value %r", template)
-            return u""
+        results = dict.fromkeys(res_ids, u"")
 
-    def get_email_template(self, cr, uid, template_id=False, record_id=None, context=None):
+        # try to load the template
+        try:
+            template = mako_template_env.from_string(tools.ustr(template))
+        except Exception:
+            _logger.exception("Failed to load template %r", template)
+            return results
+
+        # prepare template variables
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        records = self.pool[model].browse(cr, uid, res_ids, context=context) or [None]
+        variables = {
+            'user': user,
+            'ctx': context,  # context kw would clash with mako internals
+        }
+        for record in records:
+            res_id = record.id if record else None
+            variables['object'] = record
+            try:
+                render_result = template.render(variables)
+            except Exception:
+                _logger.exception("Failed to render template %r using values %r" % (template, variables))
+                render_result = u""
+            if render_result == u"False":
+                render_result = u""
+            results[res_id] = render_result
+        return results
+
+    def get_email_template_batch(self, cr, uid, template_id=False, res_ids=None, context=None):
         if context is None:
             context = {}
+        if res_ids is None:
+            res_ids = [None]
+        results = dict.fromkeys(res_ids, False)
+
         if not template_id:
-            return False
+            return results
         template = self.browse(cr, uid, template_id, context)
-        lang = self.render_template(cr, uid, template.lang, template.model, record_id, context)
-        if lang:
-            # Use translated template if necessary
-            ctx = context.copy()
-            ctx['lang'] = lang
-            template = self.browse(cr, uid, template.id, ctx)
-        else:
-            template = self.browse(cr, uid, int(template_id), context)
-        return template
+        langs = self.render_template_batch(cr, uid, template.lang, template.model, res_ids, context)
+        for res_id, lang in langs.iteritems():
+            if lang:
+                # Use translated template if necessary
+                ctx = context.copy()
+                ctx['lang'] = lang
+                template = self.browse(cr, uid, template.id, ctx)
+            else:
+                template = self.browse(cr, uid, int(template_id), context)
+            results[res_id] = template
+        return results
 
     def onchange_model_id(self, cr, uid, ids, model_id, context=None):
         mod_name = False
@@ -300,64 +314,75 @@ class email_template(osv.osv):
                         })
         return {'value': result}
 
-    def generate_email(self, cr, uid, template_id, res_id, context=None):
-        """Generates an email from the template for given (model, res_id) pair.
+    def generate_email_batch(self, cr, uid, template_id, res_ids, context=None, fields=None):
+        """Generates an email from the template for given the given model based on
+        records given by res_ids.
 
-           :param template_id: id of the template to render.
-           :param res_id: id of the record to use for rendering the template (model
-                          is taken from template definition)
-           :returns: a dict containing all relevant fields for creating a new
-                     mail.mail entry, with one extra key ``attachments``, in the
-                     format expected by :py:meth:`mail_thread.message_post`.
+        :param template_id: id of the template to render.
+        :param res_id: id of the record to use for rendering the template (model
+                       is taken from template definition)
+        :returns: a dict containing all relevant fields for creating a new
+                  mail.mail entry, with one extra key ``attachments``, in the
+                  format expected by :py:meth:`mail_thread.message_post`.
         """
         if context is None:
             context = {}
+        if fields is None:
+            fields = ['subject', 'body_html', 'email_from', 'email_to', 'partner_to', 'email_cc', 'reply_to']
+
         report_xml_pool = self.pool.get('ir.actions.report.xml')
-        template = self.get_email_template(cr, uid, template_id, res_id, context)
-        values = {}
-        for field in ['subject', 'body_html', 'email_from',
-                      'email_to', 'partner_to', 'email_cc', 'reply_to']:
-            values[field] = self.render_template(cr, uid, getattr(template, field),
-                                                 template.model, res_id, context=context) \
-                                                 or False
-        if template.user_signature:
-            signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
-            values['body_html'] = tools.append_content_to_html(values['body_html'], signature)
+        res_ids_to_templates = self.get_email_template_batch(cr, uid, template_id, res_ids, context)
 
-        if values['body_html']:
-            values['body'] = tools.html_sanitize(values['body_html'])
+        # templates: res_id -> template; template -> res_ids
+        templates_to_res_ids = {}
+        for res_id, template in res_ids_to_templates.iteritems():
+            templates_to_res_ids.setdefault(template, []).append(res_id)
 
-        values.update(mail_server_id=template.mail_server_id.id or False,
-                      auto_delete=template.auto_delete,
-                      model=template.model,
-                      res_id=res_id or False)
+        results = dict()
+        for template, template_res_ids in templates_to_res_ids.iteritems():
+            # generate fields value for all res_ids linked to the current template
+            for field in ['subject', 'body_html', 'email_from', 'email_to', 'partner_to', 'email_cc', 'reply_to']:
+                generated_field_values = self.render_template_batch(cr, uid, getattr(template, field), template.model, template_res_ids, context=context)
+                for res_id, field_value in generated_field_values.iteritems():
+                    results.setdefault(res_id, dict())[field] = field_value
+            # update values for all res_ids
+            for res_id in template_res_ids:
+                values = results[res_id]
+                if template.user_signature:
+                    signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
+                    values['body_html'] = tools.append_content_to_html(values['body_html'], signature)
+                if values['body_html']:
+                    values['body'] = tools.html_sanitize(values['body_html'])
+                values.update(
+                    mail_server_id=template.mail_server_id.id or False,
+                    auto_delete=template.auto_delete,
+                    model=template.model,
+                    res_id=res_id or False,
+                    attachment_ids=[attach.id for attach in template.attachment_ids],
+                )
 
-        attachments = []
-        # Add report in attachments
-        if template.report_template:
-            report_name = self.render_template(cr, uid, template.report_name, template.model, res_id, context=context)
-            report_service = report_xml_pool.browse(cr, uid, template.report_template.id, context).report_name
-            # Ensure report is rendered using template's language
-            ctx = context.copy()
-            if template.lang:
-                ctx['lang'] = self.render_template(cr, uid, template.lang, template.model, res_id, context)
-            result, format = openerp.report.render_report(cr, uid, [res_id], report_service, {'model': template.model}, ctx)
-            result = base64.b64encode(result)
-            if not report_name:
-                report_name = 'report.' + report_service
-            ext = "." + format
-            if not report_name.endswith(ext):
-                report_name += ext
-            attachments.append((report_name, result))
+            # Add report in attachments
+            if template.report_template:
+                for res_id in template_res_ids:
+                    attachments = []
+                    report_name = self.render_template(cr, uid, template.report_name, template.model, res_id, context=context)
+                    report_service = report_xml_pool.browse(cr, uid, template.report_template.id, context).report_name
+                    # Ensure report is rendered using template's language
+                    ctx = context.copy()
+                    if template.lang:
+                        ctx['lang'] = self.render_template_batch(cr, uid, template.lang, template.model, res_id, context)  # take 0 ?
+                    result, format = openerp.report.render_report(cr, uid, [res_id], report_service, {'model': template.model}, ctx)
+                    result = base64.b64encode(result)
+                    if not report_name:
+                        report_name = 'report.' + report_service
+                    ext = "." + format
+                    if not report_name.endswith(ext):
+                        report_name += ext
+                    attachments.append((report_name, result))
 
-        attachment_ids = []
-        # Add template attachments
-        for attach in template.attachment_ids:
-            attachment_ids.append(attach.id)
+                    values['attachments'] = attachments
 
-        values['attachments'] = attachments
-        values['attachment_ids'] = attachment_ids
-        return values
+        return results
 
     def send_mail(self, cr, uid, template_id, res_id, force_send=False, raise_exception=False, context=None):
         """Generates a new mail message for the given template and record,
@@ -404,4 +429,14 @@ class email_template(osv.osv):
             mail_mail.send(cr, uid, [msg_id], raise_exception=raise_exception, context=context)
         return msg_id
 
+    # Compatibility method
+    def render_template(self, cr, uid, template, model, res_id, context=None):
+        return self.render_template_batch(cr, uid, template, model, [res_id], context)[res_id]
+
+    def get_email_template(self, cr, uid, template_id=False, record_id=None, context=None):
+        return self.get_email_template_batch(cr, uid, template_id, [record_id], context)[record_id]
+
+    def generate_email(self, cr, uid, template_id, res_id, context=None):
+        return self.generate_email_batch(cr, uid, template_id, [res_id], context)[res_id]
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index 0aab765efbf..bae7a0d8f9c 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -62,6 +62,7 @@ class mail_compose_message(osv.TransientModel):
         for wizard in self.browse(cr, uid, ids, context=context):
             if wizard.template_id:
                 wizard_context['mail_notify_user_signature'] = False  # template user_signature is added when generating body_html
+                wizard_context['mail_auto_delete'] = wizard.template_id.auto_delete  # mass mailing: use template auto_delete value -> note, for emails mass mailing only
             if not wizard.attachment_ids or wizard.composition_mode == 'mass_mail' or not wizard.template_id:
                 continue
             new_attachment_ids = []
@@ -81,7 +82,7 @@ class mail_compose_message(osv.TransientModel):
             template_values = self.pool.get('email.template').read(cr, uid, template_id, fields, context)
             values = dict((field, template_values[field]) for field in fields if template_values.get(field))
         elif template_id:
-            values = self.generate_email_for_composer(cr, uid, template_id, res_id, context=context)
+            values = self.generate_email_for_composer_batch(cr, uid, template_id, [res_id], context=context)[res_id]
             # transform attachments into attachment_ids; not attached to the document because this will
             # be done further in the posting process, allowing to clean database if email not send
             values['attachment_ids'] = values.pop('attachment_ids', [])
@@ -147,45 +148,55 @@ class mail_compose_message(osv.TransientModel):
                     partner_ids.append(int(partner_id))
         return partner_ids
 
-    def generate_email_for_composer(self, cr, uid, template_id, res_id, context=None):
+    def generate_email_for_composer_batch(self, cr, uid, template_id, res_ids, context=None):
         """ Call email_template.generate_email(), get fields relevant for
             mail.compose.message, transform email_cc and email_to into partner_ids """
-        template_values = self.pool.get('email.template').generate_email(cr, uid, template_id, res_id, context=context)
         # filter template values
         fields = ['subject', 'body_html', 'email_from', 'email_to', 'partner_to', 'email_cc',  'reply_to', 'attachment_ids', 'attachments', 'mail_server_id']
-        values = dict((field, template_values[field]) for field in fields if template_values.get(field))
-        values['body'] = values.pop('body_html', '')
+        values = dict.fromkeys(res_ids, False)
 
-        # transform email_to, email_cc into partner_ids
-        ctx = dict((k, v) for k, v in (context or {}).items() if not k.startswith('default_'))
-        partner_ids = self._get_or_create_partners_from_values(cr, uid, values, context=ctx)
-        # legacy template behavior: void values do not erase existing values and the
-        # related key is removed from the values dict
-        if partner_ids:
-            values['partner_ids'] = list(partner_ids)
+        template_values = self.pool.get('email.template').generate_email_batch(cr, uid, template_id, res_ids, context=context)
+        for res_id in res_ids:
+            res_id_values = dict((field, template_values[res_id][field]) for field in fields if template_values[res_id].get(field))
+            res_id_values['body'] = res_id_values.pop('body_html', '')
 
+            # transform email_to, email_cc into partner_ids
+            ctx = dict((k, v) for k, v in (context or {}).items() if not k.startswith('default_'))
+            partner_ids = self._get_or_create_partners_from_values(cr, uid, res_id_values, context=ctx)
+            # legacy template behavior: void values do not erase existing values and the
+            # related key is removed from the values dict
+            if partner_ids:
+                res_id_values['partner_ids'] = list(partner_ids)
+
+            values[res_id] = res_id_values
         return values
 
-    def render_message(self, cr, uid, wizard, res_id, context=None):
+    def render_message_batch(self, cr, uid, wizard, res_ids, context=None):
         """ Override to handle templates. """
-        # generate the composer email
+        # generate template-based values
         if wizard.template_id:
-            values = self.generate_email_for_composer(cr, uid, wizard.template_id.id, res_id, context=context)
+            template_values = self.generate_email_for_composer_batch(cr, uid, wizard.template_id.id, res_ids, context=context)
         else:
-            values = {}
-        # remove attachments as they should not be rendered
-        values.pop('attachment_ids', None)
-        # get values to return
-        email_dict = super(mail_compose_message, self).render_message(cr, uid, wizard, res_id, context)
-        # those values are not managed; they are readonly
-        email_dict.pop('email_to', None)
-        email_dict.pop('email_cc', None)
-        email_dict.pop('partner_to', None)
-        # update template values by wizard values
-        values.update(email_dict)
-        return values
+            template_values = dict.fromkeys(res_ids, dict())
+        # generate composer values
+        composer_values = super(mail_compose_message, self).render_message_batch(cr, uid, wizard, res_ids, context)
 
-    def render_template(self, cr, uid, template, model, res_id, context=None):
-        return self.pool.get('email.template').render_template(cr, uid, template, model, res_id, context=context)
+        for res_id in res_ids:
+            # remove attachments from template values as they should not be rendered
+            template_values[res_id].pop('attachment_ids', None)
+            # remove some keys from composer that are readonly
+            composer_values[res_id].pop('email_to', None)
+            composer_values[res_id].pop('email_cc', None)
+            composer_values[res_id].pop('partner_to', None)
+            # update template values by composer values
+            template_values[res_id].update(composer_values[res_id])
+        return template_values
+
+    def render_template_batch(self, cr, uid, template, model, res_ids, context=None):
+        return self.pool.get('email.template').render_template_batch(cr, uid, template, model, res_ids, context=context)
+
+    # Compatibility methods
+    def generate_email_for_composer(self, cr, uid, template_id, res_id, context=None):
+        return self.generate_email_for_composer_batch(cr, uid, template_id, [res_id], context)[res_id]
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 6ab1f0e81ff..34c3db4de9b 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -233,7 +233,11 @@ class mail_compose_message(osv.TransientModel):
             email(s), rendering any template patterns on the fly if needed. """
         if context is None:
             context = {}
-        ir_attachment_obj = self.pool.get('ir.attachment')
+        # clean the context (hint: mass mailing sets some default values that
+        # could be wrongly interpreted by mail_mail)
+        context.pop('default_email_to', None)
+        context.pop('default_partner_ids', None)
+
         active_ids = context.get('active_ids')
         is_log = context.get('mail_compose_log', False)
 
@@ -252,43 +256,11 @@ class mail_compose_message(osv.TransientModel):
             else:
                 res_ids = [wizard.res_id]
 
-            for res_id in res_ids:
-                # mail.message values, according to the wizard options
-                post_values = {
-                    'subject': wizard.subject,
-                    'body': wizard.body,
-                    'parent_id': wizard.parent_id and wizard.parent_id.id,
-                    'partner_ids': [partner.id for partner in wizard.partner_ids],
-                    'attachment_ids': [attach.id for attach in wizard.attachment_ids],
-                }
-                # mass mailing: render and override default values
-                if mass_mail_mode and wizard.model:
-                    email_dict = self.render_message(cr, uid, wizard, res_id, context=context)
-                    post_values['partner_ids'] += email_dict.pop('partner_ids', [])
-                    post_values['attachments'] = email_dict.pop('attachments', [])
-                    attachment_ids = []
-                    for attach_id in post_values.pop('attachment_ids'):
-                        new_attach_id = ir_attachment_obj.copy(cr, uid, attach_id, {'res_model': self._name, 'res_id': wizard.id}, context=context)
-                        attachment_ids.append(new_attach_id)
-                    post_values['attachment_ids'] = attachment_ids
-                    # email_from: mass mailing only can specify another email_from
-                    if email_dict.get('email_from'):
-                        post_values['email_from'] = email_dict.pop('email_from')
-                    # replies redirection: mass mailing only
-                    if not wizard.same_thread:
-                        post_values['reply_to'] = email_dict.pop('reply_to')
-                    else:
-                        email_dict.pop('reply_to')
-                    post_values.update(email_dict)
-                # clean the context (hint: mass mailing sets some default values that
-                # could be wrongly interpreted by mail_mail)
-                context.pop('default_email_to', None)
-                context.pop('default_partner_ids', None)
-                # post the message
+            all_mail_values = self.get_mail_values(cr, uid, wizard, res_ids, context=context)
+
+            for res_id, mail_values in all_mail_values.iteritems():
                 if mass_mail_mode and not wizard.post:
-                    post_values['body_html'] = post_values.get('body', '')
-                    post_values['recipient_ids'] = [(4, id) for id in post_values.pop('partner_ids', [])]
-                    self.pool.get('mail.mail').create(cr, uid, post_values, context=context)
+                    self.pool.get('mail.mail').create(cr, uid, mail_values, context=context)
                 else:
                     subtype = 'mail.mt_comment'
                     if is_log:  # log a note: subtype is False
@@ -297,46 +269,122 @@ class mail_compose_message(osv.TransientModel):
                         if not wizard.notify:
                             subtype = False
                         context = dict(context,
-                                    mail_notify_force_send=False,  # do not send emails directly but use the queue instead
-                                    mail_create_nosubscribe=True)  # add context key to avoid subscribing the author
-                    active_model_pool.message_post(cr, uid, [res_id], type='comment', subtype=subtype, context=context, **post_values)
+                                       mail_notify_force_send=False,  # do not send emails directly but use the queue instead
+                                       mail_create_nosubscribe=True)  # add context key to avoid subscribing the author
+                    active_model_pool.message_post(cr, uid, [res_id], type='comment', subtype=subtype, context=context, **mail_values)
 
         return {'type': 'ir.actions.act_window_close'}
 
-    def render_message(self, cr, uid, wizard, res_id, context=None):
-        """ Generate an email from the template for given (wizard.model, res_id)
-            pair. This method is meant to be inherited by email_template that
-            will produce a more complete dictionary. """
-        return {
-            'subject': self.render_template(cr, uid, wizard.subject, wizard.model, res_id, context),
-            'body': self.render_template(cr, uid, wizard.body, wizard.model, res_id, context),
-            'email_from': self.render_template(cr, uid, wizard.email_from, wizard.model, res_id, context),
-            'reply_to': self.render_template(cr, uid, wizard.reply_to, wizard.model, res_id, context),
-        }
+    def get_mail_values(self, cr, uid, wizard, res_ids, context=None):
+        """Generate the values that will be used by send_mail to create mail_messages
+        or mail_mails. """
+        results = dict.fromkeys(res_ids, False)
+        mass_mail_mode = wizard.composition_mode == 'mass_mail'
 
-    def render_template(self, cr, uid, template, model, res_id, context=None):
+        # render all template-based value at once
+        if mass_mail_mode and wizard.model:
+            rendered_values = self.render_message_batch(cr, uid, wizard, res_ids, context=context)
+
+        for res_id in res_ids:
+            # static wizard (mail.message) values
+            mail_values = {
+                'subject': wizard.subject,
+                'body': wizard.body,
+                'parent_id': wizard.parent_id and wizard.parent_id.id,
+                'partner_ids': [partner.id for partner in wizard.partner_ids],
+                'attachment_ids': [attach.id for attach in wizard.attachment_ids],
+            }
+            # mass mailing: rendering override wizard static values
+            if mass_mail_mode and wizard.model:
+                email_dict = rendered_values[res_id]
+                mail_values['partner_ids'] += email_dict.pop('partner_ids', [])
+                mail_values['attachments'] = email_dict.pop('attachments', [])
+                attachment_ids = []
+                for attach_id in mail_values.pop('attachment_ids'):
+                    new_attach_id = self.pool.get('ir.attachment').copy(cr, uid, attach_id, {'res_model': self._name, 'res_id': wizard.id}, context=context)
+                    attachment_ids.append(new_attach_id)
+                mail_values['attachment_ids'] = attachment_ids
+                # email_from: mass mailing only can specify another email_from
+                if email_dict.get('email_from'):
+                    mail_values['email_from'] = email_dict.pop('email_from')
+                # replies redirection: mass mailing only
+                if not wizard.same_thread:
+                    mail_values['reply_to'] = email_dict.pop('reply_to')
+                else:
+                    email_dict.pop('reply_to')
+                mail_values.update(email_dict)
+            # mass mailing without post: mail_mail values
+            if mass_mail_mode and not wizard.post:
+                if 'mail_auto_delete' in context:
+                    mail_values['auto_delete'] = context.get('mail_auto_delete')
+                mail_values['body_html'] = mail_values.get('body', '')
+                mail_values['recipient_ids'] = [(4, id) for id in mail_values.pop('partner_ids', [])]
+            results[res_id] = mail_values
+        return results
+
+    def render_message_batch(self, cr, uid, wizard, res_ids, context=None):
+        """Generate template-based values of wizard, for the document records given
+        by res_ids. This method is meant to be inherited by email_template that
+        will produce a more complete dictionary, using Jinja2 templates.
+
+        Each template is generated for all res_ids, allowing to parse the template
+        once, and render it multiple times. This is useful for mass mailing where
+        template rendering represent a significant part of the process.
+
+        :param browse wizard: current mail.compose.message browse record
+        :param list res_ids: list of record ids
+
+        :return dict results: for each res_id, the generated template values for
+                              subject, body, email_from and reply_to
+        """
+        subjects = self.render_template_batch(cr, uid, wizard.subject, wizard.model, res_ids, context)
+        bodies = self.render_template_batch(cr, uid, wizard.body, wizard.model, res_ids, context)
+        emails_from = self.render_template_batch(cr, uid, wizard.email_from, wizard.model, res_ids, context)
+        replies_to = self.render_template_batch(cr, uid, wizard.reply_to, wizard.model, res_ids, context)
+
+        results = dict.fromkeys(res_ids, False)
+        for res_id in res_ids:
+            results[res_id] = {
+                'subject': subjects[res_id],
+                'body': bodies[res_id],
+                'email_from': emails_from[res_id],
+                'reply_to': replies_to[res_id],
+            }
+        return results
+
+    def render_template_batch(self, cr, uid, template, model, res_ids, context=None):
         """ Render the given template text, replace mako-like expressions ``${expr}``
-            with the result of evaluating these expressions with an evaluation context
-            containing:
+        with the result of evaluating these expressions with an evaluation context
+        containing:
 
-                * ``user``: browse_record of the current user
-                * ``object``: browse_record of the document record this mail is
-                              related to
-                * ``context``: the context passed to the mail composition wizard
+            * ``user``: browse_record of the current user
+            * ``object``: browse_record of the document record this mail is
+                          related to
+            * ``context``: the context passed to the mail composition wizard
 
-            :param str template: the template text to render
-            :param str model: model name of the document record this mail is related to.
-            :param int res_id: id of the document record this mail is related to.
+        :param str template: the template text to render
+        :param str model: model name of the document record this mail is related to
+        :param list res_ids: list of record ids
         """
         if context is None:
             context = {}
+        results = dict.fromkeys(res_ids, False)
 
-        def merge(match):
-            exp = str(match.group()[2:-1]).strip()
-            result = eval(exp, {
-                'user': self.pool.get('res.users').browse(cr, uid, uid, context=context),
-                'object': self.pool[model].browse(cr, uid, res_id, context=context),
-                'context': dict(context),  # copy context to prevent side-effects of eval
+        for res_id in res_ids:
+            def merge(match):
+                exp = str(match.group()[2:-1]).strip()
+                result = eval(exp, {
+                    'user': self.pool.get('res.users').browse(cr, uid, uid, context=context),
+                    'object': self.pool[model].browse(cr, uid, res_id, context=context),
+                    'context': dict(context),  # copy context to prevent side-effects of eval
                 })
-            return result and tools.ustr(result) or ''
-        return template and EXPRESSION_PATTERN.sub(merge, template)
+                return result and tools.ustr(result) or ''
+            results[res_id] = template and EXPRESSION_PATTERN.sub(merge, template)
+        return results
+
+    # Compatibility methods
+    def render_template(self, cr, uid, template, model, res_id, context=None):
+        return self.render_template_batch(cr, uid, template, model, [res_id], context)[res_id]
+
+    def render_message(self, cr, uid, wizard, res_id, context=None):
+        return self.render_message_batch(cr, uid, wizard, [res_id], context)[res_id]

From f70313103a082044d21e4b2290348bfe4d398bc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 29 Aug 2013 12:09:32 +0200
Subject: [PATCH 101/164] [IMP] mail_message: cleaned search view

bzr revid: tde@openerp.com-20130829100932-xrh11khzghwxzyuf
---
 addons/mail/mail_message_view.xml | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index e4442e366e3..e2d1deb028b 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -56,7 +56,8 @@
             <field name="priority">25</field>
             <field name="arch" type="xml">
                 <search string="Messages Search">
-                    <field name="subject" string="Content" filter_domain="['|', ('subject', 'ilike', self), ('body', 'ilike', self)]" />
+                    <field name="body" string="Content" filter_domain="['|', ('subject', 'ilike', self), ('body', 'ilike', self)]" />
+                    <field name="subject"/>
                     <field name="type"/>
                     <field name="author_id"/>
                     <field name="partner_ids"/>
@@ -66,23 +67,13 @@
                     <filter string="To Read"
                             name="message_unread" help="Show messages to read"
                             domain="[('to_read', '=', True)]"/>
-                    <filter string="Read"
-                            name="message_read" help="Show already read messages"
-                            domain="[('to_read', '=', False)]"/>
-                    <separator/>
-                    <filter string="Comments"
-                            name="comments" help="Comments"
-                            domain="[('type', '=', 'comment')]"/>
-                    <filter string="Notifications"
-                            name="notifications" help="Notifications"
-                            domain="[('type', '=', 'notification')]"/>
-                    <filter string="Emails"
-                            name="emails" help="Emails"
-                            domain="[('type', '=', 'email')]"/>
                     <separator/>
                     <filter string="Has attachments"
                             name="attachments"
                             domain="[('attachment_ids', '!=', False)]"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Type" name="thread" domain="[]" context="{'group_by':'type'}"/>
+                    </group>
                 </search>
             </field>
         </record>

From 4bc4547cb90f158d80ffb3275ae47fe2ead66192 Mon Sep 17 00:00:00 2001
From: "Bharat R. Devnani (OpenERP)" <bde@tinyerp.com>
Date: Fri, 30 Aug 2013 19:26:43 +0530
Subject: [PATCH 102/164] [ADD] added the functionalities mentioned on pad

bzr revid: bde@tinyerp.com-20130830135643-ehzm0bdtvq8lltdi
---
 addons/account/account.py                      |  4 ++++
 addons/account/account_installer.xml           |  2 +-
 addons/l10n_ar/l10n_ar_wizard.xml              | 10 +++++++---
 addons/l10n_at/l10n_chart_at_wizard.xml        | 10 +++++++---
 addons/l10n_be/wizard/account_wizard.xml       | 12 +++++++++---
 addons/l10n_bo/l10n_bo_wizard.xml              | 10 +++++++---
 addons/l10n_br/l10n_br_wizard.xml              | 12 +++++++++---
 addons/l10n_ca/l10n_ca_wizard.xml              |  6 +++++-
 addons/l10n_ch/wizard.xml                      |  6 ++++++
 addons/l10n_cl/l10n_cl_wizard.xml              |  7 ++++++-
 addons/l10n_cn/l10n_chart_cn_wizard.xml        |  7 ++++++-
 addons/l10n_co/data/l10n_chart_mx_wizard.xml   |  6 ++++++
 addons/l10n_cr/l10n_wizard.xml                 |  7 ++++++-
 addons/l10n_de/l10n_de_wizard.xml              |  6 +++++-
 addons/l10n_ec/l10n_chart_ec_wizard.xml        |  7 ++++++-
 addons/l10n_es/l10n_es_wizard.xml              |  5 +++++
 addons/l10n_et/l10n_et_wizard.xml              |  6 ++++++
 addons/l10n_fr/l10n_fr_wizard.xml              |  5 +++++
 addons/l10n_gr/l10n_gr_wizard.xml              |  7 ++++++-
 addons/l10n_gt/l10n_gt_base.xml                |  4 ++++
 addons/l10n_hn/l10n_hn_base.xml                |  4 ++++
 addons/l10n_hr/l10n_hr_wizard.xml              |  6 ++++++
 addons/l10n_in/l10n_in_wizard.xml              |  5 +++++
 addons/l10n_it/l10n_chart_it_generic.xml       |  6 ++++++
 addons/l10n_lu/l10n_lu_wizard.xml              |  5 +++++
 addons/l10n_ma/l10n_ma_tax.xml                 |  3 ++-
 addons/l10n_ma/l10n_ma_wizard.xml              |  5 +++++
 addons/l10n_mx/data/l10n_chart_mx_wizard.xml   | 12 +++++++++---
 addons/l10n_nl/l10n_nl_wizard.xml              |  7 ++++++-
 addons/l10n_pa/l10n_pa_wizard.xml              |  4 ++++
 addons/l10n_pe/l10n_pe_wizard.xml              |  4 ++++
 addons/l10n_pl/l10n_chart_pl_wizard.xml        |  5 +++++
 addons/l10n_pt/l10n_chart_pt_wizard.xml        |  5 +++++
 addons/l10n_ro/l10n_chart_ro_wizard.xml        |  5 +++++
 addons/l10n_si/l10n_si_wizard.xml              |  6 ++++++
 .../l10n_syscohada/l10n_syscohada_wizard.xml   |  6 ++++++
 addons/l10n_th/account_data.xml                |  6 ++++++
 addons/l10n_tr/l10n_tr_wizard.xml              |  6 ++++++
 addons/l10n_uk/l10n_uk_wizard.xml              |  5 +++++
 addons/l10n_us/__openerp__.py                  |  3 ++-
 addons/l10n_us/l10n_us_wizard.xml              | 11 ++++++++++-
 addons/l10n_uy/l10n_uy_wizard.xml              |  5 +++++
 addons/l10n_ve/data/account_tax.xml            | 18 ++----------------
 addons/l10n_ve/data/l10n_chart_ve_wizard.xml   |  5 +++++
 addons/l10n_vn/l10n_vn_wizard.xml              |  4 ++++
 45 files changed, 244 insertions(+), 46 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 33b52b643ed..3a5e2f12cfc 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -3030,6 +3030,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
     }
 
     def onchange_company_id(self, cr, uid, ids, company_id, context=None):
+        if context.get('default_currency_id', False):
+            dummy, view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', context.get('default_currency_id'))
+            return {'value': {'currency_id': view_id}}
         currency_id = False
         if company_id:
             currency_id = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id.id
@@ -3067,6 +3070,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             res.update({'company_id': self.pool.get('res.users').browse(cr, uid, [uid], context=context)[0].company_id.id})
         if 'currency_id' in fields:
             company_id = res.get('company_id') or False
+            
             if company_id:
                 company_obj = self.pool.get('res.company')
                 country_id = company_obj.browse(cr, uid, company_id, context=context).country_id.id
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index b03babc63ac..79557b3f406 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -51,6 +51,6 @@
             <field name="sequence">3</field>
             <field name="type">automatic</field>
         </record>
-
+        
     </data>
 </openerp>
diff --git a/addons/l10n_ar/l10n_ar_wizard.xml b/addons/l10n_ar/l10n_ar_wizard.xml
index 82e7671b4d3..f21b5cd8c11 100644
--- a/addons/l10n_ar/l10n_ar_wizard.xml
+++ b/addons/l10n_ar/l10n_ar_wizard.xml
@@ -2,9 +2,13 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
-            <field name="state">open</field>
-        </record>
+		<record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+		    <field name="state">open</field>
+		</record>
+		
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+		    <field name="state">done</field>
+		</record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_at/l10n_chart_at_wizard.xml b/addons/l10n_at/l10n_chart_at_wizard.xml
index 19d27fb47c7..350ea995edc 100644
--- a/addons/l10n_at/l10n_chart_at_wizard.xml
+++ b/addons/l10n_at/l10n_chart_at_wizard.xml
@@ -1,9 +1,13 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
-            <field name="state">open</field>
-        </record>
+		<record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+		    <field name="state">open</field>
+		</record>
+		
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+		    <field name="state">done</field>
+		</record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_be/wizard/account_wizard.xml b/addons/l10n_be/wizard/account_wizard.xml
index dde7a77516a..27785c1b6cf 100644
--- a/addons/l10n_be/wizard/account_wizard.xml
+++ b/addons/l10n_be/wizard/account_wizard.xml
@@ -1,7 +1,13 @@
 <openerp>
     <data noupdate="1">
-        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
-            <field name="state">open</field>
-        </record>
+    
+		<record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+		    <field name="state">open</field>
+		</record>
+		
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+		    <field name="state">done</field>
+		</record>
+        
     </data>
 </openerp>
diff --git a/addons/l10n_bo/l10n_bo_wizard.xml b/addons/l10n_bo/l10n_bo_wizard.xml
index 4de61247b90..cc2f17058ff 100644
--- a/addons/l10n_bo/l10n_bo_wizard.xml
+++ b/addons/l10n_bo/l10n_bo_wizard.xml
@@ -2,9 +2,13 @@
 <openerp>
     <data noupdate="1">
         
-        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
-            <field name="state">open</field>
-        </record>
+		<record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+			<field name="state">open</field>
+		</record>
+
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
         
     </data>
 </openerp>
diff --git a/addons/l10n_br/l10n_br_wizard.xml b/addons/l10n_br/l10n_br_wizard.xml
index 748b8913660..5988a2ccd40 100644
--- a/addons/l10n_br/l10n_br_wizard.xml
+++ b/addons/l10n_br/l10n_br_wizard.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-      <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
-        <field name="state">open</field>
-      </record>
+    
+		<record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+			<field name="state">open</field>
+		</record>
+      
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+        
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/l10n_ca/l10n_ca_wizard.xml b/addons/l10n_ca/l10n_ca_wizard.xml
index 19d27fb47c7..007f2badc7a 100644
--- a/addons/l10n_ca/l10n_ca_wizard.xml
+++ b/addons/l10n_ca/l10n_ca_wizard.xml
@@ -4,6 +4,10 @@
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
-
+		
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      
     </data>
 </openerp>
diff --git a/addons/l10n_ch/wizard.xml b/addons/l10n_ch/wizard.xml
index dde7a77516a..8247cf51cc0 100644
--- a/addons/l10n_ch/wizard.xml
+++ b/addons/l10n_ch/wizard.xml
@@ -1,7 +1,13 @@
 <openerp>
     <data noupdate="1">
+    
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
+        
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+        
     </data>
 </openerp>
diff --git a/addons/l10n_cl/l10n_cl_wizard.xml b/addons/l10n_cl/l10n_cl_wizard.xml
index 704ac4daf38..f05a8d4d664 100644
--- a/addons/l10n_cl/l10n_cl_wizard.xml
+++ b/addons/l10n_cl/l10n_cl_wizard.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+    
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
-
+        
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+        
     </data>
 </openerp>
diff --git a/addons/l10n_cn/l10n_chart_cn_wizard.xml b/addons/l10n_cn/l10n_chart_cn_wizard.xml
index 52aaa88fdab..d93d83a37aa 100644
--- a/addons/l10n_cn/l10n_chart_cn_wizard.xml
+++ b/addons/l10n_cn/l10n_chart_cn_wizard.xml
@@ -1,8 +1,13 @@
 <openerp>
     <data noupdate="1">
+        
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
-
+        
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+        
     </data>
 </openerp>
diff --git a/addons/l10n_co/data/l10n_chart_mx_wizard.xml b/addons/l10n_co/data/l10n_chart_mx_wizard.xml
index e73c75c3506..c6f013cbdb3 100644
--- a/addons/l10n_co/data/l10n_chart_mx_wizard.xml
+++ b/addons/l10n_co/data/l10n_chart_mx_wizard.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+    
       <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
         <field name="state">open</field>
       </record>
+      
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+        
     </data>
 </openerp>
diff --git a/addons/l10n_cr/l10n_wizard.xml b/addons/l10n_cr/l10n_wizard.xml
index 6919eb199b6..2199faa9366 100644
--- a/addons/l10n_cr/l10n_wizard.xml
+++ b/addons/l10n_cr/l10n_wizard.xml
@@ -1,8 +1,13 @@
 <openerp>
     <data>
+    
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
-
+		
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      
     </data>
 </openerp>
diff --git a/addons/l10n_de/l10n_de_wizard.xml b/addons/l10n_de/l10n_de_wizard.xml
index 19d27fb47c7..007f2badc7a 100644
--- a/addons/l10n_de/l10n_de_wizard.xml
+++ b/addons/l10n_de/l10n_de_wizard.xml
@@ -4,6 +4,10 @@
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
-
+		
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      
     </data>
 </openerp>
diff --git a/addons/l10n_ec/l10n_chart_ec_wizard.xml b/addons/l10n_ec/l10n_chart_ec_wizard.xml
index 52aaa88fdab..71b98ed174b 100644
--- a/addons/l10n_ec/l10n_chart_ec_wizard.xml
+++ b/addons/l10n_ec/l10n_chart_ec_wizard.xml
@@ -1,8 +1,13 @@
 <openerp>
     <data noupdate="1">
+    
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
-
+        
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	
     </data>
 </openerp>
diff --git a/addons/l10n_es/l10n_es_wizard.xml b/addons/l10n_es/l10n_es_wizard.xml
index 52aaa88fdab..22953449166 100644
--- a/addons/l10n_es/l10n_es_wizard.xml
+++ b/addons/l10n_es/l10n_es_wizard.xml
@@ -1,8 +1,13 @@
 <openerp>
     <data noupdate="1">
+    
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
 
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	
     </data>
 </openerp>
diff --git a/addons/l10n_et/l10n_et_wizard.xml b/addons/l10n_et/l10n_et_wizard.xml
index cbbb56b7989..1027cc5874f 100644
--- a/addons/l10n_et/l10n_et_wizard.xml
+++ b/addons/l10n_et/l10n_et_wizard.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 	<data noupdate="1">
+	
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
+        
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+		     <field name="state">done</field>
+		</record>
+      	        
     </data>
 </openerp>
diff --git a/addons/l10n_fr/l10n_fr_wizard.xml b/addons/l10n_fr/l10n_fr_wizard.xml
index 704ac4daf38..193de99eeb4 100644
--- a/addons/l10n_fr/l10n_fr_wizard.xml
+++ b/addons/l10n_fr/l10n_fr_wizard.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+    
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
 
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	
     </data>
 </openerp>
diff --git a/addons/l10n_gr/l10n_gr_wizard.xml b/addons/l10n_gr/l10n_gr_wizard.xml
index 52aaa88fdab..71b98ed174b 100644
--- a/addons/l10n_gr/l10n_gr_wizard.xml
+++ b/addons/l10n_gr/l10n_gr_wizard.xml
@@ -1,8 +1,13 @@
 <openerp>
     <data noupdate="1">
+    
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
-
+        
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	
     </data>
 </openerp>
diff --git a/addons/l10n_gt/l10n_gt_base.xml b/addons/l10n_gt/l10n_gt_base.xml
index 8caf6ebe48c..ddce9748193 100644
--- a/addons/l10n_gt/l10n_gt_base.xml
+++ b/addons/l10n_gt/l10n_gt_base.xml
@@ -4,6 +4,10 @@
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
+        
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>        
 
         <!-- Moneda Quetzal -->
 
diff --git a/addons/l10n_hn/l10n_hn_base.xml b/addons/l10n_hn/l10n_hn_base.xml
index b8b85c3f2a7..63cf79a441f 100644
--- a/addons/l10n_hn/l10n_hn_base.xml
+++ b/addons/l10n_hn/l10n_hn_base.xml
@@ -5,6 +5,10 @@
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
+        
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
 
         <!-- Plantilla de cuentas -->
 
diff --git a/addons/l10n_hr/l10n_hr_wizard.xml b/addons/l10n_hr/l10n_hr_wizard.xml
index b736f241607..25cc74eb4a6 100644
--- a/addons/l10n_hr/l10n_hr_wizard.xml
+++ b/addons/l10n_hr/l10n_hr_wizard.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+    
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
+
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	        
     </data>
 </openerp>
diff --git a/addons/l10n_in/l10n_in_wizard.xml b/addons/l10n_in/l10n_in_wizard.xml
index 704ac4daf38..193de99eeb4 100644
--- a/addons/l10n_in/l10n_in_wizard.xml
+++ b/addons/l10n_in/l10n_in_wizard.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+    
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
 
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	
     </data>
 </openerp>
diff --git a/addons/l10n_it/l10n_chart_it_generic.xml b/addons/l10n_it/l10n_chart_it_generic.xml
index dde7a77516a..71b98ed174b 100644
--- a/addons/l10n_it/l10n_chart_it_generic.xml
+++ b/addons/l10n_it/l10n_chart_it_generic.xml
@@ -1,7 +1,13 @@
 <openerp>
     <data noupdate="1">
+    
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
+        
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	
     </data>
 </openerp>
diff --git a/addons/l10n_lu/l10n_lu_wizard.xml b/addons/l10n_lu/l10n_lu_wizard.xml
index 52aaa88fdab..22953449166 100644
--- a/addons/l10n_lu/l10n_lu_wizard.xml
+++ b/addons/l10n_lu/l10n_lu_wizard.xml
@@ -1,8 +1,13 @@
 <openerp>
     <data noupdate="1">
+    
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
 
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	
     </data>
 </openerp>
diff --git a/addons/l10n_ma/l10n_ma_tax.xml b/addons/l10n_ma/l10n_ma_tax.xml
index 070d2d4fc9b..f296b22edca 100644
--- a/addons/l10n_ma/l10n_ma_tax.xml
+++ b/addons/l10n_ma/l10n_ma_tax.xml
@@ -742,7 +742,8 @@
         <field name="account_root_id" ref="pcg_0"/>
         <field name="tax_code_root_id" ref="vat_ma_tax_root"/>
         <field name="bank_account_view_id" ref="pcg_514"/>
-        
+        <field name="property_account_receivable" ref="pcg_3488"/>
+        <field name="property_account_payable" ref="pcg_4488"/>
     </record>
 
   <record model="account.tax.template" id="tva_exo">
diff --git a/addons/l10n_ma/l10n_ma_wizard.xml b/addons/l10n_ma/l10n_ma_wizard.xml
index 52aaa88fdab..22953449166 100644
--- a/addons/l10n_ma/l10n_ma_wizard.xml
+++ b/addons/l10n_ma/l10n_ma_wizard.xml
@@ -1,8 +1,13 @@
 <openerp>
     <data noupdate="1">
+    
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
 
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	
     </data>
 </openerp>
diff --git a/addons/l10n_mx/data/l10n_chart_mx_wizard.xml b/addons/l10n_mx/data/l10n_chart_mx_wizard.xml
index e73c75c3506..baf1a49fc54 100644
--- a/addons/l10n_mx/data/l10n_chart_mx_wizard.xml
+++ b/addons/l10n_mx/data/l10n_chart_mx_wizard.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-      <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
-        <field name="state">open</field>
-      </record>
+    
+		<record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+		  <field name="state">open</field>
+		</record>
+      
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	      
     </data>
 </openerp>
diff --git a/addons/l10n_nl/l10n_nl_wizard.xml b/addons/l10n_nl/l10n_nl_wizard.xml
index 52aaa88fdab..3b11bd90c90 100644
--- a/addons/l10n_nl/l10n_nl_wizard.xml
+++ b/addons/l10n_nl/l10n_nl_wizard.xml
@@ -1,8 +1,13 @@
 <openerp>
     <data noupdate="1">
+        
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
-
+        
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	
     </data>
 </openerp>
diff --git a/addons/l10n_pa/l10n_pa_wizard.xml b/addons/l10n_pa/l10n_pa_wizard.xml
index 4de61247b90..8acb61d7edf 100644
--- a/addons/l10n_pa/l10n_pa_wizard.xml
+++ b/addons/l10n_pa/l10n_pa_wizard.xml
@@ -6,5 +6,9 @@
             <field name="state">open</field>
         </record>
         
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	        
     </data>
 </openerp>
diff --git a/addons/l10n_pe/l10n_pe_wizard.xml b/addons/l10n_pe/l10n_pe_wizard.xml
index 82e7671b4d3..b18ee6e26ca 100644
--- a/addons/l10n_pe/l10n_pe_wizard.xml
+++ b/addons/l10n_pe/l10n_pe_wizard.xml
@@ -6,5 +6,9 @@
             <field name="state">open</field>
         </record>
 
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	
     </data>
 </openerp>
diff --git a/addons/l10n_pl/l10n_chart_pl_wizard.xml b/addons/l10n_pl/l10n_chart_pl_wizard.xml
index 52aaa88fdab..22953449166 100644
--- a/addons/l10n_pl/l10n_chart_pl_wizard.xml
+++ b/addons/l10n_pl/l10n_chart_pl_wizard.xml
@@ -1,8 +1,13 @@
 <openerp>
     <data noupdate="1">
+    
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
 
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	
     </data>
 </openerp>
diff --git a/addons/l10n_pt/l10n_chart_pt_wizard.xml b/addons/l10n_pt/l10n_chart_pt_wizard.xml
index 52aaa88fdab..22953449166 100644
--- a/addons/l10n_pt/l10n_chart_pt_wizard.xml
+++ b/addons/l10n_pt/l10n_chart_pt_wizard.xml
@@ -1,8 +1,13 @@
 <openerp>
     <data noupdate="1">
+    
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
 
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	
     </data>
 </openerp>
diff --git a/addons/l10n_ro/l10n_chart_ro_wizard.xml b/addons/l10n_ro/l10n_chart_ro_wizard.xml
index 52aaa88fdab..22953449166 100644
--- a/addons/l10n_ro/l10n_chart_ro_wizard.xml
+++ b/addons/l10n_ro/l10n_chart_ro_wizard.xml
@@ -1,8 +1,13 @@
 <openerp>
     <data noupdate="1">
+    
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
 
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	
     </data>
 </openerp>
diff --git a/addons/l10n_si/l10n_si_wizard.xml b/addons/l10n_si/l10n_si_wizard.xml
index 5a4b51a01e9..65e60217eb3 100644
--- a/addons/l10n_si/l10n_si_wizard.xml
+++ b/addons/l10n_si/l10n_si_wizard.xml
@@ -1,8 +1,14 @@
 <openerp>
     <data noupdate="1">
+    
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
+        
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>        
+      	
     </data>
 </openerp>
 
diff --git a/addons/l10n_syscohada/l10n_syscohada_wizard.xml b/addons/l10n_syscohada/l10n_syscohada_wizard.xml
index dde7a77516a..2f815a22ff6 100644
--- a/addons/l10n_syscohada/l10n_syscohada_wizard.xml
+++ b/addons/l10n_syscohada/l10n_syscohada_wizard.xml
@@ -1,7 +1,13 @@
 <openerp>
     <data noupdate="1">
+    
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
+
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	        
     </data>
 </openerp>
diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml
index 9ae3d9e3364..5df58bc3867 100644
--- a/addons/l10n_th/account_data.xml
+++ b/addons/l10n_th/account_data.xml
@@ -645,8 +645,14 @@
 
 <data noupdate="1">
         <!-- INSTALL ACTION -->
+        
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
+        
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	       
 </data>
 </openerp><!-- vim: set fdm=marker : -->
diff --git a/addons/l10n_tr/l10n_tr_wizard.xml b/addons/l10n_tr/l10n_tr_wizard.xml
index 66b9d37221b..a2c8c45c2de 100644
--- a/addons/l10n_tr/l10n_tr_wizard.xml
+++ b/addons/l10n_tr/l10n_tr_wizard.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data noupdate="1">
+    
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
+
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	
     </data>
 </openerp>
diff --git a/addons/l10n_uk/l10n_uk_wizard.xml b/addons/l10n_uk/l10n_uk_wizard.xml
index 8a6f1a5a83c..b488b5b53f0 100644
--- a/addons/l10n_uk/l10n_uk_wizard.xml
+++ b/addons/l10n_uk/l10n_uk_wizard.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+    
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
 
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	
     </data>
 </openerp>
diff --git a/addons/l10n_us/__openerp__.py b/addons/l10n_us/__openerp__.py
index 90c0e6fd4ad..cc0de9350f2 100644
--- a/addons/l10n_us/__openerp__.py
+++ b/addons/l10n_us/__openerp__.py
@@ -36,7 +36,8 @@ United States - Chart of accounts.
         'account_tax_code_template.xml',
         'account_tax_template.xml',
         'account_chart_template_after.xml',
-        'l10n_us_wizard.xml'
+        'l10n_us_wizard.xml',
+        'account_chart_template_set_accounts.xml'
     ],
     'demo': [],
     'test': [],
diff --git a/addons/l10n_us/l10n_us_wizard.xml b/addons/l10n_us/l10n_us_wizard.xml
index 52aaa88fdab..7d53a61910c 100644
--- a/addons/l10n_us/l10n_us_wizard.xml
+++ b/addons/l10n_us/l10n_us_wizard.xml
@@ -1,8 +1,17 @@
 <openerp>
     <data noupdate="1">
+    
+    	<record id="account.action_wizard_multi_chart" model="ir.actions.act_window">
+            <field name="context">{'default_currency_id': "USD"}</field>
+        </record>
+    	
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
-
+        
+        <record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+        
     </data>
 </openerp>
diff --git a/addons/l10n_uy/l10n_uy_wizard.xml b/addons/l10n_uy/l10n_uy_wizard.xml
index 3dea57dc5c2..4a82f72ca23 100644
--- a/addons/l10n_uy/l10n_uy_wizard.xml
+++ b/addons/l10n_uy/l10n_uy_wizard.xml
@@ -4,5 +4,10 @@
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
+
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	        
     </data>
 </openerp>
diff --git a/addons/l10n_ve/data/account_tax.xml b/addons/l10n_ve/data/account_tax.xml
index d28b0d1d8f3..915761fc92a 100644
--- a/addons/l10n_ve/data/account_tax.xml
+++ b/addons/l10n_ve/data/account_tax.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-	<record id="tax0sale" model="account.tax.template">
+	<record id="tax0all" model="account.tax.template">
 		<field name="chart_template_id" ref="ve_chart_template_amd"/>
 		<field name="name">Exento</field>
 		<field name="amount">0.00000</field>
 		<field name="type">percent</field>
-		<field name="type_tax_use">sale</field>
+		<field name="type_tax_use">all</field>
 		<field name="collected_id" ref="account_activa_account_2172003"/>
 		<field name="paid_id" ref="account_activa_account_2172003"/>
 		<field name="base_code_id" ref="vat_code_base_due"/>
@@ -14,7 +14,6 @@
 		<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
 		<field name="ref_tax_code_id" ref="vat_code_payable"/>
 	</record>
-
 	<record id="tax1sale" model="account.tax.template">
 		<field name="chart_template_id" ref="ve_chart_template_amd"/>
 		<field name="name">IVA (12.0%) ventas</field>
@@ -54,19 +53,6 @@
 		<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
 		<field name="ref_tax_code_id" ref="vat_code_payable"/>
     </record>
-	<record id="tax0purchase" model="account.tax.template">
-		<field name="chart_template_id" ref="ve_chart_template_amd"/>
-		<field name="name">Exento</field>
-		<field name="amount">0.00000</field>
-		<field name="type">percent</field>
-		<field name="type_tax_use">purchase</field>
-		<field name="collected_id" ref="account_activa_account_2172003"/>
-		<field name="paid_id" ref="account_activa_account_2172003"/>
-		<field name="base_code_id" ref="vat_code_base_due"/>
-		<field name="tax_code_id" ref="vat_code_due_tva"/>
-		<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
-		<field name="ref_tax_code_id" ref="vat_code_payable"/>
-	</record>
 	<record id="tax1purchase" model="account.tax.template">
 		<field name="chart_template_id" ref="ve_chart_template_amd"/>
 		<field name="name">IVA (12.0%) compras</field>
diff --git a/addons/l10n_ve/data/l10n_chart_ve_wizard.xml b/addons/l10n_ve/data/l10n_chart_ve_wizard.xml
index dde7a77516a..e772699014f 100644
--- a/addons/l10n_ve/data/l10n_chart_ve_wizard.xml
+++ b/addons/l10n_ve/data/l10n_chart_ve_wizard.xml
@@ -3,5 +3,10 @@
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
+
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>
+      	
     </data>
 </openerp>
diff --git a/addons/l10n_vn/l10n_vn_wizard.xml b/addons/l10n_vn/l10n_vn_wizard.xml
index 368a3cbd8b3..f84b8d654e4 100755
--- a/addons/l10n_vn/l10n_vn_wizard.xml
+++ b/addons/l10n_vn/l10n_vn_wizard.xml
@@ -5,6 +5,10 @@
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
+
+		<record id="account.account_configuration_installer_todo" model="ir.actions.todo">
+			<field name="state">done</field>
+		</record>        
         
     </data>
 </openerp>        
\ No newline at end of file

From 00711ec5bdd7df523196f3f5a2d712f47ccace9a Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 2 Sep 2013 16:06:29 +0530
Subject: [PATCH 103/164] [IMP] set defalut cot as per last configuration
 wizard.

bzr revid: tpa@tinyerp.com-20130902103629-9d1joumo51b7w8qg
---
 addons/account/account.py            | 5 ++++-
 addons/account/account_installer.xml | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 33b52b643ed..4773547df30 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -3076,7 +3076,10 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         ids = self.pool.get('account.chart.template').search(cr, uid, [('visible', '=', True)], context=context)
         if ids:
             if 'chart_template_id' in fields:
-                res.update({'only_one_chart_template': len(ids) == 1, 'chart_template_id': ids[0]})
+                chart_id = ids[0]
+                if context.get("default_charts"):
+                    chart_id = self.pool.get('ir.model.data').search_read(cr, uid, [('model','=','account.chart.template'),('module','=',context.get("default_charts"))], ['res_id'], context=context)[0]['res_id']
+                res.update({'only_one_chart_template': len(ids) == 1, 'chart_template_id': chart_id})
             if 'sale_tax' in fields:
                 sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id"
                                               , "=", ids[0]), ('type_tax_use', 'in', ('sale','all'))], order="sequence")
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index b03babc63ac..8d1b25b299f 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -10,7 +10,7 @@
                 </form>
                 <footer position="replace">
                     <footer>
-                      <button name="action_next" type="object" string="Continue" class="oe_highlight"/>
+                      <button name="action_next" context="{'default_charts':charts}" type="object" string="Continue" class="oe_highlight"/>
                     </footer>
                 </footer>
                 <separator string="title" position="replace">

From 1b0ad7b55f013f94e39aac141d4f8edf0cd31847 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 2 Sep 2013 16:59:43 +0530
Subject: [PATCH 104/164] [IMP] l10n_us: improved code to set default recivable
 and payble accounts.

bzr revid: tpa@tinyerp.com-20130902112943-cj3jbtn1bt5n15y2
---
 addons/account/account.py                       | 1 +
 addons/l10n_us/account_chart_template_after.xml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/addons/account/account.py b/addons/account/account.py
index c298a15646b..45308a9e7d4 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -3030,6 +3030,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
     }
 
     def onchange_company_id(self, cr, uid, ids, company_id, context=None):
+        if context is None:context = {}
         if context.get('default_currency_id', False):
             dummy, view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', context.get('default_currency_id'))
             return {'value': {'currency_id': view_id}}
diff --git a/addons/l10n_us/account_chart_template_after.xml b/addons/l10n_us/account_chart_template_after.xml
index 5ca3a169aba..4dea930f09f 100644
--- a/addons/l10n_us/account_chart_template_after.xml
+++ b/addons/l10n_us/account_chart_template_after.xml
@@ -6,6 +6,8 @@
             <field name="account_root_id" ref="coa_basic"/>
             <field name="bank_account_view_id" ref="cash_expenditure"/>
             <field name="tax_code_root_id" ref="tax_code_chart_root"/>
+            <field name="property_account_receivable" ref="account_receivable"/>
+            <field name="property_account_payable" ref="account_payable"/>
         </record>
         <record id="account_chart_template_advertising" model="account.chart.template">
             <field name="bank_account_view_id" ref="cash_expenditure"/>

From 34862b9d247571606b11b751542751b9720d5627 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 2 Sep 2013 18:38:39 +0530
Subject: [PATCH 105/164] [ADD] added currency_id in account.chart.template and
 remove onchange from company_id to set currency in account data configuration
 wizard and set currency_in in l10n_us.

bzr revid: tpa@tinyerp.com-20130902130839-mpvu7nfzefmzh9kq
---
 addons/account/account.py                 | 14 +++-----------
 addons/account/account_view.xml           |  2 +-
 addons/l10n_us/account_chart_template.xml |  9 +++++++++
 addons/l10n_us/l10n_us_wizard.xml         |  8 ++------
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 45308a9e7d4..1a593e4ad59 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2774,6 +2774,7 @@ class account_chart_template(osv.osv):
         'parent_id': fields.many2one('account.chart.template', 'Parent Chart Template'),
         'code_digits': fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"),
         'visible': fields.boolean('Can be Visible?', help="Set this to False if you don't want this template to be used actively in the wizard that generate Chart of Accounts from templates, this is useful when you want to generate accounts of this template only when loading its child template."),
+        'currency_id': fields.many2one('res.currency', 'Currency'),
         'complete_tax_set': fields.boolean('Complete Set of Taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sale and purchase rates or choose from list of taxes. This last choice assumes that the set of tax defined on this template is complete'),
         'account_root_id': fields.many2one('account.account.template', 'Root Account', domain=[('parent_id','=',False)]),
         'tax_code_root_id': fields.many2one('account.tax.code.template', 'Root Tax Code', domain=[('parent_id','=',False)]),
@@ -3029,16 +3030,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         'complete_tax_set': fields.boolean('Complete Set of Taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sales and purchase rates or use the usual m2o fields. This last choice assumes that the set of tax defined for the chosen template is complete'),
     }
 
-    def onchange_company_id(self, cr, uid, ids, company_id, context=None):
-        if context is None:context = {}
-        if context.get('default_currency_id', False):
-            dummy, view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', context.get('default_currency_id'))
-            return {'value': {'currency_id': view_id}}
-        currency_id = False
-        if company_id:
-            currency_id = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id.id
-        return {'value': {'currency_id': currency_id}}
-
     def onchange_tax_rate(self, cr, uid, ids, rate=False, context=None):
         return {'value': {'purchase_tax_rate': rate or False}}
 
@@ -3048,7 +3039,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         res['value'] = {'complete_tax_set': False, 'sale_tax': False, 'purchase_tax': False}
         if chart_template_id:
             data = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context)
-            res['value'].update({'complete_tax_set': data.complete_tax_set})
+            currency_id = data.currency_id.id or self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
+            res['value'].update({'complete_tax_set': data.complete_tax_set, 'currency_id': currency_id})
             if data.complete_tax_set:
             # default tax is given by the lowest sequence. For same sequence we will take the latest created as it will be the case for tax created while isntalling the generic chart of account
                 sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id"
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 91c6d6608fd..cb53d7d8fdc 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2120,7 +2120,7 @@
                             <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
                         </group>
                         <group>
-                            <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
+                            <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                             <field name="currency_id" class="oe_inline"/>
                             <field name="sale_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
                             <label for="sale_tax_rate" string="Sale Tax" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
diff --git a/addons/l10n_us/account_chart_template.xml b/addons/l10n_us/account_chart_template.xml
index 0863680981f..704afbad152 100644
--- a/addons/l10n_us/account_chart_template.xml
+++ b/addons/l10n_us/account_chart_template.xml
@@ -6,6 +6,7 @@
             <field name="name">Basic Chart of Account</field>
             <field name="visible" eval="False" />
             <field name="complete_tax_set" eval="False" />
+            <field name="currency_id" ref="base.USD"/>
         </record>
 
         <record id="account_chart_template_cogs" model="account.chart.template">
@@ -13,45 +14,53 @@
             <field name="visible" eval="False" />
             <field name="parent_id" ref="account_chart_template_basic"/>
             <field name="complete_tax_set" eval="False" />
+            <field name="currency_id" ref="base.USD"/>
         </record>
         <record id="account_chart_template_advertising" model="account.chart.template">
             <field name="name">Advertising</field>
             <field name="complete_tax_set" eval="False" />
             <field name="parent_id" ref="account_chart_template_cogs"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
         <record id="account_chart_template_agriculture" model="account.chart.template">
             <field name="name">Agriculture</field>
             <field name="complete_tax_set" eval="False" />
             <field name="parent_id" ref="account_chart_template_basic"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
         <record id="account_chart_template_construction" model="account.chart.template">
             <field name="name">Construction Trades (Plumber, Electrician, HVAC, etc.)</field>
             <field name="complete_tax_set" eval="False" />
             <field name="parent_id" ref="account_chart_template_cogs"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
 
         <record id="account_chart_template_financial_service" model="account.chart.template">
             <field name="name">Financial Services other than Accounting or Bookkeeping</field>
             <field name="complete_tax_set" eval="False" />
             <field name="parent_id" ref="account_chart_template_cogs"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
 
         <record id="account_chart_template_general_service" model="account.chart.template">
             <field name="name">General Service-Based Business</field>
             <field name="complete_tax_set" eval="False" />
             <field name="parent_id" ref="account_chart_template_cogs"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
 
         <record id="account_chart_template_legal_service" model="account.chart.template">
             <field name="name">Legal Services</field>
             <field name="complete_tax_set" eval="False" />
             <field name="parent_id" ref="account_chart_template_basic"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
 
         <record id="account_chart_template_general_product" model="account.chart.template">
             <field name="name">General Product-Based Business</field>
             <field name="complete_tax_set" eval="False" />
             <field name="parent_id" ref="account_chart_template_basic"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/l10n_us/l10n_us_wizard.xml b/addons/l10n_us/l10n_us_wizard.xml
index 9373935b22c..19d27fb47c7 100644
--- a/addons/l10n_us/l10n_us_wizard.xml
+++ b/addons/l10n_us/l10n_us_wizard.xml
@@ -1,13 +1,9 @@
 <openerp>
     <data noupdate="1">
-    
-    	<record id="account.action_wizard_multi_chart" model="ir.actions.act_window">
-            <field name="context">{'default_currency_id': "USD"}</field>
-        </record>
-    	
+
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
-        
+
     </data>
 </openerp>

From e7ef5b87909dc6acaedf8b0660b2ba87189e1d6c Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 3 Sep 2013 11:07:15 +0530
Subject: [PATCH 106/164] [IMP] in order to set default chart which was last
 created set max of ids.

bzr revid: tpa@tinyerp.com-20130903053715-zyduv0q0b81lz0vq
---
 addons/account/account.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 1a593e4ad59..9f9ee187d69 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -3072,7 +3072,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         ids = self.pool.get('account.chart.template').search(cr, uid, [('visible', '=', True)], context=context)
         if ids:
             if 'chart_template_id' in fields:
-                chart_id = ids[0]
+                #in order to get set default chart which was last created set max of ids.
+                chart_id = max(ids)
                 if context.get("default_charts"):
                     chart_id = self.pool.get('ir.model.data').search_read(cr, uid, [('model','=','account.chart.template'),('module','=',context.get("default_charts"))], ['res_id'], context=context)[0]['res_id']
                 res.update({'only_one_chart_template': len(ids) == 1, 'chart_template_id': chart_id})

From 305e9f5cddf209db45e5bb5c6cfa7d7838b171f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 3 Sep 2013 16:58:40 +0200
Subject: [PATCH 107/164] [ADD] web, web_kanban: moved sparkline and gauge
 widgets from crm and sale_crm into web, because other modules will have to
 use it in kanban veiws.

bzr revid: tde@openerp.com-20130903145840-uxt0blhjcly1oz3o
---
 addons/web/__openerp__.py                     |    2 +
 .../lib/jquery.sparkline/jquery.sparkline.js  | 3047 +++++++++++++++++
 .../web/static/lib/justgage/justgage.1.0.1.js |  946 +++++
 addons/web/static/lib/qweb/qweb2.js           |    1 +
 addons/web_kanban/static/src/js/kanban.js     |  142 +
 5 files changed, 4138 insertions(+)
 create mode 100644 addons/web/static/lib/jquery.sparkline/jquery.sparkline.js
 create mode 100644 addons/web/static/lib/justgage/justgage.1.0.1.js

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 5c8d27e11cb..32a108c131d 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -32,9 +32,11 @@ This module provides the core of the OpenERP Web Client.
         "static/lib/jquery.ui.notify/js/jquery.notify.js",
         "static/lib/jquery.deferred-queue/jquery.deferred-queue.js",
         "static/lib/jquery.scrollTo/jquery.scrollTo-min.js",
+        "static/lib/jquery.sparkline/jquery.sparkline.js",
         "static/lib/jquery.tipsy/jquery.tipsy.js",
         "static/lib/jquery.textext/jquery.textext.js",
         "static/lib/jquery.timeago/jquery.timeago.js",
+        "static/lib/justgage/justgage.1.0.1.js",
         "static/lib/qweb/qweb2.js",
         "static/lib/underscore/underscore.js",
         "static/lib/underscore.string/lib/underscore.string.js",
diff --git a/addons/web/static/lib/jquery.sparkline/jquery.sparkline.js b/addons/web/static/lib/jquery.sparkline/jquery.sparkline.js
new file mode 100644
index 00000000000..8069db45fe9
--- /dev/null
+++ b/addons/web/static/lib/jquery.sparkline/jquery.sparkline.js
@@ -0,0 +1,3047 @@
+/**
+*
+* jquery.sparkline.js
+*
+* v2.1.1
+* (c) Splunk, Inc
+* Contact: Gareth Watts (gareth@splunk.com)
+* http://omnipotent.net/jquery.sparkline/
+*
+* Generates inline sparkline charts from data supplied either to the method
+* or inline in HTML
+*
+* Compatible with Internet Explorer 6.0+ and modern browsers equipped with the canvas tag
+* (Firefox 2.0+, Safari, Opera, etc)
+*
+* License: New BSD License
+*
+* Copyright (c) 2012, Splunk Inc.
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification,
+* are permitted provided that the following conditions are met:
+*
+*     * Redistributions of source code must retain the above copyright notice,
+*       this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright notice,
+*       this list of conditions and the following disclaimer in the documentation
+*       and/or other materials provided with the distribution.
+*     * Neither the name of Splunk Inc nor the names of its contributors may
+*       be used to endorse or promote products derived from this software without
+*       specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+* SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*
+* Usage:
+*  $(selector).sparkline(values, options)
+*
+* If values is undefined or set to 'html' then the data values are read from the specified tag:
+*   <p>Sparkline: <span class="sparkline">1,4,6,6,8,5,3,5</span></p>
+*   $('.sparkline').sparkline();
+* There must be no spaces in the enclosed data set
+*
+* Otherwise values must be an array of numbers or null values
+*    <p>Sparkline: <span id="sparkline1">This text replaced if the browser is compatible</span></p>
+*    $('#sparkline1').sparkline([1,4,6,6,8,5,3,5])
+*    $('#sparkline2').sparkline([1,4,6,null,null,5,3,5])
+*
+* Values can also be specified in an HTML comment, or as a values attribute:
+*    <p>Sparkline: <span class="sparkline"><!--1,4,6,6,8,5,3,5 --></span></p>
+*    <p>Sparkline: <span class="sparkline" values="1,4,6,6,8,5,3,5"></span></p>
+*    $('.sparkline').sparkline();
+*
+* For line charts, x values can also be specified:
+*   <p>Sparkline: <span class="sparkline">1:1,2.7:4,3.4:6,5:6,6:8,8.7:5,9:3,10:5</span></p>
+*    $('#sparkline1').sparkline([ [1,1], [2.7,4], [3.4,6], [5,6], [6,8], [8.7,5], [9,3], [10,5] ])
+*
+* By default, options should be passed in as teh second argument to the sparkline function:
+*   $('.sparkline').sparkline([1,2,3,4], {type: 'bar'})
+*
+* Options can also be set by passing them on the tag itself.  This feature is disabled by default though
+* as there's a slight performance overhead:
+*   $('.sparkline').sparkline([1,2,3,4], {enableTagOptions: true})
+*   <p>Sparkline: <span class="sparkline" sparkType="bar" sparkBarColor="red">loading</span></p>
+* Prefix all options supplied as tag attribute with "spark" (configurable by setting tagOptionPrefix)
+*
+* Supported options:
+*   lineColor - Color of the line used for the chart
+*   fillColor - Color used to fill in the chart - Set to '' or false for a transparent chart
+*   width - Width of the chart - Defaults to 3 times the number of values in pixels
+*   height - Height of the chart - Defaults to the height of the containing element
+*   chartRangeMin - Specify the minimum value to use for the Y range of the chart - Defaults to the minimum value supplied
+*   chartRangeMax - Specify the maximum value to use for the Y range of the chart - Defaults to the maximum value supplied
+*   chartRangeClip - Clip out of range values to the max/min specified by chartRangeMin and chartRangeMax
+*   chartRangeMinX - Specify the minimum value to use for the X range of the chart - Defaults to the minimum value supplied
+*   chartRangeMaxX - Specify the maximum value to use for the X range of the chart - Defaults to the maximum value supplied
+*   composite - If true then don't erase any existing chart attached to the tag, but draw
+*           another chart over the top - Note that width and height are ignored if an
+*           existing chart is detected.
+*   tagValuesAttribute - Name of tag attribute to check for data values - Defaults to 'values'
+*   enableTagOptions - Whether to check tags for sparkline options
+*   tagOptionPrefix - Prefix used for options supplied as tag attributes - Defaults to 'spark'
+*   disableHiddenCheck - If set to true, then the plugin will assume that charts will never be drawn into a
+*           hidden dom element, avoding a browser reflow
+*   disableInteraction - If set to true then all mouseover/click interaction behaviour will be disabled,
+*       making the plugin perform much like it did in 1.x
+*   disableTooltips - If set to true then tooltips will be disabled - Defaults to false (tooltips enabled)
+*   disableHighlight - If set to true then highlighting of selected chart elements on mouseover will be disabled
+*       defaults to false (highlights enabled)
+*   highlightLighten - Factor to lighten/darken highlighted chart values by - Defaults to 1.4 for a 40% increase
+*   tooltipContainer - Specify which DOM element the tooltip should be rendered into - defaults to document.body
+*   tooltipClassname - Optional CSS classname to apply to tooltips - If not specified then a default style will be applied
+*   tooltipOffsetX - How many pixels away from the mouse pointer to render the tooltip on the X axis
+*   tooltipOffsetY - How many pixels away from the mouse pointer to render the tooltip on the r axis
+*   tooltipFormatter  - Optional callback that allows you to override the HTML displayed in the tooltip
+*       callback is given arguments of (sparkline, options, fields)
+*   tooltipChartTitle - If specified then the tooltip uses the string specified by this setting as a title
+*   tooltipFormat - A format string or SPFormat object  (or an array thereof for multiple entries)
+*       to control the format of the tooltip
+*   tooltipPrefix - A string to prepend to each field displayed in a tooltip
+*   tooltipSuffix - A string to append to each field displayed in a tooltip
+*   tooltipSkipNull - If true then null values will not have a tooltip displayed (defaults to true)
+*   tooltipValueLookups - An object or range map to map field values to tooltip strings
+*       (eg. to map -1 to "Lost", 0 to "Draw", and 1 to "Win")
+*   numberFormatter - Optional callback for formatting numbers in tooltips
+*   numberDigitGroupSep - Character to use for group separator in numbers "1,234" - Defaults to ","
+*   numberDecimalMark - Character to use for the decimal point when formatting numbers - Defaults to "."
+*   numberDigitGroupCount - Number of digits between group separator - Defaults to 3
+*
+* There are 7 types of sparkline, selected by supplying a "type" option of 'line' (default),
+* 'bar', 'tristate', 'bullet', 'discrete', 'pie' or 'box'
+*    line - Line chart.  Options:
+*       spotColor - Set to '' to not end each line in a circular spot
+*       minSpotColor - If set, color of spot at minimum value
+*       maxSpotColor - If set, color of spot at maximum value
+*       spotRadius - Radius in pixels
+*       lineWidth - Width of line in pixels
+*       normalRangeMin
+*       normalRangeMax - If set draws a filled horizontal bar between these two values marking the "normal"
+*                      or expected range of values
+*       normalRangeColor - Color to use for the above bar
+*       drawNormalOnTop - Draw the normal range above the chart fill color if true
+*       defaultPixelsPerValue - Defaults to 3 pixels of width for each value in the chart
+*       highlightSpotColor - The color to use for drawing a highlight spot on mouseover - Set to null to disable
+*       highlightLineColor - The color to use for drawing a highlight line on mouseover - Set to null to disable
+*       valueSpots - Specify which points to draw spots on, and in which color.  Accepts a range map
+*
+*   bar - Bar chart.  Options:
+*       barColor - Color of bars for postive values
+*       negBarColor - Color of bars for negative values
+*       zeroColor - Color of bars with zero values
+*       nullColor - Color of bars with null values - Defaults to omitting the bar entirely
+*       barWidth - Width of bars in pixels
+*       colorMap - Optional mappnig of values to colors to override the *BarColor values above
+*                  can be an Array of values to control the color of individual bars or a range map
+*                  to specify colors for individual ranges of values
+*       barSpacing - Gap between bars in pixels
+*       zeroAxis - Centers the y-axis around zero if true
+*
+*   tristate - Charts values of win (>0), lose (<0) or draw (=0)
+*       posBarColor - Color of win values
+*       negBarColor - Color of lose values
+*       zeroBarColor - Color of draw values
+*       barWidth - Width of bars in pixels
+*       barSpacing - Gap between bars in pixels
+*       colorMap - Optional mappnig of values to colors to override the *BarColor values above
+*                  can be an Array of values to control the color of individual bars or a range map
+*                  to specify colors for individual ranges of values
+*
+*   discrete - Options:
+*       lineHeight - Height of each line in pixels - Defaults to 30% of the graph height
+*       thesholdValue - Values less than this value will be drawn using thresholdColor instead of lineColor
+*       thresholdColor
+*
+*   bullet - Values for bullet graphs msut be in the order: target, performance, range1, range2, range3, ...
+*       options:
+*       targetColor - The color of the vertical target marker
+*       targetWidth - The width of the target marker in pixels
+*       performanceColor - The color of the performance measure horizontal bar
+*       rangeColors - Colors to use for each qualitative range background color
+*
+*   pie - Pie chart. Options:
+*       sliceColors - An array of colors to use for pie slices
+*       offset - Angle in degrees to offset the first slice - Try -90 or +90
+*       borderWidth - Width of border to draw around the pie chart, in pixels - Defaults to 0 (no border)
+*       borderColor - Color to use for the pie chart border - Defaults to #000
+*
+*   box - Box plot. Options:
+*       raw - Set to true to supply pre-computed plot points as values
+*             values should be: low_outlier, low_whisker, q1, median, q3, high_whisker, high_outlier
+*             When set to false you can supply any number of values and the box plot will
+*             be computed for you.  Default is false.
+*       showOutliers - Set to true (default) to display outliers as circles
+*       outlierIQR - Interquartile range used to determine outliers.  Default 1.5
+*       boxLineColor - Outline color of the box
+*       boxFillColor - Fill color for the box
+*       whiskerColor - Line color used for whiskers
+*       outlierLineColor - Outline color of outlier circles
+*       outlierFillColor - Fill color of the outlier circles
+*       spotRadius - Radius of outlier circles
+*       medianColor - Line color of the median line
+*       target - Draw a target cross hair at the supplied value (default undefined)
+*
+*
+*
+*   Examples:
+*   $('#sparkline1').sparkline(myvalues, { lineColor: '#f00', fillColor: false });
+*   $('.barsparks').sparkline('html', { type:'bar', height:'40px', barWidth:5 });
+*   $('#tristate').sparkline([1,1,-1,1,0,0,-1], { type:'tristate' }):
+*   $('#discrete').sparkline([1,3,4,5,5,3,4,5], { type:'discrete' });
+*   $('#bullet').sparkline([10,12,12,9,7], { type:'bullet' });
+*   $('#pie').sparkline([1,1,2], { type:'pie' });
+*/
+
+/*jslint regexp: true, browser: true, jquery: true, white: true, nomen: false, plusplus: false, maxerr: 500, indent: 4 */
+
+(function(factory) {
+    if(typeof define === 'function' && define.amd) {
+        define(['jquery'], factory);
+    }
+    else {
+        factory(jQuery);
+    }
+}
+(function($) {
+    'use strict';
+
+    var UNSET_OPTION = {},
+        getDefaults, createClass, SPFormat, clipval, quartile, normalizeValue, normalizeValues,
+        remove, isNumber, all, sum, addCSS, ensureArray, formatNumber, RangeMap,
+        MouseHandler, Tooltip, barHighlightMixin,
+        line, bar, tristate, discrete, bullet, pie, box, defaultStyles, initStyles,
+        VShape, VCanvas_base, VCanvas_canvas, VCanvas_vml, pending, shapeCount = 0;
+
+    /**
+     * Default configuration settings
+     */
+    getDefaults = function () {
+        return {
+            // Settings common to most/all chart types
+            common: {
+                type: 'line',
+                lineColor: '#00f',
+                fillColor: '#cdf',
+                defaultPixelsPerValue: 3,
+                width: 'auto',
+                height: 'auto',
+                composite: false,
+                tagValuesAttribute: 'values',
+                tagOptionsPrefix: 'spark',
+                enableTagOptions: false,
+                enableHighlight: true,
+                highlightLighten: 1.4,
+                tooltipSkipNull: true,
+                tooltipPrefix: '',
+                tooltipSuffix: '',
+                disableHiddenCheck: false,
+                numberFormatter: false,
+                numberDigitGroupCount: 3,
+                numberDigitGroupSep: ',',
+                numberDecimalMark: '.',
+                disableTooltips: false,
+                disableInteraction: false
+            },
+            // Defaults for line charts
+            line: {
+                spotColor: '#f80',
+                highlightSpotColor: '#5f5',
+                highlightLineColor: '#f22',
+                spotRadius: 1.5,
+                minSpotColor: '#f80',
+                maxSpotColor: '#f80',
+                lineWidth: 1,
+                normalRangeMin: undefined,
+                normalRangeMax: undefined,
+                normalRangeColor: '#ccc',
+                drawNormalOnTop: false,
+                chartRangeMin: undefined,
+                chartRangeMax: undefined,
+                chartRangeMinX: undefined,
+                chartRangeMaxX: undefined,
+                tooltipFormat: new SPFormat('<span style="color: {{color}}">&#9679;</span> {{prefix}}{{y}}{{suffix}}')
+            },
+            // Defaults for bar charts
+            bar: {
+                barColor: '#3366cc',
+                negBarColor: '#f44',
+                stackedBarColor: ['#3366cc', '#dc3912', '#ff9900', '#109618', '#66aa00',
+                    '#dd4477', '#0099c6', '#990099'],
+                zeroColor: undefined,
+                nullColor: undefined,
+                zeroAxis: true,
+                barWidth: 4,
+                barSpacing: 1,
+                chartRangeMax: undefined,
+                chartRangeMin: undefined,
+                chartRangeClip: false,
+                colorMap: undefined,
+                tooltipFormat: new SPFormat('<span style="color: {{color}}">&#9679;</span> {{prefix}}{{value}}{{suffix}}')
+            },
+            // Defaults for tristate charts
+            tristate: {
+                barWidth: 4,
+                barSpacing: 1,
+                posBarColor: '#6f6',
+                negBarColor: '#f44',
+                zeroBarColor: '#999',
+                colorMap: {},
+                tooltipFormat: new SPFormat('<span style="color: {{color}}">&#9679;</span> {{value:map}}'),
+                tooltipValueLookups: { map: { '-1': 'Loss', '0': 'Draw', '1': 'Win' } }
+            },
+            // Defaults for discrete charts
+            discrete: {
+                lineHeight: 'auto',
+                thresholdColor: undefined,
+                thresholdValue: 0,
+                chartRangeMax: undefined,
+                chartRangeMin: undefined,
+                chartRangeClip: false,
+                tooltipFormat: new SPFormat('{{prefix}}{{value}}{{suffix}}')
+            },
+            // Defaults for bullet charts
+            bullet: {
+                targetColor: '#f33',
+                targetWidth: 3, // width of the target bar in pixels
+                performanceColor: '#33f',
+                rangeColors: ['#d3dafe', '#a8b6ff', '#7f94ff'],
+                base: undefined, // set this to a number to change the base start number
+                tooltipFormat: new SPFormat('{{fieldkey:fields}} - {{value}}'),
+                tooltipValueLookups: { fields: {r: 'Range', p: 'Performance', t: 'Target'} }
+            },
+            // Defaults for pie charts
+            pie: {
+                offset: 0,
+                sliceColors: ['#3366cc', '#dc3912', '#ff9900', '#109618', '#66aa00',
+                    '#dd4477', '#0099c6', '#990099'],
+                borderWidth: 0,
+                borderColor: '#000',
+                tooltipFormat: new SPFormat('<span style="color: {{color}}">&#9679;</span> {{value}} ({{percent.1}}%)')
+            },
+            // Defaults for box plots
+            box: {
+                raw: false,
+                boxLineColor: '#000',
+                boxFillColor: '#cdf',
+                whiskerColor: '#000',
+                outlierLineColor: '#333',
+                outlierFillColor: '#fff',
+                medianColor: '#f00',
+                showOutliers: true,
+                outlierIQR: 1.5,
+                spotRadius: 1.5,
+                target: undefined,
+                targetColor: '#4a2',
+                chartRangeMax: undefined,
+                chartRangeMin: undefined,
+                tooltipFormat: new SPFormat('{{field:fields}}: {{value}}'),
+                tooltipFormatFieldlistKey: 'field',
+                tooltipValueLookups: { fields: { lq: 'Lower Quartile', med: 'Median',
+                    uq: 'Upper Quartile', lo: 'Left Outlier', ro: 'Right Outlier',
+                    lw: 'Left Whisker', rw: 'Right Whisker'} }
+            }
+        };
+    };
+
+    // You can have tooltips use a css class other than jqstooltip by specifying tooltipClassname
+    defaultStyles = '.jqstooltip { ' +
+            'position: absolute;' +
+            'left: 0px;' +
+            'top: 0px;' +
+            'visibility: hidden;' +
+            'background: rgb(0, 0, 0) transparent;' +
+            'background-color: rgba(0,0,0,0.6);' +
+            'filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000);' +
+            '-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000)";' +
+            'color: white;' +
+            'font: 10px arial, san serif;' +
+            'text-align: left;' +
+            'white-space: nowrap;' +
+            'padding: 5px;' +
+            'border: 1px solid white;' +
+            'z-index: 10000;' +
+            '}' +
+            '.jqsfield { ' +
+            'color: white;' +
+            'font: 10px arial, san serif;' +
+            'text-align: left;' +
+            '}';
+
+    /**
+     * Utilities
+     */
+
+    createClass = function (/* [baseclass, [mixin, ...]], definition */) {
+        var Class, args;
+        Class = function () {
+            this.init.apply(this, arguments);
+        };
+        if (arguments.length > 1) {
+            if (arguments[0]) {
+                Class.prototype = $.extend(new arguments[0](), arguments[arguments.length - 1]);
+                Class._super = arguments[0].prototype;
+            } else {
+                Class.prototype = arguments[arguments.length - 1];
+            }
+            if (arguments.length > 2) {
+                args = Array.prototype.slice.call(arguments, 1, -1);
+                args.unshift(Class.prototype);
+                $.extend.apply($, args);
+            }
+        } else {
+            Class.prototype = arguments[0];
+        }
+        Class.prototype.cls = Class;
+        return Class;
+    };
+
+    /**
+     * Wraps a format string for tooltips
+     * {{x}}
+     * {{x.2}
+     * {{x:months}}
+     */
+    $.SPFormatClass = SPFormat = createClass({
+        fre: /\{\{([\w.]+?)(:(.+?))?\}\}/g,
+        precre: /(\w+)\.(\d+)/,
+
+        init: function (format, fclass) {
+            this.format = format;
+            this.fclass = fclass;
+        },
+
+        render: function (fieldset, lookups, options) {
+            var self = this,
+                fields = fieldset,
+                match, token, lookupkey, fieldvalue, prec;
+            return this.format.replace(this.fre, function () {
+                var lookup;
+                token = arguments[1];
+                lookupkey = arguments[3];
+                match = self.precre.exec(token);
+                if (match) {
+                    prec = match[2];
+                    token = match[1];
+                } else {
+                    prec = false;
+                }
+                fieldvalue = fields[token];
+                if (fieldvalue === undefined) {
+                    return '';
+                }
+                if (lookupkey && lookups && lookups[lookupkey]) {
+                    lookup = lookups[lookupkey];
+                    if (lookup.get) { // RangeMap
+                        return lookups[lookupkey].get(fieldvalue) || fieldvalue;
+                    } else {
+                        return lookups[lookupkey][fieldvalue] || fieldvalue;
+                    }
+                }
+                if (isNumber(fieldvalue)) {
+                    if (options.get('numberFormatter')) {
+                        fieldvalue = options.get('numberFormatter')(fieldvalue);
+                    } else {
+                        fieldvalue = formatNumber(fieldvalue, prec,
+                            options.get('numberDigitGroupCount'),
+                            options.get('numberDigitGroupSep'),
+                            options.get('numberDecimalMark'));
+                    }
+                }
+                return fieldvalue;
+            });
+        }
+    });
+
+    // convience method to avoid needing the new operator
+    $.spformat = function(format, fclass) {
+        return new SPFormat(format, fclass);
+    };
+
+    clipval = function (val, min, max) {
+        if (val < min) {
+            return min;
+        }
+        if (val > max) {
+            return max;
+        }
+        return val;
+    };
+
+    quartile = function (values, q) {
+        var vl;
+        if (q === 2) {
+            vl = Math.floor(values.length / 2);
+            return values.length % 2 ? values[vl] : (values[vl-1] + values[vl]) / 2;
+        } else {
+            if (values.length % 2 ) { // odd
+                vl = (values.length * q + q) / 4;
+                return vl % 1 ? (values[Math.floor(vl)] + values[Math.floor(vl) - 1]) / 2 : values[vl-1];
+            } else { //even
+                vl = (values.length * q + 2) / 4;
+                return vl % 1 ? (values[Math.floor(vl)] + values[Math.floor(vl) - 1]) / 2 :  values[vl-1];
+
+            }
+        }
+    };
+
+    normalizeValue = function (val) {
+        var nf;
+        switch (val) {
+            case 'undefined':
+                val = undefined;
+                break;
+            case 'null':
+                val = null;
+                break;
+            case 'true':
+                val = true;
+                break;
+            case 'false':
+                val = false;
+                break;
+            default:
+                nf = parseFloat(val);
+                if (val == nf) {
+                    val = nf;
+                }
+        }
+        return val;
+    };
+
+    normalizeValues = function (vals) {
+        var i, result = [];
+        for (i = vals.length; i--;) {
+            result[i] = normalizeValue(vals[i]);
+        }
+        return result;
+    };
+
+    remove = function (vals, filter) {
+        var i, vl, result = [];
+        for (i = 0, vl = vals.length; i < vl; i++) {
+            if (vals[i] !== filter) {
+                result.push(vals[i]);
+            }
+        }
+        return result;
+    };
+
+    isNumber = function (num) {
+        return !isNaN(parseFloat(num)) && isFinite(num);
+    };
+
+    formatNumber = function (num, prec, groupsize, groupsep, decsep) {
+        var p, i;
+        num = (prec === false ? parseFloat(num).toString() : num.toFixed(prec)).split('');
+        p = (p = $.inArray('.', num)) < 0 ? num.length : p;
+        if (p < num.length) {
+            num[p] = decsep;
+        }
+        for (i = p - groupsize; i > 0; i -= groupsize) {
+            num.splice(i, 0, groupsep);
+        }
+        return num.join('');
+    };
+
+    // determine if all values of an array match a value
+    // returns true if the array is empty
+    all = function (val, arr, ignoreNull) {
+        var i;
+        for (i = arr.length; i--; ) {
+            if (ignoreNull && arr[i] === null) continue;
+            if (arr[i] !== val) {
+                return false;
+            }
+        }
+        return true;
+    };
+
+    // sums the numeric values in an array, ignoring other values
+    sum = function (vals) {
+        var total = 0, i;
+        for (i = vals.length; i--;) {
+            total += typeof vals[i] === 'number' ? vals[i] : 0;
+        }
+        return total;
+    };
+
+    ensureArray = function (val) {
+        return $.isArray(val) ? val : [val];
+    };
+
+    // http://paulirish.com/2008/bookmarklet-inject-new-css-rules/
+    addCSS = function(css) {
+        var tag;
+        //if ('\v' == 'v') /* ie only */ {
+        if (document.createStyleSheet) {
+            document.createStyleSheet().cssText = css;
+        } else {
+            tag = document.createElement('style');
+            tag.type = 'text/css';
+            document.getElementsByTagName('head')[0].appendChild(tag);
+            tag[(typeof document.body.style.WebkitAppearance == 'string') /* webkit only */ ? 'innerText' : 'innerHTML'] = css;
+        }
+    };
+
+    // Provide a cross-browser interface to a few simple drawing primitives
+    $.fn.simpledraw = function (width, height, useExisting, interact) {
+        var target, mhandler;
+        if (useExisting && (target = this.data('_jqs_vcanvas'))) {
+            return target;
+        }
+        if (width === undefined) {
+            width = $(this).innerWidth();
+        }
+        if (height === undefined) {
+            height = $(this).innerHeight();
+        }
+        if ($.fn.sparkline.hasCanvas) {
+            target = new VCanvas_canvas(width, height, this, interact);
+        } else if ($.fn.sparkline.hasVML) {
+            target = new VCanvas_vml(width, height, this);
+        } else {
+            return false;
+        }
+        mhandler = $(this).data('_jqs_mhandler');
+        if (mhandler) {
+            mhandler.registerCanvas(target);
+        }
+        return target;
+    };
+
+    $.fn.cleardraw = function () {
+        var target = this.data('_jqs_vcanvas');
+        if (target) {
+            target.reset();
+        }
+    };
+
+    $.RangeMapClass = RangeMap = createClass({
+        init: function (map) {
+            var key, range, rangelist = [];
+            for (key in map) {
+                if (map.hasOwnProperty(key) && typeof key === 'string' && key.indexOf(':') > -1) {
+                    range = key.split(':');
+                    range[0] = range[0].length === 0 ? -Infinity : parseFloat(range[0]);
+                    range[1] = range[1].length === 0 ? Infinity : parseFloat(range[1]);
+                    range[2] = map[key];
+                    rangelist.push(range);
+                }
+            }
+            this.map = map;
+            this.rangelist = rangelist || false;
+        },
+
+        get: function (value) {
+            var rangelist = this.rangelist,
+                i, range, result;
+            if ((result = this.map[value]) !== undefined) {
+                return result;
+            }
+            if (rangelist) {
+                for (i = rangelist.length; i--;) {
+                    range = rangelist[i];
+                    if (range[0] <= value && range[1] >= value) {
+                        return range[2];
+                    }
+                }
+            }
+            return undefined;
+        }
+    });
+
+    // Convenience function
+    $.range_map = function(map) {
+        return new RangeMap(map);
+    };
+
+    MouseHandler = createClass({
+        init: function (el, options) {
+            var $el = $(el);
+            this.$el = $el;
+            this.options = options;
+            this.currentPageX = 0;
+            this.currentPageY = 0;
+            this.el = el;
+            this.splist = [];
+            this.tooltip = null;
+            this.over = false;
+            this.displayTooltips = !options.get('disableTooltips');
+            this.highlightEnabled = !options.get('disableHighlight');
+        },
+
+        registerSparkline: function (sp) {
+            this.splist.push(sp);
+            if (this.over) {
+                this.updateDisplay();
+            }
+        },
+
+        registerCanvas: function (canvas) {
+            var $canvas = $(canvas.canvas);
+            this.canvas = canvas;
+            this.$canvas = $canvas;
+            $canvas.mouseenter($.proxy(this.mouseenter, this));
+            $canvas.mouseleave($.proxy(this.mouseleave, this));
+            $canvas.click($.proxy(this.mouseclick, this));
+        },
+
+        reset: function (removeTooltip) {
+            this.splist = [];
+            if (this.tooltip && removeTooltip) {
+                this.tooltip.remove();
+                this.tooltip = undefined;
+            }
+        },
+
+        mouseclick: function (e) {
+            var clickEvent = $.Event('sparklineClick');
+            clickEvent.originalEvent = e;
+            clickEvent.sparklines = this.splist;
+            this.$el.trigger(clickEvent);
+        },
+
+        mouseenter: function (e) {
+            $(document.body).unbind('mousemove.jqs');
+            $(document.body).bind('mousemove.jqs', $.proxy(this.mousemove, this));
+            this.over = true;
+            this.currentPageX = e.pageX;
+            this.currentPageY = e.pageY;
+            this.currentEl = e.target;
+            if (!this.tooltip && this.displayTooltips) {
+                this.tooltip = new Tooltip(this.options);
+                this.tooltip.updatePosition(e.pageX, e.pageY);
+            }
+            this.updateDisplay();
+        },
+
+        mouseleave: function () {
+            $(document.body).unbind('mousemove.jqs');
+            var splist = this.splist,
+                 spcount = splist.length,
+                 needsRefresh = false,
+                 sp, i;
+            this.over = false;
+            this.currentEl = null;
+
+            if (this.tooltip) {
+                this.tooltip.remove();
+                this.tooltip = null;
+            }
+
+            for (i = 0; i < spcount; i++) {
+                sp = splist[i];
+                if (sp.clearRegionHighlight()) {
+                    needsRefresh = true;
+                }
+            }
+
+            if (needsRefresh) {
+                this.canvas.render();
+            }
+        },
+
+        mousemove: function (e) {
+            this.currentPageX = e.pageX;
+            this.currentPageY = e.pageY;
+            this.currentEl = e.target;
+            if (this.tooltip) {
+                this.tooltip.updatePosition(e.pageX, e.pageY);
+            }
+            this.updateDisplay();
+        },
+
+        updateDisplay: function () {
+            var splist = this.splist,
+                 spcount = splist.length,
+                 needsRefresh = false,
+                 offset = this.$canvas.offset(),
+                 localX = this.currentPageX - offset.left,
+                 localY = this.currentPageY - offset.top,
+                 tooltiphtml, sp, i, result, changeEvent;
+            if (!this.over) {
+                return;
+            }
+            for (i = 0; i < spcount; i++) {
+                sp = splist[i];
+                result = sp.setRegionHighlight(this.currentEl, localX, localY);
+                if (result) {
+                    needsRefresh = true;
+                }
+            }
+            if (needsRefresh) {
+                changeEvent = $.Event('sparklineRegionChange');
+                changeEvent.sparklines = this.splist;
+                this.$el.trigger(changeEvent);
+                if (this.tooltip) {
+                    tooltiphtml = '';
+                    for (i = 0; i < spcount; i++) {
+                        sp = splist[i];
+                        tooltiphtml += sp.getCurrentRegionTooltip();
+                    }
+                    this.tooltip.setContent(tooltiphtml);
+                }
+                if (!this.disableHighlight) {
+                    this.canvas.render();
+                }
+            }
+            if (result === null) {
+                this.mouseleave();
+            }
+        }
+    });
+
+
+    Tooltip = createClass({
+        sizeStyle: 'position: static !important;' +
+            'display: block !important;' +
+            'visibility: hidden !important;' +
+            'float: left !important;',
+
+        init: function (options) {
+            var tooltipClassname = options.get('tooltipClassname', 'jqstooltip'),
+                sizetipStyle = this.sizeStyle,
+                offset;
+            this.container = options.get('tooltipContainer') || document.body;
+            this.tooltipOffsetX = options.get('tooltipOffsetX', 10);
+            this.tooltipOffsetY = options.get('tooltipOffsetY', 12);
+            // remove any previous lingering tooltip
+            $('#jqssizetip').remove();
+            $('#jqstooltip').remove();
+            this.sizetip = $('<div/>', {
+                id: 'jqssizetip',
+                style: sizetipStyle,
+                'class': tooltipClassname
+            });
+            this.tooltip = $('<div/>', {
+                id: 'jqstooltip',
+                'class': tooltipClassname
+            }).appendTo(this.container);
+            // account for the container's location
+            offset = this.tooltip.offset();
+            this.offsetLeft = offset.left;
+            this.offsetTop = offset.top;
+            this.hidden = true;
+            $(window).unbind('resize.jqs scroll.jqs');
+            $(window).bind('resize.jqs scroll.jqs', $.proxy(this.updateWindowDims, this));
+            this.updateWindowDims();
+        },
+
+        updateWindowDims: function () {
+            this.scrollTop = $(window).scrollTop();
+            this.scrollLeft = $(window).scrollLeft();
+            this.scrollRight = this.scrollLeft + $(window).width();
+            this.updatePosition();
+        },
+
+        getSize: function (content) {
+            this.sizetip.html(content).appendTo(this.container);
+            this.width = this.sizetip.width() + 1;
+            this.height = this.sizetip.height();
+            this.sizetip.remove();
+        },
+
+        setContent: function (content) {
+            if (!content) {
+                this.tooltip.css('visibility', 'hidden');
+                this.hidden = true;
+                return;
+            }
+            this.getSize(content);
+            this.tooltip.html(content)
+                .css({
+                    'width': this.width,
+                    'height': this.height,
+                    'visibility': 'visible'
+                });
+            if (this.hidden) {
+                this.hidden = false;
+                this.updatePosition();
+            }
+        },
+
+        updatePosition: function (x, y) {
+            if (x === undefined) {
+                if (this.mousex === undefined) {
+                    return;
+                }
+                x = this.mousex - this.offsetLeft;
+                y = this.mousey - this.offsetTop;
+
+            } else {
+                this.mousex = x = x - this.offsetLeft;
+                this.mousey = y = y - this.offsetTop;
+            }
+            if (!this.height || !this.width || this.hidden) {
+                return;
+            }
+
+            y -= this.height + this.tooltipOffsetY;
+            x += this.tooltipOffsetX;
+
+            if (y < this.scrollTop) {
+                y = this.scrollTop;
+            }
+            if (x < this.scrollLeft) {
+                x = this.scrollLeft;
+            } else if (x + this.width > this.scrollRight) {
+                x = this.scrollRight - this.width;
+            }
+
+            this.tooltip.css({
+                'left': x,
+                'top': y
+            });
+        },
+
+        remove: function () {
+            this.tooltip.remove();
+            this.sizetip.remove();
+            this.sizetip = this.tooltip = undefined;
+            $(window).unbind('resize.jqs scroll.jqs');
+        }
+    });
+
+    initStyles = function() {
+        addCSS(defaultStyles);
+    };
+
+    $(initStyles);
+
+    pending = [];
+    $.fn.sparkline = function (userValues, userOptions) {
+        return this.each(function () {
+            var options = new $.fn.sparkline.options(this, userOptions),
+                 $this = $(this),
+                 render, i;
+            render = function () {
+                var values, width, height, tmp, mhandler, sp, vals;
+                if (userValues === 'html' || userValues === undefined) {
+                    vals = this.getAttribute(options.get('tagValuesAttribute'));
+                    if (vals === undefined || vals === null) {
+                        vals = $this.html();
+                    }
+                    values = vals.replace(/(^\s*<!--)|(-->\s*$)|\s+/g, '').split(',');
+                } else {
+                    values = userValues;
+                }
+
+                width = options.get('width') === 'auto' ? values.length * options.get('defaultPixelsPerValue') : options.get('width');
+                if (options.get('height') === 'auto') {
+                    if (!options.get('composite') || !$.data(this, '_jqs_vcanvas')) {
+                        // must be a better way to get the line height
+                        tmp = document.createElement('span');
+                        tmp.innerHTML = 'a';
+                        $this.html(tmp);
+                        height = $(tmp).innerHeight() || $(tmp).height();
+                        $(tmp).remove();
+                        tmp = null;
+                    }
+                } else {
+                    height = options.get('height');
+                }
+
+                if (!options.get('disableInteraction')) {
+                    mhandler = $.data(this, '_jqs_mhandler');
+                    if (!mhandler) {
+                        mhandler = new MouseHandler(this, options);
+                        $.data(this, '_jqs_mhandler', mhandler);
+                    } else if (!options.get('composite')) {
+                        mhandler.reset();
+                    }
+                } else {
+                    mhandler = false;
+                }
+
+                if (options.get('composite') && !$.data(this, '_jqs_vcanvas')) {
+                    if (!$.data(this, '_jqs_errnotify')) {
+                        alert('Attempted to attach a composite sparkline to an element with no existing sparkline');
+                        $.data(this, '_jqs_errnotify', true);
+                    }
+                    return;
+                }
+
+                sp = new $.fn.sparkline[options.get('type')](this, values, options, width, height);
+
+                sp.render();
+
+                if (mhandler) {
+                    mhandler.registerSparkline(sp);
+                }
+            };
+            // jQuery 1.3.0 completely changed the meaning of :hidden :-/
+            if (($(this).html() && !options.get('disableHiddenCheck') && $(this).is(':hidden')) || ($.fn.jquery < '1.3.0' && $(this).parents().is(':hidden')) || !$(this).parents('body').length) {
+                if (!options.get('composite') && $.data(this, '_jqs_pending')) {
+                    // remove any existing references to the element
+                    for (i = pending.length; i; i--) {
+                        if (pending[i - 1][0] == this) {
+                            pending.splice(i - 1, 1);
+                        }
+                    }
+                }
+                pending.push([this, render]);
+                $.data(this, '_jqs_pending', true);
+            } else {
+                render.call(this);
+            }
+        });
+    };
+
+    $.fn.sparkline.defaults = getDefaults();
+
+
+    $.sparkline_display_visible = function () {
+        var el, i, pl;
+        var done = [];
+        for (i = 0, pl = pending.length; i < pl; i++) {
+            el = pending[i][0];
+            if ($(el).is(':visible') && !$(el).parents().is(':hidden')) {
+                pending[i][1].call(el);
+                $.data(pending[i][0], '_jqs_pending', false);
+                done.push(i);
+            } else if (!$(el).closest('html').length && !$.data(el, '_jqs_pending')) {
+                // element has been inserted and removed from the DOM
+                // If it was not yet inserted into the dom then the .data request
+                // will return true.
+                // removing from the dom causes the data to be removed.
+                $.data(pending[i][0], '_jqs_pending', false);
+                done.push(i);
+            }
+        }
+        for (i = done.length; i; i--) {
+            pending.splice(done[i - 1], 1);
+        }
+    };
+
+
+    /**
+     * User option handler
+     */
+    $.fn.sparkline.options = createClass({
+        init: function (tag, userOptions) {
+            var extendedOptions, defaults, base, tagOptionType;
+            this.userOptions = userOptions = userOptions || {};
+            this.tag = tag;
+            this.tagValCache = {};
+            defaults = $.fn.sparkline.defaults;
+            base = defaults.common;
+            this.tagOptionsPrefix = userOptions.enableTagOptions && (userOptions.tagOptionsPrefix || base.tagOptionsPrefix);
+
+            tagOptionType = this.getTagSetting('type');
+            if (tagOptionType === UNSET_OPTION) {
+                extendedOptions = defaults[userOptions.type || base.type];
+            } else {
+                extendedOptions = defaults[tagOptionType];
+            }
+            this.mergedOptions = $.extend({}, base, extendedOptions, userOptions);
+        },
+
+
+        getTagSetting: function (key) {
+            var prefix = this.tagOptionsPrefix,
+                val, i, pairs, keyval;
+            if (prefix === false || prefix === undefined) {
+                return UNSET_OPTION;
+            }
+            if (this.tagValCache.hasOwnProperty(key)) {
+                val = this.tagValCache.key;
+            } else {
+                val = this.tag.getAttribute(prefix + key);
+                if (val === undefined || val === null) {
+                    val = UNSET_OPTION;
+                } else if (val.substr(0, 1) === '[') {
+                    val = val.substr(1, val.length - 2).split(',');
+                    for (i = val.length; i--;) {
+                        val[i] = normalizeValue(val[i].replace(/(^\s*)|(\s*$)/g, ''));
+                    }
+                } else if (val.substr(0, 1) === '{') {
+                    pairs = val.substr(1, val.length - 2).split(',');
+                    val = {};
+                    for (i = pairs.length; i--;) {
+                        keyval = pairs[i].split(':', 2);
+                        val[keyval[0].replace(/(^\s*)|(\s*$)/g, '')] = normalizeValue(keyval[1].replace(/(^\s*)|(\s*$)/g, ''));
+                    }
+                } else {
+                    val = normalizeValue(val);
+                }
+                this.tagValCache.key = val;
+            }
+            return val;
+        },
+
+        get: function (key, defaultval) {
+            var tagOption = this.getTagSetting(key),
+                result;
+            if (tagOption !== UNSET_OPTION) {
+                return tagOption;
+            }
+            return (result = this.mergedOptions[key]) === undefined ? defaultval : result;
+        }
+    });
+
+
+    $.fn.sparkline._base = createClass({
+        disabled: false,
+
+        init: function (el, values, options, width, height) {
+            this.el = el;
+            this.$el = $(el);
+            this.values = values;
+            this.options = options;
+            this.width = width;
+            this.height = height;
+            this.currentRegion = undefined;
+        },
+
+        /**
+         * Setup the canvas
+         */
+        initTarget: function () {
+            var interactive = !this.options.get('disableInteraction');
+            if (!(this.target = this.$el.simpledraw(this.width, this.height, this.options.get('composite'), interactive))) {
+                this.disabled = true;
+            } else {
+                this.canvasWidth = this.target.pixelWidth;
+                this.canvasHeight = this.target.pixelHeight;
+            }
+        },
+
+        /**
+         * Actually render the chart to the canvas
+         */
+        render: function () {
+            if (this.disabled) {
+                this.el.innerHTML = '';
+                return false;
+            }
+            return true;
+        },
+
+        /**
+         * Return a region id for a given x/y co-ordinate
+         */
+        getRegion: function (x, y) {
+        },
+
+        /**
+         * Highlight an item based on the moused-over x,y co-ordinate
+         */
+        setRegionHighlight: function (el, x, y) {
+            var currentRegion = this.currentRegion,
+                highlightEnabled = !this.options.get('disableHighlight'),
+                newRegion;
+            if (x > this.canvasWidth || y > this.canvasHeight || x < 0 || y < 0) {
+                return null;
+            }
+            newRegion = this.getRegion(el, x, y);
+            if (currentRegion !== newRegion) {
+                if (currentRegion !== undefined && highlightEnabled) {
+                    this.removeHighlight();
+                }
+                this.currentRegion = newRegion;
+                if (newRegion !== undefined && highlightEnabled) {
+                    this.renderHighlight();
+                }
+                return true;
+            }
+            return false;
+        },
+
+        /**
+         * Reset any currently highlighted item
+         */
+        clearRegionHighlight: function () {
+            if (this.currentRegion !== undefined) {
+                this.removeHighlight();
+                this.currentRegion = undefined;
+                return true;
+            }
+            return false;
+        },
+
+        renderHighlight: function () {
+            this.changeHighlight(true);
+        },
+
+        removeHighlight: function () {
+            this.changeHighlight(false);
+        },
+
+        changeHighlight: function (highlight)  {},
+
+        /**
+         * Fetch the HTML to display as a tooltip
+         */
+        getCurrentRegionTooltip: function () {
+            var options = this.options,
+                header = '',
+                entries = [],
+                fields, formats, formatlen, fclass, text, i,
+                showFields, showFieldsKey, newFields, fv,
+                formatter, format, fieldlen, j;
+            if (this.currentRegion === undefined) {
+                return '';
+            }
+            fields = this.getCurrentRegionFields();
+            formatter = options.get('tooltipFormatter');
+            if (formatter) {
+                return formatter(this, options, fields);
+            }
+            if (options.get('tooltipChartTitle')) {
+                header += '<div class="jqs jqstitle">' + options.get('tooltipChartTitle') + '</div>\n';
+            }
+            formats = this.options.get('tooltipFormat');
+            if (!formats) {
+                return '';
+            }
+            if (!$.isArray(formats)) {
+                formats = [formats];
+            }
+            if (!$.isArray(fields)) {
+                fields = [fields];
+            }
+            showFields = this.options.get('tooltipFormatFieldlist');
+            showFieldsKey = this.options.get('tooltipFormatFieldlistKey');
+            if (showFields && showFieldsKey) {
+                // user-selected ordering of fields
+                newFields = [];
+                for (i = fields.length; i--;) {
+                    fv = fields[i][showFieldsKey];
+                    if ((j = $.inArray(fv, showFields)) != -1) {
+                        newFields[j] = fields[i];
+                    }
+                }
+                fields = newFields;
+            }
+            formatlen = formats.length;
+            fieldlen = fields.length;
+            for (i = 0; i < formatlen; i++) {
+                format = formats[i];
+                if (typeof format === 'string') {
+                    format = new SPFormat(format);
+                }
+                fclass = format.fclass || 'jqsfield';
+                for (j = 0; j < fieldlen; j++) {
+                    if (!fields[j].isNull || !options.get('tooltipSkipNull')) {
+                        $.extend(fields[j], {
+                            prefix: options.get('tooltipPrefix'),
+                            suffix: options.get('tooltipSuffix')
+                        });
+                        text = format.render(fields[j], options.get('tooltipValueLookups'), options);
+                        entries.push('<div class="' + fclass + '">' + text + '</div>');
+                    }
+                }
+            }
+            if (entries.length) {
+                return header + entries.join('\n');
+            }
+            return '';
+        },
+
+        getCurrentRegionFields: function () {},
+
+        calcHighlightColor: function (color, options) {
+            var highlightColor = options.get('highlightColor'),
+                lighten = options.get('highlightLighten'),
+                parse, mult, rgbnew, i;
+            if (highlightColor) {
+                return highlightColor;
+            }
+            if (lighten) {
+                // extract RGB values
+                parse = /^#([0-9a-f])([0-9a-f])([0-9a-f])$/i.exec(color) || /^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/i.exec(color);
+                if (parse) {
+                    rgbnew = [];
+                    mult = color.length === 4 ? 16 : 1;
+                    for (i = 0; i < 3; i++) {
+                        rgbnew[i] = clipval(Math.round(parseInt(parse[i + 1], 16) * mult * lighten), 0, 255);
+                    }
+                    return 'rgb(' + rgbnew.join(',') + ')';
+                }
+
+            }
+            return color;
+        }
+
+    });
+
+    barHighlightMixin = {
+        changeHighlight: function (highlight) {
+            var currentRegion = this.currentRegion,
+                target = this.target,
+                shapeids = this.regionShapes[currentRegion],
+                newShapes;
+            // will be null if the region value was null
+            if (shapeids) {
+                newShapes = this.renderRegion(currentRegion, highlight);
+                if ($.isArray(newShapes) || $.isArray(shapeids)) {
+                    target.replaceWithShapes(shapeids, newShapes);
+                    this.regionShapes[currentRegion] = $.map(newShapes, function (newShape) {
+                        return newShape.id;
+                    });
+                } else {
+                    target.replaceWithShape(shapeids, newShapes);
+                    this.regionShapes[currentRegion] = newShapes.id;
+                }
+            }
+        },
+
+        render: function () {
+            var values = this.values,
+                target = this.target,
+                regionShapes = this.regionShapes,
+                shapes, ids, i, j;
+
+            if (!this.cls._super.render.call(this)) {
+                return;
+            }
+            for (i = values.length; i--;) {
+                shapes = this.renderRegion(i);
+                if (shapes) {
+                    if ($.isArray(shapes)) {
+                        ids = [];
+                        for (j = shapes.length; j--;) {
+                            shapes[j].append();
+                            ids.push(shapes[j].id);
+                        }
+                        regionShapes[i] = ids;
+                    } else {
+                        shapes.append();
+                        regionShapes[i] = shapes.id; // store just the shapeid
+                    }
+                } else {
+                    // null value
+                    regionShapes[i] = null;
+                }
+            }
+            target.render();
+        }
+    };
+
+    /**
+     * Line charts
+     */
+    $.fn.sparkline.line = line = createClass($.fn.sparkline._base, {
+        type: 'line',
+
+        init: function (el, values, options, width, height) {
+            line._super.init.call(this, el, values, options, width, height);
+            this.vertices = [];
+            this.regionMap = [];
+            this.xvalues = [];
+            this.yvalues = [];
+            this.yminmax = [];
+            this.hightlightSpotId = null;
+            this.lastShapeId = null;
+            this.initTarget();
+        },
+
+        getRegion: function (el, x, y) {
+            var i,
+                regionMap = this.regionMap; // maps regions to value positions
+            for (i = regionMap.length; i--;) {
+                if (regionMap[i] !== null && x >= regionMap[i][0] && x <= regionMap[i][1]) {
+                    return regionMap[i][2];
+                }
+            }
+            return undefined;
+        },
+
+        getCurrentRegionFields: function () {
+            var currentRegion = this.currentRegion;
+            return {
+                isNull: this.yvalues[currentRegion] === null,
+                x: this.xvalues[currentRegion],
+                y: this.yvalues[currentRegion],
+                color: this.options.get('lineColor'),
+                fillColor: this.options.get('fillColor'),
+                offset: currentRegion
+            };
+        },
+
+        renderHighlight: function () {
+            var currentRegion = this.currentRegion,
+                target = this.target,
+                vertex = this.vertices[currentRegion],
+                options = this.options,
+                spotRadius = options.get('spotRadius'),
+                highlightSpotColor = options.get('highlightSpotColor'),
+                highlightLineColor = options.get('highlightLineColor'),
+                highlightSpot, highlightLine;
+
+            if (!vertex) {
+                return;
+            }
+            if (spotRadius && highlightSpotColor) {
+                highlightSpot = target.drawCircle(vertex[0], vertex[1],
+                    spotRadius, undefined, highlightSpotColor);
+                this.highlightSpotId = highlightSpot.id;
+                target.insertAfterShape(this.lastShapeId, highlightSpot);
+            }
+            if (highlightLineColor) {
+                highlightLine = target.drawLine(vertex[0], this.canvasTop, vertex[0],
+                    this.canvasTop + this.canvasHeight, highlightLineColor);
+                this.highlightLineId = highlightLine.id;
+                target.insertAfterShape(this.lastShapeId, highlightLine);
+            }
+        },
+
+        removeHighlight: function () {
+            var target = this.target;
+            if (this.highlightSpotId) {
+                target.removeShapeId(this.highlightSpotId);
+                this.highlightSpotId = null;
+            }
+            if (this.highlightLineId) {
+                target.removeShapeId(this.highlightLineId);
+                this.highlightLineId = null;
+            }
+        },
+
+        scanValues: function () {
+            var values = this.values,
+                valcount = values.length,
+                xvalues = this.xvalues,
+                yvalues = this.yvalues,
+                yminmax = this.yminmax,
+                i, val, isStr, isArray, sp;
+            for (i = 0; i < valcount; i++) {
+                val = values[i];
+                isStr = typeof(values[i]) === 'string';
+                isArray = typeof(values[i]) === 'object' && values[i] instanceof Array;
+                sp = isStr && values[i].split(':');
+                if (isStr && sp.length === 2) { // x:y
+                    xvalues.push(Number(sp[0]));
+                    yvalues.push(Number(sp[1]));
+                    yminmax.push(Number(sp[1]));
+                } else if (isArray) {
+                    xvalues.push(val[0]);
+                    yvalues.push(val[1]);
+                    yminmax.push(val[1]);
+                } else {
+                    xvalues.push(i);
+                    if (values[i] === null || values[i] === 'null') {
+                        yvalues.push(null);
+                    } else {
+                        yvalues.push(Number(val));
+                        yminmax.push(Number(val));
+                    }
+                }
+            }
+            if (this.options.get('xvalues')) {
+                xvalues = this.options.get('xvalues');
+            }
+
+            this.maxy = this.maxyorg = Math.max.apply(Math, yminmax);
+            this.miny = this.minyorg = Math.min.apply(Math, yminmax);
+
+            this.maxx = Math.max.apply(Math, xvalues);
+            this.minx = Math.min.apply(Math, xvalues);
+
+            this.xvalues = xvalues;
+            this.yvalues = yvalues;
+            this.yminmax = yminmax;
+
+        },
+
+        processRangeOptions: function () {
+            var options = this.options,
+                normalRangeMin = options.get('normalRangeMin'),
+                normalRangeMax = options.get('normalRangeMax');
+
+            if (normalRangeMin !== undefined) {
+                if (normalRangeMin < this.miny) {
+                    this.miny = normalRangeMin;
+                }
+                if (normalRangeMax > this.maxy) {
+                    this.maxy = normalRangeMax;
+                }
+            }
+            if (options.get('chartRangeMin') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMin') < this.miny)) {
+                this.miny = options.get('chartRangeMin');
+            }
+            if (options.get('chartRangeMax') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMax') > this.maxy)) {
+                this.maxy = options.get('chartRangeMax');
+            }
+            if (options.get('chartRangeMinX') !== undefined && (options.get('chartRangeClipX') || options.get('chartRangeMinX') < this.minx)) {
+                this.minx = options.get('chartRangeMinX');
+            }
+            if (options.get('chartRangeMaxX') !== undefined && (options.get('chartRangeClipX') || options.get('chartRangeMaxX') > this.maxx)) {
+                this.maxx = options.get('chartRangeMaxX');
+            }
+
+        },
+
+        drawNormalRange: function (canvasLeft, canvasTop, canvasHeight, canvasWidth, rangey) {
+            var normalRangeMin = this.options.get('normalRangeMin'),
+                normalRangeMax = this.options.get('normalRangeMax'),
+                ytop = canvasTop + Math.round(canvasHeight - (canvasHeight * ((normalRangeMax - this.miny) / rangey))),
+                height = Math.round((canvasHeight * (normalRangeMax - normalRangeMin)) / rangey);
+            this.target.drawRect(canvasLeft, ytop, canvasWidth, height, undefined, this.options.get('normalRangeColor')).append();
+        },
+
+        render: function () {
+            var options = this.options,
+                target = this.target,
+                canvasWidth = this.canvasWidth,
+                canvasHeight = this.canvasHeight,
+                vertices = this.vertices,
+                spotRadius = options.get('spotRadius'),
+                regionMap = this.regionMap,
+                rangex, rangey, yvallast,
+                canvasTop, canvasLeft,
+                vertex, path, paths, x, y, xnext, xpos, xposnext,
+                last, next, yvalcount, lineShapes, fillShapes, plen,
+                valueSpots, hlSpotsEnabled, color, xvalues, yvalues, i;
+
+            if (!line._super.render.call(this)) {
+                return;
+            }
+
+            this.scanValues();
+            this.processRangeOptions();
+
+            xvalues = this.xvalues;
+            yvalues = this.yvalues;
+
+            if (!this.yminmax.length || this.yvalues.length < 2) {
+                // empty or all null valuess
+                return;
+            }
+
+            canvasTop = canvasLeft = 0;
+
+            rangex = this.maxx - this.minx === 0 ? 1 : this.maxx - this.minx;
+            rangey = this.maxy - this.miny === 0 ? 1 : this.maxy - this.miny;
+            yvallast = this.yvalues.length - 1;
+
+            if (spotRadius && (canvasWidth < (spotRadius * 4) || canvasHeight < (spotRadius * 4))) {
+                spotRadius = 0;
+            }
+            if (spotRadius) {
+                // adjust the canvas size as required so that spots will fit
+                hlSpotsEnabled = options.get('highlightSpotColor') &&  !options.get('disableInteraction');
+                if (hlSpotsEnabled || options.get('minSpotColor') || (options.get('spotColor') && yvalues[yvallast] === this.miny)) {
+                    canvasHeight -= Math.ceil(spotRadius);
+                }
+                if (hlSpotsEnabled || options.get('maxSpotColor') || (options.get('spotColor') && yvalues[yvallast] === this.maxy)) {
+                    canvasHeight -= Math.ceil(spotRadius);
+                    canvasTop += Math.ceil(spotRadius);
+                }
+                if (hlSpotsEnabled ||
+                     ((options.get('minSpotColor') || options.get('maxSpotColor')) && (yvalues[0] === this.miny || yvalues[0] === this.maxy))) {
+                    canvasLeft += Math.ceil(spotRadius);
+                    canvasWidth -= Math.ceil(spotRadius);
+                }
+                if (hlSpotsEnabled || options.get('spotColor') ||
+                    (options.get('minSpotColor') || options.get('maxSpotColor') &&
+                        (yvalues[yvallast] === this.miny || yvalues[yvallast] === this.maxy))) {
+                    canvasWidth -= Math.ceil(spotRadius);
+                }
+            }
+
+
+            canvasHeight--;
+
+            if (options.get('normalRangeMin') !== undefined && !options.get('drawNormalOnTop')) {
+                this.drawNormalRange(canvasLeft, canvasTop, canvasHeight, canvasWidth, rangey);
+            }
+
+            path = [];
+            paths = [path];
+            last = next = null;
+            yvalcount = yvalues.length;
+            for (i = 0; i < yvalcount; i++) {
+                x = xvalues[i];
+                xnext = xvalues[i + 1];
+                y = yvalues[i];
+                xpos = canvasLeft + Math.round((x - this.minx) * (canvasWidth / rangex));
+                xposnext = i < yvalcount - 1 ? canvasLeft + Math.round((xnext - this.minx) * (canvasWidth / rangex)) : canvasWidth;
+                next = xpos + ((xposnext - xpos) / 2);
+                regionMap[i] = [last || 0, next, i];
+                last = next;
+                if (y === null) {
+                    if (i) {
+                        if (yvalues[i - 1] !== null) {
+                            path = [];
+                            paths.push(path);
+                        }
+                        vertices.push(null);
+                    }
+                } else {
+                    if (y < this.miny) {
+                        y = this.miny;
+                    }
+                    if (y > this.maxy) {
+                        y = this.maxy;
+                    }
+                    if (!path.length) {
+                        // previous value was null
+                        path.push([xpos, canvasTop + canvasHeight]);
+                    }
+                    vertex = [xpos, canvasTop + Math.round(canvasHeight - (canvasHeight * ((y - this.miny) / rangey)))];
+                    path.push(vertex);
+                    vertices.push(vertex);
+                }
+            }
+
+            lineShapes = [];
+            fillShapes = [];
+            plen = paths.length;
+            for (i = 0; i < plen; i++) {
+                path = paths[i];
+                if (path.length) {
+                    if (options.get('fillColor')) {
+                        path.push([path[path.length - 1][0], (canvasTop + canvasHeight)]);
+                        fillShapes.push(path.slice(0));
+                        path.pop();
+                    }
+                    // if there's only a single point in this path, then we want to display it
+                    // as a vertical line which means we keep path[0]  as is
+                    if (path.length > 2) {
+                        // else we want the first value
+                        path[0] = [path[0][0], path[1][1]];
+                    }
+                    lineShapes.push(path);
+                }
+            }
+
+            // draw the fill first, then optionally the normal range, then the line on top of that
+            plen = fillShapes.length;
+            for (i = 0; i < plen; i++) {
+                target.drawShape(fillShapes[i],
+                    options.get('fillColor'), options.get('fillColor')).append();
+            }
+
+            if (options.get('normalRangeMin') !== undefined && options.get('drawNormalOnTop')) {
+                this.drawNormalRange(canvasLeft, canvasTop, canvasHeight, canvasWidth, rangey);
+            }
+
+            plen = lineShapes.length;
+            for (i = 0; i < plen; i++) {
+                target.drawShape(lineShapes[i], options.get('lineColor'), undefined,
+                    options.get('lineWidth')).append();
+            }
+
+            if (spotRadius && options.get('valueSpots')) {
+                valueSpots = options.get('valueSpots');
+                if (valueSpots.get === undefined) {
+                    valueSpots = new RangeMap(valueSpots);
+                }
+                for (i = 0; i < yvalcount; i++) {
+                    color = valueSpots.get(yvalues[i]);
+                    if (color) {
+                        target.drawCircle(canvasLeft + Math.round((xvalues[i] - this.minx) * (canvasWidth / rangex)),
+                            canvasTop + Math.round(canvasHeight - (canvasHeight * ((yvalues[i] - this.miny) / rangey))),
+                            spotRadius, undefined,
+                            color).append();
+                    }
+                }
+
+            }
+            if (spotRadius && options.get('spotColor') && yvalues[yvallast] !== null) {
+                target.drawCircle(canvasLeft + Math.round((xvalues[xvalues.length - 1] - this.minx) * (canvasWidth / rangex)),
+                    canvasTop + Math.round(canvasHeight - (canvasHeight * ((yvalues[yvallast] - this.miny) / rangey))),
+                    spotRadius, undefined,
+                    options.get('spotColor')).append();
+            }
+            if (this.maxy !== this.minyorg) {
+                if (spotRadius && options.get('minSpotColor')) {
+                    x = xvalues[$.inArray(this.minyorg, yvalues)];
+                    target.drawCircle(canvasLeft + Math.round((x - this.minx) * (canvasWidth / rangex)),
+                        canvasTop + Math.round(canvasHeight - (canvasHeight * ((this.minyorg - this.miny) / rangey))),
+                        spotRadius, undefined,
+                        options.get('minSpotColor')).append();
+                }
+                if (spotRadius && options.get('maxSpotColor')) {
+                    x = xvalues[$.inArray(this.maxyorg, yvalues)];
+                    target.drawCircle(canvasLeft + Math.round((x - this.minx) * (canvasWidth / rangex)),
+                        canvasTop + Math.round(canvasHeight - (canvasHeight * ((this.maxyorg - this.miny) / rangey))),
+                        spotRadius, undefined,
+                        options.get('maxSpotColor')).append();
+                }
+            }
+
+            this.lastShapeId = target.getLastShapeId();
+            this.canvasTop = canvasTop;
+            target.render();
+        }
+    });
+
+    /**
+     * Bar charts
+     */
+    $.fn.sparkline.bar = bar = createClass($.fn.sparkline._base, barHighlightMixin, {
+        type: 'bar',
+
+        init: function (el, values, options, width, height) {
+            var barWidth = parseInt(options.get('barWidth'), 10),
+                barSpacing = parseInt(options.get('barSpacing'), 10),
+                chartRangeMin = options.get('chartRangeMin'),
+                chartRangeMax = options.get('chartRangeMax'),
+                chartRangeClip = options.get('chartRangeClip'),
+                stackMin = Infinity,
+                stackMax = -Infinity,
+                isStackString, groupMin, groupMax, stackRanges,
+                numValues, i, vlen, range, zeroAxis, xaxisOffset, min, max, clipMin, clipMax,
+                stacked, vlist, j, slen, svals, val, yoffset, yMaxCalc, canvasHeightEf;
+            bar._super.init.call(this, el, values, options, width, height);
+
+            // scan values to determine whether to stack bars
+            for (i = 0, vlen = values.length; i < vlen; i++) {
+                val = values[i];
+                isStackString = typeof(val) === 'string' && val.indexOf(':') > -1;
+                if (isStackString || $.isArray(val)) {
+                    stacked = true;
+                    if (isStackString) {
+                        val = values[i] = normalizeValues(val.split(':'));
+                    }
+                    val = remove(val, null); // min/max will treat null as zero
+                    groupMin = Math.min.apply(Math, val);
+                    groupMax = Math.max.apply(Math, val);
+                    if (groupMin < stackMin) {
+                        stackMin = groupMin;
+                    }
+                    if (groupMax > stackMax) {
+                        stackMax = groupMax;
+                    }
+                }
+            }
+
+            this.stacked = stacked;
+            this.regionShapes = {};
+            this.barWidth = barWidth;
+            this.barSpacing = barSpacing;
+            this.totalBarWidth = barWidth + barSpacing;
+            this.width = width = (values.length * barWidth) + ((values.length - 1) * barSpacing);
+
+            this.initTarget();
+
+            if (chartRangeClip) {
+                clipMin = chartRangeMin === undefined ? -Infinity : chartRangeMin;
+                clipMax = chartRangeMax === undefined ? Infinity : chartRangeMax;
+            }
+
+            numValues = [];
+            stackRanges = stacked ? [] : numValues;
+            var stackTotals = [];
+            var stackRangesNeg = [];
+            for (i = 0, vlen = values.length; i < vlen; i++) {
+                if (stacked) {
+                    vlist = values[i];
+                    values[i] = svals = [];
+                    stackTotals[i] = 0;
+                    stackRanges[i] = stackRangesNeg[i] = 0;
+                    for (j = 0, slen = vlist.length; j < slen; j++) {
+                        val = svals[j] = chartRangeClip ? clipval(vlist[j], clipMin, clipMax) : vlist[j];
+                        if (val !== null) {
+                            if (val > 0) {
+                                stackTotals[i] += val;
+                            }
+                            if (stackMin < 0 && stackMax > 0) {
+                                if (val < 0) {
+                                    stackRangesNeg[i] += Math.abs(val);
+                                } else {
+                                    stackRanges[i] += val;
+                                }
+                            } else {
+                                stackRanges[i] += Math.abs(val - (val < 0 ? stackMax : stackMin));
+                            }
+                            numValues.push(val);
+                        }
+                    }
+                } else {
+                    val = chartRangeClip ? clipval(values[i], clipMin, clipMax) : values[i];
+                    val = values[i] = normalizeValue(val);
+                    if (val !== null) {
+                        numValues.push(val);
+                    }
+                }
+            }
+            this.max = max = Math.max.apply(Math, numValues);
+            this.min = min = Math.min.apply(Math, numValues);
+            this.stackMax = stackMax = stacked ? Math.max.apply(Math, stackTotals) : max;
+            this.stackMin = stackMin = stacked ? Math.min.apply(Math, numValues) : min;
+
+            if (options.get('chartRangeMin') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMin') < min)) {
+                min = options.get('chartRangeMin');
+            }
+            if (options.get('chartRangeMax') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMax') > max)) {
+                max = options.get('chartRangeMax');
+            }
+
+            this.zeroAxis = zeroAxis = options.get('zeroAxis', true);
+            if (min <= 0 && max >= 0 && zeroAxis) {
+                xaxisOffset = 0;
+            } else if (zeroAxis == false) {
+                xaxisOffset = min;
+            } else if (min > 0) {
+                xaxisOffset = min;
+            } else {
+                xaxisOffset = max;
+            }
+            this.xaxisOffset = xaxisOffset;
+
+            range = stacked ? (Math.max.apply(Math, stackRanges) + Math.max.apply(Math, stackRangesNeg)) : max - min;
+
+            // as we plot zero/min values a single pixel line, we add a pixel to all other
+            // values - Reduce the effective canvas size to suit
+            this.canvasHeightEf = (zeroAxis && min < 0) ? this.canvasHeight - 2 : this.canvasHeight - 1;
+
+            if (min < xaxisOffset) {
+                yMaxCalc = (stacked && max >= 0) ? stackMax : max;
+                yoffset = (yMaxCalc - xaxisOffset) / range * this.canvasHeight;
+                if (yoffset !== Math.ceil(yoffset)) {
+                    this.canvasHeightEf -= 2;
+                    yoffset = Math.ceil(yoffset);
+                }
+            } else {
+                yoffset = this.canvasHeight;
+            }
+            this.yoffset = yoffset;
+
+            if ($.isArray(options.get('colorMap'))) {
+                this.colorMapByIndex = options.get('colorMap');
+                this.colorMapByValue = null;
+            } else {
+                this.colorMapByIndex = null;
+                this.colorMapByValue = options.get('colorMap');
+                if (this.colorMapByValue && this.colorMapByValue.get === undefined) {
+                    this.colorMapByValue = new RangeMap(this.colorMapByValue);
+                }
+            }
+
+            this.range = range;
+        },
+
+        getRegion: function (el, x, y) {
+            var result = Math.floor(x / this.totalBarWidth);
+            return (result < 0 || result >= this.values.length) ? undefined : result;
+        },
+
+        getCurrentRegionFields: function () {
+            var currentRegion = this.currentRegion,
+                values = ensureArray(this.values[currentRegion]),
+                result = [],
+                value, i;
+            for (i = values.length; i--;) {
+                value = values[i];
+                result.push({
+                    isNull: value === null,
+                    value: value,
+                    color: this.calcColor(i, value, currentRegion),
+                    offset: currentRegion
+                });
+            }
+            return result;
+        },
+
+        calcColor: function (stacknum, value, valuenum) {
+            var colorMapByIndex = this.colorMapByIndex,
+                colorMapByValue = this.colorMapByValue,
+                options = this.options,
+                color, newColor;
+            if (this.stacked) {
+                color = options.get('stackedBarColor');
+            } else {
+                color = (value < 0) ? options.get('negBarColor') : options.get('barColor');
+            }
+            if (value === 0 && options.get('zeroColor') !== undefined) {
+                color = options.get('zeroColor');
+            }
+            if (colorMapByValue && (newColor = colorMapByValue.get(value))) {
+                color = newColor;
+            } else if (colorMapByIndex && colorMapByIndex.length > valuenum) {
+                color = colorMapByIndex[valuenum];
+            }
+            return $.isArray(color) ? color[stacknum % color.length] : color;
+        },
+
+        /**
+         * Render bar(s) for a region
+         */
+        renderRegion: function (valuenum, highlight) {
+            var vals = this.values[valuenum],
+                options = this.options,
+                xaxisOffset = this.xaxisOffset,
+                result = [],
+                range = this.range,
+                stacked = this.stacked,
+                target = this.target,
+                x = valuenum * this.totalBarWidth,
+                canvasHeightEf = this.canvasHeightEf,
+                yoffset = this.yoffset,
+                y, height, color, isNull, yoffsetNeg, i, valcount, val, minPlotted, allMin;
+
+            vals = $.isArray(vals) ? vals : [vals];
+            valcount = vals.length;
+            val = vals[0];
+            isNull = all(null, vals);
+            allMin = all(xaxisOffset, vals, true);
+
+            if (isNull) {
+                if (options.get('nullColor')) {
+                    color = highlight ? options.get('nullColor') : this.calcHighlightColor(options.get('nullColor'), options);
+                    y = (yoffset > 0) ? yoffset - 1 : yoffset;
+                    return target.drawRect(x, y, this.barWidth - 1, 0, color, color);
+                } else {
+                    return undefined;
+                }
+            }
+            yoffsetNeg = yoffset;
+            for (i = 0; i < valcount; i++) {
+                val = vals[i];
+
+                if (stacked && val === xaxisOffset) {
+                    if (!allMin || minPlotted) {
+                        continue;
+                    }
+                    minPlotted = true;
+                }
+
+                if (range > 0) {
+                    height = Math.floor(canvasHeightEf * ((Math.abs(val - xaxisOffset) / range))) + 1;
+                } else {
+                    height = 1;
+                }
+                if (val < xaxisOffset || (val === xaxisOffset && yoffset === 0)) {
+                    y = yoffsetNeg;
+                    yoffsetNeg += height;
+                } else {
+                    y = yoffset - height;
+                    yoffset -= height;
+                }
+                color = this.calcColor(i, val, valuenum);
+                if (highlight) {
+                    color = this.calcHighlightColor(color, options);
+                }
+                result.push(target.drawRect(x, y, this.barWidth - 1, height - 1, color, color));
+            }
+            if (result.length === 1) {
+                return result[0];
+            }
+            return result;
+        }
+    });
+
+    /**
+     * Tristate charts
+     */
+    $.fn.sparkline.tristate = tristate = createClass($.fn.sparkline._base, barHighlightMixin, {
+        type: 'tristate',
+
+        init: function (el, values, options, width, height) {
+            var barWidth = parseInt(options.get('barWidth'), 10),
+                barSpacing = parseInt(options.get('barSpacing'), 10);
+            tristate._super.init.call(this, el, values, options, width, height);
+
+            this.regionShapes = {};
+            this.barWidth = barWidth;
+            this.barSpacing = barSpacing;
+            this.totalBarWidth = barWidth + barSpacing;
+            this.values = $.map(values, Number);
+            this.width = width = (values.length * barWidth) + ((values.length - 1) * barSpacing);
+
+            if ($.isArray(options.get('colorMap'))) {
+                this.colorMapByIndex = options.get('colorMap');
+                this.colorMapByValue = null;
+            } else {
+                this.colorMapByIndex = null;
+                this.colorMapByValue = options.get('colorMap');
+                if (this.colorMapByValue && this.colorMapByValue.get === undefined) {
+                    this.colorMapByValue = new RangeMap(this.colorMapByValue);
+                }
+            }
+            this.initTarget();
+        },
+
+        getRegion: function (el, x, y) {
+            return Math.floor(x / this.totalBarWidth);
+        },
+
+        getCurrentRegionFields: function () {
+            var currentRegion = this.currentRegion;
+            return {
+                isNull: this.values[currentRegion] === undefined,
+                value: this.values[currentRegion],
+                color: this.calcColor(this.values[currentRegion], currentRegion),
+                offset: currentRegion
+            };
+        },
+
+        calcColor: function (value, valuenum) {
+            var values = this.values,
+                options = this.options,
+                colorMapByIndex = this.colorMapByIndex,
+                colorMapByValue = this.colorMapByValue,
+                color, newColor;
+
+            if (colorMapByValue && (newColor = colorMapByValue.get(value))) {
+                color = newColor;
+            } else if (colorMapByIndex && colorMapByIndex.length > valuenum) {
+                color = colorMapByIndex[valuenum];
+            } else if (values[valuenum] < 0) {
+                color = options.get('negBarColor');
+            } else if (values[valuenum] > 0) {
+                color = options.get('posBarColor');
+            } else {
+                color = options.get('zeroBarColor');
+            }
+            return color;
+        },
+
+        renderRegion: function (valuenum, highlight) {
+            var values = this.values,
+                options = this.options,
+                target = this.target,
+                canvasHeight, height, halfHeight,
+                x, y, color;
+
+            canvasHeight = target.pixelHeight;
+            halfHeight = Math.round(canvasHeight / 2);
+
+            x = valuenum * this.totalBarWidth;
+            if (values[valuenum] < 0) {
+                y = halfHeight;
+                height = halfHeight - 1;
+            } else if (values[valuenum] > 0) {
+                y = 0;
+                height = halfHeight - 1;
+            } else {
+                y = halfHeight - 1;
+                height = 2;
+            }
+            color = this.calcColor(values[valuenum], valuenum);
+            if (color === null) {
+                return;
+            }
+            if (highlight) {
+                color = this.calcHighlightColor(color, options);
+            }
+            return target.drawRect(x, y, this.barWidth - 1, height - 1, color, color);
+        }
+    });
+
+    /**
+     * Discrete charts
+     */
+    $.fn.sparkline.discrete = discrete = createClass($.fn.sparkline._base, barHighlightMixin, {
+        type: 'discrete',
+
+        init: function (el, values, options, width, height) {
+            discrete._super.init.call(this, el, values, options, width, height);
+
+            this.regionShapes = {};
+            this.values = values = $.map(values, Number);
+            this.min = Math.min.apply(Math, values);
+            this.max = Math.max.apply(Math, values);
+            this.range = this.max - this.min;
+            this.width = width = options.get('width') === 'auto' ? values.length * 2 : this.width;
+            this.interval = Math.floor(width / values.length);
+            this.itemWidth = width / values.length;
+            if (options.get('chartRangeMin') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMin') < this.min)) {
+                this.min = options.get('chartRangeMin');
+            }
+            if (options.get('chartRangeMax') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMax') > this.max)) {
+                this.max = options.get('chartRangeMax');
+            }
+            this.initTarget();
+            if (this.target) {
+                this.lineHeight = options.get('lineHeight') === 'auto' ? Math.round(this.canvasHeight * 0.3) : options.get('lineHeight');
+            }
+        },
+
+        getRegion: function (el, x, y) {
+            return Math.floor(x / this.itemWidth);
+        },
+
+        getCurrentRegionFields: function () {
+            var currentRegion = this.currentRegion;
+            return {
+                isNull: this.values[currentRegion] === undefined,
+                value: this.values[currentRegion],
+                offset: currentRegion
+            };
+        },
+
+        renderRegion: function (valuenum, highlight) {
+            var values = this.values,
+                options = this.options,
+                min = this.min,
+                max = this.max,
+                range = this.range,
+                interval = this.interval,
+                target = this.target,
+                canvasHeight = this.canvasHeight,
+                lineHeight = this.lineHeight,
+                pheight = canvasHeight - lineHeight,
+                ytop, val, color, x;
+
+            val = clipval(values[valuenum], min, max);
+            x = valuenum * interval;
+            ytop = Math.round(pheight - pheight * ((val - min) / range));
+            color = (options.get('thresholdColor') && val < options.get('thresholdValue')) ? options.get('thresholdColor') : options.get('lineColor');
+            if (highlight) {
+                color = this.calcHighlightColor(color, options);
+            }
+            return target.drawLine(x, ytop, x, ytop + lineHeight, color);
+        }
+    });
+
+    /**
+     * Bullet charts
+     */
+    $.fn.sparkline.bullet = bullet = createClass($.fn.sparkline._base, {
+        type: 'bullet',
+
+        init: function (el, values, options, width, height) {
+            var min, max, vals;
+            bullet._super.init.call(this, el, values, options, width, height);
+
+            // values: target, performance, range1, range2, range3
+            this.values = values = normalizeValues(values);
+            // target or performance could be null
+            vals = values.slice();
+            vals[0] = vals[0] === null ? vals[2] : vals[0];
+            vals[1] = values[1] === null ? vals[2] : vals[1];
+            min = Math.min.apply(Math, values);
+            max = Math.max.apply(Math, values);
+            if (options.get('base') === undefined) {
+                min = min < 0 ? min : 0;
+            } else {
+                min = options.get('base');
+            }
+            this.min = min;
+            this.max = max;
+            this.range = max - min;
+            this.shapes = {};
+            this.valueShapes = {};
+            this.regiondata = {};
+            this.width = width = options.get('width') === 'auto' ? '4.0em' : width;
+            this.target = this.$el.simpledraw(width, height, options.get('composite'));
+            if (!values.length) {
+                this.disabled = true;
+            }
+            this.initTarget();
+        },
+
+        getRegion: function (el, x, y) {
+            var shapeid = this.target.getShapeAt(el, x, y);
+            return (shapeid !== undefined && this.shapes[shapeid] !== undefined) ? this.shapes[shapeid] : undefined;
+        },
+
+        getCurrentRegionFields: function () {
+            var currentRegion = this.currentRegion;
+            return {
+                fieldkey: currentRegion.substr(0, 1),
+                value: this.values[currentRegion.substr(1)],
+                region: currentRegion
+            };
+        },
+
+        changeHighlight: function (highlight) {
+            var currentRegion = this.currentRegion,
+                shapeid = this.valueShapes[currentRegion],
+                shape;
+            delete this.shapes[shapeid];
+            switch (currentRegion.substr(0, 1)) {
+                case 'r':
+                    shape = this.renderRange(currentRegion.substr(1), highlight);
+                    break;
+                case 'p':
+                    shape = this.renderPerformance(highlight);
+                    break;
+                case 't':
+                    shape = this.renderTarget(highlight);
+                    break;
+            }
+            this.valueShapes[currentRegion] = shape.id;
+            this.shapes[shape.id] = currentRegion;
+            this.target.replaceWithShape(shapeid, shape);
+        },
+
+        renderRange: function (rn, highlight) {
+            var rangeval = this.values[rn],
+                rangewidth = Math.round(this.canvasWidth * ((rangeval - this.min) / this.range)),
+                color = this.options.get('rangeColors')[rn - 2];
+            if (highlight) {
+                color = this.calcHighlightColor(color, this.options);
+            }
+            return this.target.drawRect(0, 0, rangewidth - 1, this.canvasHeight - 1, color, color);
+        },
+
+        renderPerformance: function (highlight) {
+            var perfval = this.values[1],
+                perfwidth = Math.round(this.canvasWidth * ((perfval - this.min) / this.range)),
+                color = this.options.get('performanceColor');
+            if (highlight) {
+                color = this.calcHighlightColor(color, this.options);
+            }
+            return this.target.drawRect(0, Math.round(this.canvasHeight * 0.3), perfwidth - 1,
+                Math.round(this.canvasHeight * 0.4) - 1, color, color);
+        },
+
+        renderTarget: function (highlight) {
+            var targetval = this.values[0],
+                x = Math.round(this.canvasWidth * ((targetval - this.min) / this.range) - (this.options.get('targetWidth') / 2)),
+                targettop = Math.round(this.canvasHeight * 0.10),
+                targetheight = this.canvasHeight - (targettop * 2),
+                color = this.options.get('targetColor');
+            if (highlight) {
+                color = this.calcHighlightColor(color, this.options);
+            }
+            return this.target.drawRect(x, targettop, this.options.get('targetWidth') - 1, targetheight - 1, color, color);
+        },
+
+        render: function () {
+            var vlen = this.values.length,
+                target = this.target,
+                i, shape;
+            if (!bullet._super.render.call(this)) {
+                return;
+            }
+            for (i = 2; i < vlen; i++) {
+                shape = this.renderRange(i).append();
+                this.shapes[shape.id] = 'r' + i;
+                this.valueShapes['r' + i] = shape.id;
+            }
+            if (this.values[1] !== null) {
+                shape = this.renderPerformance().append();
+                this.shapes[shape.id] = 'p1';
+                this.valueShapes.p1 = shape.id;
+            }
+            if (this.values[0] !== null) {
+                shape = this.renderTarget().append();
+                this.shapes[shape.id] = 't0';
+                this.valueShapes.t0 = shape.id;
+            }
+            target.render();
+        }
+    });
+
+    /**
+     * Pie charts
+     */
+    $.fn.sparkline.pie = pie = createClass($.fn.sparkline._base, {
+        type: 'pie',
+
+        init: function (el, values, options, width, height) {
+            var total = 0, i;
+
+            pie._super.init.call(this, el, values, options, width, height);
+
+            this.shapes = {}; // map shape ids to value offsets
+            this.valueShapes = {}; // maps value offsets to shape ids
+            this.values = values = $.map(values, Number);
+
+            if (options.get('width') === 'auto') {
+                this.width = this.height;
+            }
+
+            if (values.length > 0) {
+                for (i = values.length; i--;) {
+                    total += values[i];
+                }
+            }
+            this.total = total;
+            this.initTarget();
+            this.radius = Math.floor(Math.min(this.canvasWidth, this.canvasHeight) / 2);
+        },
+
+        getRegion: function (el, x, y) {
+            var shapeid = this.target.getShapeAt(el, x, y);
+            return (shapeid !== undefined && this.shapes[shapeid] !== undefined) ? this.shapes[shapeid] : undefined;
+        },
+
+        getCurrentRegionFields: function () {
+            var currentRegion = this.currentRegion;
+            return {
+                isNull: this.values[currentRegion] === undefined,
+                value: this.values[currentRegion],
+                percent: this.values[currentRegion] / this.total * 100,
+                color: this.options.get('sliceColors')[currentRegion % this.options.get('sliceColors').length],
+                offset: currentRegion
+            };
+        },
+
+        changeHighlight: function (highlight) {
+            var currentRegion = this.currentRegion,
+                 newslice = this.renderSlice(currentRegion, highlight),
+                 shapeid = this.valueShapes[currentRegion];
+            delete this.shapes[shapeid];
+            this.target.replaceWithShape(shapeid, newslice);
+            this.valueShapes[currentRegion] = newslice.id;
+            this.shapes[newslice.id] = currentRegion;
+        },
+
+        renderSlice: function (valuenum, highlight) {
+            var target = this.target,
+                options = this.options,
+                radius = this.radius,
+                borderWidth = options.get('borderWidth'),
+                offset = options.get('offset'),
+                circle = 2 * Math.PI,
+                values = this.values,
+                total = this.total,
+                next = offset ? (2*Math.PI)*(offset/360) : 0,
+                start, end, i, vlen, color;
+
+            vlen = values.length;
+            for (i = 0; i < vlen; i++) {
+                start = next;
+                end = next;
+                if (total > 0) {  // avoid divide by zero
+                    end = next + (circle * (values[i] / total));
+                }
+                if (valuenum === i) {
+                    color = options.get('sliceColors')[i % options.get('sliceColors').length];
+                    if (highlight) {
+                        color = this.calcHighlightColor(color, options);
+                    }
+
+                    return target.drawPieSlice(radius, radius, radius - borderWidth, start, end, undefined, color);
+                }
+                next = end;
+            }
+        },
+
+        render: function () {
+            var target = this.target,
+                values = this.values,
+                options = this.options,
+                radius = this.radius,
+                borderWidth = options.get('borderWidth'),
+                shape, i;
+
+            if (!pie._super.render.call(this)) {
+                return;
+            }
+            if (borderWidth) {
+                target.drawCircle(radius, radius, Math.floor(radius - (borderWidth / 2)),
+                    options.get('borderColor'), undefined, borderWidth).append();
+            }
+            for (i = values.length; i--;) {
+                if (values[i]) { // don't render zero values
+                    shape = this.renderSlice(i).append();
+                    this.valueShapes[i] = shape.id; // store just the shapeid
+                    this.shapes[shape.id] = i;
+                }
+            }
+            target.render();
+        }
+    });
+
+    /**
+     * Box plots
+     */
+    $.fn.sparkline.box = box = createClass($.fn.sparkline._base, {
+        type: 'box',
+
+        init: function (el, values, options, width, height) {
+            box._super.init.call(this, el, values, options, width, height);
+            this.values = $.map(values, Number);
+            this.width = options.get('width') === 'auto' ? '4.0em' : width;
+            this.initTarget();
+            if (!this.values.length) {
+                this.disabled = 1;
+            }
+        },
+
+        /**
+         * Simulate a single region
+         */
+        getRegion: function () {
+            return 1;
+        },
+
+        getCurrentRegionFields: function () {
+            var result = [
+                { field: 'lq', value: this.quartiles[0] },
+                { field: 'med', value: this.quartiles[1] },
+                { field: 'uq', value: this.quartiles[2] }
+            ];
+            if (this.loutlier !== undefined) {
+                result.push({ field: 'lo', value: this.loutlier});
+            }
+            if (this.routlier !== undefined) {
+                result.push({ field: 'ro', value: this.routlier});
+            }
+            if (this.lwhisker !== undefined) {
+                result.push({ field: 'lw', value: this.lwhisker});
+            }
+            if (this.rwhisker !== undefined) {
+                result.push({ field: 'rw', value: this.rwhisker});
+            }
+            return result;
+        },
+
+        render: function () {
+            var target = this.target,
+                values = this.values,
+                vlen = values.length,
+                options = this.options,
+                canvasWidth = this.canvasWidth,
+                canvasHeight = this.canvasHeight,
+                minValue = options.get('chartRangeMin') === undefined ? Math.min.apply(Math, values) : options.get('chartRangeMin'),
+                maxValue = options.get('chartRangeMax') === undefined ? Math.max.apply(Math, values) : options.get('chartRangeMax'),
+                canvasLeft = 0,
+                lwhisker, loutlier, iqr, q1, q2, q3, rwhisker, routlier, i,
+                size, unitSize;
+
+            if (!box._super.render.call(this)) {
+                return;
+            }
+
+            if (options.get('raw')) {
+                if (options.get('showOutliers') && values.length > 5) {
+                    loutlier = values[0];
+                    lwhisker = values[1];
+                    q1 = values[2];
+                    q2 = values[3];
+                    q3 = values[4];
+                    rwhisker = values[5];
+                    routlier = values[6];
+                } else {
+                    lwhisker = values[0];
+                    q1 = values[1];
+                    q2 = values[2];
+                    q3 = values[3];
+                    rwhisker = values[4];
+                }
+            } else {
+                values.sort(function (a, b) { return a - b; });
+                q1 = quartile(values, 1);
+                q2 = quartile(values, 2);
+                q3 = quartile(values, 3);
+                iqr = q3 - q1;
+                if (options.get('showOutliers')) {
+                    lwhisker = rwhisker = undefined;
+                    for (i = 0; i < vlen; i++) {
+                        if (lwhisker === undefined && values[i] > q1 - (iqr * options.get('outlierIQR'))) {
+                            lwhisker = values[i];
+                        }
+                        if (values[i] < q3 + (iqr * options.get('outlierIQR'))) {
+                            rwhisker = values[i];
+                        }
+                    }
+                    loutlier = values[0];
+                    routlier = values[vlen - 1];
+                } else {
+                    lwhisker = values[0];
+                    rwhisker = values[vlen - 1];
+                }
+            }
+            this.quartiles = [q1, q2, q3];
+            this.lwhisker = lwhisker;
+            this.rwhisker = rwhisker;
+            this.loutlier = loutlier;
+            this.routlier = routlier;
+
+            unitSize = canvasWidth / (maxValue - minValue + 1);
+            if (options.get('showOutliers')) {
+                canvasLeft = Math.ceil(options.get('spotRadius'));
+                canvasWidth -= 2 * Math.ceil(options.get('spotRadius'));
+                unitSize = canvasWidth / (maxValue - minValue + 1);
+                if (loutlier < lwhisker) {
+                    target.drawCircle((loutlier - minValue) * unitSize + canvasLeft,
+                        canvasHeight / 2,
+                        options.get('spotRadius'),
+                        options.get('outlierLineColor'),
+                        options.get('outlierFillColor')).append();
+                }
+                if (routlier > rwhisker) {
+                    target.drawCircle((routlier - minValue) * unitSize + canvasLeft,
+                        canvasHeight / 2,
+                        options.get('spotRadius'),
+                        options.get('outlierLineColor'),
+                        options.get('outlierFillColor')).append();
+                }
+            }
+
+            // box
+            target.drawRect(
+                Math.round((q1 - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight * 0.1),
+                Math.round((q3 - q1) * unitSize),
+                Math.round(canvasHeight * 0.8),
+                options.get('boxLineColor'),
+                options.get('boxFillColor')).append();
+            // left whisker
+            target.drawLine(
+                Math.round((lwhisker - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight / 2),
+                Math.round((q1 - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight / 2),
+                options.get('lineColor')).append();
+            target.drawLine(
+                Math.round((lwhisker - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight / 4),
+                Math.round((lwhisker - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight - canvasHeight / 4),
+                options.get('whiskerColor')).append();
+            // right whisker
+            target.drawLine(Math.round((rwhisker - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight / 2),
+                Math.round((q3 - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight / 2),
+                options.get('lineColor')).append();
+            target.drawLine(
+                Math.round((rwhisker - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight / 4),
+                Math.round((rwhisker - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight - canvasHeight / 4),
+                options.get('whiskerColor')).append();
+            // median line
+            target.drawLine(
+                Math.round((q2 - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight * 0.1),
+                Math.round((q2 - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight * 0.9),
+                options.get('medianColor')).append();
+            if (options.get('target')) {
+                size = Math.ceil(options.get('spotRadius'));
+                target.drawLine(
+                    Math.round((options.get('target') - minValue) * unitSize + canvasLeft),
+                    Math.round((canvasHeight / 2) - size),
+                    Math.round((options.get('target') - minValue) * unitSize + canvasLeft),
+                    Math.round((canvasHeight / 2) + size),
+                    options.get('targetColor')).append();
+                target.drawLine(
+                    Math.round((options.get('target') - minValue) * unitSize + canvasLeft - size),
+                    Math.round(canvasHeight / 2),
+                    Math.round((options.get('target') - minValue) * unitSize + canvasLeft + size),
+                    Math.round(canvasHeight / 2),
+                    options.get('targetColor')).append();
+            }
+            target.render();
+        }
+    });
+
+    // Setup a very simple "virtual canvas" to make drawing the few shapes we need easier
+    // This is accessible as $(foo).simpledraw()
+
+    // Detect browser renderer support
+    (function() {
+        if (document.namespaces && !document.namespaces.v) {
+            $.fn.sparkline.hasVML = true;
+            document.namespaces.add('v', 'urn:schemas-microsoft-com:vml', '#default#VML');
+        } else {
+            $.fn.sparkline.hasVML = false;
+        }
+
+        var el = document.createElement('canvas');
+        $.fn.sparkline.hasCanvas = !!(el.getContext && el.getContext('2d'));
+
+    })()
+
+    VShape = createClass({
+        init: function (target, id, type, args) {
+            this.target = target;
+            this.id = id;
+            this.type = type;
+            this.args = args;
+        },
+        append: function () {
+            this.target.appendShape(this);
+            return this;
+        }
+    });
+
+    VCanvas_base = createClass({
+        _pxregex: /(\d+)(px)?\s*$/i,
+
+        init: function (width, height, target) {
+            if (!width) {
+                return;
+            }
+            this.width = width;
+            this.height = height;
+            this.target = target;
+            this.lastShapeId = null;
+            if (target[0]) {
+                target = target[0];
+            }
+            $.data(target, '_jqs_vcanvas', this);
+        },
+
+        drawLine: function (x1, y1, x2, y2, lineColor, lineWidth) {
+            return this.drawShape([[x1, y1], [x2, y2]], lineColor, lineWidth);
+        },
+
+        drawShape: function (path, lineColor, fillColor, lineWidth) {
+            return this._genShape('Shape', [path, lineColor, fillColor, lineWidth]);
+        },
+
+        drawCircle: function (x, y, radius, lineColor, fillColor, lineWidth) {
+            return this._genShape('Circle', [x, y, radius, lineColor, fillColor, lineWidth]);
+        },
+
+        drawPieSlice: function (x, y, radius, startAngle, endAngle, lineColor, fillColor) {
+            return this._genShape('PieSlice', [x, y, radius, startAngle, endAngle, lineColor, fillColor]);
+        },
+
+        drawRect: function (x, y, width, height, lineColor, fillColor) {
+            return this._genShape('Rect', [x, y, width, height, lineColor, fillColor]);
+        },
+
+        getElement: function () {
+            return this.canvas;
+        },
+
+        /**
+         * Return the most recently inserted shape id
+         */
+        getLastShapeId: function () {
+            return this.lastShapeId;
+        },
+
+        /**
+         * Clear and reset the canvas
+         */
+        reset: function () {
+            alert('reset not implemented');
+        },
+
+        _insert: function (el, target) {
+            $(target).html(el);
+        },
+
+        /**
+         * Calculate the pixel dimensions of the canvas
+         */
+        _calculatePixelDims: function (width, height, canvas) {
+            // XXX This should probably be a configurable option
+            var match;
+            match = this._pxregex.exec(height);
+            if (match) {
+                this.pixelHeight = match[1];
+            } else {
+                this.pixelHeight = $(canvas).height();
+            }
+            match = this._pxregex.exec(width);
+            if (match) {
+                this.pixelWidth = match[1];
+            } else {
+                this.pixelWidth = $(canvas).width();
+            }
+        },
+
+        /**
+         * Generate a shape object and id for later rendering
+         */
+        _genShape: function (shapetype, shapeargs) {
+            var id = shapeCount++;
+            shapeargs.unshift(id);
+            return new VShape(this, id, shapetype, shapeargs);
+        },
+
+        /**
+         * Add a shape to the end of the render queue
+         */
+        appendShape: function (shape) {
+            alert('appendShape not implemented');
+        },
+
+        /**
+         * Replace one shape with another
+         */
+        replaceWithShape: function (shapeid, shape) {
+            alert('replaceWithShape not implemented');
+        },
+
+        /**
+         * Insert one shape after another in the render queue
+         */
+        insertAfterShape: function (shapeid, shape) {
+            alert('insertAfterShape not implemented');
+        },
+
+        /**
+         * Remove a shape from the queue
+         */
+        removeShapeId: function (shapeid) {
+            alert('removeShapeId not implemented');
+        },
+
+        /**
+         * Find a shape at the specified x/y co-ordinates
+         */
+        getShapeAt: function (el, x, y) {
+            alert('getShapeAt not implemented');
+        },
+
+        /**
+         * Render all queued shapes onto the canvas
+         */
+        render: function () {
+            alert('render not implemented');
+        }
+    });
+
+    VCanvas_canvas = createClass(VCanvas_base, {
+        init: function (width, height, target, interact) {
+            VCanvas_canvas._super.init.call(this, width, height, target);
+            this.canvas = document.createElement('canvas');
+            if (target[0]) {
+                target = target[0];
+            }
+            $.data(target, '_jqs_vcanvas', this);
+            $(this.canvas).css({ display: 'inline-block', width: width, height: height, verticalAlign: 'top' });
+            this._insert(this.canvas, target);
+            this._calculatePixelDims(width, height, this.canvas);
+            this.canvas.width = this.pixelWidth;
+            this.canvas.height = this.pixelHeight;
+            this.interact = interact;
+            this.shapes = {};
+            this.shapeseq = [];
+            this.currentTargetShapeId = undefined;
+            $(this.canvas).css({width: this.pixelWidth, height: this.pixelHeight});
+        },
+
+        _getContext: function (lineColor, fillColor, lineWidth) {
+            var context = this.canvas.getContext('2d');
+            if (lineColor !== undefined) {
+                context.strokeStyle = lineColor;
+            }
+            context.lineWidth = lineWidth === undefined ? 1 : lineWidth;
+            if (fillColor !== undefined) {
+                context.fillStyle = fillColor;
+            }
+            return context;
+        },
+
+        reset: function () {
+            var context = this._getContext();
+            context.clearRect(0, 0, this.pixelWidth, this.pixelHeight);
+            this.shapes = {};
+            this.shapeseq = [];
+            this.currentTargetShapeId = undefined;
+        },
+
+        _drawShape: function (shapeid, path, lineColor, fillColor, lineWidth) {
+            var context = this._getContext(lineColor, fillColor, lineWidth),
+                i, plen;
+            context.beginPath();
+            context.moveTo(path[0][0] + 0.5, path[0][1] + 0.5);
+            for (i = 1, plen = path.length; i < plen; i++) {
+                context.lineTo(path[i][0] + 0.5, path[i][1] + 0.5); // the 0.5 offset gives us crisp pixel-width lines
+            }
+            if (lineColor !== undefined) {
+                context.stroke();
+            }
+            if (fillColor !== undefined) {
+                context.fill();
+            }
+            if (this.targetX !== undefined && this.targetY !== undefined &&
+                context.isPointInPath(this.targetX, this.targetY)) {
+                this.currentTargetShapeId = shapeid;
+            }
+        },
+
+        _drawCircle: function (shapeid, x, y, radius, lineColor, fillColor, lineWidth) {
+            var context = this._getContext(lineColor, fillColor, lineWidth);
+            context.beginPath();
+            context.arc(x, y, radius, 0, 2 * Math.PI, false);
+            if (this.targetX !== undefined && this.targetY !== undefined &&
+                context.isPointInPath(this.targetX, this.targetY)) {
+                this.currentTargetShapeId = shapeid;
+            }
+            if (lineColor !== undefined) {
+                context.stroke();
+            }
+            if (fillColor !== undefined) {
+                context.fill();
+            }
+        },
+
+        _drawPieSlice: function (shapeid, x, y, radius, startAngle, endAngle, lineColor, fillColor) {
+            var context = this._getContext(lineColor, fillColor);
+            context.beginPath();
+            context.moveTo(x, y);
+            context.arc(x, y, radius, startAngle, endAngle, false);
+            context.lineTo(x, y);
+            context.closePath();
+            if (lineColor !== undefined) {
+                context.stroke();
+            }
+            if (fillColor) {
+                context.fill();
+            }
+            if (this.targetX !== undefined && this.targetY !== undefined &&
+                context.isPointInPath(this.targetX, this.targetY)) {
+                this.currentTargetShapeId = shapeid;
+            }
+        },
+
+        _drawRect: function (shapeid, x, y, width, height, lineColor, fillColor) {
+            return this._drawShape(shapeid, [[x, y], [x + width, y], [x + width, y + height], [x, y + height], [x, y]], lineColor, fillColor);
+        },
+
+        appendShape: function (shape) {
+            this.shapes[shape.id] = shape;
+            this.shapeseq.push(shape.id);
+            this.lastShapeId = shape.id;
+            return shape.id;
+        },
+
+        replaceWithShape: function (shapeid, shape) {
+            var shapeseq = this.shapeseq,
+                i;
+            this.shapes[shape.id] = shape;
+            for (i = shapeseq.length; i--;) {
+                if (shapeseq[i] == shapeid) {
+                    shapeseq[i] = shape.id;
+                }
+            }
+            delete this.shapes[shapeid];
+        },
+
+        replaceWithShapes: function (shapeids, shapes) {
+            var shapeseq = this.shapeseq,
+                shapemap = {},
+                sid, i, first;
+
+            for (i = shapeids.length; i--;) {
+                shapemap[shapeids[i]] = true;
+            }
+            for (i = shapeseq.length; i--;) {
+                sid = shapeseq[i];
+                if (shapemap[sid]) {
+                    shapeseq.splice(i, 1);
+                    delete this.shapes[sid];
+                    first = i;
+                }
+            }
+            for (i = shapes.length; i--;) {
+                shapeseq.splice(first, 0, shapes[i].id);
+                this.shapes[shapes[i].id] = shapes[i];
+            }
+
+        },
+
+        insertAfterShape: function (shapeid, shape) {
+            var shapeseq = this.shapeseq,
+                i;
+            for (i = shapeseq.length; i--;) {
+                if (shapeseq[i] === shapeid) {
+                    shapeseq.splice(i + 1, 0, shape.id);
+                    this.shapes[shape.id] = shape;
+                    return;
+                }
+            }
+        },
+
+        removeShapeId: function (shapeid) {
+            var shapeseq = this.shapeseq,
+                i;
+            for (i = shapeseq.length; i--;) {
+                if (shapeseq[i] === shapeid) {
+                    shapeseq.splice(i, 1);
+                    break;
+                }
+            }
+            delete this.shapes[shapeid];
+        },
+
+        getShapeAt: function (el, x, y) {
+            this.targetX = x;
+            this.targetY = y;
+            this.render();
+            return this.currentTargetShapeId;
+        },
+
+        render: function () {
+            var shapeseq = this.shapeseq,
+                shapes = this.shapes,
+                shapeCount = shapeseq.length,
+                context = this._getContext(),
+                shapeid, shape, i;
+            context.clearRect(0, 0, this.pixelWidth, this.pixelHeight);
+            for (i = 0; i < shapeCount; i++) {
+                shapeid = shapeseq[i];
+                shape = shapes[shapeid];
+                this['_draw' + shape.type].apply(this, shape.args);
+            }
+            if (!this.interact) {
+                // not interactive so no need to keep the shapes array
+                this.shapes = {};
+                this.shapeseq = [];
+            }
+        }
+
+    });
+
+    VCanvas_vml = createClass(VCanvas_base, {
+        init: function (width, height, target) {
+            var groupel;
+            VCanvas_vml._super.init.call(this, width, height, target);
+            if (target[0]) {
+                target = target[0];
+            }
+            $.data(target, '_jqs_vcanvas', this);
+            this.canvas = document.createElement('span');
+            $(this.canvas).css({ display: 'inline-block', position: 'relative', overflow: 'hidden', width: width, height: height, margin: '0px', padding: '0px', verticalAlign: 'top'});
+            this._insert(this.canvas, target);
+            this._calculatePixelDims(width, height, this.canvas);
+            this.canvas.width = this.pixelWidth;
+            this.canvas.height = this.pixelHeight;
+            groupel = '<v:group coordorigin="0 0" coordsize="' + this.pixelWidth + ' ' + this.pixelHeight + '"' +
+                    ' style="position:absolute;top:0;left:0;width:' + this.pixelWidth + 'px;height=' + this.pixelHeight + 'px;"></v:group>';
+            this.canvas.insertAdjacentHTML('beforeEnd', groupel);
+            this.group = $(this.canvas).children()[0];
+            this.rendered = false;
+            this.prerender = '';
+        },
+
+        _drawShape: function (shapeid, path, lineColor, fillColor, lineWidth) {
+            var vpath = [],
+                initial, stroke, fill, closed, vel, plen, i;
+            for (i = 0, plen = path.length; i < plen; i++) {
+                vpath[i] = '' + (path[i][0]) + ',' + (path[i][1]);
+            }
+            initial = vpath.splice(0, 1);
+            lineWidth = lineWidth === undefined ? 1 : lineWidth;
+            stroke = lineColor === undefined ? ' stroked="false" ' : ' strokeWeight="' + lineWidth + 'px" strokeColor="' + lineColor + '" ';
+            fill = fillColor === undefined ? ' filled="false"' : ' fillColor="' + fillColor + '" filled="true" ';
+            closed = vpath[0] === vpath[vpath.length - 1] ? 'x ' : '';
+            vel = '<v:shape coordorigin="0 0" coordsize="' + this.pixelWidth + ' ' + this.pixelHeight + '" ' +
+                 ' id="jqsshape' + shapeid + '" ' +
+                 stroke +
+                 fill +
+                ' style="position:absolute;left:0px;top:0px;height:' + this.pixelHeight + 'px;width:' + this.pixelWidth + 'px;padding:0px;margin:0px;" ' +
+                ' path="m ' + initial + ' l ' + vpath.join(', ') + ' ' + closed + 'e">' +
+                ' </v:shape>';
+            return vel;
+        },
+
+        _drawCircle: function (shapeid, x, y, radius, lineColor, fillColor, lineWidth) {
+            var stroke, fill, vel;
+            x -= radius;
+            y -= radius;
+            stroke = lineColor === undefined ? ' stroked="false" ' : ' strokeWeight="' + lineWidth + 'px" strokeColor="' + lineColor + '" ';
+            fill = fillColor === undefined ? ' filled="false"' : ' fillColor="' + fillColor + '" filled="true" ';
+            vel = '<v:oval ' +
+                 ' id="jqsshape' + shapeid + '" ' +
+                stroke +
+                fill +
+                ' style="position:absolute;top:' + y + 'px; left:' + x + 'px; width:' + (radius * 2) + 'px; height:' + (radius * 2) + 'px"></v:oval>';
+            return vel;
+
+        },
+
+        _drawPieSlice: function (shapeid, x, y, radius, startAngle, endAngle, lineColor, fillColor) {
+            var vpath, startx, starty, endx, endy, stroke, fill, vel;
+            if (startAngle === endAngle) {
+                return '';  // VML seems to have problem when start angle equals end angle.
+            }
+            if ((endAngle - startAngle) === (2 * Math.PI)) {
+                startAngle = 0.0;  // VML seems to have a problem when drawing a full circle that doesn't start 0
+                endAngle = (2 * Math.PI);
+            }
+
+            startx = x + Math.round(Math.cos(startAngle) * radius);
+            starty = y + Math.round(Math.sin(startAngle) * radius);
+            endx = x + Math.round(Math.cos(endAngle) * radius);
+            endy = y + Math.round(Math.sin(endAngle) * radius);
+
+            if (startx === endx && starty === endy) {
+                if ((endAngle - startAngle) < Math.PI) {
+                    // Prevent very small slices from being mistaken as a whole pie
+                    return '';
+                }
+                // essentially going to be the entire circle, so ignore startAngle
+                startx = endx = x + radius;
+                starty = endy = y;
+            }
+
+            if (startx === endx && starty === endy && (endAngle - startAngle) < Math.PI) {
+                return '';
+            }
+
+            vpath = [x - radius, y - radius, x + radius, y + radius, startx, starty, endx, endy];
+            stroke = lineColor === undefined ? ' stroked="false" ' : ' strokeWeight="1px" strokeColor="' + lineColor + '" ';
+            fill = fillColor === undefined ? ' filled="false"' : ' fillColor="' + fillColor + '" filled="true" ';
+            vel = '<v:shape coordorigin="0 0" coordsize="' + this.pixelWidth + ' ' + this.pixelHeight + '" ' +
+                 ' id="jqsshape' + shapeid + '" ' +
+                 stroke +
+                 fill +
+                ' style="position:absolute;left:0px;top:0px;height:' + this.pixelHeight + 'px;width:' + this.pixelWidth + 'px;padding:0px;margin:0px;" ' +
+                ' path="m ' + x + ',' + y + ' wa ' + vpath.join(', ') + ' x e">' +
+                ' </v:shape>';
+            return vel;
+        },
+
+        _drawRect: function (shapeid, x, y, width, height, lineColor, fillColor) {
+            return this._drawShape(shapeid, [[x, y], [x, y + height], [x + width, y + height], [x + width, y], [x, y]], lineColor, fillColor);
+        },
+
+        reset: function () {
+            this.group.innerHTML = '';
+        },
+
+        appendShape: function (shape) {
+            var vel = this['_draw' + shape.type].apply(this, shape.args);
+            if (this.rendered) {
+                this.group.insertAdjacentHTML('beforeEnd', vel);
+            } else {
+                this.prerender += vel;
+            }
+            this.lastShapeId = shape.id;
+            return shape.id;
+        },
+
+        replaceWithShape: function (shapeid, shape) {
+            var existing = $('#jqsshape' + shapeid),
+                vel = this['_draw' + shape.type].apply(this, shape.args);
+            existing[0].outerHTML = vel;
+        },
+
+        replaceWithShapes: function (shapeids, shapes) {
+            // replace the first shapeid with all the new shapes then toast the remaining old shapes
+            var existing = $('#jqsshape' + shapeids[0]),
+                replace = '',
+                slen = shapes.length,
+                i;
+            for (i = 0; i < slen; i++) {
+                replace += this['_draw' + shapes[i].type].apply(this, shapes[i].args);
+            }
+            existing[0].outerHTML = replace;
+            for (i = 1; i < shapeids.length; i++) {
+                $('#jqsshape' + shapeids[i]).remove();
+            }
+        },
+
+        insertAfterShape: function (shapeid, shape) {
+            var existing = $('#jqsshape' + shapeid),
+                 vel = this['_draw' + shape.type].apply(this, shape.args);
+            existing[0].insertAdjacentHTML('afterEnd', vel);
+        },
+
+        removeShapeId: function (shapeid) {
+            var existing = $('#jqsshape' + shapeid);
+            this.group.removeChild(existing[0]);
+        },
+
+        getShapeAt: function (el, x, y) {
+            var shapeid = el.id.substr(8);
+            return shapeid;
+        },
+
+        render: function () {
+            if (!this.rendered) {
+                // batch the intial render into a single repaint
+                this.group.innerHTML = this.prerender;
+                this.rendered = true;
+            }
+        }
+    });
+
+}));
diff --git a/addons/web/static/lib/justgage/justgage.1.0.1.js b/addons/web/static/lib/justgage/justgage.1.0.1.js
new file mode 100644
index 00000000000..24540beb293
--- /dev/null
+++ b/addons/web/static/lib/justgage/justgage.1.0.1.js
@@ -0,0 +1,946 @@
+/**
+ * JustGage - this is work-in-progress, unreleased, unofficial code, so it might not work top-notch :)
+ * Check http://www.justgage.com for official releases
+ * Licensed under MIT.
+ * @author Bojan Djuricic  (@Toorshia)
+ *
+ * LATEST UPDATES
+
+ * -----------------------------
+ * April 18, 2013.
+ * -----------------------------
+     * parentNode - use this instead of id, to attach gauge to node which is outside of DOM tree - https://github.com/toorshia/justgage/issues/48
+     * width - force gauge width
+     * height - force gauge height
+
+ * -----------------------------
+ * April 17, 2013.
+ * -----------------------------
+     * fix - https://github.com/toorshia/justgage/issues/49
+
+ * -----------------------------
+ * April 01, 2013.
+ * -----------------------------
+     * fix - https://github.com/toorshia/justgage/issues/46
+
+ * -----------------------------
+ * March 26, 2013.
+ * -----------------------------
+     * customSectors - define specific color for value range (0-10 : red, 10-30 : blue etc.)
+
+ * -----------------------------
+ * March 23, 2013.
+ * -----------------------------
+     * counter - option to animate value  in counting fashion
+     * fix - https://github.com/toorshia/justgage/issues/45
+
+ * -----------------------------
+ * March 13, 2013.
+ * -----------------------------
+     * refresh method - added optional 'max' parameter to use when you need to update max value
+
+ * -----------------------------
+ * February 26, 2013.
+ * -----------------------------
+     * decimals - option to define/limit number of decimals when not using humanFriendly or customRenderer to display value
+     * fixed a missing parameters bug when calling generateShadow()  for IE < 9
+
+ * -----------------------------
+ * December 31, 2012.
+ * -----------------------------
+     * fixed text y-position for hidden divs - workaround for Raphael <tspan> 'dy' bug - https://github.com/DmitryBaranovskiy/raphael/issues/491
+     * 'show' parameters, like showMinMax are now 'hide' because I am lame developer - please update these in your setups
+     * Min and Max labels are now auto-off when in donut mode
+     * Start angle in donut mode is now 90
+     * donutStartAngle - option to define start angle for donut
+
+ * -----------------------------
+ * November 25, 2012.
+ * -----------------------------
+     * Option to define custom rendering function for displayed value
+
+ * -----------------------------
+ * November 19, 2012.
+ * -----------------------------
+     * Config.value is now updated after gauge refresh
+
+ * -----------------------------
+ * November 13, 2012.
+ * -----------------------------
+     * Donut display mode added
+     * Option to hide value label
+     * Option to enable responsive gauge size
+     * Removed default title attribute
+     * Option to accept min and max defined as string values
+     * Option to configure value symbol
+     * Fixed bad aspect ratio calculations
+     * Option to configure minimum font size for all texts
+     * Option to show shorthand big numbers (human friendly)
+     */
+
+ JustGage = function(config) {
+
+  // if (!config.id) {alert("Missing id parameter for gauge!"); return false;}
+  // if (!document.getElementById(config.id)) {alert("No element with id: \""+config.id+"\" found!"); return false;}
+
+  var obj = this;
+
+  // configurable parameters
+  obj.config =
+  {
+    // id : string
+    // this is container element id
+    id : config.id,
+
+    // parentNode : node object
+    // this is container element
+    parentNode : (config.parentNode) ? config.parentNode : null,
+
+    // width : int
+    // gauge width
+    width : (config.width) ? config.width : null,
+
+    // height : int
+    // gauge height
+    height : (config.height) ? config.height : null,
+
+    // title : string
+    // gauge title
+    title : (config.title) ? config.title : "",
+
+    // titleFontColor : string
+    // color of gauge title
+    titleFontColor : (config.titleFontColor) ? config.titleFontColor : "#999999",
+
+    // value : int
+    // value gauge is showing
+    value : (config.value) ? config.value : 0,
+
+    // valueFontColor : string
+    // color of label showing current value
+    valueFontColor : (config.valueFontColor) ? config.valueFontColor : "#010101",
+
+    // symbol : string
+    // special symbol to show next to value
+    symbol : (config.symbol) ? config.symbol : "",
+
+    // min : int
+    // min value
+    min : (config.min !== undefined) ? parseFloat(config.min) : 0,
+
+    // max : int
+    // max value
+    max : (config.max !== undefined) ? parseFloat(config.max) : 100,
+
+    // humanFriendlyDecimal : int
+    // number of decimal places for our human friendly number to contain
+    humanFriendlyDecimal : (config.humanFriendlyDecimal) ? config.humanFriendlyDecimal : 0,
+
+    // textRenderer: func
+    // function applied before rendering text
+    textRenderer  : (config.textRenderer) ? config.textRenderer : null,
+
+    // gaugeWidthScale : float
+    // width of the gauge element
+    gaugeWidthScale : (config.gaugeWidthScale) ? config.gaugeWidthScale : 1.0,
+
+    // gaugeColor : string
+    // background color of gauge element
+    gaugeColor : (config.gaugeColor) ? config.gaugeColor : "#edebeb",
+
+    // label : string
+    // text to show below value
+    label : (config.label) ? config.label : "",
+
+    // labelFontColor : string
+    // color of label showing label under value
+    labelFontColor : (config.labelFontColor) ? config.labelFontColor : "#b3b3b3",
+
+    // shadowOpacity : int
+    // 0 ~ 1
+    shadowOpacity : (config.shadowOpacity) ? config.shadowOpacity : 0.2,
+
+    // shadowSize: int
+    // inner shadow size
+    shadowSize : (config.shadowSize) ? config.shadowSize : 5,
+
+    // shadowVerticalOffset : int
+    // how much shadow is offset from top
+    shadowVerticalOffset : (config.shadowVerticalOffset) ? config.shadowVerticalOffset : 3,
+
+    // levelColors : string[]
+    // colors of indicator, from lower to upper, in RGB format
+    levelColors : (config.levelColors) ? config.levelColors : [
+    "#a9d70b",
+    "#f9c802",
+    "#ff0000"
+    ],
+
+    // startAnimationTime : int
+    // length of initial animation
+    startAnimationTime : (config.startAnimationTime) ? config.startAnimationTime : 700,
+
+    // startAnimationType : string
+    // type of initial animation (linear, >, <,  <>, bounce)
+    startAnimationType : (config.startAnimationType) ? config.startAnimationType : ">",
+
+    // refreshAnimationTime : int
+    // length of refresh animation
+    refreshAnimationTime : (config.refreshAnimationTime) ? config.refreshAnimationTime : 700,
+
+    // refreshAnimationType : string
+    // type of refresh animation (linear, >, <,  <>, bounce)
+    refreshAnimationType : (config.refreshAnimationType) ? config.refreshAnimationType : ">",
+
+    // donutStartAngle : int
+    // angle to start from when in donut mode
+    donutStartAngle : (config.donutStartAngle) ? config.donutStartAngle : 90,
+
+    // valueMinFontSize : int
+    // absolute minimum font size for the value
+    valueMinFontSize : config.valueMinFontSize || 16,
+
+    // titleMinFontSize
+    // absolute minimum font size for the title
+    titleMinFontSize : config.titleMinFontSize || 10,
+
+    // labelMinFontSize
+    // absolute minimum font size for the label
+    labelMinFontSize : config.labelMinFontSize || 10,
+
+    // minLabelMinFontSize
+    // absolute minimum font size for the minimum label
+    minLabelMinFontSize : config.minLabelMinFontSize || 10,
+
+    // maxLabelMinFontSize
+    // absolute minimum font size for the maximum label
+    maxLabelMinFontSize : config.maxLabelMinFontSize || 10,
+
+    // hideValue : bool
+    // hide value text
+    hideValue : (config.hideValue) ? config.hideValue : false,
+
+    // hideMinMax : bool
+    // hide min and max values
+    hideMinMax : (config.hideMinMax) ? config.hideMinMax : false,
+
+    // hideInnerShadow : bool
+    // hide inner shadow
+    hideInnerShadow : (config.hideInnerShadow) ? config.hideInnerShadow : false,
+
+    // humanFriendly : bool
+    // convert large numbers for min, max, value to human friendly (e.g. 1234567 -> 1.23M)
+    humanFriendly : (config.humanFriendly) ? config.humanFriendly : false,
+
+    // noGradient : bool
+    // whether to use gradual color change for value, or sector-based
+    noGradient : (config.noGradient) ? config.noGradient : false,
+
+    // donut : bool
+    // show full donut gauge
+    donut : (config.donut) ? config.donut : false,
+
+    // relativeGaugeSize : bool
+    // whether gauge size should follow changes in container element size
+    relativeGaugeSize : (config.relativeGaugeSize) ? config.relativeGaugeSize : false,
+
+    // counter : bool
+    // animate level number change
+    counter : (config.counter) ? config.counter : false,
+
+    // decimals : int
+    // number of digits after floating point
+    decimals : (config.decimals) ? config.decimals : 0,
+
+    // customSectors : [] of objects
+    // number of digits after floating point
+    customSectors : (config.customSectors) ? config.customSectors : []
+  };
+
+  // variables
+  var
+  canvasW,
+  canvasH,
+  widgetW,
+  widgetH,
+  aspect,
+  dx,
+  dy,
+  titleFontSize,
+  titleX,
+  titleY,
+  valueFontSize,
+  valueX,
+  valueY,
+  labelFontSize,
+  labelX,
+  labelY,
+  minFontSize,
+  minX,
+  minY,
+  maxFontSize,
+  maxX,
+  maxY;
+
+  // overflow values
+  if (obj.config.value > obj.config.max) obj.config.value = obj.config.max;
+  if (obj.config.value < obj.config.min) obj.config.value = obj.config.min;
+  obj.originalValue = config.value;
+
+  // create canvas
+  if (obj.config.id !== null && (document.getElementById(obj.config.id)) !== null) {
+    obj.canvas = Raphael(obj.config.id, "100%", "100%");
+  } else if (obj.config.parentNode !== null) {
+    obj.canvas = Raphael(obj.config.parentNode, "100%", "100%");
+  }
+
+  if (obj.config.relativeGaugeSize === true) {
+    obj.canvas.setViewBox(0, 0, 200, 150, true);
+  }
+
+  // canvas dimensions
+  if (obj.config.relativeGaugeSize === true) {
+    canvasW = 200;
+    canvasH = 150;
+  } else if (obj.config.width !== null && obj.config.height !== null) {
+    canvasW = obj.config.width;
+    canvasH = obj.config.height;
+  } else if (obj.config.parentNode !== null) {
+    obj.canvas.setViewBox(0, 0, 200, 150, true);
+    canvasW = 200;
+    canvasH = 150;
+  } else {
+    canvasW = getStyle(document.getElementById(obj.config.id), "width").slice(0, -2) * 1;
+    canvasH = getStyle(document.getElementById(obj.config.id), "height").slice(0, -2) * 1;
+  }
+
+  // widget dimensions
+  if (obj.config.donut === true) {
+
+    // DONUT *******************************
+
+    // width more than height
+    if(canvasW > canvasH) {
+      widgetH = canvasH;
+      widgetW = widgetH;
+    // width less than height
+  } else if (canvasW < canvasH) {
+    widgetW = canvasW;
+    widgetH = widgetW;
+      // if height don't fit, rescale both
+      if(widgetH > canvasH) {
+        aspect = widgetH / canvasH;
+        widgetH = widgetH / aspect;
+        widgetW = widgetH / aspect;
+      }
+    // equal
+  } else {
+    widgetW = canvasW;
+    widgetH = widgetW;
+  }
+
+    // delta
+    dx = (canvasW - widgetW)/2;
+    dy = (canvasH - widgetH)/2;
+
+    // title
+    titleFontSize = ((widgetH / 8) > 10) ? (widgetH / 10) : 10;
+    titleX = dx + widgetW / 2;
+    titleY = dy + widgetH / 11;
+
+    // value
+    valueFontSize = ((widgetH / 6.4) > 16) ? (widgetH / 5.4) : 18;
+    valueX = dx + widgetW / 2;
+    if(obj.config.label !== '') {
+      valueY = dy + widgetH / 1.85;
+    } else {
+      valueY = dy + widgetH / 1.7;
+    }
+
+    // label
+    labelFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
+    labelX = dx + widgetW / 2;
+    labelY = valueY + labelFontSize;
+
+    // min
+    minFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
+    minX = dx + (widgetW / 10) + (widgetW / 6.666666666666667 * obj.config.gaugeWidthScale) / 2 ;
+    minY = labelY;
+
+    // max
+    maxFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
+    maxX = dx + widgetW - (widgetW / 10) - (widgetW / 6.666666666666667 * obj.config.gaugeWidthScale) / 2 ;
+    maxY = labelY;
+
+  } else {
+    // HALF *******************************
+
+    // width more than height
+    if(canvasW > canvasH) {
+      widgetH = canvasH;
+      widgetW = widgetH * 1.25;
+      //if width doesn't fit, rescale both
+      if(widgetW > canvasW) {
+        aspect = widgetW / canvasW;
+        widgetW = widgetW / aspect;
+        widgetH = widgetH / aspect;
+      }
+    // width less than height
+  } else if (canvasW < canvasH) {
+    widgetW = canvasW;
+    widgetH = widgetW / 1.25;
+      // if height don't fit, rescale both
+      if(widgetH > canvasH) {
+        aspect = widgetH / canvasH;
+        widgetH = widgetH / aspect;
+        widgetW = widgetH / aspect;
+      }
+    // equal
+  } else {
+    widgetW = canvasW;
+    widgetH = widgetW * 0.75;
+  }
+
+    // delta
+    dx = (canvasW - widgetW)/2;
+    dy = (canvasH - widgetH)/2;
+
+    // title
+    titleFontSize = ((widgetH / 8) > obj.config.titleMinFontSize) ? (widgetH / 10) : obj.config.titleMinFontSize;
+    titleX = dx + widgetW / 2;
+    titleY = dy + widgetH / 6.4;
+
+    // value
+    valueFontSize = ((widgetH / 6.5) > obj.config.valueMinFontSize) ? (widgetH / 6.5) : obj.config.valueMinFontSize;
+    valueX = dx + widgetW / 2;
+    valueY = dy + widgetH / 1.275;
+
+    // label
+    labelFontSize = ((widgetH / 16) > obj.config.labelMinFontSize) ? (widgetH / 16) : obj.config.labelMinFontSize;
+    labelX = dx + widgetW / 2;
+    labelY = valueY + valueFontSize / 2 + 5;
+
+    // min
+    minFontSize = ((widgetH / 16) > obj.config.minLabelMinFontSize) ? (widgetH / 16) : obj.config.minLabelMinFontSize;
+    minX = dx + (widgetW / 10) + (widgetW / 6.666666666666667 * obj.config.gaugeWidthScale) / 2 ;
+    minY = labelY;
+
+    // max
+    maxFontSize = ((widgetH / 16) > obj.config.maxLabelMinFontSize) ? (widgetH / 16) : obj.config.maxLabelMinFontSize;
+    maxX = dx + widgetW - (widgetW / 10) - (widgetW / 6.666666666666667 * obj.config.gaugeWidthScale) / 2 ;
+    maxY = labelY;
+  }
+
+  // parameters
+  obj.params  = {
+    canvasW : canvasW,
+    canvasH : canvasH,
+    widgetW : widgetW,
+    widgetH : widgetH,
+    dx : dx,
+    dy : dy,
+    titleFontSize : titleFontSize,
+    titleX : titleX,
+    titleY : titleY,
+    valueFontSize : valueFontSize,
+    valueX : valueX,
+    valueY : valueY,
+    labelFontSize : labelFontSize,
+    labelX : labelX,
+    labelY : labelY,
+    minFontSize : minFontSize,
+    minX : minX,
+    minY : minY,
+    maxFontSize : maxFontSize,
+    maxX : maxX,
+    maxY : maxY
+  };
+
+  // var clear
+  canvasW, canvasH, widgetW, widgetH, aspect, dx, dy, titleFontSize, titleX, titleY, valueFontSize, valueX, valueY, labelFontSize, labelX, labelY, minFontSize, minX, minY, maxFontSize, maxX, maxY = null
+
+  // pki - custom attribute for generating gauge paths
+  obj.canvas.customAttributes.pki = function (value, min, max, w, h, dx, dy, gws, donut) {
+
+    var alpha, Ro, Ri, Cx, Cy, Xo, Yo, Xi, Yi, path;
+
+    if (donut) {
+      alpha = (1 - 2 * (value - min) / (max - min)) * Math.PI;
+      Ro = w / 2 - w / 7;
+      Ri = Ro - w / 6.666666666666667 * gws;
+
+      Cx = w / 2 + dx;
+      Cy = h / 1.95 + dy;
+
+      Xo = w / 2 + dx + Ro * Math.cos(alpha);
+      Yo = h - (h - Cy) + 0 - Ro * Math.sin(alpha);
+      Xi = w / 2 + dx + Ri * Math.cos(alpha);
+      Yi = h - (h - Cy) + 0 - Ri * Math.sin(alpha);
+
+      path += "M" + (Cx - Ri) + "," + Cy + " ";
+      path += "L" + (Cx - Ro) + "," + Cy + " ";
+      if (value > ((max - min) / 2)) {
+        path += "A" + Ro + "," + Ro + " 0 0 1 " + (Cx + Ro) + "," + Cy + " ";
+      }
+      path += "A" + Ro + "," + Ro + " 0 0 1 " + Xo + "," + Yo + " ";
+      path += "L" + Xi + "," + Yi + " ";
+      if (value > ((max - min) / 2)) {
+        path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx + Ri) + "," + Cy + " ";
+      }
+      path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx - Ri) + "," + Cy + " ";
+      path += "Z ";
+
+      return { path: path };
+
+    } else {
+      alpha = (1 - (value - min) / (max - min)) * Math.PI;
+      Ro = w / 2 - w / 10;
+      Ri = Ro - w / 6.666666666666667 * gws;
+
+      Cx = w / 2 + dx;
+      Cy = h / 1.25 + dy;
+
+      Xo = w / 2 + dx + Ro * Math.cos(alpha);
+      Yo = h - (h - Cy) + 0 - Ro * Math.sin(alpha);
+      Xi = w / 2 + dx + Ri * Math.cos(alpha);
+      Yi = h - (h - Cy) + 0 - Ri * Math.sin(alpha);
+
+      path += "M" + (Cx - Ri) + "," + Cy + " ";
+      path += "L" + (Cx - Ro) + "," + Cy + " ";
+      path += "A" + Ro + "," + Ro + " 0 0 1 " + Xo + "," + Yo + " ";
+      path += "L" + Xi + "," + Yi + " ";
+      path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx - Ri) + "," + Cy + " ";
+      path += "Z ";
+
+      return { path: path };
+    }
+
+    // var clear
+    alpha, Ro, Ri, Cx, Cy, Xo, Yo, Xi, Yi, path = null;
+  };
+
+  // gauge
+  obj.gauge = obj.canvas.path().attr({
+      "stroke": "none",
+      "fill": obj.config.gaugeColor,
+      pki: [
+        obj.config.max,
+        obj.config.min,
+        obj.config.max,
+        obj.params.widgetW,
+        obj.params.widgetH,
+        obj.params.dx,
+        obj.params.dy,
+        obj.config.gaugeWidthScale,
+        obj.config.donut
+      ]
+  });
+
+  // level
+  obj.level = obj.canvas.path().attr({
+    "stroke": "none",
+    "fill": getColor(obj.config.value, (obj.config.value - obj.config.min) / (obj.config.max - obj.config.min), obj.config.levelColors, obj.config.noGradient, obj.config.customSectors),
+    pki: [
+      obj.config.min,
+      obj.config.min,
+      obj.config.max,
+      obj.params.widgetW,
+      obj.params.widgetH,
+      obj.params.dx,
+      obj.params.dy,
+      obj.config.gaugeWidthScale,
+      obj.config.donut
+    ]
+  });
+  if(obj.config.donut) {
+    obj.level.transform("r" + obj.config.donutStartAngle + ", " + (obj.params.widgetW/2 + obj.params.dx) + ", " + (obj.params.widgetH/1.95 + obj.params.dy));
+  }
+
+  // title
+  obj.txtTitle = obj.canvas.text(obj.params.titleX, obj.params.titleY, obj.config.title);
+  obj.txtTitle.attr({
+    "font-size":obj.params.titleFontSize,
+    "font-weight":"bold",
+    "font-family":"Arial",
+    "fill":obj.config.titleFontColor,
+    "fill-opacity":"1"
+  });
+  setDy(obj.txtTitle, obj.params.titleFontSize, obj.params.titleY);
+
+  // value
+  obj.txtValue = obj.canvas.text(obj.params.valueX, obj.params.valueY, 0);
+  obj.txtValue.attr({
+    "font-size":obj.params.valueFontSize,
+    "font-weight":"bold",
+    "font-family":"Arial",
+    "fill":obj.config.valueFontColor,
+    "fill-opacity":"0"
+  });
+  setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
+
+  // label
+  obj.txtLabel = obj.canvas.text(obj.params.labelX, obj.params.labelY, obj.config.label);
+  obj.txtLabel.attr({
+    "font-size":obj.params.labelFontSize,
+    "font-weight":"normal",
+    "font-family":"Arial",
+    "fill":obj.config.labelFontColor,
+    "fill-opacity":"0"
+  });
+  setDy(obj.txtLabel, obj.params.labelFontSize, obj.params.labelY);
+
+  // min
+  obj.txtMinimum = obj.config.min;
+  if( obj.config.humanFriendly ) obj.txtMinimum = humanFriendlyNumber( obj.config.min, obj.config.humanFriendlyDecimal );
+  obj.txtMin = obj.canvas.text(obj.params.minX, obj.params.minY, obj.txtMinimum);
+  obj.txtMin.attr({
+    "font-size":obj.params.minFontSize,
+    "font-weight":"normal",
+    "font-family":"Arial",
+    "fill":obj.config.labelFontColor,
+    "fill-opacity": (obj.config.hideMinMax || obj.config.donut)? "0" : "1"
+  });
+  setDy(obj.txtMin, obj.params.minFontSize, obj.params.minY);
+
+  // max
+  obj.txtMaximum = obj.config.max;
+  if( obj.config.humanFriendly ) obj.txtMaximum = humanFriendlyNumber( obj.config.max, obj.config.humanFriendlyDecimal );
+  obj.txtMax = obj.canvas.text(obj.params.maxX, obj.params.maxY, obj.txtMaximum);
+  obj.txtMax.attr({
+    "font-size":obj.params.maxFontSize,
+    "font-weight":"normal",
+    "font-family":"Arial",
+    "fill":obj.config.labelFontColor,
+    "fill-opacity": (obj.config.hideMinMax || obj.config.donut)? "0" : "1"
+  });
+  setDy(obj.txtMax, obj.params.maxFontSize, obj.params.maxY);
+
+  var defs = obj.canvas.canvas.childNodes[1];
+  var svg = "http://www.w3.org/2000/svg";
+
+  if (ie < 9) {
+    onCreateElementNsReady(function() {
+      obj.generateShadow(svg, defs);
+    });
+  } else {
+    obj.generateShadow(svg, defs);
+  }
+
+  // var clear
+  defs, svg = null;
+
+  // set value to display
+  if(obj.config.textRenderer) {
+    obj.originalValue = obj.config.textRenderer(obj.originalValue);
+  } else if(obj.config.humanFriendly) {
+    obj.originalValue = humanFriendlyNumber( obj.originalValue, obj.config.humanFriendlyDecimal ) + obj.config.symbol;
+  } else {
+    obj.originalValue = (obj.originalValue * 1).toFixed(obj.config.decimals) + obj.config.symbol;
+  }
+
+  if(obj.config.counter === true) {
+    //on each animation frame
+    eve.on("raphael.anim.frame." + (obj.level.id), function() {
+      var currentValue = obj.level.attr("pki");
+      if(obj.config.textRenderer) {
+        obj.txtValue.attr("text", obj.config.textRenderer(Math.floor(currentValue[0])));
+      } else if(obj.config.humanFriendly) {
+        obj.txtValue.attr("text", humanFriendlyNumber( Math.floor(currentValue[0]), obj.config.humanFriendlyDecimal ) + obj.config.symbol);
+      } else {
+        obj.txtValue.attr("text", (currentValue[0] * 1).toFixed(obj.config.decimals) + obj.config.symbol);
+      }
+      setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
+      currentValue = null;
+    });
+    //on animation end
+    eve.on("raphael.anim.finish." + (obj.level.id), function() {
+      obj.txtValue.attr({"text" : obj.originalValue});
+      setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
+    });
+  } else {
+    //on animation start
+    eve.on("raphael.anim.start." + (obj.level.id), function() {
+      obj.txtValue.attr({"text" : obj.originalValue});
+      setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
+    });
+  }
+
+  // animate gauge level, value & label
+  obj.level.animate({
+    pki: [
+      obj.config.value,
+      obj.config.min,
+      obj.config.max,
+      obj.params.widgetW,
+      obj.params.widgetH,
+      obj.params.dx,
+      obj.params.dy,
+      obj.config.gaugeWidthScale,
+      obj.config.donut
+    ]
+  }, obj.config.startAnimationTime, obj.config.startAnimationType);
+  obj.txtValue.animate({"fill-opacity":(obj.config.hideValue)?"0":"1"}, obj.config.startAnimationTime, obj.config.startAnimationType);
+  obj.txtLabel.animate({"fill-opacity":"1"}, obj.config.startAnimationTime, obj.config.startAnimationType);
+};
+
+/** Refresh gauge level */
+JustGage.prototype.refresh = function(val, max) {
+
+  var obj = this;
+  var displayVal, color, max = max || null;
+
+  // set new max
+  if(max !== null) {
+    obj.config.max = max;
+
+    obj.txtMaximum = obj.config.max;
+    if( obj.config.humanFriendly ) obj.txtMaximum = humanFriendlyNumber( obj.config.max, obj.config.humanFriendlyDecimal );
+    obj.txtMax.attr({"text" : obj.txtMaximum});
+    setDy(obj.txtMax, obj.params.maxFontSize, obj.params.maxY);
+  }
+
+  // overflow values
+  displayVal = val;
+  if ((val * 1) > (obj.config.max * 1)) {val = (obj.config.max * 1);}
+  if ((val * 1) < (obj.config.min * 1)) {val = (obj.config.min * 1);}
+
+  color = getColor(val, (val - obj.config.min) / (obj.config.max - obj.config.min), obj.config.levelColors, obj.config.noGradient, obj.config.customSectors);
+
+  if(obj.config.textRenderer) {
+    displayVal = obj.config.textRenderer(displayVal);
+  } else if( obj.config.humanFriendly ) {
+    displayVal = humanFriendlyNumber( displayVal, obj.config.humanFriendlyDecimal ) + obj.config.symbol;
+  } else {
+    displayVal = (displayVal * 1).toFixed(obj.config.decimals) + obj.config.symbol;
+  }
+  obj.originalValue = displayVal;
+  obj.config.value = val * 1;
+
+  if(!obj.config.counter) {
+    obj.txtValue.attr({"text":displayVal});
+    setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
+  }
+
+  obj.level.animate({
+    pki: [
+      obj.config.value,
+      obj.config.min,
+      obj.config.max,
+      obj.params.widgetW,
+      obj.params.widgetH,
+      obj.params.dx,
+      obj.params.dy,
+      obj.config.gaugeWidthScale,
+      obj.config.donut
+    ],
+    "fill":color
+  },  obj.config.refreshAnimationTime, obj.config.refreshAnimationType);
+
+  // var clear
+  obj, displayVal, color, max = null;
+};
+
+/** Generate shadow */
+JustGage.prototype.generateShadow = function(svg, defs) {
+
+  var obj = this;
+  var gaussFilter, feOffset, feGaussianBlur, feComposite1, feFlood, feComposite2, feComposite3;
+
+  // FILTER
+  gaussFilter = document.createElementNS(svg,"filter");
+  gaussFilter.setAttribute("id","inner-shadow");
+  defs.appendChild(gaussFilter);
+
+  // offset
+  feOffset = document.createElementNS(svg,"feOffset");
+  feOffset.setAttribute("dx", 0);
+  feOffset.setAttribute("dy", obj.config.shadowVerticalOffset);
+  gaussFilter.appendChild(feOffset);
+
+  // blur
+  feGaussianBlur = document.createElementNS(svg,"feGaussianBlur");
+  feGaussianBlur.setAttribute("result","offset-blur");
+  feGaussianBlur.setAttribute("stdDeviation", obj.config.shadowSize);
+  gaussFilter.appendChild(feGaussianBlur);
+
+  // composite 1
+  feComposite1 = document.createElementNS(svg,"feComposite");
+  feComposite1.setAttribute("operator","out");
+  feComposite1.setAttribute("in", "SourceGraphic");
+  feComposite1.setAttribute("in2","offset-blur");
+  feComposite1.setAttribute("result","inverse");
+  gaussFilter.appendChild(feComposite1);
+
+  // flood
+  feFlood = document.createElementNS(svg,"feFlood");
+  feFlood.setAttribute("flood-color","black");
+  feFlood.setAttribute("flood-opacity", obj.config.shadowOpacity);
+  feFlood.setAttribute("result","color");
+  gaussFilter.appendChild(feFlood);
+
+  // composite 2
+  feComposite2 = document.createElementNS(svg,"feComposite");
+  feComposite2.setAttribute("operator","in");
+  feComposite2.setAttribute("in", "color");
+  feComposite2.setAttribute("in2","inverse");
+  feComposite2.setAttribute("result","shadow");
+  gaussFilter.appendChild(feComposite2);
+
+  // composite 3
+  feComposite3 = document.createElementNS(svg,"feComposite");
+  feComposite3.setAttribute("operator","over");
+  feComposite3.setAttribute("in", "shadow");
+  feComposite3.setAttribute("in2","SourceGraphic");
+  gaussFilter.appendChild(feComposite3);
+
+  // set shadow
+  if (!obj.config.hideInnerShadow) {
+    obj.canvas.canvas.childNodes[2].setAttribute("filter", "url(#inner-shadow)");
+    obj.canvas.canvas.childNodes[3].setAttribute("filter", "url(#inner-shadow)");
+  }
+
+  // var clear
+  gaussFilter, feOffset, feGaussianBlur, feComposite1, feFlood, feComposite2, feComposite3 = null;
+
+};
+
+/** Get color for value */
+function getColor(val, pct, col, noGradient, custSec) {
+
+  var no, inc, colors, percentage, rval, gval, bval, lower, upper, range, rangePct, pctLower, pctUpper, color;
+  var noGradient = noGradient || custSec.length > 0;
+
+  if(custSec.length > 0) {
+    for(var i = 0; i < custSec.length; i++) {
+      if(val > custSec[i].lo && val <= custSec[i].hi) {
+        return custSec[i].color;
+      }
+    }
+  }
+
+  no = col.length;
+  if (no === 1) return col[0];
+  inc = (noGradient) ? (1 / no) : (1 / (no - 1));
+  colors = [];
+  for (var i = 0; i < col.length; i++) {
+    percentage = (noGradient) ? (inc * (i + 1)) : (inc * i);
+    rval = parseInt((cutHex(col[i])).substring(0,2),16);
+    gval = parseInt((cutHex(col[i])).substring(2,4),16);
+    bval = parseInt((cutHex(col[i])).substring(4,6),16);
+    colors[i] = { pct: percentage, color: { r: rval, g: gval, b: bval  } };
+  }
+
+  if(pct === 0) {
+    return 'rgb(' + [colors[0].color.r, colors[0].color.g, colors[0].color.b].join(',') + ')';
+  }
+
+  for (var j = 0; j < colors.length; j++) {
+    if (pct <= colors[j].pct) {
+      if (noGradient) {
+        return 'rgb(' + [colors[j].color.r, colors[j].color.g, colors[j].color.b].join(',') + ')';
+      } else {
+        lower = colors[j - 1];
+        upper = colors[j];
+        range = upper.pct - lower.pct;
+        rangePct = (pct - lower.pct) / range;
+        pctLower = 1 - rangePct;
+        pctUpper = rangePct;
+        color = {
+          r: Math.floor(lower.color.r * pctLower + upper.color.r * pctUpper),
+          g: Math.floor(lower.color.g * pctLower + upper.color.g * pctUpper),
+          b: Math.floor(lower.color.b * pctLower + upper.color.b * pctUpper)
+        };
+        return 'rgb(' + [color.r, color.g, color.b].join(',') + ')';
+      }
+    }
+  }
+
+}
+
+/** Fix Raphael display:none tspan dy attribute bug */
+function setDy(elem, fontSize, txtYpos) {
+  if (!ie || ie > 9) {
+    elem.node.firstChild.attributes.dy.value = 0;
+  }
+}
+
+/** Random integer  */
+function getRandomInt (min, max) {
+  return Math.floor(Math.random() * (max - min + 1)) + min;
+}
+
+/**  Cut hex  */
+function cutHex(str) {
+  return (str.charAt(0)=="#") ? str.substring(1,7):str;
+}
+
+/**  Human friendly number suffix - From: http://stackoverflow.com/questions/2692323/code-golf-friendly-number-abbreviator */
+function humanFriendlyNumber( n, d ) {
+  var p, d2, i, s;
+
+  p = Math.pow;
+  d2 = p(10, d);
+  i = 7;
+  while( i ) {
+    s = p(10,i--*3);
+    if( s <= n ) {
+     n = Math.round(n*d2/s)/d2+"KMGTPE"[i];
+   }
+ }
+ return n;
+}
+
+/**  Get style  */
+function getStyle(oElm, strCssRule){
+  var strValue = "";
+  if(document.defaultView && document.defaultView.getComputedStyle){
+    strValue = document.defaultView.getComputedStyle(oElm, "").getPropertyValue(strCssRule);
+  }
+  else if(oElm.currentStyle){
+    strCssRule = strCssRule.replace(/\-(\w)/g, function (strMatch, p1){
+      return p1.toUpperCase();
+    });
+    strValue = oElm.currentStyle[strCssRule];
+  }
+  return strValue;
+}
+
+/**  Create Element NS Ready  */
+function onCreateElementNsReady(func) {
+  if (document.createElementNS !== undefined) {
+    func();
+  } else {
+    setTimeout(function() { onCreateElementNsReady(func); }, 100);
+  }
+}
+
+/**  Get IE version  */
+// ----------------------------------------------------------
+// A short snippet for detecting versions of IE in JavaScript
+// without resorting to user-agent sniffing
+// ----------------------------------------------------------
+// If you're not in IE (or IE version is less than 5) then:
+// ie === undefined
+// If you're in IE (>=5) then you can determine which version:
+// ie === 7; // IE7
+// Thus, to detect IE:
+// if (ie) {}
+// And to detect the version:
+// ie === 6 // IE6
+// ie > 7 // IE8, IE9 ...
+// ie < 9 // Anything less than IE9
+// ----------------------------------------------------------
+// UPDATE: Now using Live NodeList idea from @jdalton
+var ie = (function(){
+
+  var undef,
+  v = 3,
+  div = document.createElement('div'),
+  all = div.getElementsByTagName('i');
+
+  while (
+    div.innerHTML = '<!--[if gt IE ' + (++v) + ']><i></i><![endif]-->',
+    all[0]
+    );
+    return v > 4 ? v : undef;
+}());
\ No newline at end of file
diff --git a/addons/web/static/lib/qweb/qweb2.js b/addons/web/static/lib/qweb/qweb2.js
index 52e975322e5..44db469cd89 100644
--- a/addons/web/static/lib/qweb/qweb2.js
+++ b/addons/web/static/lib/qweb/qweb2.js
@@ -384,6 +384,7 @@ QWeb2.Engine = (function() {
                 this.compiled_templates[template] = tcompiled;
                 return this.render(template, dict);
             } else {
+                console.log(this.compiled_templates, template);
                 return this.tools.exception("Template '" + template + "' not found");
             }
         },
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 6f47f9c128d..aff3673f687 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -1231,6 +1231,148 @@ instance.web_kanban.AbstractField = instance.web.Widget.extend(instance.web_kanb
 });
 
 instance.web_kanban.fields_registry = new instance.web.Registry({});
+
+
+/**
+ * Kanban widgets: Sparkline
+ *
+ */
+
+instance.web_kanban.SparklineBarWidget = instance.web_kanban.AbstractField.extend({
+    className: "oe_sparkline_bar",
+    start: function() {
+        var self = this;
+        var title = this.$node.html() || this.field.string;
+        setTimeout(function () {
+            var value = _.pluck(self.field.value, 'value');
+            var tooltips = _.pluck(self.field.value, 'tooltip');
+            var sparkline_options = _.extend({
+                    type: 'bar',
+                    barWidth: 5,
+                    height: '50px',
+                    barWidth: '10px',
+                    barSpacing: '5px',
+                    barColor: '#96d854',
+                    tooltipFormat: '{{offset:offset}} {{value}}',
+                    tooltipValueLookups: {
+                        'offset': tooltips
+                    }
+                }, this.options);
+            self.$el.sparkline(value, sparkline_options);
+            self.$el.tipsy({'delayIn': 0, 'html': true, 'title': function(){return title}, 'gravity': 'n'});
+        }, 0);
+    },
+});
+
+instance.web_kanban.fields_registry.add("sparkline_bar", "instance.web_kanban.SparklineBarWidget");
+
+
+/**
+ * Kanban widgets: GaugeWidget
+ *
+ */
+
+instance.web_kanban.GaugeWidget = instance.web_kanban.AbstractField.extend({
+    className: "oe_gauge",
+    start: function() {
+        var self = this;
+        var max = 100;
+        if (this.options.max_field) {
+            max = this.getParent().record[this.options.max_field].raw_value;
+        }
+        var label = this.options.label || "";
+        if (this.options.label_field) {
+            label = this.getParent().record[this.options.label_field].raw_value;
+        }
+        var val = this.field.value;
+        var value = _.isArray(val) && val.length ? val[val.length-1]['value'] : val;
+        var title = this.$node.html() || this.field.string;
+        console.log(value, title, max);
+        this.gage = new JustGage({
+            parentNode: this.$el[0],
+            value: value,
+            title: title,
+            min: 0,
+            max: max,
+            relativeGaugeSize: true,
+            humanFriendly: true,
+            label: label,
+            levelColors: [
+                "#ff0000",
+                "#f9c802",
+                "#a9d70b"
+            ]
+        });
+
+        var flag_open = false;
+        if (self.options.action_change) {
+            var $svg = self.$el.find('svg');
+            var css = {
+                'text-align': 'center',
+                'position': 'absolute',
+                'width': self.$el.outerWidth() + 'px',
+                'top': (self.$el.outerHeight()/2-5) + 'px'
+            };
+
+            self.$el.click(function (event) {
+                event.stopPropagation();
+                flag_open = false;
+                if (!parent.view.is_action_enabled('edit')) {
+                    return;
+                }
+                if (!self.$el.find(".oe_justgage_edit").size()) {
+                    $div = $('<div class="oe_justgage_edit" style="z-index:1"/>');
+                    $div.css(css);
+                    $input = $('<input/>').val(value);
+                    $input.css({
+                        'text-align': 'center',
+                        'margin': 'auto',
+                        'width': ($svg.outerWidth()-40) + 'px'
+                    });
+                    $div.append($input);
+                    self.$el.prepend($div)
+                    $input.focus()
+                        .keydown(function (event) {
+                            event.stopPropagation();
+                            if (event.keyCode == 13 || event.keyCode == 9) {
+                                if ($input.val() != value) {
+                                    parent.view.dataset.call(self.options.action_change, [parent.id, $input.val()]).then(function () {
+                                        parent.do_reload();
+                                    });
+                                } else {
+                                    $div.remove();
+                                }
+                            }
+                        })
+                        .click(function (event) {
+                            event.stopPropagation();
+                            flag_open = false;
+                        })
+                        .blur(function (event) {
+                            if(!flag_open) {
+                                self.$el.find(".oe_justgage_edit").remove();
+                            } else {
+                                flag_open = false;
+                                setTimeout(function () {$input.focus();}, 0);
+                            }
+                        });
+                }
+            }).mousedown(function () {
+                flag_open = true;
+            });
+
+            if (!+value) {
+                $svg.fadeTo(0, 0.3);
+                $div = $('<div/>').text(_t("Click to change value"));
+                $div.css(css);
+                self.$el.append($div);
+            }
+        }
+    },
+});
+
+instance.web_kanban.fields_registry.add("gauge", "instance.web_kanban.GaugeWidget");
+
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:

From 903ca548c7ec709d905b7b1ff20c93678dcab2e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 3 Sep 2013 16:59:36 +0200
Subject: [PATCH 108/164] [IMP] mass_mailing: added kanban views for
 mass_mailing, implemented segment for campaigns. Moved sparkline and gauge
 widgets to web.

Segment: template, date, mails.
Campaign: grouped statistics.

bzr revid: tde@openerp.com-20130903145936-nwy250w1suxmtbl3
---
 addons/crm/__openerp__.py                     |    1 -
 .../static/lib/sparkline/jquery.sparkline.js  | 3047 -----------------
 addons/crm/static/src/js/crm_case_section.js  |   23 -
 addons/mail/mail_mail.py                      |   31 +-
 addons/mail/mail_thread.py                    |    3 +-
 addons/mail/tests/__init__.py                 |    3 +-
 addons/mass_mailing/__openerp__.py            |    6 +
 addons/mass_mailing/mail_mail.py              |   10 +-
 addons/mass_mailing/mail_mail_view.xml        |    1 +
 addons/mass_mailing/mass_mailing.py           |  174 +-
 addons/mass_mailing/mass_mailing_demo.xml     |   81 +
 addons/mass_mailing/mass_mailing_view.xml     |  175 +-
 .../static/src/css/mass_mailing.css           |   54 +
 addons/sale_crm/__openerp__.py                |    1 -
 addons/sale_crm/sale_crm_view.xml             |    4 +-
 addons/sale_crm/static/lib/justgage.js        |  883 -----
 addons/sale_crm/static/src/js/sale_crm.js     |  108 -
 17 files changed, 495 insertions(+), 4110 deletions(-)
 delete mode 100644 addons/crm/static/lib/sparkline/jquery.sparkline.js
 create mode 100644 addons/mass_mailing/mass_mailing_demo.xml
 create mode 100644 addons/mass_mailing/static/src/css/mass_mailing.css
 delete mode 100644 addons/sale_crm/static/lib/justgage.js
 delete mode 100644 addons/sale_crm/static/src/js/sale_crm.js

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 1b4ba191b82..ae9da7ade08 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -121,7 +121,6 @@ Dashboard for CRM will include:
         'static/src/css/crm.css'
     ],
     'js': [
-        'static/lib/sparkline/jquery.sparkline.js',
         'static/src/js/crm_case_section.js',
     ],
     'installable': True,
diff --git a/addons/crm/static/lib/sparkline/jquery.sparkline.js b/addons/crm/static/lib/sparkline/jquery.sparkline.js
deleted file mode 100644
index c003923e03b..00000000000
--- a/addons/crm/static/lib/sparkline/jquery.sparkline.js
+++ /dev/null
@@ -1,3047 +0,0 @@
-/**
-*
-* jquery.sparkline.js
-*
-* v2.1.1
-* (c) Splunk, Inc
-* Contact: Gareth Watts (gareth@splunk.com)
-* http://omnipotent.net/jquery.sparkline/
-*
-* Generates inline sparkline charts from data supplied either to the method
-* or inline in HTML
-*
-* Compatible with Internet Explorer 6.0+ and modern browsers equipped with the canvas tag
-* (Firefox 2.0+, Safari, Opera, etc)
-*
-* License: New BSD License
-*
-* Copyright (c) 2012, Splunk Inc.
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-*     * Redistributions of source code must retain the above copyright notice,
-*       this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright notice,
-*       this list of conditions and the following disclaimer in the documentation
-*       and/or other materials provided with the distribution.
-*     * Neither the name of Splunk Inc nor the names of its contributors may
-*       be used to endorse or promote products derived from this software without
-*       specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-* SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*
-* Usage:
-*  $(selector).sparkline(values, options)
-*
-* If values is undefined or set to 'html' then the data values are read from the specified tag:
-*   <p>Sparkline: <span class="sparkline">1,4,6,6,8,5,3,5</span></p>
-*   $('.sparkline').sparkline();
-* There must be no spaces in the enclosed data set
-*
-* Otherwise values must be an array of numbers or null values
-*    <p>Sparkline: <span id="sparkline1">This text replaced if the browser is compatible</span></p>
-*    $('#sparkline1').sparkline([1,4,6,6,8,5,3,5])
-*    $('#sparkline2').sparkline([1,4,6,null,null,5,3,5])
-*
-* Values can also be specified in an HTML comment, or as a values attribute:
-*    <p>Sparkline: <span class="sparkline"><!--1,4,6,6,8,5,3,5 --></span></p>
-*    <p>Sparkline: <span class="sparkline" values="1,4,6,6,8,5,3,5"></span></p>
-*    $('.sparkline').sparkline();
-*
-* For line charts, x values can also be specified:
-*   <p>Sparkline: <span class="sparkline">1:1,2.7:4,3.4:6,5:6,6:8,8.7:5,9:3,10:5</span></p>
-*    $('#sparkline1').sparkline([ [1,1], [2.7,4], [3.4,6], [5,6], [6,8], [8.7,5], [9,3], [10,5] ])
-*
-* By default, options should be passed in as teh second argument to the sparkline function:
-*   $('.sparkline').sparkline([1,2,3,4], {type: 'bar'})
-*
-* Options can also be set by passing them on the tag itself.  This feature is disabled by default though
-* as there's a slight performance overhead:
-*   $('.sparkline').sparkline([1,2,3,4], {enableTagOptions: true})
-*   <p>Sparkline: <span class="sparkline" sparkType="bar" sparkBarColor="red">loading</span></p>
-* Prefix all options supplied as tag attribute with "spark" (configurable by setting tagOptionPrefix)
-*
-* Supported options:
-*   lineColor - Color of the line used for the chart
-*   fillColor - Color used to fill in the chart - Set to '' or false for a transparent chart
-*   width - Width of the chart - Defaults to 3 times the number of values in pixels
-*   height - Height of the chart - Defaults to the height of the containing element
-*   chartRangeMin - Specify the minimum value to use for the Y range of the chart - Defaults to the minimum value supplied
-*   chartRangeMax - Specify the maximum value to use for the Y range of the chart - Defaults to the maximum value supplied
-*   chartRangeClip - Clip out of range values to the max/min specified by chartRangeMin and chartRangeMax
-*   chartRangeMinX - Specify the minimum value to use for the X range of the chart - Defaults to the minimum value supplied
-*   chartRangeMaxX - Specify the maximum value to use for the X range of the chart - Defaults to the maximum value supplied
-*   composite - If true then don't erase any existing chart attached to the tag, but draw
-*           another chart over the top - Note that width and height are ignored if an
-*           existing chart is detected.
-*   tagValuesAttribute - Name of tag attribute to check for data values - Defaults to 'values'
-*   enableTagOptions - Whether to check tags for sparkline options
-*   tagOptionPrefix - Prefix used for options supplied as tag attributes - Defaults to 'spark'
-*   disableHiddenCheck - If set to true, then the plugin will assume that charts will never be drawn into a
-*           hidden dom element, avoding a browser reflow
-*   disableInteraction - If set to true then all mouseover/click interaction behaviour will be disabled,
-*       making the plugin perform much like it did in 1.x
-*   disableTooltips - If set to true then tooltips will be disabled - Defaults to false (tooltips enabled)
-*   disableHighlight - If set to true then highlighting of selected chart elements on mouseover will be disabled
-*       defaults to false (highlights enabled)
-*   highlightLighten - Factor to lighten/darken highlighted chart values by - Defaults to 1.4 for a 40% increase
-*   tooltipContainer - Specify which DOM element the tooltip should be rendered into - defaults to document.body
-*   tooltipClassname - Optional CSS classname to apply to tooltips - If not specified then a default style will be applied
-*   tooltipOffsetX - How many pixels away from the mouse pointer to render the tooltip on the X axis
-*   tooltipOffsetY - How many pixels away from the mouse pointer to render the tooltip on the r axis
-*   tooltipFormatter  - Optional callback that allows you to override the HTML displayed in the tooltip
-*       callback is given arguments of (sparkline, options, fields)
-*   tooltipChartTitle - If specified then the tooltip uses the string specified by this setting as a title
-*   tooltipFormat - A format string or SPFormat object  (or an array thereof for multiple entries)
-*       to control the format of the tooltip
-*   tooltipPrefix - A string to prepend to each field displayed in a tooltip
-*   tooltipSuffix - A string to append to each field displayed in a tooltip
-*   tooltipSkipNull - If true then null values will not have a tooltip displayed (defaults to true)
-*   tooltipValueLookups - An object or range map to map field values to tooltip strings
-*       (eg. to map -1 to "Lost", 0 to "Draw", and 1 to "Win")
-*   numberFormatter - Optional callback for formatting numbers in tooltips
-*   numberDigitGroupSep - Character to use for group separator in numbers "1,234" - Defaults to ","
-*   numberDecimalMark - Character to use for the decimal point when formatting numbers - Defaults to "."
-*   numberDigitGroupCount - Number of digits between group separator - Defaults to 3
-*
-* There are 7 types of sparkline, selected by supplying a "type" option of 'line' (default),
-* 'bar', 'tristate', 'bullet', 'discrete', 'pie' or 'box'
-*    line - Line chart.  Options:
-*       spotColor - Set to '' to not end each line in a circular spot
-*       minSpotColor - If set, color of spot at minimum value
-*       maxSpotColor - If set, color of spot at maximum value
-*       spotRadius - Radius in pixels
-*       lineWidth - Width of line in pixels
-*       normalRangeMin
-*       normalRangeMax - If set draws a filled horizontal bar between these two values marking the "normal"
-*                      or expected range of values
-*       normalRangeColor - Color to use for the above bar
-*       drawNormalOnTop - Draw the normal range above the chart fill color if true
-*       defaultPixelsPerValue - Defaults to 3 pixels of width for each value in the chart
-*       highlightSpotColor - The color to use for drawing a highlight spot on mouseover - Set to null to disable
-*       highlightLineColor - The color to use for drawing a highlight line on mouseover - Set to null to disable
-*       valueSpots - Specify which points to draw spots on, and in which color.  Accepts a range map
-*
-*   bar - Bar chart.  Options:
-*       barColor - Color of bars for postive values
-*       negBarColor - Color of bars for negative values
-*       zeroColor - Color of bars with zero values
-*       nullColor - Color of bars with null values - Defaults to omitting the bar entirely
-*       barWidth - Width of bars in pixels
-*       colorMap - Optional mappnig of values to colors to override the *BarColor values above
-*                  can be an Array of values to control the color of individual bars or a range map
-*                  to specify colors for individual ranges of values
-*       barSpacing - Gap between bars in pixels
-*       zeroAxis - Centers the y-axis around zero if true
-*
-*   tristate - Charts values of win (>0), lose (<0) or draw (=0)
-*       posBarColor - Color of win values
-*       negBarColor - Color of lose values
-*       zeroBarColor - Color of draw values
-*       barWidth - Width of bars in pixels
-*       barSpacing - Gap between bars in pixels
-*       colorMap - Optional mappnig of values to colors to override the *BarColor values above
-*                  can be an Array of values to control the color of individual bars or a range map
-*                  to specify colors for individual ranges of values
-*
-*   discrete - Options:
-*       lineHeight - Height of each line in pixels - Defaults to 30% of the graph height
-*       thesholdValue - Values less than this value will be drawn using thresholdColor instead of lineColor
-*       thresholdColor
-*
-*   bullet - Values for bullet graphs msut be in the order: target, performance, range1, range2, range3, ...
-*       options:
-*       targetColor - The color of the vertical target marker
-*       targetWidth - The width of the target marker in pixels
-*       performanceColor - The color of the performance measure horizontal bar
-*       rangeColors - Colors to use for each qualitative range background color
-*
-*   pie - Pie chart. Options:
-*       sliceColors - An array of colors to use for pie slices
-*       offset - Angle in degrees to offset the first slice - Try -90 or +90
-*       borderWidth - Width of border to draw around the pie chart, in pixels - Defaults to 0 (no border)
-*       borderColor - Color to use for the pie chart border - Defaults to #000
-*
-*   box - Box plot. Options:
-*       raw - Set to true to supply pre-computed plot points as values
-*             values should be: low_outlier, low_whisker, q1, median, q3, high_whisker, high_outlier
-*             When set to false you can supply any number of values and the box plot will
-*             be computed for you.  Default is false.
-*       showOutliers - Set to true (default) to display outliers as circles
-*       outlierIQR - Interquartile range used to determine outliers.  Default 1.5
-*       boxLineColor - Outline color of the box
-*       boxFillColor - Fill color for the box
-*       whiskerColor - Line color used for whiskers
-*       outlierLineColor - Outline color of outlier circles
-*       outlierFillColor - Fill color of the outlier circles
-*       spotRadius - Radius of outlier circles
-*       medianColor - Line color of the median line
-*       target - Draw a target cross hair at the supplied value (default undefined)
-*
-*
-*
-*   Examples:
-*   $('#sparkline1').sparkline(myvalues, { lineColor: '#f00', fillColor: false });
-*   $('.barsparks').sparkline('html', { type:'bar', height:'40px', barWidth:5 });
-*   $('#tristate').sparkline([1,1,-1,1,0,0,-1], { type:'tristate' }):
-*   $('#discrete').sparkline([1,3,4,5,5,3,4,5], { type:'discrete' });
-*   $('#bullet').sparkline([10,12,12,9,7], { type:'bullet' });
-*   $('#pie').sparkline([1,1,2], { type:'pie' });
-*/
-
-/*jslint regexp: true, browser: true, jquery: true, white: true, nomen: false, plusplus: false, maxerr: 500, indent: 4 */
-
-(function(factory) {
-    if(typeof define === 'function' && define.amd) {
-		define(['jquery'], factory);
-	}
-	else {
-		factory(jQuery);
-	}
-}
-(function($) {
-    'use strict';
-
-    var UNSET_OPTION = {},
-        getDefaults, createClass, SPFormat, clipval, quartile, normalizeValue, normalizeValues,
-        remove, isNumber, all, sum, addCSS, ensureArray, formatNumber, RangeMap,
-        MouseHandler, Tooltip, barHighlightMixin,
-        line, bar, tristate, discrete, bullet, pie, box, defaultStyles, initStyles,
-        VShape, VCanvas_base, VCanvas_canvas, VCanvas_vml, pending, shapeCount = 0;
-
-    /**
-     * Default configuration settings
-     */
-    getDefaults = function () {
-        return {
-            // Settings common to most/all chart types
-            common: {
-                type: 'line',
-                lineColor: '#00f',
-                fillColor: '#cdf',
-                defaultPixelsPerValue: 3,
-                width: 'auto',
-                height: 'auto',
-                composite: false,
-                tagValuesAttribute: 'values',
-                tagOptionsPrefix: 'spark',
-                enableTagOptions: false,
-                enableHighlight: true,
-                highlightLighten: 1.4,
-                tooltipSkipNull: true,
-                tooltipPrefix: '',
-                tooltipSuffix: '',
-                disableHiddenCheck: false,
-                numberFormatter: false,
-                numberDigitGroupCount: 3,
-                numberDigitGroupSep: ',',
-                numberDecimalMark: '.',
-                disableTooltips: false,
-                disableInteraction: false
-            },
-            // Defaults for line charts
-            line: {
-                spotColor: '#f80',
-                highlightSpotColor: '#5f5',
-                highlightLineColor: '#f22',
-                spotRadius: 1.5,
-                minSpotColor: '#f80',
-                maxSpotColor: '#f80',
-                lineWidth: 1,
-                normalRangeMin: undefined,
-                normalRangeMax: undefined,
-                normalRangeColor: '#ccc',
-                drawNormalOnTop: false,
-                chartRangeMin: undefined,
-                chartRangeMax: undefined,
-                chartRangeMinX: undefined,
-                chartRangeMaxX: undefined,
-                tooltipFormat: new SPFormat('<span style="color: {{color}}">&#9679;</span> {{prefix}}{{y}}{{suffix}}')
-            },
-            // Defaults for bar charts
-            bar: {
-                barColor: '#3366cc',
-                negBarColor: '#f44',
-                stackedBarColor: ['#3366cc', '#dc3912', '#ff9900', '#109618', '#66aa00',
-                    '#dd4477', '#0099c6', '#990099'],
-                zeroColor: undefined,
-                nullColor: undefined,
-                zeroAxis: true,
-                barWidth: 4,
-                barSpacing: 1,
-                chartRangeMax: undefined,
-                chartRangeMin: undefined,
-                chartRangeClip: false,
-                colorMap: undefined,
-                tooltipFormat: new SPFormat('<span style="color: {{color}}">&#9679;</span> {{prefix}}{{value}}{{suffix}}')
-            },
-            // Defaults for tristate charts
-            tristate: {
-                barWidth: 4,
-                barSpacing: 1,
-                posBarColor: '#6f6',
-                negBarColor: '#f44',
-                zeroBarColor: '#999',
-                colorMap: {},
-                tooltipFormat: new SPFormat('<span style="color: {{color}}">&#9679;</span> {{value:map}}'),
-                tooltipValueLookups: { map: { '-1': 'Loss', '0': 'Draw', '1': 'Win' } }
-            },
-            // Defaults for discrete charts
-            discrete: {
-                lineHeight: 'auto',
-                thresholdColor: undefined,
-                thresholdValue: 0,
-                chartRangeMax: undefined,
-                chartRangeMin: undefined,
-                chartRangeClip: false,
-                tooltipFormat: new SPFormat('{{prefix}}{{value}}{{suffix}}')
-            },
-            // Defaults for bullet charts
-            bullet: {
-                targetColor: '#f33',
-                targetWidth: 3, // width of the target bar in pixels
-                performanceColor: '#33f',
-                rangeColors: ['#d3dafe', '#a8b6ff', '#7f94ff'],
-                base: undefined, // set this to a number to change the base start number
-                tooltipFormat: new SPFormat('{{fieldkey:fields}} - {{value}}'),
-                tooltipValueLookups: { fields: {r: 'Range', p: 'Performance', t: 'Target'} }
-            },
-            // Defaults for pie charts
-            pie: {
-                offset: 0,
-                sliceColors: ['#3366cc', '#dc3912', '#ff9900', '#109618', '#66aa00',
-                    '#dd4477', '#0099c6', '#990099'],
-                borderWidth: 0,
-                borderColor: '#000',
-                tooltipFormat: new SPFormat('<span style="color: {{color}}">&#9679;</span> {{value}} ({{percent.1}}%)')
-            },
-            // Defaults for box plots
-            box: {
-                raw: false,
-                boxLineColor: '#000',
-                boxFillColor: '#cdf',
-                whiskerColor: '#000',
-                outlierLineColor: '#333',
-                outlierFillColor: '#fff',
-                medianColor: '#f00',
-                showOutliers: true,
-                outlierIQR: 1.5,
-                spotRadius: 1.5,
-                target: undefined,
-                targetColor: '#4a2',
-                chartRangeMax: undefined,
-                chartRangeMin: undefined,
-                tooltipFormat: new SPFormat('{{field:fields}}: {{value}}'),
-                tooltipFormatFieldlistKey: 'field',
-                tooltipValueLookups: { fields: { lq: 'Lower Quartile', med: 'Median',
-                    uq: 'Upper Quartile', lo: 'Left Outlier', ro: 'Right Outlier',
-                    lw: 'Left Whisker', rw: 'Right Whisker'} }
-            }
-        };
-    };
-
-    // You can have tooltips use a css class other than jqstooltip by specifying tooltipClassname
-    defaultStyles = '.jqstooltip { ' +
-            'position: absolute;' +
-            'left: 0px;' +
-            'top: 0px;' +
-            'visibility: hidden;' +
-            'background: rgb(0, 0, 0) transparent;' +
-            'background-color: rgba(0,0,0,0.6);' +
-            'filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000);' +
-            '-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000)";' +
-            'color: white;' +
-            'font: 10px arial, san serif;' +
-            'text-align: left;' +
-            'white-space: nowrap;' +
-            'padding: 5px;' +
-            'border: 1px solid white;' +
-            'z-index: 10000;' +
-            '}' +
-            '.jqsfield { ' +
-            'color: white;' +
-            'font: 10px arial, san serif;' +
-            'text-align: left;' +
-            '}';
-
-    /**
-     * Utilities
-     */
-
-    createClass = function (/* [baseclass, [mixin, ...]], definition */) {
-        var Class, args;
-        Class = function () {
-            this.init.apply(this, arguments);
-        };
-        if (arguments.length > 1) {
-            if (arguments[0]) {
-                Class.prototype = $.extend(new arguments[0](), arguments[arguments.length - 1]);
-                Class._super = arguments[0].prototype;
-            } else {
-                Class.prototype = arguments[arguments.length - 1];
-            }
-            if (arguments.length > 2) {
-                args = Array.prototype.slice.call(arguments, 1, -1);
-                args.unshift(Class.prototype);
-                $.extend.apply($, args);
-            }
-        } else {
-            Class.prototype = arguments[0];
-        }
-        Class.prototype.cls = Class;
-        return Class;
-    };
-
-    /**
-     * Wraps a format string for tooltips
-     * {{x}}
-     * {{x.2}
-     * {{x:months}}
-     */
-    $.SPFormatClass = SPFormat = createClass({
-        fre: /\{\{([\w.]+?)(:(.+?))?\}\}/g,
-        precre: /(\w+)\.(\d+)/,
-
-        init: function (format, fclass) {
-            this.format = format;
-            this.fclass = fclass;
-        },
-
-        render: function (fieldset, lookups, options) {
-            var self = this,
-                fields = fieldset,
-                match, token, lookupkey, fieldvalue, prec;
-            return this.format.replace(this.fre, function () {
-                var lookup;
-                token = arguments[1];
-                lookupkey = arguments[3];
-                match = self.precre.exec(token);
-                if (match) {
-                    prec = match[2];
-                    token = match[1];
-                } else {
-                    prec = false;
-                }
-                fieldvalue = fields[token];
-                if (fieldvalue === undefined) {
-                    return '';
-                }
-                if (lookupkey && lookups && lookups[lookupkey]) {
-                    lookup = lookups[lookupkey];
-                    if (lookup.get) { // RangeMap
-                        return lookups[lookupkey].get(fieldvalue) || fieldvalue;
-                    } else {
-                        return lookups[lookupkey][fieldvalue] || fieldvalue;
-                    }
-                }
-                if (isNumber(fieldvalue)) {
-                    if (options.get('numberFormatter')) {
-                        fieldvalue = options.get('numberFormatter')(fieldvalue);
-                    } else {
-                        fieldvalue = formatNumber(fieldvalue, prec,
-                            options.get('numberDigitGroupCount'),
-                            options.get('numberDigitGroupSep'),
-                            options.get('numberDecimalMark'));
-                    }
-                }
-                return fieldvalue;
-            });
-        }
-    });
-
-    // convience method to avoid needing the new operator
-    $.spformat = function(format, fclass) {
-        return new SPFormat(format, fclass);
-    };
-
-    clipval = function (val, min, max) {
-        if (val < min) {
-            return min;
-        }
-        if (val > max) {
-            return max;
-        }
-        return val;
-    };
-
-    quartile = function (values, q) {
-        var vl;
-        if (q === 2) {
-            vl = Math.floor(values.length / 2);
-            return values.length % 2 ? values[vl] : (values[vl-1] + values[vl]) / 2;
-        } else {
-            if (values.length % 2 ) { // odd
-                vl = (values.length * q + q) / 4;
-                return vl % 1 ? (values[Math.floor(vl)] + values[Math.floor(vl) - 1]) / 2 : values[vl-1];
-            } else { //even
-                vl = (values.length * q + 2) / 4;
-                return vl % 1 ? (values[Math.floor(vl)] + values[Math.floor(vl) - 1]) / 2 :  values[vl-1];
-
-            }
-        }
-    };
-
-    normalizeValue = function (val) {
-        var nf;
-        switch (val) {
-            case 'undefined':
-                val = undefined;
-                break;
-            case 'null':
-                val = null;
-                break;
-            case 'true':
-                val = true;
-                break;
-            case 'false':
-                val = false;
-                break;
-            default:
-                nf = parseFloat(val);
-                if (val == nf) {
-                    val = nf;
-                }
-        }
-        return val;
-    };
-
-    normalizeValues = function (vals) {
-        var i, result = [];
-        for (i = vals.length; i--;) {
-            result[i] = normalizeValue(vals[i]);
-        }
-        return result;
-    };
-
-    remove = function (vals, filter) {
-        var i, vl, result = [];
-        for (i = 0, vl = vals.length; i < vl; i++) {
-            if (vals[i] !== filter) {
-                result.push(vals[i]);
-            }
-        }
-        return result;
-    };
-
-    isNumber = function (num) {
-        return !isNaN(parseFloat(num)) && isFinite(num);
-    };
-
-    formatNumber = function (num, prec, groupsize, groupsep, decsep) {
-        var p, i;
-        num = (prec === false ? parseFloat(num).toString() : num.toFixed(prec)).split('');
-        p = (p = $.inArray('.', num)) < 0 ? num.length : p;
-        if (p < num.length) {
-            num[p] = decsep;
-        }
-        for (i = p - groupsize; i > 0; i -= groupsize) {
-            num.splice(i, 0, groupsep);
-        }
-        return num.join('');
-    };
-
-    // determine if all values of an array match a value
-    // returns true if the array is empty
-    all = function (val, arr, ignoreNull) {
-        var i;
-        for (i = arr.length; i--; ) {
-            if (ignoreNull && arr[i] === null) continue;
-            if (arr[i] !== val) {
-                return false;
-            }
-        }
-        return true;
-    };
-
-    // sums the numeric values in an array, ignoring other values
-    sum = function (vals) {
-        var total = 0, i;
-        for (i = vals.length; i--;) {
-            total += typeof vals[i] === 'number' ? vals[i] : 0;
-        }
-        return total;
-    };
-
-    ensureArray = function (val) {
-        return $.isArray(val) ? val : [val];
-    };
-
-    // http://paulirish.com/2008/bookmarklet-inject-new-css-rules/
-    addCSS = function(css) {
-        var tag;
-        //if ('\v' == 'v') /* ie only */ {
-        if (document.createStyleSheet) {
-            document.createStyleSheet().cssText = css;
-        } else {
-            tag = document.createElement('style');
-            tag.type = 'text/css';
-            document.getElementsByTagName('head')[0].appendChild(tag);
-            tag[(typeof document.body.style.WebkitAppearance == 'string') /* webkit only */ ? 'innerText' : 'innerHTML'] = css;
-        }
-    };
-
-    // Provide a cross-browser interface to a few simple drawing primitives
-    $.fn.simpledraw = function (width, height, useExisting, interact) {
-        var target, mhandler;
-        if (useExisting && (target = this.data('_jqs_vcanvas'))) {
-            return target;
-        }
-        if (width === undefined) {
-            width = $(this).innerWidth();
-        }
-        if (height === undefined) {
-            height = $(this).innerHeight();
-        }
-        if ($.fn.sparkline.hasCanvas) {
-            target = new VCanvas_canvas(width, height, this, interact);
-        } else if ($.fn.sparkline.hasVML) {
-            target = new VCanvas_vml(width, height, this);
-        } else {
-            return false;
-        }
-        mhandler = $(this).data('_jqs_mhandler');
-        if (mhandler) {
-            mhandler.registerCanvas(target);
-        }
-        return target;
-    };
-
-    $.fn.cleardraw = function () {
-        var target = this.data('_jqs_vcanvas');
-        if (target) {
-            target.reset();
-        }
-    };
-
-    $.RangeMapClass = RangeMap = createClass({
-        init: function (map) {
-            var key, range, rangelist = [];
-            for (key in map) {
-                if (map.hasOwnProperty(key) && typeof key === 'string' && key.indexOf(':') > -1) {
-                    range = key.split(':');
-                    range[0] = range[0].length === 0 ? -Infinity : parseFloat(range[0]);
-                    range[1] = range[1].length === 0 ? Infinity : parseFloat(range[1]);
-                    range[2] = map[key];
-                    rangelist.push(range);
-                }
-            }
-            this.map = map;
-            this.rangelist = rangelist || false;
-        },
-
-        get: function (value) {
-            var rangelist = this.rangelist,
-                i, range, result;
-            if ((result = this.map[value]) !== undefined) {
-                return result;
-            }
-            if (rangelist) {
-                for (i = rangelist.length; i--;) {
-                    range = rangelist[i];
-                    if (range[0] <= value && range[1] >= value) {
-                        return range[2];
-                    }
-                }
-            }
-            return undefined;
-        }
-    });
-
-    // Convenience function
-    $.range_map = function(map) {
-        return new RangeMap(map);
-    };
-
-    MouseHandler = createClass({
-        init: function (el, options) {
-            var $el = $(el);
-            this.$el = $el;
-            this.options = options;
-            this.currentPageX = 0;
-            this.currentPageY = 0;
-            this.el = el;
-            this.splist = [];
-            this.tooltip = null;
-            this.over = false;
-            this.displayTooltips = !options.get('disableTooltips');
-            this.highlightEnabled = !options.get('disableHighlight');
-        },
-
-        registerSparkline: function (sp) {
-            this.splist.push(sp);
-            if (this.over) {
-                this.updateDisplay();
-            }
-        },
-
-        registerCanvas: function (canvas) {
-            var $canvas = $(canvas.canvas);
-            this.canvas = canvas;
-            this.$canvas = $canvas;
-            $canvas.mouseenter($.proxy(this.mouseenter, this));
-            $canvas.mouseleave($.proxy(this.mouseleave, this));
-            $canvas.click($.proxy(this.mouseclick, this));
-        },
-
-        reset: function (removeTooltip) {
-            this.splist = [];
-            if (this.tooltip && removeTooltip) {
-                this.tooltip.remove();
-                this.tooltip = undefined;
-            }
-        },
-
-        mouseclick: function (e) {
-            var clickEvent = $.Event('sparklineClick');
-            clickEvent.originalEvent = e;
-            clickEvent.sparklines = this.splist;
-            this.$el.trigger(clickEvent);
-        },
-
-        mouseenter: function (e) {
-            $(document.body).unbind('mousemove.jqs');
-            $(document.body).bind('mousemove.jqs', $.proxy(this.mousemove, this));
-            this.over = true;
-            this.currentPageX = e.pageX;
-            this.currentPageY = e.pageY;
-            this.currentEl = e.target;
-            if (!this.tooltip && this.displayTooltips) {
-                this.tooltip = new Tooltip(this.options);
-                this.tooltip.updatePosition(e.pageX, e.pageY);
-            }
-            this.updateDisplay();
-        },
-
-        mouseleave: function () {
-            $(document.body).unbind('mousemove.jqs');
-            var splist = this.splist,
-                 spcount = splist.length,
-                 needsRefresh = false,
-                 sp, i;
-            this.over = false;
-            this.currentEl = null;
-
-            if (this.tooltip) {
-                this.tooltip.remove();
-                this.tooltip = null;
-            }
-
-            for (i = 0; i < spcount; i++) {
-                sp = splist[i];
-                if (sp.clearRegionHighlight()) {
-                    needsRefresh = true;
-                }
-            }
-
-            if (needsRefresh) {
-                this.canvas.render();
-            }
-        },
-
-        mousemove: function (e) {
-            this.currentPageX = e.pageX;
-            this.currentPageY = e.pageY;
-            this.currentEl = e.target;
-            if (this.tooltip) {
-                this.tooltip.updatePosition(e.pageX, e.pageY);
-            }
-            this.updateDisplay();
-        },
-
-        updateDisplay: function () {
-            var splist = this.splist,
-                 spcount = splist.length,
-                 needsRefresh = false,
-                 offset = this.$canvas.offset(),
-                 localX = this.currentPageX - offset.left,
-                 localY = this.currentPageY - offset.top,
-                 tooltiphtml, sp, i, result, changeEvent;
-            if (!this.over) {
-                return;
-            }
-            for (i = 0; i < spcount; i++) {
-                sp = splist[i];
-                result = sp.setRegionHighlight(this.currentEl, localX, localY);
-                if (result) {
-                    needsRefresh = true;
-                }
-            }
-            if (needsRefresh) {
-                changeEvent = $.Event('sparklineRegionChange');
-                changeEvent.sparklines = this.splist;
-                this.$el.trigger(changeEvent);
-                if (this.tooltip) {
-                    tooltiphtml = '';
-                    for (i = 0; i < spcount; i++) {
-                        sp = splist[i];
-                        tooltiphtml += sp.getCurrentRegionTooltip();
-                    }
-                    this.tooltip.setContent(tooltiphtml);
-                }
-                if (!this.disableHighlight) {
-                    this.canvas.render();
-                }
-            }
-            if (result === null) {
-                this.mouseleave();
-            }
-        }
-    });
-
-
-    Tooltip = createClass({
-        sizeStyle: 'position: static !important;' +
-            'display: block !important;' +
-            'visibility: hidden !important;' +
-            'float: left !important;',
-
-        init: function (options) {
-            var tooltipClassname = options.get('tooltipClassname', 'jqstooltip'),
-                sizetipStyle = this.sizeStyle,
-                offset;
-            this.container = options.get('tooltipContainer') || document.body;
-            this.tooltipOffsetX = options.get('tooltipOffsetX', 10);
-            this.tooltipOffsetY = options.get('tooltipOffsetY', 12);
-            // remove any previous lingering tooltip
-            $('#jqssizetip').remove();
-            $('#jqstooltip').remove();
-            this.sizetip = $('<div/>', {
-                id: 'jqssizetip',
-                style: sizetipStyle,
-                'class': tooltipClassname
-            });
-            this.tooltip = $('<div/>', {
-                id: 'jqstooltip',
-                'class': tooltipClassname
-            }).appendTo(this.container);
-            // account for the container's location
-            offset = this.tooltip.offset();
-            this.offsetLeft = offset.left;
-            this.offsetTop = offset.top;
-            this.hidden = true;
-            $(window).unbind('resize.jqs scroll.jqs');
-            $(window).bind('resize.jqs scroll.jqs', $.proxy(this.updateWindowDims, this));
-            this.updateWindowDims();
-        },
-
-        updateWindowDims: function () {
-            this.scrollTop = $(window).scrollTop();
-            this.scrollLeft = $(window).scrollLeft();
-            this.scrollRight = this.scrollLeft + $(window).width();
-            this.updatePosition();
-        },
-
-        getSize: function (content) {
-            this.sizetip.html(content).appendTo(this.container);
-            this.width = this.sizetip.width() + 1;
-            this.height = this.sizetip.height();
-            this.sizetip.remove();
-        },
-
-        setContent: function (content) {
-            if (!content) {
-                this.tooltip.css('visibility', 'hidden');
-                this.hidden = true;
-                return;
-            }
-            this.getSize(content);
-            this.tooltip.html(content)
-                .css({
-                    'width': this.width,
-                    'height': this.height,
-                    'visibility': 'visible'
-                });
-            if (this.hidden) {
-                this.hidden = false;
-                this.updatePosition();
-            }
-        },
-
-        updatePosition: function (x, y) {
-            if (x === undefined) {
-                if (this.mousex === undefined) {
-                    return;
-                }
-                x = this.mousex - this.offsetLeft;
-                y = this.mousey - this.offsetTop;
-
-            } else {
-                this.mousex = x = x - this.offsetLeft;
-                this.mousey = y = y - this.offsetTop;
-            }
-            if (!this.height || !this.width || this.hidden) {
-                return;
-            }
-
-            y -= this.height + this.tooltipOffsetY;
-            x += this.tooltipOffsetX;
-
-            if (y < this.scrollTop) {
-                y = this.scrollTop;
-            }
-            if (x < this.scrollLeft) {
-                x = this.scrollLeft;
-            } else if (x + this.width > this.scrollRight) {
-                x = this.scrollRight - this.width;
-            }
-
-            this.tooltip.css({
-                'left': x,
-                'top': y
-            });
-        },
-
-        remove: function () {
-            this.tooltip.remove();
-            this.sizetip.remove();
-            this.sizetip = this.tooltip = undefined;
-            $(window).unbind('resize.jqs scroll.jqs');
-        }
-    });
-
-    initStyles = function() {
-        addCSS(defaultStyles);
-    };
-
-    $(initStyles);
-
-    pending = [];
-    $.fn.sparkline = function (userValues, userOptions) {
-        return this.each(function () {
-            var options = new $.fn.sparkline.options(this, userOptions),
-                 $this = $(this),
-                 render, i;
-            render = function () {
-                var values, width, height, tmp, mhandler, sp, vals;
-                if (userValues === 'html' || userValues === undefined) {
-                    vals = this.getAttribute(options.get('tagValuesAttribute'));
-                    if (vals === undefined || vals === null) {
-                        vals = $this.html();
-                    }
-                    values = vals.replace(/(^\s*<!--)|(-->\s*$)|\s+/g, '').split(',');
-                } else {
-                    values = userValues;
-                }
-
-                width = options.get('width') === 'auto' ? values.length * options.get('defaultPixelsPerValue') : options.get('width');
-                if (options.get('height') === 'auto') {
-                    if (!options.get('composite') || !$.data(this, '_jqs_vcanvas')) {
-                        // must be a better way to get the line height
-                        tmp = document.createElement('span');
-                        tmp.innerHTML = 'a';
-                        $this.html(tmp);
-                        height = $(tmp).innerHeight() || $(tmp).height();
-                        $(tmp).remove();
-                        tmp = null;
-                    }
-                } else {
-                    height = options.get('height');
-                }
-
-                if (!options.get('disableInteraction')) {
-                    mhandler = $.data(this, '_jqs_mhandler');
-                    if (!mhandler) {
-                        mhandler = new MouseHandler(this, options);
-                        $.data(this, '_jqs_mhandler', mhandler);
-                    } else if (!options.get('composite')) {
-                        mhandler.reset();
-                    }
-                } else {
-                    mhandler = false;
-                }
-
-                if (options.get('composite') && !$.data(this, '_jqs_vcanvas')) {
-                    if (!$.data(this, '_jqs_errnotify')) {
-                        alert('Attempted to attach a composite sparkline to an element with no existing sparkline');
-                        $.data(this, '_jqs_errnotify', true);
-                    }
-                    return;
-                }
-
-                sp = new $.fn.sparkline[options.get('type')](this, values, options, width, height);
-
-                sp.render();
-
-                if (mhandler) {
-                    mhandler.registerSparkline(sp);
-                }
-            };
-            // jQuery 1.3.0 completely changed the meaning of :hidden :-/
-            if (($(this).html() && !options.get('disableHiddenCheck') && $(this).is(':hidden')) || ($.fn.jquery < '1.3.0' && $(this).parents().is(':hidden')) || !$(this).parents('body').length) {
-                if (!options.get('composite') && $.data(this, '_jqs_pending')) {
-                    // remove any existing references to the element
-                    for (i = pending.length; i; i--) {
-                        if (pending[i - 1][0] == this) {
-                            pending.splice(i - 1, 1);
-                        }
-                    }
-                }
-                pending.push([this, render]);
-                $.data(this, '_jqs_pending', true);
-            } else {
-                render.call(this);
-            }
-        });
-    };
-
-    $.fn.sparkline.defaults = getDefaults();
-
-
-    $.sparkline_display_visible = function () {
-        var el, i, pl;
-        var done = [];
-        for (i = 0, pl = pending.length; i < pl; i++) {
-            el = pending[i][0];
-            if ($(el).is(':visible') && !$(el).parents().is(':hidden')) {
-                pending[i][1].call(el);
-                $.data(pending[i][0], '_jqs_pending', false);
-                done.push(i);
-            } else if (!$(el).closest('html').length && !$.data(el, '_jqs_pending')) {
-                // element has been inserted and removed from the DOM
-                // If it was not yet inserted into the dom then the .data request
-                // will return true.
-                // removing from the dom causes the data to be removed.
-                $.data(pending[i][0], '_jqs_pending', false);
-                done.push(i);
-            }
-        }
-        for (i = done.length; i; i--) {
-            pending.splice(done[i - 1], 1);
-        }
-    };
-
-
-    /**
-     * User option handler
-     */
-    $.fn.sparkline.options = createClass({
-        init: function (tag, userOptions) {
-            var extendedOptions, defaults, base, tagOptionType;
-            this.userOptions = userOptions = userOptions || {};
-            this.tag = tag;
-            this.tagValCache = {};
-            defaults = $.fn.sparkline.defaults;
-            base = defaults.common;
-            this.tagOptionsPrefix = userOptions.enableTagOptions && (userOptions.tagOptionsPrefix || base.tagOptionsPrefix);
-
-            tagOptionType = this.getTagSetting('type');
-            if (tagOptionType === UNSET_OPTION) {
-                extendedOptions = defaults[userOptions.type || base.type];
-            } else {
-                extendedOptions = defaults[tagOptionType];
-            }
-            this.mergedOptions = $.extend({}, base, extendedOptions, userOptions);
-        },
-
-
-        getTagSetting: function (key) {
-            var prefix = this.tagOptionsPrefix,
-                val, i, pairs, keyval;
-            if (prefix === false || prefix === undefined) {
-                return UNSET_OPTION;
-            }
-            if (this.tagValCache.hasOwnProperty(key)) {
-                val = this.tagValCache.key;
-            } else {
-                val = this.tag.getAttribute(prefix + key);
-                if (val === undefined || val === null) {
-                    val = UNSET_OPTION;
-                } else if (val.substr(0, 1) === '[') {
-                    val = val.substr(1, val.length - 2).split(',');
-                    for (i = val.length; i--;) {
-                        val[i] = normalizeValue(val[i].replace(/(^\s*)|(\s*$)/g, ''));
-                    }
-                } else if (val.substr(0, 1) === '{') {
-                    pairs = val.substr(1, val.length - 2).split(',');
-                    val = {};
-                    for (i = pairs.length; i--;) {
-                        keyval = pairs[i].split(':', 2);
-                        val[keyval[0].replace(/(^\s*)|(\s*$)/g, '')] = normalizeValue(keyval[1].replace(/(^\s*)|(\s*$)/g, ''));
-                    }
-                } else {
-                    val = normalizeValue(val);
-                }
-                this.tagValCache.key = val;
-            }
-            return val;
-        },
-
-        get: function (key, defaultval) {
-            var tagOption = this.getTagSetting(key),
-                result;
-            if (tagOption !== UNSET_OPTION) {
-                return tagOption;
-            }
-            return (result = this.mergedOptions[key]) === undefined ? defaultval : result;
-        }
-    });
-
-
-    $.fn.sparkline._base = createClass({
-        disabled: false,
-
-        init: function (el, values, options, width, height) {
-            this.el = el;
-            this.$el = $(el);
-            this.values = values;
-            this.options = options;
-            this.width = width;
-            this.height = height;
-            this.currentRegion = undefined;
-        },
-
-        /**
-         * Setup the canvas
-         */
-        initTarget: function () {
-            var interactive = !this.options.get('disableInteraction');
-            if (!(this.target = this.$el.simpledraw(this.width, this.height, this.options.get('composite'), interactive))) {
-                this.disabled = true;
-            } else {
-                this.canvasWidth = this.target.pixelWidth;
-                this.canvasHeight = this.target.pixelHeight;
-            }
-        },
-
-        /**
-         * Actually render the chart to the canvas
-         */
-        render: function () {
-            if (this.disabled) {
-                this.el.innerHTML = '';
-                return false;
-            }
-            return true;
-        },
-
-        /**
-         * Return a region id for a given x/y co-ordinate
-         */
-        getRegion: function (x, y) {
-        },
-
-        /**
-         * Highlight an item based on the moused-over x,y co-ordinate
-         */
-        setRegionHighlight: function (el, x, y) {
-            var currentRegion = this.currentRegion,
-                highlightEnabled = !this.options.get('disableHighlight'),
-                newRegion;
-            if (x > this.canvasWidth || y > this.canvasHeight || x < 0 || y < 0) {
-                return null;
-            }
-            newRegion = this.getRegion(el, x, y);
-            if (currentRegion !== newRegion) {
-                if (currentRegion !== undefined && highlightEnabled) {
-                    this.removeHighlight();
-                }
-                this.currentRegion = newRegion;
-                if (newRegion !== undefined && highlightEnabled) {
-                    this.renderHighlight();
-                }
-                return true;
-            }
-            return false;
-        },
-
-        /**
-         * Reset any currently highlighted item
-         */
-        clearRegionHighlight: function () {
-            if (this.currentRegion !== undefined) {
-                this.removeHighlight();
-                this.currentRegion = undefined;
-                return true;
-            }
-            return false;
-        },
-
-        renderHighlight: function () {
-            this.changeHighlight(true);
-        },
-
-        removeHighlight: function () {
-            this.changeHighlight(false);
-        },
-
-        changeHighlight: function (highlight)  {},
-
-        /**
-         * Fetch the HTML to display as a tooltip
-         */
-        getCurrentRegionTooltip: function () {
-            var options = this.options,
-                header = '',
-                entries = [],
-                fields, formats, formatlen, fclass, text, i,
-                showFields, showFieldsKey, newFields, fv,
-                formatter, format, fieldlen, j;
-            if (this.currentRegion === undefined) {
-                return '';
-            }
-            fields = this.getCurrentRegionFields();
-            formatter = options.get('tooltipFormatter');
-            if (formatter) {
-                return formatter(this, options, fields);
-            }
-            if (options.get('tooltipChartTitle')) {
-                header += '<div class="jqs jqstitle">' + options.get('tooltipChartTitle') + '</div>\n';
-            }
-            formats = this.options.get('tooltipFormat');
-            if (!formats) {
-                return '';
-            }
-            if (!$.isArray(formats)) {
-                formats = [formats];
-            }
-            if (!$.isArray(fields)) {
-                fields = [fields];
-            }
-            showFields = this.options.get('tooltipFormatFieldlist');
-            showFieldsKey = this.options.get('tooltipFormatFieldlistKey');
-            if (showFields && showFieldsKey) {
-                // user-selected ordering of fields
-                newFields = [];
-                for (i = fields.length; i--;) {
-                    fv = fields[i][showFieldsKey];
-                    if ((j = $.inArray(fv, showFields)) != -1) {
-                        newFields[j] = fields[i];
-                    }
-                }
-                fields = newFields;
-            }
-            formatlen = formats.length;
-            fieldlen = fields.length;
-            for (i = 0; i < formatlen; i++) {
-                format = formats[i];
-                if (typeof format === 'string') {
-                    format = new SPFormat(format);
-                }
-                fclass = format.fclass || 'jqsfield';
-                for (j = 0; j < fieldlen; j++) {
-                    if (!fields[j].isNull || !options.get('tooltipSkipNull')) {
-                        $.extend(fields[j], {
-                            prefix: options.get('tooltipPrefix'),
-                            suffix: options.get('tooltipSuffix')
-                        });
-                        text = format.render(fields[j], options.get('tooltipValueLookups'), options);
-                        entries.push('<div class="' + fclass + '">' + text + '</div>');
-                    }
-                }
-            }
-            if (entries.length) {
-                return header + entries.join('\n');
-            }
-            return '';
-        },
-
-        getCurrentRegionFields: function () {},
-
-        calcHighlightColor: function (color, options) {
-            var highlightColor = options.get('highlightColor'),
-                lighten = options.get('highlightLighten'),
-                parse, mult, rgbnew, i;
-            if (highlightColor) {
-                return highlightColor;
-            }
-            if (lighten) {
-                // extract RGB values
-                parse = /^#([0-9a-f])([0-9a-f])([0-9a-f])$/i.exec(color) || /^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/i.exec(color);
-                if (parse) {
-                    rgbnew = [];
-                    mult = color.length === 4 ? 16 : 1;
-                    for (i = 0; i < 3; i++) {
-                        rgbnew[i] = clipval(Math.round(parseInt(parse[i + 1], 16) * mult * lighten), 0, 255);
-                    }
-                    return 'rgb(' + rgbnew.join(',') + ')';
-                }
-
-            }
-            return color;
-        }
-
-    });
-
-    barHighlightMixin = {
-        changeHighlight: function (highlight) {
-            var currentRegion = this.currentRegion,
-                target = this.target,
-                shapeids = this.regionShapes[currentRegion],
-                newShapes;
-            // will be null if the region value was null
-            if (shapeids) {
-                newShapes = this.renderRegion(currentRegion, highlight);
-                if ($.isArray(newShapes) || $.isArray(shapeids)) {
-                    target.replaceWithShapes(shapeids, newShapes);
-                    this.regionShapes[currentRegion] = $.map(newShapes, function (newShape) {
-                        return newShape.id;
-                    });
-                } else {
-                    target.replaceWithShape(shapeids, newShapes);
-                    this.regionShapes[currentRegion] = newShapes.id;
-                }
-            }
-        },
-
-        render: function () {
-            var values = this.values,
-                target = this.target,
-                regionShapes = this.regionShapes,
-                shapes, ids, i, j;
-
-            if (!this.cls._super.render.call(this)) {
-                return;
-            }
-            for (i = values.length; i--;) {
-                shapes = this.renderRegion(i);
-                if (shapes) {
-                    if ($.isArray(shapes)) {
-                        ids = [];
-                        for (j = shapes.length; j--;) {
-                            shapes[j].append();
-                            ids.push(shapes[j].id);
-                        }
-                        regionShapes[i] = ids;
-                    } else {
-                        shapes.append();
-                        regionShapes[i] = shapes.id; // store just the shapeid
-                    }
-                } else {
-                    // null value
-                    regionShapes[i] = null;
-                }
-            }
-            target.render();
-        }
-    };
-
-    /**
-     * Line charts
-     */
-    $.fn.sparkline.line = line = createClass($.fn.sparkline._base, {
-        type: 'line',
-
-        init: function (el, values, options, width, height) {
-            line._super.init.call(this, el, values, options, width, height);
-            this.vertices = [];
-            this.regionMap = [];
-            this.xvalues = [];
-            this.yvalues = [];
-            this.yminmax = [];
-            this.hightlightSpotId = null;
-            this.lastShapeId = null;
-            this.initTarget();
-        },
-
-        getRegion: function (el, x, y) {
-            var i,
-                regionMap = this.regionMap; // maps regions to value positions
-            for (i = regionMap.length; i--;) {
-                if (regionMap[i] !== null && x >= regionMap[i][0] && x <= regionMap[i][1]) {
-                    return regionMap[i][2];
-                }
-            }
-            return undefined;
-        },
-
-        getCurrentRegionFields: function () {
-            var currentRegion = this.currentRegion;
-            return {
-                isNull: this.yvalues[currentRegion] === null,
-                x: this.xvalues[currentRegion],
-                y: this.yvalues[currentRegion],
-                color: this.options.get('lineColor'),
-                fillColor: this.options.get('fillColor'),
-                offset: currentRegion
-            };
-        },
-
-        renderHighlight: function () {
-            var currentRegion = this.currentRegion,
-                target = this.target,
-                vertex = this.vertices[currentRegion],
-                options = this.options,
-                spotRadius = options.get('spotRadius'),
-                highlightSpotColor = options.get('highlightSpotColor'),
-                highlightLineColor = options.get('highlightLineColor'),
-                highlightSpot, highlightLine;
-
-            if (!vertex) {
-                return;
-            }
-            if (spotRadius && highlightSpotColor) {
-                highlightSpot = target.drawCircle(vertex[0], vertex[1],
-                    spotRadius, undefined, highlightSpotColor);
-                this.highlightSpotId = highlightSpot.id;
-                target.insertAfterShape(this.lastShapeId, highlightSpot);
-            }
-            if (highlightLineColor) {
-                highlightLine = target.drawLine(vertex[0], this.canvasTop, vertex[0],
-                    this.canvasTop + this.canvasHeight, highlightLineColor);
-                this.highlightLineId = highlightLine.id;
-                target.insertAfterShape(this.lastShapeId, highlightLine);
-            }
-        },
-
-        removeHighlight: function () {
-            var target = this.target;
-            if (this.highlightSpotId) {
-                target.removeShapeId(this.highlightSpotId);
-                this.highlightSpotId = null;
-            }
-            if (this.highlightLineId) {
-                target.removeShapeId(this.highlightLineId);
-                this.highlightLineId = null;
-            }
-        },
-
-        scanValues: function () {
-            var values = this.values,
-                valcount = values.length,
-                xvalues = this.xvalues,
-                yvalues = this.yvalues,
-                yminmax = this.yminmax,
-                i, val, isStr, isArray, sp;
-            for (i = 0; i < valcount; i++) {
-                val = values[i];
-                isStr = typeof(values[i]) === 'string';
-                isArray = typeof(values[i]) === 'object' && values[i] instanceof Array;
-                sp = isStr && values[i].split(':');
-                if (isStr && sp.length === 2) { // x:y
-                    xvalues.push(Number(sp[0]));
-                    yvalues.push(Number(sp[1]));
-                    yminmax.push(Number(sp[1]));
-                } else if (isArray) {
-                    xvalues.push(val[0]);
-                    yvalues.push(val[1]);
-                    yminmax.push(val[1]);
-                } else {
-                    xvalues.push(i);
-                    if (values[i] === null || values[i] === 'null') {
-                        yvalues.push(null);
-                    } else {
-                        yvalues.push(Number(val));
-                        yminmax.push(Number(val));
-                    }
-                }
-            }
-            if (this.options.get('xvalues')) {
-                xvalues = this.options.get('xvalues');
-            }
-
-            this.maxy = this.maxyorg = Math.max.apply(Math, yminmax);
-            this.miny = this.minyorg = Math.min.apply(Math, yminmax);
-
-            this.maxx = Math.max.apply(Math, xvalues);
-            this.minx = Math.min.apply(Math, xvalues);
-
-            this.xvalues = xvalues;
-            this.yvalues = yvalues;
-            this.yminmax = yminmax;
-
-        },
-
-        processRangeOptions: function () {
-            var options = this.options,
-                normalRangeMin = options.get('normalRangeMin'),
-                normalRangeMax = options.get('normalRangeMax');
-
-            if (normalRangeMin !== undefined) {
-                if (normalRangeMin < this.miny) {
-                    this.miny = normalRangeMin;
-                }
-                if (normalRangeMax > this.maxy) {
-                    this.maxy = normalRangeMax;
-                }
-            }
-            if (options.get('chartRangeMin') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMin') < this.miny)) {
-                this.miny = options.get('chartRangeMin');
-            }
-            if (options.get('chartRangeMax') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMax') > this.maxy)) {
-                this.maxy = options.get('chartRangeMax');
-            }
-            if (options.get('chartRangeMinX') !== undefined && (options.get('chartRangeClipX') || options.get('chartRangeMinX') < this.minx)) {
-                this.minx = options.get('chartRangeMinX');
-            }
-            if (options.get('chartRangeMaxX') !== undefined && (options.get('chartRangeClipX') || options.get('chartRangeMaxX') > this.maxx)) {
-                this.maxx = options.get('chartRangeMaxX');
-            }
-
-        },
-
-        drawNormalRange: function (canvasLeft, canvasTop, canvasHeight, canvasWidth, rangey) {
-            var normalRangeMin = this.options.get('normalRangeMin'),
-                normalRangeMax = this.options.get('normalRangeMax'),
-                ytop = canvasTop + Math.round(canvasHeight - (canvasHeight * ((normalRangeMax - this.miny) / rangey))),
-                height = Math.round((canvasHeight * (normalRangeMax - normalRangeMin)) / rangey);
-            this.target.drawRect(canvasLeft, ytop, canvasWidth, height, undefined, this.options.get('normalRangeColor')).append();
-        },
-
-        render: function () {
-            var options = this.options,
-                target = this.target,
-                canvasWidth = this.canvasWidth,
-                canvasHeight = this.canvasHeight,
-                vertices = this.vertices,
-                spotRadius = options.get('spotRadius'),
-                regionMap = this.regionMap,
-                rangex, rangey, yvallast,
-                canvasTop, canvasLeft,
-                vertex, path, paths, x, y, xnext, xpos, xposnext,
-                last, next, yvalcount, lineShapes, fillShapes, plen,
-                valueSpots, hlSpotsEnabled, color, xvalues, yvalues, i;
-
-            if (!line._super.render.call(this)) {
-                return;
-            }
-
-            this.scanValues();
-            this.processRangeOptions();
-
-            xvalues = this.xvalues;
-            yvalues = this.yvalues;
-
-            if (!this.yminmax.length || this.yvalues.length < 2) {
-                // empty or all null valuess
-                return;
-            }
-
-            canvasTop = canvasLeft = 0;
-
-            rangex = this.maxx - this.minx === 0 ? 1 : this.maxx - this.minx;
-            rangey = this.maxy - this.miny === 0 ? 1 : this.maxy - this.miny;
-            yvallast = this.yvalues.length - 1;
-
-            if (spotRadius && (canvasWidth < (spotRadius * 4) || canvasHeight < (spotRadius * 4))) {
-                spotRadius = 0;
-            }
-            if (spotRadius) {
-                // adjust the canvas size as required so that spots will fit
-                hlSpotsEnabled = options.get('highlightSpotColor') &&  !options.get('disableInteraction');
-                if (hlSpotsEnabled || options.get('minSpotColor') || (options.get('spotColor') && yvalues[yvallast] === this.miny)) {
-                    canvasHeight -= Math.ceil(spotRadius);
-                }
-                if (hlSpotsEnabled || options.get('maxSpotColor') || (options.get('spotColor') && yvalues[yvallast] === this.maxy)) {
-                    canvasHeight -= Math.ceil(spotRadius);
-                    canvasTop += Math.ceil(spotRadius);
-                }
-                if (hlSpotsEnabled ||
-                     ((options.get('minSpotColor') || options.get('maxSpotColor')) && (yvalues[0] === this.miny || yvalues[0] === this.maxy))) {
-                    canvasLeft += Math.ceil(spotRadius);
-                    canvasWidth -= Math.ceil(spotRadius);
-                }
-                if (hlSpotsEnabled || options.get('spotColor') ||
-                    (options.get('minSpotColor') || options.get('maxSpotColor') &&
-                        (yvalues[yvallast] === this.miny || yvalues[yvallast] === this.maxy))) {
-                    canvasWidth -= Math.ceil(spotRadius);
-                }
-            }
-
-
-            canvasHeight--;
-
-            if (options.get('normalRangeMin') !== undefined && !options.get('drawNormalOnTop')) {
-                this.drawNormalRange(canvasLeft, canvasTop, canvasHeight, canvasWidth, rangey);
-            }
-
-            path = [];
-            paths = [path];
-            last = next = null;
-            yvalcount = yvalues.length;
-            for (i = 0; i < yvalcount; i++) {
-                x = xvalues[i];
-                xnext = xvalues[i + 1];
-                y = yvalues[i];
-                xpos = canvasLeft + Math.round((x - this.minx) * (canvasWidth / rangex));
-                xposnext = i < yvalcount - 1 ? canvasLeft + Math.round((xnext - this.minx) * (canvasWidth / rangex)) : canvasWidth;
-                next = xpos + ((xposnext - xpos) / 2);
-                regionMap[i] = [last || 0, next, i];
-                last = next;
-                if (y === null) {
-                    if (i) {
-                        if (yvalues[i - 1] !== null) {
-                            path = [];
-                            paths.push(path);
-                        }
-                        vertices.push(null);
-                    }
-                } else {
-                    if (y < this.miny) {
-                        y = this.miny;
-                    }
-                    if (y > this.maxy) {
-                        y = this.maxy;
-                    }
-                    if (!path.length) {
-                        // previous value was null
-                        path.push([xpos, canvasTop + canvasHeight]);
-                    }
-                    vertex = [xpos, canvasTop + Math.round(canvasHeight - (canvasHeight * ((y - this.miny) / rangey)))];
-                    path.push(vertex);
-                    vertices.push(vertex);
-                }
-            }
-
-            lineShapes = [];
-            fillShapes = [];
-            plen = paths.length;
-            for (i = 0; i < plen; i++) {
-                path = paths[i];
-                if (path.length) {
-                    if (options.get('fillColor')) {
-                        path.push([path[path.length - 1][0], (canvasTop + canvasHeight)]);
-                        fillShapes.push(path.slice(0));
-                        path.pop();
-                    }
-                    // if there's only a single point in this path, then we want to display it
-                    // as a vertical line which means we keep path[0]  as is
-                    if (path.length > 2) {
-                        // else we want the first value
-                        path[0] = [path[0][0], path[1][1]];
-                    }
-                    lineShapes.push(path);
-                }
-            }
-
-            // draw the fill first, then optionally the normal range, then the line on top of that
-            plen = fillShapes.length;
-            for (i = 0; i < plen; i++) {
-                target.drawShape(fillShapes[i],
-                    options.get('fillColor'), options.get('fillColor')).append();
-            }
-
-            if (options.get('normalRangeMin') !== undefined && options.get('drawNormalOnTop')) {
-                this.drawNormalRange(canvasLeft, canvasTop, canvasHeight, canvasWidth, rangey);
-            }
-
-            plen = lineShapes.length;
-            for (i = 0; i < plen; i++) {
-                target.drawShape(lineShapes[i], options.get('lineColor'), undefined,
-                    options.get('lineWidth')).append();
-            }
-
-            if (spotRadius && options.get('valueSpots')) {
-                valueSpots = options.get('valueSpots');
-                if (valueSpots.get === undefined) {
-                    valueSpots = new RangeMap(valueSpots);
-                }
-                for (i = 0; i < yvalcount; i++) {
-                    color = valueSpots.get(yvalues[i]);
-                    if (color) {
-                        target.drawCircle(canvasLeft + Math.round((xvalues[i] - this.minx) * (canvasWidth / rangex)),
-                            canvasTop + Math.round(canvasHeight - (canvasHeight * ((yvalues[i] - this.miny) / rangey))),
-                            spotRadius, undefined,
-                            color).append();
-                    }
-                }
-
-            }
-            if (spotRadius && options.get('spotColor') && yvalues[yvallast] !== null) {
-                target.drawCircle(canvasLeft + Math.round((xvalues[xvalues.length - 1] - this.minx) * (canvasWidth / rangex)),
-                    canvasTop + Math.round(canvasHeight - (canvasHeight * ((yvalues[yvallast] - this.miny) / rangey))),
-                    spotRadius, undefined,
-                    options.get('spotColor')).append();
-            }
-            if (this.maxy !== this.minyorg) {
-                if (spotRadius && options.get('minSpotColor')) {
-                    x = xvalues[$.inArray(this.minyorg, yvalues)];
-                    target.drawCircle(canvasLeft + Math.round((x - this.minx) * (canvasWidth / rangex)),
-                        canvasTop + Math.round(canvasHeight - (canvasHeight * ((this.minyorg - this.miny) / rangey))),
-                        spotRadius, undefined,
-                        options.get('minSpotColor')).append();
-                }
-                if (spotRadius && options.get('maxSpotColor')) {
-                    x = xvalues[$.inArray(this.maxyorg, yvalues)];
-                    target.drawCircle(canvasLeft + Math.round((x - this.minx) * (canvasWidth / rangex)),
-                        canvasTop + Math.round(canvasHeight - (canvasHeight * ((this.maxyorg - this.miny) / rangey))),
-                        spotRadius, undefined,
-                        options.get('maxSpotColor')).append();
-                }
-            }
-
-            this.lastShapeId = target.getLastShapeId();
-            this.canvasTop = canvasTop;
-            target.render();
-        }
-    });
-
-    /**
-     * Bar charts
-     */
-    $.fn.sparkline.bar = bar = createClass($.fn.sparkline._base, barHighlightMixin, {
-        type: 'bar',
-
-        init: function (el, values, options, width, height) {
-            var barWidth = parseInt(options.get('barWidth'), 10),
-                barSpacing = parseInt(options.get('barSpacing'), 10),
-                chartRangeMin = options.get('chartRangeMin'),
-                chartRangeMax = options.get('chartRangeMax'),
-                chartRangeClip = options.get('chartRangeClip'),
-                stackMin = Infinity,
-                stackMax = -Infinity,
-                isStackString, groupMin, groupMax, stackRanges,
-                numValues, i, vlen, range, zeroAxis, xaxisOffset, min, max, clipMin, clipMax,
-                stacked, vlist, j, slen, svals, val, yoffset, yMaxCalc, canvasHeightEf;
-            bar._super.init.call(this, el, values, options, width, height);
-
-            // scan values to determine whether to stack bars
-            for (i = 0, vlen = values.length; i < vlen; i++) {
-                val = values[i];
-                isStackString = typeof(val) === 'string' && val.indexOf(':') > -1;
-                if (isStackString || $.isArray(val)) {
-                    stacked = true;
-                    if (isStackString) {
-                        val = values[i] = normalizeValues(val.split(':'));
-                    }
-                    val = remove(val, null); // min/max will treat null as zero
-                    groupMin = Math.min.apply(Math, val);
-                    groupMax = Math.max.apply(Math, val);
-                    if (groupMin < stackMin) {
-                        stackMin = groupMin;
-                    }
-                    if (groupMax > stackMax) {
-                        stackMax = groupMax;
-                    }
-                }
-            }
-
-            this.stacked = stacked;
-            this.regionShapes = {};
-            this.barWidth = barWidth;
-            this.barSpacing = barSpacing;
-            this.totalBarWidth = barWidth + barSpacing;
-            this.width = width = (values.length * barWidth) + ((values.length - 1) * barSpacing);
-
-            this.initTarget();
-
-            if (chartRangeClip) {
-                clipMin = chartRangeMin === undefined ? -Infinity : chartRangeMin;
-                clipMax = chartRangeMax === undefined ? Infinity : chartRangeMax;
-            }
-
-            numValues = [];
-            stackRanges = stacked ? [] : numValues;
-            var stackTotals = [];
-            var stackRangesNeg = [];
-            for (i = 0, vlen = values.length; i < vlen; i++) {
-                if (stacked) {
-                    vlist = values[i];
-                    values[i] = svals = [];
-                    stackTotals[i] = 0;
-                    stackRanges[i] = stackRangesNeg[i] = 0;
-                    for (j = 0, slen = vlist.length; j < slen; j++) {
-                        val = svals[j] = chartRangeClip ? clipval(vlist[j], clipMin, clipMax) : vlist[j];
-                        if (val !== null) {
-                            if (val > 0) {
-                                stackTotals[i] += val;
-                            }
-                            if (stackMin < 0 && stackMax > 0) {
-                                if (val < 0) {
-                                    stackRangesNeg[i] += Math.abs(val);
-                                } else {
-                                    stackRanges[i] += val;
-                                }
-                            } else {
-                                stackRanges[i] += Math.abs(val - (val < 0 ? stackMax : stackMin));
-                            }
-                            numValues.push(val);
-                        }
-                    }
-                } else {
-                    val = chartRangeClip ? clipval(values[i], clipMin, clipMax) : values[i];
-                    val = values[i] = normalizeValue(val);
-                    if (val !== null) {
-                        numValues.push(val);
-                    }
-                }
-            }
-            this.max = max = Math.max.apply(Math, numValues);
-            this.min = min = Math.min.apply(Math, numValues);
-            this.stackMax = stackMax = stacked ? Math.max.apply(Math, stackTotals) : max;
-            this.stackMin = stackMin = stacked ? Math.min.apply(Math, numValues) : min;
-
-            if (options.get('chartRangeMin') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMin') < min)) {
-                min = options.get('chartRangeMin');
-            }
-            if (options.get('chartRangeMax') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMax') > max)) {
-                max = options.get('chartRangeMax');
-            }
-
-            this.zeroAxis = zeroAxis = options.get('zeroAxis', true);
-            if (min <= 0 && max >= 0 && zeroAxis) {
-                xaxisOffset = 0;
-            } else if (zeroAxis == false) {
-                xaxisOffset = min;
-            } else if (min > 0) {
-                xaxisOffset = min;
-            } else {
-                xaxisOffset = max;
-            }
-            this.xaxisOffset = xaxisOffset;
-
-            range = stacked ? (Math.max.apply(Math, stackRanges) + Math.max.apply(Math, stackRangesNeg)) : max - min;
-
-            // as we plot zero/min values a single pixel line, we add a pixel to all other
-            // values - Reduce the effective canvas size to suit
-            this.canvasHeightEf = (zeroAxis && min < 0) ? this.canvasHeight - 2 : this.canvasHeight - 1;
-
-            if (min < xaxisOffset) {
-                yMaxCalc = (stacked && max >= 0) ? stackMax : max;
-                yoffset = (yMaxCalc - xaxisOffset) / range * this.canvasHeight;
-                if (yoffset !== Math.ceil(yoffset)) {
-                    this.canvasHeightEf -= 2;
-                    yoffset = Math.ceil(yoffset);
-                }
-            } else {
-                yoffset = this.canvasHeight;
-            }
-            this.yoffset = yoffset;
-
-            if ($.isArray(options.get('colorMap'))) {
-                this.colorMapByIndex = options.get('colorMap');
-                this.colorMapByValue = null;
-            } else {
-                this.colorMapByIndex = null;
-                this.colorMapByValue = options.get('colorMap');
-                if (this.colorMapByValue && this.colorMapByValue.get === undefined) {
-                    this.colorMapByValue = new RangeMap(this.colorMapByValue);
-                }
-            }
-
-            this.range = range;
-        },
-
-        getRegion: function (el, x, y) {
-            var result = Math.floor(x / this.totalBarWidth);
-            return (result < 0 || result >= this.values.length) ? undefined : result;
-        },
-
-        getCurrentRegionFields: function () {
-            var currentRegion = this.currentRegion,
-                values = ensureArray(this.values[currentRegion]),
-                result = [],
-                value, i;
-            for (i = values.length; i--;) {
-                value = values[i];
-                result.push({
-                    isNull: value === null,
-                    value: value,
-                    color: this.calcColor(i, value, currentRegion),
-                    offset: currentRegion
-                });
-            }
-            return result;
-        },
-
-        calcColor: function (stacknum, value, valuenum) {
-            var colorMapByIndex = this.colorMapByIndex,
-                colorMapByValue = this.colorMapByValue,
-                options = this.options,
-                color, newColor;
-            if (this.stacked) {
-                color = options.get('stackedBarColor');
-            } else {
-                color = (value < 0) ? options.get('negBarColor') : options.get('barColor');
-            }
-            if (value === 0 && options.get('zeroColor') !== undefined) {
-                color = options.get('zeroColor');
-            }
-            if (colorMapByValue && (newColor = colorMapByValue.get(value))) {
-                color = newColor;
-            } else if (colorMapByIndex && colorMapByIndex.length > valuenum) {
-                color = colorMapByIndex[valuenum];
-            }
-            return $.isArray(color) ? color[stacknum % color.length] : color;
-        },
-
-        /**
-         * Render bar(s) for a region
-         */
-        renderRegion: function (valuenum, highlight) {
-            var vals = this.values[valuenum],
-                options = this.options,
-                xaxisOffset = this.xaxisOffset,
-                result = [],
-                range = this.range,
-                stacked = this.stacked,
-                target = this.target,
-                x = valuenum * this.totalBarWidth,
-                canvasHeightEf = this.canvasHeightEf,
-                yoffset = this.yoffset,
-                y, height, color, isNull, yoffsetNeg, i, valcount, val, minPlotted, allMin;
-
-            vals = $.isArray(vals) ? vals : [vals];
-            valcount = vals.length;
-            val = vals[0];
-            isNull = all(null, vals);
-            allMin = all(xaxisOffset, vals, true);
-
-            if (isNull) {
-                if (options.get('nullColor')) {
-                    color = highlight ? options.get('nullColor') : this.calcHighlightColor(options.get('nullColor'), options);
-                    y = (yoffset > 0) ? yoffset - 1 : yoffset;
-                    return target.drawRect(x, y, this.barWidth - 1, 0, color, color);
-                } else {
-                    return undefined;
-                }
-            }
-            yoffsetNeg = yoffset;
-            for (i = 0; i < valcount; i++) {
-                val = vals[i];
-
-                if (stacked && val === xaxisOffset) {
-                    if (!allMin || minPlotted) {
-                        continue;
-                    }
-                    minPlotted = true;
-                }
-
-                if (range > 0) {
-                    height = Math.floor(canvasHeightEf * ((Math.abs(val - xaxisOffset) / range))) + 1;
-                } else {
-                    height = 1;
-                }
-                if (val < xaxisOffset || (val === xaxisOffset && yoffset === 0)) {
-                    y = yoffsetNeg;
-                    yoffsetNeg += height;
-                } else {
-                    y = yoffset - height;
-                    yoffset -= height;
-                }
-                color = this.calcColor(i, val, valuenum);
-                if (highlight) {
-                    color = this.calcHighlightColor(color, options);
-                }
-                result.push(target.drawRect(x, y, this.barWidth - 1, height - 1, color, color));
-            }
-            if (result.length === 1) {
-                return result[0];
-            }
-            return result;
-        }
-    });
-
-    /**
-     * Tristate charts
-     */
-    $.fn.sparkline.tristate = tristate = createClass($.fn.sparkline._base, barHighlightMixin, {
-        type: 'tristate',
-
-        init: function (el, values, options, width, height) {
-            var barWidth = parseInt(options.get('barWidth'), 10),
-                barSpacing = parseInt(options.get('barSpacing'), 10);
-            tristate._super.init.call(this, el, values, options, width, height);
-
-            this.regionShapes = {};
-            this.barWidth = barWidth;
-            this.barSpacing = barSpacing;
-            this.totalBarWidth = barWidth + barSpacing;
-            this.values = $.map(values, Number);
-            this.width = width = (values.length * barWidth) + ((values.length - 1) * barSpacing);
-
-            if ($.isArray(options.get('colorMap'))) {
-                this.colorMapByIndex = options.get('colorMap');
-                this.colorMapByValue = null;
-            } else {
-                this.colorMapByIndex = null;
-                this.colorMapByValue = options.get('colorMap');
-                if (this.colorMapByValue && this.colorMapByValue.get === undefined) {
-                    this.colorMapByValue = new RangeMap(this.colorMapByValue);
-                }
-            }
-            this.initTarget();
-        },
-
-        getRegion: function (el, x, y) {
-            return Math.floor(x / this.totalBarWidth);
-        },
-
-        getCurrentRegionFields: function () {
-            var currentRegion = this.currentRegion;
-            return {
-                isNull: this.values[currentRegion] === undefined,
-                value: this.values[currentRegion],
-                color: this.calcColor(this.values[currentRegion], currentRegion),
-                offset: currentRegion
-            };
-        },
-
-        calcColor: function (value, valuenum) {
-            var values = this.values,
-                options = this.options,
-                colorMapByIndex = this.colorMapByIndex,
-                colorMapByValue = this.colorMapByValue,
-                color, newColor;
-
-            if (colorMapByValue && (newColor = colorMapByValue.get(value))) {
-                color = newColor;
-            } else if (colorMapByIndex && colorMapByIndex.length > valuenum) {
-                color = colorMapByIndex[valuenum];
-            } else if (values[valuenum] < 0) {
-                color = options.get('negBarColor');
-            } else if (values[valuenum] > 0) {
-                color = options.get('posBarColor');
-            } else {
-                color = options.get('zeroBarColor');
-            }
-            return color;
-        },
-
-        renderRegion: function (valuenum, highlight) {
-            var values = this.values,
-                options = this.options,
-                target = this.target,
-                canvasHeight, height, halfHeight,
-                x, y, color;
-
-            canvasHeight = target.pixelHeight;
-            halfHeight = Math.round(canvasHeight / 2);
-
-            x = valuenum * this.totalBarWidth;
-            if (values[valuenum] < 0) {
-                y = halfHeight;
-                height = halfHeight - 1;
-            } else if (values[valuenum] > 0) {
-                y = 0;
-                height = halfHeight - 1;
-            } else {
-                y = halfHeight - 1;
-                height = 2;
-            }
-            color = this.calcColor(values[valuenum], valuenum);
-            if (color === null) {
-                return;
-            }
-            if (highlight) {
-                color = this.calcHighlightColor(color, options);
-            }
-            return target.drawRect(x, y, this.barWidth - 1, height - 1, color, color);
-        }
-    });
-
-    /**
-     * Discrete charts
-     */
-    $.fn.sparkline.discrete = discrete = createClass($.fn.sparkline._base, barHighlightMixin, {
-        type: 'discrete',
-
-        init: function (el, values, options, width, height) {
-            discrete._super.init.call(this, el, values, options, width, height);
-
-            this.regionShapes = {};
-            this.values = values = $.map(values, Number);
-            this.min = Math.min.apply(Math, values);
-            this.max = Math.max.apply(Math, values);
-            this.range = this.max - this.min;
-            this.width = width = options.get('width') === 'auto' ? values.length * 2 : this.width;
-            this.interval = Math.floor(width / values.length);
-            this.itemWidth = width / values.length;
-            if (options.get('chartRangeMin') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMin') < this.min)) {
-                this.min = options.get('chartRangeMin');
-            }
-            if (options.get('chartRangeMax') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMax') > this.max)) {
-                this.max = options.get('chartRangeMax');
-            }
-            this.initTarget();
-            if (this.target) {
-                this.lineHeight = options.get('lineHeight') === 'auto' ? Math.round(this.canvasHeight * 0.3) : options.get('lineHeight');
-            }
-        },
-
-        getRegion: function (el, x, y) {
-            return Math.floor(x / this.itemWidth);
-        },
-
-        getCurrentRegionFields: function () {
-            var currentRegion = this.currentRegion;
-            return {
-                isNull: this.values[currentRegion] === undefined,
-                value: this.values[currentRegion],
-                offset: currentRegion
-            };
-        },
-
-        renderRegion: function (valuenum, highlight) {
-            var values = this.values,
-                options = this.options,
-                min = this.min,
-                max = this.max,
-                range = this.range,
-                interval = this.interval,
-                target = this.target,
-                canvasHeight = this.canvasHeight,
-                lineHeight = this.lineHeight,
-                pheight = canvasHeight - lineHeight,
-                ytop, val, color, x;
-
-            val = clipval(values[valuenum], min, max);
-            x = valuenum * interval;
-            ytop = Math.round(pheight - pheight * ((val - min) / range));
-            color = (options.get('thresholdColor') && val < options.get('thresholdValue')) ? options.get('thresholdColor') : options.get('lineColor');
-            if (highlight) {
-                color = this.calcHighlightColor(color, options);
-            }
-            return target.drawLine(x, ytop, x, ytop + lineHeight, color);
-        }
-    });
-
-    /**
-     * Bullet charts
-     */
-    $.fn.sparkline.bullet = bullet = createClass($.fn.sparkline._base, {
-        type: 'bullet',
-
-        init: function (el, values, options, width, height) {
-            var min, max, vals;
-            bullet._super.init.call(this, el, values, options, width, height);
-
-            // values: target, performance, range1, range2, range3
-            this.values = values = normalizeValues(values);
-            // target or performance could be null
-            vals = values.slice();
-            vals[0] = vals[0] === null ? vals[2] : vals[0];
-            vals[1] = values[1] === null ? vals[2] : vals[1];
-            min = Math.min.apply(Math, values);
-            max = Math.max.apply(Math, values);
-            if (options.get('base') === undefined) {
-                min = min < 0 ? min : 0;
-            } else {
-                min = options.get('base');
-            }
-            this.min = min;
-            this.max = max;
-            this.range = max - min;
-            this.shapes = {};
-            this.valueShapes = {};
-            this.regiondata = {};
-            this.width = width = options.get('width') === 'auto' ? '4.0em' : width;
-            this.target = this.$el.simpledraw(width, height, options.get('composite'));
-            if (!values.length) {
-                this.disabled = true;
-            }
-            this.initTarget();
-        },
-
-        getRegion: function (el, x, y) {
-            var shapeid = this.target.getShapeAt(el, x, y);
-            return (shapeid !== undefined && this.shapes[shapeid] !== undefined) ? this.shapes[shapeid] : undefined;
-        },
-
-        getCurrentRegionFields: function () {
-            var currentRegion = this.currentRegion;
-            return {
-                fieldkey: currentRegion.substr(0, 1),
-                value: this.values[currentRegion.substr(1)],
-                region: currentRegion
-            };
-        },
-
-        changeHighlight: function (highlight) {
-            var currentRegion = this.currentRegion,
-                shapeid = this.valueShapes[currentRegion],
-                shape;
-            delete this.shapes[shapeid];
-            switch (currentRegion.substr(0, 1)) {
-                case 'r':
-                    shape = this.renderRange(currentRegion.substr(1), highlight);
-                    break;
-                case 'p':
-                    shape = this.renderPerformance(highlight);
-                    break;
-                case 't':
-                    shape = this.renderTarget(highlight);
-                    break;
-            }
-            this.valueShapes[currentRegion] = shape.id;
-            this.shapes[shape.id] = currentRegion;
-            this.target.replaceWithShape(shapeid, shape);
-        },
-
-        renderRange: function (rn, highlight) {
-            var rangeval = this.values[rn],
-                rangewidth = Math.round(this.canvasWidth * ((rangeval - this.min) / this.range)),
-                color = this.options.get('rangeColors')[rn - 2];
-            if (highlight) {
-                color = this.calcHighlightColor(color, this.options);
-            }
-            return this.target.drawRect(0, 0, rangewidth - 1, this.canvasHeight - 1, color, color);
-        },
-
-        renderPerformance: function (highlight) {
-            var perfval = this.values[1],
-                perfwidth = Math.round(this.canvasWidth * ((perfval - this.min) / this.range)),
-                color = this.options.get('performanceColor');
-            if (highlight) {
-                color = this.calcHighlightColor(color, this.options);
-            }
-            return this.target.drawRect(0, Math.round(this.canvasHeight * 0.3), perfwidth - 1,
-                Math.round(this.canvasHeight * 0.4) - 1, color, color);
-        },
-
-        renderTarget: function (highlight) {
-            var targetval = this.values[0],
-                x = Math.round(this.canvasWidth * ((targetval - this.min) / this.range) - (this.options.get('targetWidth') / 2)),
-                targettop = Math.round(this.canvasHeight * 0.10),
-                targetheight = this.canvasHeight - (targettop * 2),
-                color = this.options.get('targetColor');
-            if (highlight) {
-                color = this.calcHighlightColor(color, this.options);
-            }
-            return this.target.drawRect(x, targettop, this.options.get('targetWidth') - 1, targetheight - 1, color, color);
-        },
-
-        render: function () {
-            var vlen = this.values.length,
-                target = this.target,
-                i, shape;
-            if (!bullet._super.render.call(this)) {
-                return;
-            }
-            for (i = 2; i < vlen; i++) {
-                shape = this.renderRange(i).append();
-                this.shapes[shape.id] = 'r' + i;
-                this.valueShapes['r' + i] = shape.id;
-            }
-            if (this.values[1] !== null) {
-                shape = this.renderPerformance().append();
-                this.shapes[shape.id] = 'p1';
-                this.valueShapes.p1 = shape.id;
-            }
-            if (this.values[0] !== null) {
-                shape = this.renderTarget().append();
-                this.shapes[shape.id] = 't0';
-                this.valueShapes.t0 = shape.id;
-            }
-            target.render();
-        }
-    });
-
-    /**
-     * Pie charts
-     */
-    $.fn.sparkline.pie = pie = createClass($.fn.sparkline._base, {
-        type: 'pie',
-
-        init: function (el, values, options, width, height) {
-            var total = 0, i;
-
-            pie._super.init.call(this, el, values, options, width, height);
-
-            this.shapes = {}; // map shape ids to value offsets
-            this.valueShapes = {}; // maps value offsets to shape ids
-            this.values = values = $.map(values, Number);
-
-            if (options.get('width') === 'auto') {
-                this.width = this.height;
-            }
-
-            if (values.length > 0) {
-                for (i = values.length; i--;) {
-                    total += values[i];
-                }
-            }
-            this.total = total;
-            this.initTarget();
-            this.radius = Math.floor(Math.min(this.canvasWidth, this.canvasHeight) / 2);
-        },
-
-        getRegion: function (el, x, y) {
-            var shapeid = this.target.getShapeAt(el, x, y);
-            return (shapeid !== undefined && this.shapes[shapeid] !== undefined) ? this.shapes[shapeid] : undefined;
-        },
-
-        getCurrentRegionFields: function () {
-            var currentRegion = this.currentRegion;
-            return {
-                isNull: this.values[currentRegion] === undefined,
-                value: this.values[currentRegion],
-                percent: this.values[currentRegion] / this.total * 100,
-                color: this.options.get('sliceColors')[currentRegion % this.options.get('sliceColors').length],
-                offset: currentRegion
-            };
-        },
-
-        changeHighlight: function (highlight) {
-            var currentRegion = this.currentRegion,
-                 newslice = this.renderSlice(currentRegion, highlight),
-                 shapeid = this.valueShapes[currentRegion];
-            delete this.shapes[shapeid];
-            this.target.replaceWithShape(shapeid, newslice);
-            this.valueShapes[currentRegion] = newslice.id;
-            this.shapes[newslice.id] = currentRegion;
-        },
-
-        renderSlice: function (valuenum, highlight) {
-            var target = this.target,
-                options = this.options,
-                radius = this.radius,
-                borderWidth = options.get('borderWidth'),
-                offset = options.get('offset'),
-                circle = 2 * Math.PI,
-                values = this.values,
-                total = this.total,
-                next = offset ? (2*Math.PI)*(offset/360) : 0,
-                start, end, i, vlen, color;
-
-            vlen = values.length;
-            for (i = 0; i < vlen; i++) {
-                start = next;
-                end = next;
-                if (total > 0) {  // avoid divide by zero
-                    end = next + (circle * (values[i] / total));
-                }
-                if (valuenum === i) {
-                    color = options.get('sliceColors')[i % options.get('sliceColors').length];
-                    if (highlight) {
-                        color = this.calcHighlightColor(color, options);
-                    }
-
-                    return target.drawPieSlice(radius, radius, radius - borderWidth, start, end, undefined, color);
-                }
-                next = end;
-            }
-        },
-
-        render: function () {
-            var target = this.target,
-                values = this.values,
-                options = this.options,
-                radius = this.radius,
-                borderWidth = options.get('borderWidth'),
-                shape, i;
-
-            if (!pie._super.render.call(this)) {
-                return;
-            }
-            if (borderWidth) {
-                target.drawCircle(radius, radius, Math.floor(radius - (borderWidth / 2)),
-                    options.get('borderColor'), undefined, borderWidth).append();
-            }
-            for (i = values.length; i--;) {
-                if (values[i]) { // don't render zero values
-                    shape = this.renderSlice(i).append();
-                    this.valueShapes[i] = shape.id; // store just the shapeid
-                    this.shapes[shape.id] = i;
-                }
-            }
-            target.render();
-        }
-    });
-
-    /**
-     * Box plots
-     */
-    $.fn.sparkline.box = box = createClass($.fn.sparkline._base, {
-        type: 'box',
-
-        init: function (el, values, options, width, height) {
-            box._super.init.call(this, el, values, options, width, height);
-            this.values = $.map(values, Number);
-            this.width = options.get('width') === 'auto' ? '4.0em' : width;
-            this.initTarget();
-            if (!this.values.length) {
-                this.disabled = 1;
-            }
-        },
-
-        /**
-         * Simulate a single region
-         */
-        getRegion: function () {
-            return 1;
-        },
-
-        getCurrentRegionFields: function () {
-            var result = [
-                { field: 'lq', value: this.quartiles[0] },
-                { field: 'med', value: this.quartiles[1] },
-                { field: 'uq', value: this.quartiles[2] }
-            ];
-            if (this.loutlier !== undefined) {
-                result.push({ field: 'lo', value: this.loutlier});
-            }
-            if (this.routlier !== undefined) {
-                result.push({ field: 'ro', value: this.routlier});
-            }
-            if (this.lwhisker !== undefined) {
-                result.push({ field: 'lw', value: this.lwhisker});
-            }
-            if (this.rwhisker !== undefined) {
-                result.push({ field: 'rw', value: this.rwhisker});
-            }
-            return result;
-        },
-
-        render: function () {
-            var target = this.target,
-                values = this.values,
-                vlen = values.length,
-                options = this.options,
-                canvasWidth = this.canvasWidth,
-                canvasHeight = this.canvasHeight,
-                minValue = options.get('chartRangeMin') === undefined ? Math.min.apply(Math, values) : options.get('chartRangeMin'),
-                maxValue = options.get('chartRangeMax') === undefined ? Math.max.apply(Math, values) : options.get('chartRangeMax'),
-                canvasLeft = 0,
-                lwhisker, loutlier, iqr, q1, q2, q3, rwhisker, routlier, i,
-                size, unitSize;
-
-            if (!box._super.render.call(this)) {
-                return;
-            }
-
-            if (options.get('raw')) {
-                if (options.get('showOutliers') && values.length > 5) {
-                    loutlier = values[0];
-                    lwhisker = values[1];
-                    q1 = values[2];
-                    q2 = values[3];
-                    q3 = values[4];
-                    rwhisker = values[5];
-                    routlier = values[6];
-                } else {
-                    lwhisker = values[0];
-                    q1 = values[1];
-                    q2 = values[2];
-                    q3 = values[3];
-                    rwhisker = values[4];
-                }
-            } else {
-                values.sort(function (a, b) { return a - b; });
-                q1 = quartile(values, 1);
-                q2 = quartile(values, 2);
-                q3 = quartile(values, 3);
-                iqr = q3 - q1;
-                if (options.get('showOutliers')) {
-                    lwhisker = rwhisker = undefined;
-                    for (i = 0; i < vlen; i++) {
-                        if (lwhisker === undefined && values[i] > q1 - (iqr * options.get('outlierIQR'))) {
-                            lwhisker = values[i];
-                        }
-                        if (values[i] < q3 + (iqr * options.get('outlierIQR'))) {
-                            rwhisker = values[i];
-                        }
-                    }
-                    loutlier = values[0];
-                    routlier = values[vlen - 1];
-                } else {
-                    lwhisker = values[0];
-                    rwhisker = values[vlen - 1];
-                }
-            }
-            this.quartiles = [q1, q2, q3];
-            this.lwhisker = lwhisker;
-            this.rwhisker = rwhisker;
-            this.loutlier = loutlier;
-            this.routlier = routlier;
-
-            unitSize = canvasWidth / (maxValue - minValue + 1);
-            if (options.get('showOutliers')) {
-                canvasLeft = Math.ceil(options.get('spotRadius'));
-                canvasWidth -= 2 * Math.ceil(options.get('spotRadius'));
-                unitSize = canvasWidth / (maxValue - minValue + 1);
-                if (loutlier < lwhisker) {
-                    target.drawCircle((loutlier - minValue) * unitSize + canvasLeft,
-                        canvasHeight / 2,
-                        options.get('spotRadius'),
-                        options.get('outlierLineColor'),
-                        options.get('outlierFillColor')).append();
-                }
-                if (routlier > rwhisker) {
-                    target.drawCircle((routlier - minValue) * unitSize + canvasLeft,
-                        canvasHeight / 2,
-                        options.get('spotRadius'),
-                        options.get('outlierLineColor'),
-                        options.get('outlierFillColor')).append();
-                }
-            }
-
-            // box
-            target.drawRect(
-                Math.round((q1 - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight * 0.1),
-                Math.round((q3 - q1) * unitSize),
-                Math.round(canvasHeight * 0.8),
-                options.get('boxLineColor'),
-                options.get('boxFillColor')).append();
-            // left whisker
-            target.drawLine(
-                Math.round((lwhisker - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight / 2),
-                Math.round((q1 - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight / 2),
-                options.get('lineColor')).append();
-            target.drawLine(
-                Math.round((lwhisker - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight / 4),
-                Math.round((lwhisker - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight - canvasHeight / 4),
-                options.get('whiskerColor')).append();
-            // right whisker
-            target.drawLine(Math.round((rwhisker - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight / 2),
-                Math.round((q3 - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight / 2),
-                options.get('lineColor')).append();
-            target.drawLine(
-                Math.round((rwhisker - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight / 4),
-                Math.round((rwhisker - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight - canvasHeight / 4),
-                options.get('whiskerColor')).append();
-            // median line
-            target.drawLine(
-                Math.round((q2 - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight * 0.1),
-                Math.round((q2 - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight * 0.9),
-                options.get('medianColor')).append();
-            if (options.get('target')) {
-                size = Math.ceil(options.get('spotRadius'));
-                target.drawLine(
-                    Math.round((options.get('target') - minValue) * unitSize + canvasLeft),
-                    Math.round((canvasHeight / 2) - size),
-                    Math.round((options.get('target') - minValue) * unitSize + canvasLeft),
-                    Math.round((canvasHeight / 2) + size),
-                    options.get('targetColor')).append();
-                target.drawLine(
-                    Math.round((options.get('target') - minValue) * unitSize + canvasLeft - size),
-                    Math.round(canvasHeight / 2),
-                    Math.round((options.get('target') - minValue) * unitSize + canvasLeft + size),
-                    Math.round(canvasHeight / 2),
-                    options.get('targetColor')).append();
-            }
-            target.render();
-        }
-    });
-
-    // Setup a very simple "virtual canvas" to make drawing the few shapes we need easier
-    // This is accessible as $(foo).simpledraw()
-
-    // Detect browser renderer support
-    (function() {
-        if (document.namespaces && !document.namespaces.v) {
-            $.fn.sparkline.hasVML = true;
-            document.namespaces.add('v', 'urn:schemas-microsoft-com:vml', '#default#VML');
-        } else {
-            $.fn.sparkline.hasVML = false;
-        }
-
-        var el = document.createElement('canvas');
-        $.fn.sparkline.hasCanvas = !!(el.getContext && el.getContext('2d'));
-
-    })()
-
-    VShape = createClass({
-        init: function (target, id, type, args) {
-            this.target = target;
-            this.id = id;
-            this.type = type;
-            this.args = args;
-        },
-        append: function () {
-            this.target.appendShape(this);
-            return this;
-        }
-    });
-
-    VCanvas_base = createClass({
-        _pxregex: /(\d+)(px)?\s*$/i,
-
-        init: function (width, height, target) {
-            if (!width) {
-                return;
-            }
-            this.width = width;
-            this.height = height;
-            this.target = target;
-            this.lastShapeId = null;
-            if (target[0]) {
-                target = target[0];
-            }
-            $.data(target, '_jqs_vcanvas', this);
-        },
-
-        drawLine: function (x1, y1, x2, y2, lineColor, lineWidth) {
-            return this.drawShape([[x1, y1], [x2, y2]], lineColor, lineWidth);
-        },
-
-        drawShape: function (path, lineColor, fillColor, lineWidth) {
-            return this._genShape('Shape', [path, lineColor, fillColor, lineWidth]);
-        },
-
-        drawCircle: function (x, y, radius, lineColor, fillColor, lineWidth) {
-            return this._genShape('Circle', [x, y, radius, lineColor, fillColor, lineWidth]);
-        },
-
-        drawPieSlice: function (x, y, radius, startAngle, endAngle, lineColor, fillColor) {
-            return this._genShape('PieSlice', [x, y, radius, startAngle, endAngle, lineColor, fillColor]);
-        },
-
-        drawRect: function (x, y, width, height, lineColor, fillColor) {
-            return this._genShape('Rect', [x, y, width, height, lineColor, fillColor]);
-        },
-
-        getElement: function () {
-            return this.canvas;
-        },
-
-        /**
-         * Return the most recently inserted shape id
-         */
-        getLastShapeId: function () {
-            return this.lastShapeId;
-        },
-
-        /**
-         * Clear and reset the canvas
-         */
-        reset: function () {
-            alert('reset not implemented');
-        },
-
-        _insert: function (el, target) {
-            $(target).html(el);
-        },
-
-        /**
-         * Calculate the pixel dimensions of the canvas
-         */
-        _calculatePixelDims: function (width, height, canvas) {
-            // XXX This should probably be a configurable option
-            var match;
-            match = this._pxregex.exec(height);
-            if (match) {
-                this.pixelHeight = match[1];
-            } else {
-                this.pixelHeight = $(canvas).height();
-            }
-            match = this._pxregex.exec(width);
-            if (match) {
-                this.pixelWidth = match[1];
-            } else {
-                this.pixelWidth = $(canvas).width();
-            }
-        },
-
-        /**
-         * Generate a shape object and id for later rendering
-         */
-        _genShape: function (shapetype, shapeargs) {
-            var id = shapeCount++;
-            shapeargs.unshift(id);
-            return new VShape(this, id, shapetype, shapeargs);
-        },
-
-        /**
-         * Add a shape to the end of the render queue
-         */
-        appendShape: function (shape) {
-            alert('appendShape not implemented');
-        },
-
-        /**
-         * Replace one shape with another
-         */
-        replaceWithShape: function (shapeid, shape) {
-            alert('replaceWithShape not implemented');
-        },
-
-        /**
-         * Insert one shape after another in the render queue
-         */
-        insertAfterShape: function (shapeid, shape) {
-            alert('insertAfterShape not implemented');
-        },
-
-        /**
-         * Remove a shape from the queue
-         */
-        removeShapeId: function (shapeid) {
-            alert('removeShapeId not implemented');
-        },
-
-        /**
-         * Find a shape at the specified x/y co-ordinates
-         */
-        getShapeAt: function (el, x, y) {
-            alert('getShapeAt not implemented');
-        },
-
-        /**
-         * Render all queued shapes onto the canvas
-         */
-        render: function () {
-            alert('render not implemented');
-        }
-    });
-
-    VCanvas_canvas = createClass(VCanvas_base, {
-        init: function (width, height, target, interact) {
-            VCanvas_canvas._super.init.call(this, width, height, target);
-            this.canvas = document.createElement('canvas');
-            if (target[0]) {
-                target = target[0];
-            }
-            $.data(target, '_jqs_vcanvas', this);
-            $(this.canvas).css({ display: 'inline-block', width: width, height: height, verticalAlign: 'top' });
-            this._insert(this.canvas, target);
-            this._calculatePixelDims(width, height, this.canvas);
-            this.canvas.width = this.pixelWidth;
-            this.canvas.height = this.pixelHeight;
-            this.interact = interact;
-            this.shapes = {};
-            this.shapeseq = [];
-            this.currentTargetShapeId = undefined;
-            $(this.canvas).css({width: this.pixelWidth, height: this.pixelHeight});
-        },
-
-        _getContext: function (lineColor, fillColor, lineWidth) {
-            var context = this.canvas.getContext('2d');
-            if (lineColor !== undefined) {
-                context.strokeStyle = lineColor;
-            }
-            context.lineWidth = lineWidth === undefined ? 1 : lineWidth;
-            if (fillColor !== undefined) {
-                context.fillStyle = fillColor;
-            }
-            return context;
-        },
-
-        reset: function () {
-            var context = this._getContext();
-            context.clearRect(0, 0, this.pixelWidth, this.pixelHeight);
-            this.shapes = {};
-            this.shapeseq = [];
-            this.currentTargetShapeId = undefined;
-        },
-
-        _drawShape: function (shapeid, path, lineColor, fillColor, lineWidth) {
-            var context = this._getContext(lineColor, fillColor, lineWidth),
-                i, plen;
-            context.beginPath();
-            context.moveTo(path[0][0] + 0.5, path[0][1] + 0.5);
-            for (i = 1, plen = path.length; i < plen; i++) {
-                context.lineTo(path[i][0] + 0.5, path[i][1] + 0.5); // the 0.5 offset gives us crisp pixel-width lines
-            }
-            if (lineColor !== undefined) {
-                context.stroke();
-            }
-            if (fillColor !== undefined) {
-                context.fill();
-            }
-            if (this.targetX !== undefined && this.targetY !== undefined &&
-                context.isPointInPath(this.targetX, this.targetY)) {
-                this.currentTargetShapeId = shapeid;
-            }
-        },
-
-        _drawCircle: function (shapeid, x, y, radius, lineColor, fillColor, lineWidth) {
-            var context = this._getContext(lineColor, fillColor, lineWidth);
-            context.beginPath();
-            context.arc(x, y, radius, 0, 2 * Math.PI, false);
-            if (this.targetX !== undefined && this.targetY !== undefined &&
-                context.isPointInPath(this.targetX, this.targetY)) {
-                this.currentTargetShapeId = shapeid;
-            }
-            if (lineColor !== undefined) {
-                context.stroke();
-            }
-            if (fillColor !== undefined) {
-                context.fill();
-            }
-        },
-
-        _drawPieSlice: function (shapeid, x, y, radius, startAngle, endAngle, lineColor, fillColor) {
-            var context = this._getContext(lineColor, fillColor);
-            context.beginPath();
-            context.moveTo(x, y);
-            context.arc(x, y, radius, startAngle, endAngle, false);
-            context.lineTo(x, y);
-            context.closePath();
-            if (lineColor !== undefined) {
-                context.stroke();
-            }
-            if (fillColor) {
-                context.fill();
-            }
-            if (this.targetX !== undefined && this.targetY !== undefined &&
-                context.isPointInPath(this.targetX, this.targetY)) {
-                this.currentTargetShapeId = shapeid;
-            }
-        },
-
-        _drawRect: function (shapeid, x, y, width, height, lineColor, fillColor) {
-            return this._drawShape(shapeid, [[x, y], [x + width, y], [x + width, y + height], [x, y + height], [x, y]], lineColor, fillColor);
-        },
-
-        appendShape: function (shape) {
-            this.shapes[shape.id] = shape;
-            this.shapeseq.push(shape.id);
-            this.lastShapeId = shape.id;
-            return shape.id;
-        },
-
-        replaceWithShape: function (shapeid, shape) {
-            var shapeseq = this.shapeseq,
-                i;
-            this.shapes[shape.id] = shape;
-            for (i = shapeseq.length; i--;) {
-                if (shapeseq[i] == shapeid) {
-                    shapeseq[i] = shape.id;
-                }
-            }
-            delete this.shapes[shapeid];
-        },
-
-        replaceWithShapes: function (shapeids, shapes) {
-            var shapeseq = this.shapeseq,
-                shapemap = {},
-                sid, i, first;
-
-            for (i = shapeids.length; i--;) {
-                shapemap[shapeids[i]] = true;
-            }
-            for (i = shapeseq.length; i--;) {
-                sid = shapeseq[i];
-                if (shapemap[sid]) {
-                    shapeseq.splice(i, 1);
-                    delete this.shapes[sid];
-                    first = i;
-                }
-            }
-            for (i = shapes.length; i--;) {
-                shapeseq.splice(first, 0, shapes[i].id);
-                this.shapes[shapes[i].id] = shapes[i];
-            }
-
-        },
-
-        insertAfterShape: function (shapeid, shape) {
-            var shapeseq = this.shapeseq,
-                i;
-            for (i = shapeseq.length; i--;) {
-                if (shapeseq[i] === shapeid) {
-                    shapeseq.splice(i + 1, 0, shape.id);
-                    this.shapes[shape.id] = shape;
-                    return;
-                }
-            }
-        },
-
-        removeShapeId: function (shapeid) {
-            var shapeseq = this.shapeseq,
-                i;
-            for (i = shapeseq.length; i--;) {
-                if (shapeseq[i] === shapeid) {
-                    shapeseq.splice(i, 1);
-                    break;
-                }
-            }
-            delete this.shapes[shapeid];
-        },
-
-        getShapeAt: function (el, x, y) {
-            this.targetX = x;
-            this.targetY = y;
-            this.render();
-            return this.currentTargetShapeId;
-        },
-
-        render: function () {
-            var shapeseq = this.shapeseq,
-                shapes = this.shapes,
-                shapeCount = shapeseq.length,
-                context = this._getContext(),
-                shapeid, shape, i;
-            context.clearRect(0, 0, this.pixelWidth, this.pixelHeight);
-            for (i = 0; i < shapeCount; i++) {
-                shapeid = shapeseq[i];
-                shape = shapes[shapeid];
-                this['_draw' + shape.type].apply(this, shape.args);
-            }
-            if (!this.interact) {
-                // not interactive so no need to keep the shapes array
-                this.shapes = {};
-                this.shapeseq = [];
-            }
-        }
-
-    });
-
-    VCanvas_vml = createClass(VCanvas_base, {
-        init: function (width, height, target) {
-            var groupel;
-            VCanvas_vml._super.init.call(this, width, height, target);
-            if (target[0]) {
-                target = target[0];
-            }
-            $.data(target, '_jqs_vcanvas', this);
-            this.canvas = document.createElement('span');
-            $(this.canvas).css({ display: 'inline-block', position: 'relative', overflow: 'hidden', width: width, height: height, margin: '0px', padding: '0px', verticalAlign: 'top'});
-            this._insert(this.canvas, target);
-            this._calculatePixelDims(width, height, this.canvas);
-            this.canvas.width = this.pixelWidth;
-            this.canvas.height = this.pixelHeight;
-            groupel = '<v:group coordorigin="0 0" coordsize="' + this.pixelWidth + ' ' + this.pixelHeight + '"' +
-                    ' style="position:absolute;top:0;left:0;width:' + this.pixelWidth + 'px;height=' + this.pixelHeight + 'px;"></v:group>';
-            this.canvas.insertAdjacentHTML('beforeEnd', groupel);
-            this.group = $(this.canvas).children()[0];
-            this.rendered = false;
-            this.prerender = '';
-        },
-
-        _drawShape: function (shapeid, path, lineColor, fillColor, lineWidth) {
-            var vpath = [],
-                initial, stroke, fill, closed, vel, plen, i;
-            for (i = 0, plen = path.length; i < plen; i++) {
-                vpath[i] = '' + (path[i][0]) + ',' + (path[i][1]);
-            }
-            initial = vpath.splice(0, 1);
-            lineWidth = lineWidth === undefined ? 1 : lineWidth;
-            stroke = lineColor === undefined ? ' stroked="false" ' : ' strokeWeight="' + lineWidth + 'px" strokeColor="' + lineColor + '" ';
-            fill = fillColor === undefined ? ' filled="false"' : ' fillColor="' + fillColor + '" filled="true" ';
-            closed = vpath[0] === vpath[vpath.length - 1] ? 'x ' : '';
-            vel = '<v:shape coordorigin="0 0" coordsize="' + this.pixelWidth + ' ' + this.pixelHeight + '" ' +
-                 ' id="jqsshape' + shapeid + '" ' +
-                 stroke +
-                 fill +
-                ' style="position:absolute;left:0px;top:0px;height:' + this.pixelHeight + 'px;width:' + this.pixelWidth + 'px;padding:0px;margin:0px;" ' +
-                ' path="m ' + initial + ' l ' + vpath.join(', ') + ' ' + closed + 'e">' +
-                ' </v:shape>';
-            return vel;
-        },
-
-        _drawCircle: function (shapeid, x, y, radius, lineColor, fillColor, lineWidth) {
-            var stroke, fill, vel;
-            x -= radius;
-            y -= radius;
-            stroke = lineColor === undefined ? ' stroked="false" ' : ' strokeWeight="' + lineWidth + 'px" strokeColor="' + lineColor + '" ';
-            fill = fillColor === undefined ? ' filled="false"' : ' fillColor="' + fillColor + '" filled="true" ';
-            vel = '<v:oval ' +
-                 ' id="jqsshape' + shapeid + '" ' +
-                stroke +
-                fill +
-                ' style="position:absolute;top:' + y + 'px; left:' + x + 'px; width:' + (radius * 2) + 'px; height:' + (radius * 2) + 'px"></v:oval>';
-            return vel;
-
-        },
-
-        _drawPieSlice: function (shapeid, x, y, radius, startAngle, endAngle, lineColor, fillColor) {
-            var vpath, startx, starty, endx, endy, stroke, fill, vel;
-            if (startAngle === endAngle) {
-                return '';  // VML seems to have problem when start angle equals end angle.
-            }
-            if ((endAngle - startAngle) === (2 * Math.PI)) {
-                startAngle = 0.0;  // VML seems to have a problem when drawing a full circle that doesn't start 0
-                endAngle = (2 * Math.PI);
-            }
-
-            startx = x + Math.round(Math.cos(startAngle) * radius);
-            starty = y + Math.round(Math.sin(startAngle) * radius);
-            endx = x + Math.round(Math.cos(endAngle) * radius);
-            endy = y + Math.round(Math.sin(endAngle) * radius);
-
-            if (startx === endx && starty === endy) {
-                if ((endAngle - startAngle) < Math.PI) {
-                    // Prevent very small slices from being mistaken as a whole pie
-                    return '';
-                }
-                // essentially going to be the entire circle, so ignore startAngle
-                startx = endx = x + radius;
-                starty = endy = y;
-            }
-
-            if (startx === endx && starty === endy && (endAngle - startAngle) < Math.PI) {
-                return '';
-            }
-
-            vpath = [x - radius, y - radius, x + radius, y + radius, startx, starty, endx, endy];
-            stroke = lineColor === undefined ? ' stroked="false" ' : ' strokeWeight="1px" strokeColor="' + lineColor + '" ';
-            fill = fillColor === undefined ? ' filled="false"' : ' fillColor="' + fillColor + '" filled="true" ';
-            vel = '<v:shape coordorigin="0 0" coordsize="' + this.pixelWidth + ' ' + this.pixelHeight + '" ' +
-                 ' id="jqsshape' + shapeid + '" ' +
-                 stroke +
-                 fill +
-                ' style="position:absolute;left:0px;top:0px;height:' + this.pixelHeight + 'px;width:' + this.pixelWidth + 'px;padding:0px;margin:0px;" ' +
-                ' path="m ' + x + ',' + y + ' wa ' + vpath.join(', ') + ' x e">' +
-                ' </v:shape>';
-            return vel;
-        },
-
-        _drawRect: function (shapeid, x, y, width, height, lineColor, fillColor) {
-            return this._drawShape(shapeid, [[x, y], [x, y + height], [x + width, y + height], [x + width, y], [x, y]], lineColor, fillColor);
-        },
-
-        reset: function () {
-            this.group.innerHTML = '';
-        },
-
-        appendShape: function (shape) {
-            var vel = this['_draw' + shape.type].apply(this, shape.args);
-            if (this.rendered) {
-                this.group.insertAdjacentHTML('beforeEnd', vel);
-            } else {
-                this.prerender += vel;
-            }
-            this.lastShapeId = shape.id;
-            return shape.id;
-        },
-
-        replaceWithShape: function (shapeid, shape) {
-            var existing = $('#jqsshape' + shapeid),
-                vel = this['_draw' + shape.type].apply(this, shape.args);
-            existing[0].outerHTML = vel;
-        },
-
-        replaceWithShapes: function (shapeids, shapes) {
-            // replace the first shapeid with all the new shapes then toast the remaining old shapes
-            var existing = $('#jqsshape' + shapeids[0]),
-                replace = '',
-                slen = shapes.length,
-                i;
-            for (i = 0; i < slen; i++) {
-                replace += this['_draw' + shapes[i].type].apply(this, shapes[i].args);
-            }
-            existing[0].outerHTML = replace;
-            for (i = 1; i < shapeids.length; i++) {
-                $('#jqsshape' + shapeids[i]).remove();
-            }
-        },
-
-        insertAfterShape: function (shapeid, shape) {
-            var existing = $('#jqsshape' + shapeid),
-                 vel = this['_draw' + shape.type].apply(this, shape.args);
-            existing[0].insertAdjacentHTML('afterEnd', vel);
-        },
-
-        removeShapeId: function (shapeid) {
-            var existing = $('#jqsshape' + shapeid);
-            this.group.removeChild(existing[0]);
-        },
-
-        getShapeAt: function (el, x, y) {
-            var shapeid = el.id.substr(8);
-            return shapeid;
-        },
-
-        render: function () {
-            if (!this.rendered) {
-                // batch the intial render into a single repaint
-                this.group.innerHTML = this.prerender;
-                this.rendered = true;
-            }
-        }
-    });
-
-}));
diff --git a/addons/crm/static/src/js/crm_case_section.js b/addons/crm/static/src/js/crm_case_section.js
index 2b4ca741d75..e027313d6dc 100644
--- a/addons/crm/static/src/js/crm_case_section.js
+++ b/addons/crm/static/src/js/crm_case_section.js
@@ -8,27 +8,4 @@ openerp.crm = function(openerp) {
             }
         },
     });
-
-    openerp.crm.SparklineBarWidget = openerp.web_kanban.AbstractField.extend({
-        className: "oe_sparkline_bar",
-        start: function() {
-            var self = this;
-            var title = this.$node.html();
-            setTimeout(function () {
-                var value = _.pluck(self.field.value, 'value');
-                var tooltips = _.pluck(self.field.value, 'tooltip');
-                self.$el.sparkline(value, {
-                    type: 'bar',
-                    barWidth: 5,
-                    tooltipFormat: '{{offset:offset}} {{value}}',
-                    tooltipValueLookups: {
-                        'offset': tooltips
-                    },
-                });
-                self.$el.tipsy({'delayIn': 0, 'html': true, 'title': function(){return title}, 'gravity': 'n'});
-            }, 0);
-        },
-    });
-    openerp.web_kanban.fields_registry.add("sparkline_bar", "openerp.crm.SparklineBarWidget");
-
 };
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index e5cb2b56eb3..73fb148c0ed 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -63,12 +63,16 @@ class mail_mail(osv.Model):
         'notification': fields.boolean('Is Notification',
             help='Mail has been created to notify people of an existing mail.message'),
         # Bounce and tracking
-        'opened': fields.integer(
+        'opened': fields.datetime(
             'Opened',
-            help='Number of times this email has been seen, using the OpenERP tracking.'),
-        'replied': fields.integer(
-            'Reply Received',
-            help='If checked, a reply to this email has been received.'),
+            help='Date when this email has been opened for the first time.'),
+        'replied': fields.datetime(
+            'Replied',
+            help='Date when this email has been replied for the first time.'),
+        'bounced': fields.datetime(
+            'Bounced',
+            help='Date when this email has bounced.'
+        ),
     }
 
     _defaults = {
@@ -103,15 +107,24 @@ class mail_mail(osv.Model):
         return self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
 
     def set_opened(self, cr, uid, ids, context=None):
-        """ Increment opened counter """
+        """ Set as opened """
         for mail in self.browse(cr, uid, ids, context=context):
-            self.write(cr, uid, [mail.id], {'opened': (mail.opened + 1)}, context=context)
+            if not mail.opened:
+                self.write(cr, uid, [mail.id], {'opened': fields.datetime.now()}, context=context)
         return True
 
     def set_replied(self, cr, uid, ids, context=None):
-        """ Increment replied counter """
+        """ Set as replied """
         for mail in self.browse(cr, uid, ids, context=context):
-            self.write(cr, uid, [mail.id], {'replied': (mail.replied + 1)}, context=context)
+            if not mail.replied:
+                self.write(cr, uid, [mail.id], {'replied': fields.datetime.now()}, context=context)
+        return True
+
+    def set_bounced(self, cr, uid, ids, context=None):
+        """ Set as bounced """
+        for mail in self.browse(cr, uid, ids, context=context):
+            if not mail.bounced:
+                self.write(cr, uid, [mail.id], {'bounced': fields.datetime.now()}, context=context)
         return True
 
     def process_email_queue(self, cr, uid, ids=None, context=None):
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 9943114a07a..9a5d3e3580d 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -1426,8 +1426,7 @@ class mail_thread(osv.AbstractModel):
             # update original mail_mail if exists
             if type == 'email':
                 mail_mail_ids = self.pool['mail.mail'].search(cr, SUPERUSER_ID, [('mail_message_id', '=', parent_id)], context=context)
-                for mail in self.pool['mail.mail'].browse(cr, SUPERUSER_ID, mail_mail_ids, context=context):
-                    self.pool['mail.mail'].write(cr, SUPERUSER_ID, [mail.id], {'replied': mail.replied + 1}, context=context)
+                self.pool['mail.mail'].set_replied(cr, SUPERUSER_ID, mail_mail_ids, context=context)
 
             message_ids = mail_message.search(cr, SUPERUSER_ID, [('id', '=', parent_id), ('parent_id', '!=', False)], context=context)
             # avoid loops when finding ancestors
diff --git a/addons/mail/tests/__init__.py b/addons/mail/tests/__init__.py
index 242beb60bf1..ff075d73d73 100644
--- a/addons/mail/tests/__init__.py
+++ b/addons/mail/tests/__init__.py
@@ -19,9 +19,10 @@
 #
 ##############################################################################
 
-from . import test_mail_group, test_mail_message, test_mail_features, test_mail_gateway, test_message_read, test_invite
+from . import test_mail_mail, test_mail_group, test_mail_message, test_mail_features, test_mail_gateway, test_message_read, test_invite
 
 checks = [
+    # test_mail_mail,
     test_mail_group,
     test_mail_message,
     test_mail_features,
diff --git a/addons/mass_mailing/__openerp__.py b/addons/mass_mailing/__openerp__.py
index e6fbb42e886..9bb5b746f63 100644
--- a/addons/mass_mailing/__openerp__.py
+++ b/addons/mass_mailing/__openerp__.py
@@ -29,10 +29,16 @@
     'description': """TODO""",
     'data': [
         'mass_mailing_view.xml',
+        'mass_mailing_demo.xml',
         'mail_mail_view.xml',
         'wizard/mail_compose_message_view.xml',
         'security/ir.model.access.csv',
     ],
+    'js': [],
+    'qweb': [],
+    'css': [
+        'static/src/css/mass_mailing.css'
+    ],
     'demo': [],
     'installable': True,
     'auto_install': False,
diff --git a/addons/mass_mailing/mail_mail.py b/addons/mass_mailing/mail_mail.py
index d7f46446b56..529c6c73e7b 100644
--- a/addons/mass_mailing/mail_mail.py
+++ b/addons/mass_mailing/mail_mail.py
@@ -28,8 +28,14 @@ class MailMail(osv.Model):
     _inherit = ['mail.mail']
 
     _columns = {
-        'mass_mailing_campaign_id': fields.many2one(
-            'mail.mass_mailing.campaign', 'Mass Mailing Campaign',
+        'mass_mailing_segment_id': fields.many2one(
+            'mail.mass_mailing.segment', 'Mass Mailing Segment',
             ondelete='set null',
         ),
+        'mass_mailing_campaign_id': fields.related(
+            'mass_mailing_segment_id', 'mass_mailing_campaign_id',
+            type='many2one', ondelete='set null',
+            relation='mail.mass_mailing.campaign',
+            store=True, readonly=True,
+        ),
     }
diff --git a/addons/mass_mailing/mail_mail_view.xml b/addons/mass_mailing/mail_mail_view.xml
index dd66aede66f..957ee0f6f93 100644
--- a/addons/mass_mailing/mail_mail_view.xml
+++ b/addons/mass_mailing/mail_mail_view.xml
@@ -10,6 +10,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='opened']" position="before">
                     <field name="mass_mailing_campaign_id"/>
+                    <field name="mass_mailing_segment_id"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/mass_mailing/mass_mailing.py b/addons/mass_mailing/mass_mailing.py
index 91392759b0e..f37f86e385a 100644
--- a/addons/mass_mailing/mass_mailing.py
+++ b/addons/mass_mailing/mass_mailing.py
@@ -19,6 +19,10 @@
 #
 ##############################################################################
 
+from datetime import date, datetime
+from dateutil import relativedelta
+
+from openerp import tools
 from openerp.osv import osv, fields
 
 
@@ -32,33 +36,42 @@ class MassMailingCampaign(osv.Model):
         """ Compute statistics of the mass mailing campaign """
         results = dict.fromkeys(ids, False)
         for campaign in self.browse(cr, uid, ids, context=context):
-            if not campaign.mail_ids:
-                results[campaign.id] = {
-                    'sent': 0,
-                    'opened_ratio': 0.0,
-                    'replied_ratio': 0.0,
-                    'bounce_ratio': 0.0,
-                }
-                continue
             results[campaign.id] = {
                 'sent': len(campaign.mail_ids),
-                'opened_ratio': len([mail for mail in campaign.mail_ids if mail.opened]) * 1.0 / len(campaign.mail_ids),
-                'replied_ratio': len([mail for mail in campaign.mail_ids if mail.replied]) * 1.0 / len(campaign.mail_ids),
-                'bounce_ratio': 0.0,
+                'opened': len([mail for mail in campaign.mail_ids if mail.opened]),
+                'replied': len([mail for mail in campaign.mail_ids if mail.replied]),
+                'bounced': len([mail for mail in campaign.mail_ids if mail.bounced]),
             }
         return results
 
+    def _get_segment_kanban_ids(self, cr, uid, ids, name, arg, context=None):
+        results = dict.fromkeys(ids, '')
+        for campaign in self.browse(cr, uid, ids, context=context):
+            segment_results = []
+            for segment in campaign.segment_ids:
+                segment_object = {}
+                for attr in ['name', 'sent', 'opened', 'replied', 'bounced']:
+                    segment_object[attr] = getattr(segment, attr)
+                segment_results.append(segment_object)
+            results[campaign.id] = segment_results
+        return results
+
     _columns = {
         'name': fields.char(
             'Campaign Name', required=True,
         ),
-        'template_id': fields.many2one(
-            'email.template', 'Email Template',
-            ondelete='set null',
+        'segment_ids': fields.one2many(
+            'mail.mass_mailing.segment', 'mass_mailing_campaign_id',
+            'Segments',
+        ),
+        'segment_kanban_ids': fields.function(
+            _get_segment_kanban_ids,
+            type='text', string='Segments (kanban data)',
+            help='This field has for purpose to gather data about segment to display them in kanban view as nested kanban views is not possible currently',
         ),
         'mail_ids': fields.one2many(
             'mail.mail', 'mass_mailing_campaign_id',
-            'Send Emails',
+            'Sent Emails',
         ),
         # stat fields
         'sent': fields.function(
@@ -66,19 +79,132 @@ class MassMailingCampaign(osv.Model):
             string='Sent Emails',
             type='integer', multi='_get_statistics'
         ),
-        'opened_ratio': fields.function(
+        'opened': fields.function(
             _get_statistics,
-            string='Opened Ratio',
-            type='float', multi='_get_statistics',
+            string='Opened',
+            type='integer', multi='_get_statistics',
         ),
-        'replied_ratio': fields.function(
+        'replied': fields.function(
             _get_statistics,
-            string='Replied Ratio',
-            type='float', multi='_get_statistics'
+            string='Replied',
+            type='integer', multi='_get_statistics'
         ),
-        'bounce_ratio': fields.function(
+        'bounced': fields.function(
             _get_statistics,
-            string='Bounce Ratio',
-            type='float', multi='_get_statistics'
+            string='Bounced',
+            type='integer', multi='_get_statistics'
+        ),
+    }
+
+
+class MassMailingSegment(osv.Model):
+    """ TODO """
+    _name = 'mail.mass_mailing.segment'
+    _description = 'Segment of a mass mailing campaign'
+    # number of periods for tracking mail_mail statistics
+    _period_number = 6
+
+    def __get_bar_values(self, cr, uid, obj, domain, read_fields, value_field, groupby_field, context=None):
+        """ Generic method to generate data for bar chart values using SparklineBarWidget.
+            This method performs obj.read_group(cr, uid, domain, read_fields, groupby_field).
+
+            :param obj: the target model (i.e. crm_lead)
+            :param domain: the domain applied to the read_group
+            :param list read_fields: the list of fields to read in the read_group
+            :param str value_field: the field used to compute the value of the bar slice
+            :param str groupby_field: the fields used to group
+
+            :return list section_result: a list of dicts: [
+                                                {   'value': (int) bar_column_value,
+                                                    'tootip': (str) bar_column_tooltip,
+                                                }
+                                            ]
+        """
+        month_begin = date.today().replace(day=1)
+        section_result = [{'value': 0,
+                           'tooltip': (month_begin + relativedelta.relativedelta(months=-i)).strftime('%B'),
+                           } for i in range(self._period_number - 1, -1, -1)]
+        group_obj = obj.read_group(cr, uid, domain, read_fields, groupby_field, context=context)
+        print group_obj
+        for group in group_obj:
+            group_begin_date = datetime.strptime(group['__domain'][0][2], tools.DEFAULT_SERVER_DATE_FORMAT)
+            month_delta = relativedelta.relativedelta(month_begin, group_begin_date)
+            section_result[self._period_number - (month_delta.months + 1)] = {'value': group.get(value_field, 0), 'tooltip': group_begin_date.strftime('%B')}
+        return section_result
+
+    def _get_monthly_statistics(self, cr, uid, ids, field_name, arg, context=None):
+        """ TODO
+        """
+        obj = self.pool.get('mail.mail')
+        res = dict.fromkeys(ids, False)
+        month_begin = date.today().replace(day=1)
+        groupby_begin = (month_begin + relativedelta.relativedelta(months=-4)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+        for id in ids:
+            res[id] = dict()
+            domain = [('mass_mailing_segment_id', '=', id), ('opened', '>=', groupby_begin)]
+            res[id]['opened_monthly'] = self.__get_bar_values(cr, uid, obj, domain, ['opened'], 'opened_count', 'opened', context=context)
+            domain = [('mass_mailing_segment_id', '=', id), ('replied', '>=', groupby_begin)]
+            res[id]['replied_monthly'] = self.__get_bar_values(cr, uid, obj, domain, ['replied'], 'replied_count', 'replied', context=context)
+        return res
+
+    def _get_statistics(self, cr, uid, ids, name, arg, context=None):
+        """ Compute statistics of the mass mailing campaign """
+        results = dict.fromkeys(ids, False)
+        for segment in self.browse(cr, uid, ids, context=context):
+            results[segment.id] = {
+                'sent': len(segment.mail_ids),
+                'opened': len([mail for mail in segment.mail_ids if mail.opened]),
+                'replied': len([mail for mail in segment.mail_ids if mail.replied]),
+                'bounced': len([mail for mail in segment.mail_ids if mail.bounced]),
+            }
+        return results
+
+    _columns = {
+        'name': fields.char('Name', required=True),
+        'mass_mailing_campaign_id': fields.many2one(
+            'mail.mass_mailing.campaign', 'Mass Mailing Campaign',
+            ondelete='cascade',
+        ),
+        'template_id': fields.many2one(
+            'email.template', 'Email Template',
+            ondelete='set null',
+        ),
+        'domain': fields.char('Domain'),
+        'date': fields.datetime('Date'),
+        # mail_mail data
+        'mail_ids': fields.one2many(
+            'mail.mail', 'mass_mailing_segment_id',
+            'Send Emails',
+        ),
+        'sent': fields.function(
+            _get_statistics,
+            string='Sent Emails',
+            type='integer', multi='_get_statistics'
+        ),
+        'opened': fields.function(
+            _get_statistics,
+            string='Opened',
+            type='integer', multi='_get_statistics',
+        ),
+        'replied': fields.function(
+            _get_statistics,
+            string='Replied',
+            type='integer', multi='_get_statistics'
+        ),
+        'bounced': fields.function(
+            _get_statistics,
+            string='Bounce',
+            type='integer', multi='_get_statistics'
+        ),
+        # monthly ratio
+        'opened_monthly': fields.function(
+            _get_monthly_statistics,
+            string='Sent Emails',
+            type='char', multi='_get_monthly_statistics',
+        ),
+        'replied_monthly': fields.function(
+            _get_monthly_statistics,
+            string='Replied',
+            type='char', multi='_get_monthly_statistics',
         ),
     }
diff --git a/addons/mass_mailing/mass_mailing_demo.xml b/addons/mass_mailing/mass_mailing_demo.xml
new file mode 100644
index 00000000000..3e04baf7cef
--- /dev/null
+++ b/addons/mass_mailing/mass_mailing_demo.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<openerp>
+    <!-- <data noupdate="1"> -->
+    <data>
+
+        <record id="mass_mail_template_1" model="email.template">
+            <field name="name">Partner Newsletter 1</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="auto_delete" eval="False"/>
+            <field name="partner_to">${object.id}</field>
+            <field name="body_html"><![CDATA[<p>Hello</p>]]></field>
+        </record>
+        <record id="mass_mail_template_2" model="email.template">
+            <field name="name">Partner Newsletter 2</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="auto_delete" eval="False"/>
+            <field name="partner_to">${object.id}</field>
+            <field name="body_html"><![CDATA[<p>Hello</p>]]></field>
+        </record>
+
+        <record id="mass_mail_campaign_1" model="mail.mass_mailing.campaign">
+            <field name="name">Partners Newsletter</field>
+        </record>
+
+        <record id="mass_mail_segment_1" model="mail.mass_mailing.segment">
+            <field name="name">First Newsletter</field>
+            <field name="template_id" eval="ref('mass_mail_template_1')"/>
+            <field name="date" eval="(DateTime.today() - relativedelta(month=2)).replace(day=1)"/>
+            <field name="mass_mailing_campaign_id" eval="ref('mass_mail_campaign_1')"/>
+        </record>
+        <record id="mass_mail_segment_2" model="mail.mass_mailing.segment">
+            <field name="name">Second Newsletter</field>
+            <field name="template_id" eval="ref('mass_mail_template_2')"/>
+            <field name="date" eval="(DateTime.today() - relativedelta(month=1)).replace(day=1)"/>
+            <field name="mass_mailing_campaign_id" eval="ref('mass_mail_campaign_1')"/>
+        </record>
+
+        <record id="mass_mail_email_1" model="mail.mail">
+            <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_1')"/>
+            <field name="opened" eval="(DateTime.today() - relativedelta(days=15)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="replied" eval="(DateTime.today() - relativedelta(days=10)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="state">sent</field>
+        </record>
+        <record id="mass_mail_email_2" model="mail.mail">
+            <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_1')"/>
+            <field name="opened" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="replied" eval="(DateTime.today() - relativedelta(days=0)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="state">sent</field>
+        </record>
+        <record id="mass_mail_email_3" model="mail.mail">
+            <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_1')"/>
+            <field name="opened" eval="(DateTime.today() - relativedelta(days=0)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="state">sent</field>
+        </record>
+        <record id="mass_mail_email_4" model="mail.mail">
+            <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_1')"/>
+            <field name="state">sent</field>
+        </record>
+        <record id="mass_mail_email_5" model="mail.mail">
+            <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_1')"/>
+            <field name="bounced" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="state">sent</field>
+        </record>
+
+        <record id="mass_mail_email_2_1" model="mail.mail">
+            <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_2')"/>
+            <field name="opened" eval="(DateTime.today() - relativedelta(days=15)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="state">sent</field>
+        </record>
+        <record id="mass_mail_email_2_2" model="mail.mail">
+            <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_2')"/>
+            <field name="opened" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="state">sent</field>
+        </record>
+        <record id="mass_mail_email_2_3" model="mail.mail">
+            <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_2')"/>
+            <field name="state">sent</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index bc28827343d..b847a89db53 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <!--  MASS MAILING CAMPAIGNS !-->
-        <record model="ir.ui.view" id="view_followers_tree">
+        <record model="ir.ui.view" id="view_mail_mass_mailing_campaign_tree">
             <field name="name">mail.mass_mailing.campaign.tree</field>
             <field name="model">mail.mass_mailing.campaign</field>
             <field name="priority">10</field>
@@ -14,7 +14,7 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_mail_subscription_form">
+        <record model="ir.ui.view" id="view_mail_mass_mailing_campaign_form">
             <field name="name">mail.mass_mailing.campaign.form</field>
             <field name="model">mail.mass_mailing.campaign</field>
             <field name="arch" type="xml">
@@ -22,27 +22,188 @@
                     <sheet>
                         <group>
                             <field name="name"/>
-                            <field name="template_id"/>
                             <field name="sent"/>
-                            <field name="opened_ratio"/>
-                            <field name="replied_ratio"/>
-                            <field name="bounce_ratio"/>
+                            <field name="opened"/>
+                            <field name="replied"/>
+                            <field name="bounced"/>
                         </group>
                     </sheet>
                 </form>
             </field>
         </record>
 
+
+        <!-- CRM Lead Kanban View  -->
+        <record model="ir.ui.view" id="view_mail_mass_mailing_campaign_kanban">
+            <field name="name">mail.mass_mailing.campaign.kanban</field>
+            <field name="model">mail.mass_mailing.campaign</field>
+            <field name="arch" type="xml">
+                <kanban>
+                    <field name="segment_kanban_ids"/>
+                    <field name='sent'/>
+                    <templates>
+                        <t t-name="mass_mailing.segment">
+                            <div>
+                                <h4><t t-raw="segment.name"/></h4>
+                            </div>
+                            <div>
+                                <p class="oe_mail_stats">
+                                    <span class="oe_mail_result"><t t-raw="segment.sent"/></span><br />
+                                    Sent
+                                </p>
+                                <p class="oe_mail_stats">
+                                    <span class="oe_mail_result"><t t-raw="segment.opened"/></span><br />
+                                    Opened
+                                </p>
+                                <p class="oe_mail_stats">
+                                    <span class="oe_mail_result"><t t-raw="segment.replied"/></span><br />
+                                    Replied
+                                </p>
+                                <p class="oe_mail_stats">
+                                    <span class="oe_mail_result"><t t-raw="segment.bounced"/></span><br />
+                                    Bounced
+                                </p>
+                            </div>
+                        </t>
+                        <t t-name="kanban-box">
+                            <!-- <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click"> -->
+                            <div t-attf-class="oe_kanban_card oe_kanban_global_click oe_kanban_mass_mailing oe_kanban_mass_mailing_campaign">
+                                 <div class="oe_kanban_content">
+                                    <h3>
+                                        <field name="name"/>
+                                    </h3>
+                                    <div>
+                                        <field name="opened" widget="gauge" style="width:120px; height: 80px;"
+                                            options="{'max_field': 'sent'}"/>
+                                        <field name="replied" widget="gauge" style="width:120px; height: 80px;"
+                                            options="{'max_field': 'sent'}"/>
+                                    </div>
+                                    <t t-foreach='record.segment_kanban_ids.value' t-as='segment'>
+                                        <t t-call="mass_mailing.segment"/>
+                                    </t>
+                                </div>
+                                <div class="oe_clear"></div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
         <record id="action_view_mass_mailing_campaigns" model="ir.actions.act_window">
             <field name="name">Mass Mailing Campaigns</field>
             <field name="res_model">mail.mass_mailing.campaign</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">kanban,tree,form</field>
+        </record>
+
+        <!--  MASS MAILING SEGMENTS !-->
+        <record model="ir.ui.view" id="view_mail_mass_mailing_segment_tree">
+            <field name="name">mail.mass_mailing.segment.tree</field>
+            <field name="model">mail.mass_mailing.segment</field>
+            <field name="priority">10</field>
+            <field name="arch" type="xml">
+                <tree string="Mass Mailing Segments">
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_mail_mass_mailing_segment_form">
+            <field name="name">mail.mass_mailing.segment.form</field>
+            <field name="model">mail.mass_mailing.segment</field>
+            <field name="arch" type="xml">
+                <form string="Mass Mailing Campaign" version="7.0">
+                    <sheet>
+                        <group>
+                            <field name="name"/>
+                            <field name="mass_mailing_campaign_id"/>
+                            <field name="date"/>
+                            <field name="template_id"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_mail_mass_mailing_segment_kanban">
+            <field name="name">mail.mass_mailing.segment.kanban</field>
+            <field name="model">mail.mass_mailing.segment</field>
+            <field name="arch" type="xml">
+                <kanban>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div t-attf-class="oe_kanban_card oe_kanban_global_click oe_kanban_mass_mailing oe_kanban_mass_mailing_segment">
+                                 <div class="oe_kanban_content">
+                                    <div>
+                                        <h3>
+                                            <field name="name"/>
+                                        </h3>
+                                            <p style="margin-left: 10px; margin-top: 8px;">
+                                                Sent: <field name="date"/><br />
+                                                Campaign: <field name="mass_mailing_campaign_id"/>
+                                            </p>
+                                    </div>
+                                    <div>
+                                        <p class="oe_mail_stats">
+                                            <span class="oe_mail_result"><field name="sent"/></span><br />
+                                            Sent
+                                        </p>
+                                        <p class="oe_mail_stats">
+                                            <span class="oe_mail_result"><field name="opened"/></span><br />
+                                            Opened
+                                        </p>
+                                        <p class="oe_mail_stats">
+                                            <span class="oe_mail_result"><field name="replied"/></span><br />
+                                            Replied
+                                        </p>
+                                        <p class="oe_mail_stats">
+                                            <span class="oe_mail_result"><field name="bounced"/></span><br />
+                                            Bounced
+                                        </p>
+                                    </div>
+                                    <div>
+                                        <div class="oe_sparkline_container">
+                                            <h4 class="oe_sparkline_bar_title">Opened</h4><br />
+                                            <field name="opened_monthly" widget="sparkline_bar" height="50px" barWidth="10px" barSpacing="15px"/>
+                                        </div>
+                                        <div class="oe_sparkline_container">
+                                            <h4 class="oe_sparkline_bar_title">Replied</h4><br />
+                                            <field name="replied_monthly" widget="sparkline_bar" height="50px" barWidth="10px" barSpacing="15px"/>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="oe_clear"></div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
+        <record id="action_view_mass_mailing_segments" model="ir.actions.act_window">
+            <field name="name">Mass Mailing Segments</field>
+            <field name="res_model">mail.mass_mailing.segment</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban,tree,form</field>
         </record>
 
         <!-- Add followers related menu entries in Settings/Email -->
         <menuitem name="Mass mailing campaigns" id="menu_email_campaigns" parent="base.menu_email"
                     action="action_view_mass_mailing_campaigns" sequence="60" groups="base.group_no_one"/>
 
+        <!-- Top menu item -->
+        <menuitem name="Marketing" id="base.marketing_menu" sequence="85"/>
+
+        <!-- Add in marketing -->
+        <menuitem name="Mass Mailing Campaign" id="mass_mailing_campaign"
+            parent="base.marketing_menu" sequence="1"/>
+        <menuitem name="Campaigns" id="menu_email_campaigns"
+            parent="mass_mailing_campaign" sequence="1"
+            action="action_view_mass_mailing_campaigns"/>
+        <menuitem name="Segments" id="menu_email_segments"
+            parent="mass_mailing_campaign" sequence="2"
+            action="action_view_mass_mailing_segments"/>
+
     </data>
 </openerp>
diff --git a/addons/mass_mailing/static/src/css/mass_mailing.css b/addons/mass_mailing/static/src/css/mass_mailing.css
new file mode 100644
index 00000000000..8b217d8d588
--- /dev/null
+++ b/addons/mass_mailing/static/src/css/mass_mailing.css
@@ -0,0 +1,54 @@
+.openerp .oe_kanban_view .oe_kanban_mass_mailing.oe_kanban_mass_mailing_campaign {
+    width: 270px;
+}
+
+.openerp .oe_kanban_view .oe_kanban_mass_mailing.oe_kanban_mass_mailing_segment {
+    width: 270px;
+}
+
+.openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_mail_stats {
+    width: 120px;
+    display: inline-block;
+    margin: 2px 5px 0px 5px;
+    text-align: center;
+    border: 1px solid rgba(0, 0, 0, 0.16);
+    -webkit-border-radius: 2px;
+    border-radius: 2px;
+}
+
+.openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_mail_result {
+    font-weight: bold;
+}
+
+.openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_gauge {
+    width: 120px;
+    height: 120px;
+    display: inline-block;
+}
+
+.openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_kanban_content div.oe_sparkline_container {
+    height: 60px;
+    width: 120px;
+    display: inline-block;
+    margin: 8px 5px 0px 5px;
+}
+
+.openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_sparkline_bar_title {
+    text-align: center;
+    display: inline;
+}
+
+.openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_sparkline_bar {
+    width: 100px;
+    height: 60px;
+    display: inline-block;
+}
+
+/* 
+ * Campaign related CSS
+ */
+
+
+/* 
+ * Segment related CSS
+ */
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 7db1aa1eff0..0cc4ad3fad2 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -48,7 +48,6 @@ modules.
         'report/sale_crm_account_invoice_report_view.xml',
     ],
     'js': [
-        'static/lib/justgage.js',
         'static/src/js/sale_crm.js',
     ],
     'demo': ['sale_crm_demo.xml'],
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 63ad9fb980e..b0bfa85163c 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -268,8 +268,8 @@
                 </xpath>
                 <xpath expr="//div[@class='oe_items_list']" position="after">
                     <div class="oe_center" t-if="record.invoiced_target.raw_value">
-                        <field name="monthly_invoiced" widget="gage" style="width:160px; height: 120px;" options="{'max_field': 'invoiced_target'}">Invoiced</field>
-                        <field name="invoiced_forecast" widget="gage" style="width:160px; height: 120px;" options="{'max_field': 'invoiced_target', 'action_change': 'action_forecast'}">Forecast</field>
+                        <field name="monthly_invoiced" widget="gauge" style="width:160px; height: 120px;" options="{'max_field': 'invoiced_target'}">Invoiced</field>
+                        <field name="invoiced_forecast" widget="gauge" style="width:160px; height: 120px;" options="{'max_field': 'invoiced_target', 'action_change': 'action_forecast'}">Forecast</field>
                     </div>
                     <div class="oe_center" style="color:#bbbbbb;" t-if="!record.invoiced_target.raw_value">
                         <br/>Define an invoicing target in the sales team settings to see the period's achievement and forecast at a glance.
diff --git a/addons/sale_crm/static/lib/justgage.js b/addons/sale_crm/static/lib/justgage.js
deleted file mode 100644
index 52b5c6ea0c3..00000000000
--- a/addons/sale_crm/static/lib/justgage.js
+++ /dev/null
@@ -1,883 +0,0 @@
-/**
- * JustGage - this is work-in-progress, unreleased, unofficial code, so it might not work top-notch :)
- * Check http://www.justgage.com for official releases
- * Licensed under MIT.
- * @author Bojan Djuricic  (@Toorshia)
- *
- * LATEST UPDATES
-
- * -----------------------------
- * April 01, 2013.
- * -----------------------------
-     * fix - https://github.com/toorshia/justgage/issues/46
-
- * -----------------------------
- * March 26, 2013.
- * -----------------------------
-     * customSectors - define specific color for value range (0-10 : red, 10-30 : blue etc.)
-
- * -----------------------------
- * March 23, 2013.
- * -----------------------------
-     * counter - option to animate value  in counting fashion
-     * fix - https://github.com/toorshia/justgage/issues/45
-
- * -----------------------------
- * March 13, 2013.
- * -----------------------------
-     * refresh method - added optional 'max' parameter to use when you need to update max value
-
- * -----------------------------
- * February 26, 2013.
- * -----------------------------
-     * decimals - option to define/limit number of decimals when not using humanFriendly or customRenderer to display value
-     * fixed a missing parameters bug when calling generateShadow()  for IE < 9
-
- * -----------------------------
- * December 31, 2012.
- * -----------------------------
-     * fixed text y-position for hidden divs - workaround for Raphael <tspan> 'dy' bug - https://github.com/DmitryBaranovskiy/raphael/issues/491
-     * 'show' parameters, like showMinMax are now 'hide' because I am lame developer - please update these in your setups
-     * Min and Max labels are now auto-off when in donut mode
-     * Start angle in donut mode is now 90
-     * donutStartAngle - option to define start angle for donut
-
- * -----------------------------
- * November 25, 2012.
- * -----------------------------
-     * Option to define custom rendering function for displayed value
-
- * -----------------------------
- * November 19, 2012.
- * -----------------------------
-     * Config.value is now updated after gauge refresh
-
- * -----------------------------
- * November 13, 2012.
- * -----------------------------
-     * Donut display mode added
-     * Option to hide value label
-     * Option to enable responsive gauge size
-     * Removed default title attribute
-     * Option to accept min and max defined as string values
-     * Option to configure value symbol
-     * Fixed bad aspect ratio calculations
-     * Option to configure minimum font size for all texts
-     * Option to show shorthand big numbers (human friendly)
-     */
-
- JustGage = function(config) {
-
-  if (!config.id) {alert("Missing id parameter for gauge!"); return false;}
-  if (!config.node) {
-    if (!document.getElementById(config.id)) {alert("No element with id: \""+config.id+"\" found!"); return false;}
-    config.node = document.getElementById(config.id);
-  }
-
-  var obj = this;
-
-  // configurable parameters
-  obj.config =
-  {
-    // id : string
-    // this is container element id
-    id : config.id,
-
-    // node : string
-    // the node to use instead of DOM
-    node : config.node,
-
-    // title : string
-    // gauge title
-    title : (config.title) ? config.title : "",
-
-    // titleFontColor : string
-    // color of gauge title
-    titleFontColor : (config.titleFontColor) ? config.titleFontColor : "#999999",
-
-    // value : int
-    // value gauge is showing
-    value : (config.value) ? config.value : 0,
-
-
-    // valueFontColor : string
-    // color of label showing current value
-    valueFontColor : (config.valueFontColor) ? config.valueFontColor : "#010101",
-
-    // symbol : string
-    // special symbol to show next to value
-    symbol : (config.symbol) ? config.symbol : "",
-
-    // min : int
-    // min value
-    min : (config.min) ? parseFloat(config.min) : 0,
-
-    // max : int
-    // max value
-    max : (config.max) ? parseFloat(config.max) : 100,
-
-    // humanFriendlyDecimal : int
-    // number of decimal places for our human friendly number to contain
-    humanFriendlyDecimal : (config.humanFriendlyDecimal) ? config.humanFriendlyDecimal : 0,
-
-    // textRenderer: func
-    // function applied before rendering text
-    textRenderer  : (config.textRenderer) ? config.textRenderer : null,
-
-    // gaugeWidthScale : float
-    // width of the gauge element
-    gaugeWidthScale : (config.gaugeWidthScale) ? config.gaugeWidthScale : 1.0,
-
-    // gaugeColor : string
-    // background color of gauge element
-    gaugeColor : (config.gaugeColor) ? config.gaugeColor : "#edebeb",
-
-    // label : string
-    // text to show below value
-    label : (config.label) ? config.label : "",
-
-    // labelFontColor : string
-    // color of label showing label under value
-    labelFontColor : (config.labelFontColor) ? config.labelFontColor : "#b3b3b3",
-
-    // shadowOpacity : int
-    // 0 ~ 1
-    shadowOpacity : (config.shadowOpacity) ? config.shadowOpacity : 0.2,
-
-    // shadowSize: int
-    // inner shadow size
-    shadowSize : (config.shadowSize) ? config.shadowSize : 5,
-
-    // shadowVerticalOffset : int
-    // how much shadow is offset from top
-    shadowVerticalOffset : (config.shadowVerticalOffset) ? config.shadowVerticalOffset : 3,
-
-    // levelColors : string[]
-    // colors of indicator, from lower to upper, in RGB format
-    levelColors : (config.levelColors) ? config.levelColors : [
-    "#a9d70b",
-    "#f9c802",
-    "#ff0000"
-    ],
-
-    // startAnimationTime : int
-    // length of initial animation
-    startAnimationTime : (config.startAnimationTime) ? config.startAnimationTime : 700,
-
-    // startAnimationType : string
-    // type of initial animation (linear, >, <,  <>, bounce)
-    startAnimationType : (config.startAnimationType) ? config.startAnimationType : ">",
-
-    // refreshAnimationTime : int
-    // length of refresh animation
-    refreshAnimationTime : (config.refreshAnimationTime) ? config.refreshAnimationTime : 700,
-
-    // refreshAnimationType : string
-    // type of refresh animation (linear, >, <,  <>, bounce)
-    refreshAnimationType : (config.refreshAnimationType) ? config.refreshAnimationType : ">",
-
-    // donutStartAngle : int
-    // angle to start from when in donut mode
-    donutStartAngle : (config.donutStartAngle) ? config.donutStartAngle : 90,
-
-    // valueMinFontSize : int
-    // absolute minimum font size for the value
-    valueMinFontSize : config.valueMinFontSize || 16,
-
-    // titleMinFontSize
-    // absolute minimum font size for the title
-    titleMinFontSize : config.titleMinFontSize || 10,
-
-    // labelMinFontSize
-    // absolute minimum font size for the label
-    labelMinFontSize : config.labelMinFontSize || 10,
-
-    // minLabelMinFontSize
-    // absolute minimum font size for the minimum label
-    minLabelMinFontSize : config.minLabelMinFontSize || 10,
-
-    // maxLabelMinFontSize
-    // absolute minimum font size for the maximum label
-    maxLabelMinFontSize : config.maxLabelMinFontSize || 10,
-
-    // hideValue : bool
-    // hide value text
-    hideValue : (config.hideValue) ? config.hideValue : false,
-
-    // hideMinMax : bool
-    // hide min and max values
-    hideMinMax : (config.hideMinMax) ? config.hideMinMax : false,
-
-    // hideInnerShadow : bool
-    // hide inner shadow
-    hideInnerShadow : (config.hideInnerShadow) ? config.hideInnerShadow : false,
-
-    // humanFriendly : bool
-    // convert large numbers for min, max, value to human friendly (e.g. 1234567 -> 1.23M)
-    humanFriendly : (config.humanFriendly) ? config.humanFriendly : false,
-
-    // noGradient : bool
-    // whether to use gradual color change for value, or sector-based
-    noGradient : (config.noGradient) ? config.noGradient : false,
-
-    // donut : bool
-    // show full donut gauge
-    donut : (config.donut) ? config.donut : false,
-
-    // relativeGaugeSize : bool
-    // whether gauge size should follow changes in container element size
-    relativeGaugeSize : (config.relativeGaugeSize) ? config.relativeGaugeSize : false,
-
-    // counter : bool
-    // animate level number change
-    counter : (config.counter) ? config.counter : false,
-
-    // decimals : int
-    // number of digits after floating point
-    decimals : (config.decimals) ? config.decimals : 0,
-
-    // customSectors : [] of objects
-    // number of digits after floating point
-    customSectors : (config.customSectors) ? config.customSectors : []
-  };
-
-  // variables
-  var
-  canvasW,
-  canvasH,
-  widgetW,
-  widgetH,
-  aspect,
-  dx,
-  dy,
-  titleFontSize,
-  titleX,
-  titleY,
-  valueFontSize,
-  valueX,
-  valueY,
-  labelFontSize,
-  labelX,
-  labelY,
-  minFontSize,
-  minX,
-  minY,
-  maxFontSize,
-  maxX,
-  maxY;
-
-  // overflow values
-  if (this.config.value > this.config.max) this.config.value = this.config.max;
-  if (this.config.value < this.config.min) this.config.value = this.config.min;
-  this.originalValue = config.value;
-
-  // canvas
-  this.canvas = Raphael(this.config.node, "100%", "100%");
-  if (this.config.relativeGaugeSize === true) {
-    this.canvas.setViewBox(0, 0, 200, 150, true);
-  }
-
-  // canvas dimensions
-  if (this.config.relativeGaugeSize === true) {
-    canvasW = 200;
-    canvasH = 150;
-  } else {
-    canvasW = getStyle(this.config.node, "width").slice(0, -2) * 1;
-    canvasH = getStyle(this.config.node, "height").slice(0, -2) * 1;
-  }
-
-  // widget dimensions
-  if (this.config.donut === true) {
-
-    // DONUT *******************************
-
-    // width more than height
-    if(canvasW > canvasH) {
-      widgetH = canvasH;
-      widgetW = widgetH;
-    // width less than height
-  } else if (canvasW < canvasH) {
-    widgetW = canvasW;
-    widgetH = widgetW;
-      // if height don't fit, rescale both
-      if(widgetH > canvasH) {
-        aspect = widgetH / canvasH;
-        widgetH = widgetH / aspect;
-        widgetW = widgetH / aspect;
-      }
-    // equal
-  } else {
-    widgetW = canvasW;
-    widgetH = widgetW;
-  }
-
-    // delta
-    dx = (canvasW - widgetW)/2;
-    dy = (canvasH - widgetH)/2;
-
-    // title
-    titleFontSize = ((widgetH / 8) > 10) ? (widgetH / 10) : 10;
-    titleX = dx + widgetW / 2;
-    titleY = dy + widgetH / 11;
-
-    // value
-    valueFontSize = ((widgetH / 6.4) > 16) ? (widgetH / 5.4) : 18;
-    valueX = dx + widgetW / 2;
-    if(this.config.label !== '') {
-      valueY = dy + widgetH / 1.85;
-    } else {
-      valueY = dy + widgetH / 1.7;
-    }
-
-    // label
-    labelFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
-    labelX = dx + widgetW / 2;
-    labelY = valueY + labelFontSize;
-
-    // min
-    minFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
-    minX = dx + (widgetW / 10) + (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
-    minY = labelY;
-
-    // max
-    maxFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
-    maxX = dx + widgetW - (widgetW / 10) - (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
-    maxY = labelY;
-
-  } else {
-    // HALF *******************************
-
-    // width more than height
-    if(canvasW > canvasH) {
-      widgetH = canvasH;
-      widgetW = widgetH * 1.25;
-      //if width doesn't fit, rescale both
-      if(widgetW > canvasW) {
-        aspect = widgetW / canvasW;
-        widgetW = widgetW / aspect;
-        widgetH = widgetH / aspect;
-      }
-    // width less than height
-  } else if (canvasW < canvasH) {
-    widgetW = canvasW;
-    widgetH = widgetW / 1.25;
-      // if height don't fit, rescale both
-      if(widgetH > canvasH) {
-        aspect = widgetH / canvasH;
-        widgetH = widgetH / aspect;
-        widgetW = widgetH / aspect;
-      }
-    // equal
-  } else {
-    widgetW = canvasW;
-    widgetH = widgetW * 0.75;
-  }
-
-    // delta
-    dx = (canvasW - widgetW)/2;
-    dy = (canvasH - widgetH)/2;
-
-    // title
-    titleFontSize = ((widgetH / 8) > this.config.titleMinFontSize) ? (widgetH / 10) : this.config.titleMinFontSize;
-    titleX = dx + widgetW / 2;
-    titleY = dy + widgetH / 6.4;
-
-    // value
-    valueFontSize = ((widgetH / 6.5) > this.config.valueMinFontSize) ? (widgetH / 6.5) : this.config.valueMinFontSize;
-    valueX = dx + widgetW / 2;
-    valueY = dy + widgetH / 1.275;
-
-    // label
-    labelFontSize = ((widgetH / 16) > this.config.labelMinFontSize) ? (widgetH / 16) : this.config.labelMinFontSize;
-    labelX = dx + widgetW / 2;
-    labelY = valueY + valueFontSize / 2 + 5;
-
-    // min
-    minFontSize = ((widgetH / 16) > this.config.minLabelMinFontSize) ? (widgetH / 16) : this.config.minLabelMinFontSize;
-    minX = dx + (widgetW / 10) + (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
-    minY = labelY;
-
-    // max
-    maxFontSize = ((widgetH / 16) > this.config.maxLabelMinFontSize) ? (widgetH / 16) : this.config.maxLabelMinFontSize;
-    maxX = dx + widgetW - (widgetW / 10) - (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
-    maxY = labelY;
-  }
-
-  // parameters
-  this.params  = {
-    canvasW : canvasW,
-    canvasH : canvasH,
-    widgetW : widgetW,
-    widgetH : widgetH,
-    dx : dx,
-    dy : dy,
-    titleFontSize : titleFontSize,
-    titleX : titleX,
-    titleY : titleY,
-    valueFontSize : valueFontSize,
-    valueX : valueX,
-    valueY : valueY,
-    labelFontSize : labelFontSize,
-    labelX : labelX,
-    labelY : labelY,
-    minFontSize : minFontSize,
-    minX : minX,
-    minY : minY,
-    maxFontSize : maxFontSize,
-    maxX : maxX,
-    maxY : maxY
-  };
-
-  // var clear
-  canvasW, canvasH, widgetW, widgetH, aspect, dx, dy, titleFontSize, titleX, titleY, valueFontSize, valueX, valueY, labelFontSize, labelX, labelY, minFontSize, minX, minY, maxFontSize, maxX, maxY = null
-
-  // pki - custom attribute for generating gauge paths
-  this.canvas.customAttributes.pki = function (value, min, max, w, h, dx, dy, gws, donut) {
-
-    var alpha, Ro, Ri, Cx, Cy, Xo, Yo, Xi, Yi, path;
-
-    if (donut) {
-      alpha = (1 - 2 * (value - min) / (max - min)) * Math.PI;
-      Ro = w / 2 - w / 7;
-      Ri = Ro - w / 6.666666666666667 * gws;
-
-      Cx = w / 2 + dx;
-      Cy = h / 1.95 + dy;
-
-      Xo = w / 2 + dx + Ro * Math.cos(alpha);
-      Yo = h - (h - Cy) + 0 - Ro * Math.sin(alpha);
-      Xi = w / 2 + dx + Ri * Math.cos(alpha);
-      Yi = h - (h - Cy) + 0 - Ri * Math.sin(alpha);
-
-      path += "M" + (Cx - Ri) + "," + Cy + " ";
-      path += "L" + (Cx - Ro) + "," + Cy + " ";
-      if (value > ((max - min) / 2)) {
-        path += "A" + Ro + "," + Ro + " 0 0 1 " + (Cx + Ro) + "," + Cy + " ";
-      }
-      path += "A" + Ro + "," + Ro + " 0 0 1 " + Xo + "," + Yo + " ";
-      path += "L" + Xi + "," + Yi + " ";
-      if (value > ((max - min) / 2)) {
-        path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx + Ri) + "," + Cy + " ";
-      }
-      path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx - Ri) + "," + Cy + " ";
-      path += "Z ";
-
-      return { path: path };
-
-    } else {
-      alpha = (1 - (value - min) / (max - min)) * Math.PI;
-      Ro = w / 2 - w / 10;
-      Ri = Ro - w / 6.666666666666667 * gws;
-
-      Cx = w / 2 + dx;
-      Cy = h / 1.25 + dy;
-
-      Xo = w / 2 + dx + Ro * Math.cos(alpha);
-      Yo = h - (h - Cy) + 0 - Ro * Math.sin(alpha);
-      Xi = w / 2 + dx + Ri * Math.cos(alpha);
-      Yi = h - (h - Cy) + 0 - Ri * Math.sin(alpha);
-
-      path += "M" + (Cx - Ri) + "," + Cy + " ";
-      path += "L" + (Cx - Ro) + "," + Cy + " ";
-      path += "A" + Ro + "," + Ro + " 0 0 1 " + Xo + "," + Yo + " ";
-      path += "L" + Xi + "," + Yi + " ";
-      path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx - Ri) + "," + Cy + " ";
-      path += "Z ";
-
-      return { path: path };
-    }
-
-    // var clear
-    alpha, Ro, Ri, Cx, Cy, Xo, Yo, Xi, Yi, path = null;
-  };
-
-  // gauge
-  this.gauge = this.canvas.path().attr({
-    "stroke": "none",
-    "fill": this.config.gaugeColor,
-    pki: [this.config.max, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut]
-  });
-  this.gauge.id = this.config.id+"-gauge";
-
-  // level
-  this.level = this.canvas.path().attr({
-    "stroke": "none",
-    "fill": getColor(this.config.value, (this.config.value - this.config.min) / (this.config.max - this.config.min), this.config.levelColors, this.config.noGradient, this.config.customSectors),
-    pki: [this.config.min, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut]
-  });
-  if(this.config.donut) {
-    this.level.transform("r" + this.config.donutStartAngle + ", " + (this.params.widgetW/2 + this.params.dx) + ", " + (this.params.widgetH/1.95 + this.params.dy));
-  }
-  this.level.id = this.config.id+"-level";
-
-  // title
-  this.txtTitle = this.canvas.text(this.params.titleX, this.params.titleY, this.config.title);
-  this.txtTitle.attr({
-    "font-size":this.params.titleFontSize,
-    "font-weight":"bold",
-    "font-family":"Arial",
-    "fill":this.config.titleFontColor,
-    "fill-opacity":"1"
-  });
-  setDy(this.txtTitle, this.params.titleFontSize, this.params.titleY);
-  this.txtTitle.id = this.config.id+"-txttitle";
-
-  // value
-  this.txtValue = this.canvas.text(this.params.valueX, this.params.valueY, 0);
-  this.txtValue.attr({
-    "font-size":this.params.valueFontSize,
-    "font-weight":"bold",
-    "font-family":"Arial",
-    "fill":this.config.valueFontColor,
-    "fill-opacity":"0"
-  });
-  setDy(this.txtValue, this.params.valueFontSize, this.params.valueY);
-  this.txtValue.id = this.config.id+"-txtvalue";
-
-  // label
-  this.txtLabel = this.canvas.text(this.params.labelX, this.params.labelY, this.config.label);
-  this.txtLabel.attr({
-    "font-size":this.params.labelFontSize,
-    "font-weight":"normal",
-    "font-family":"Arial",
-    "fill":this.config.labelFontColor,
-    "fill-opacity":"0"
-  });
-  setDy(this.txtLabel, this.params.labelFontSize, this.params.labelY);
-  this.txtLabel.id = this.config.id+"-txtlabel";
-
-  // min
-  this.txtMinimum = this.config.min;
-  if( this.config.humanFriendly ) this.txtMinimum = humanFriendlyNumber( this.config.min, this.config.humanFriendlyDecimal );
-  this.txtMin = this.canvas.text(this.params.minX, this.params.minY, this.txtMinimum);
-  this.txtMin.attr({
-    "font-size":this.params.minFontSize,
-    "font-weight":"normal",
-    "font-family":"Arial",
-    "fill":this.config.labelFontColor,
-    "fill-opacity": (this.config.hideMinMax || this.config.donut)? "0" : "1"
-  });
-  setDy(this.txtMin, this.params.minFontSize, this.params.minY);
-  this.txtMin.id = this.config.id+"-txtmin";
-
-  // max
-  this.txtMaximum = this.config.max;
-  if( this.config.humanFriendly ) this.txtMaximum = humanFriendlyNumber( this.config.max, this.config.humanFriendlyDecimal );
-  this.txtMax = this.canvas.text(this.params.maxX, this.params.maxY, this.txtMaximum);
-  this.txtMax.attr({
-    "font-size":this.params.maxFontSize,
-    "font-weight":"normal",
-    "font-family":"Arial",
-    "fill":this.config.labelFontColor,
-    "fill-opacity": (this.config.hideMinMax || this.config.donut)? "0" : "1"
-  });
-  setDy(this.txtMax, this.params.maxFontSize, this.params.maxY);
-  this.txtMax.id = this.config.id+"-txtmax";
-
-  var defs = this.canvas.canvas.childNodes[1];
-  var svg = "http://www.w3.org/2000/svg";
-
-  if (ie < 9) {
-    onCreateElementNsReady(function() {
-      this.generateShadow(svg, defs);
-    });
-  } else {
-    this.generateShadow(svg, defs);
-  }
-
-  // var clear
-  defs, svg = null;
-
-  // execute on each animation frame
-  function onAnimate() {
-    if (obj.config.counter) {
-      var currentValue = obj.level.attr("pki");
-
-      if(obj.config.textRenderer) {
-        // this.originalValue = this.config.textRenderer(this.originalValue);
-        obj.txtValue.attr("text", obj.config.textRenderer(Math.floor(currentValue[0])));
-      } else if(obj.config.humanFriendly) {
-        // this.originalValue = humanFriendlyNumber( this.originalValue, this.config.humanFriendlyDecimal ) + this.config.symbol;
-        obj.txtValue.attr("text", humanFriendlyNumber( Math.floor(currentValue[0]), obj.config.humanFriendlyDecimal ) + obj.config.symbol);
-      } else {
-        // this.originalValue += this.config.symbol;
-        obj.txtValue.attr("text", (currentValue[0] * 1).toFixed(obj.config.decimals) + obj.config.symbol);
-      }
-
-      setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
-      currentValue = null;
-    }
-  }
-
-  if(!obj.config.counter) {
-    if(obj.config.textRenderer) {
-      obj.originalValue = obj.config.textRenderer(obj.originalValue);
-    } else if(obj.config.humanFriendly) {
-      obj.originalValue = humanFriendlyNumber( obj.originalValue, obj.config.humanFriendlyDecimal ) + obj.config.symbol;
-    } else {
-      obj.originalValue = (obj.originalValue * 1).toFixed(obj.config.decimals) + obj.config.symbol;
-    }
-
-    obj.txtValue.attr("text", obj.originalValue);
-    setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
-  }
-
-  //event fired on each animation frame
-  eve.on("raphael.anim.frame.*", onAnimate);
-
-  // animate gauge level
-  this.level.animate({pki: [this.config.value, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut]},  this.config.startAnimationTime, this.config.startAnimationType);
-
-  // animate value
-  this.txtValue.animate({"fill-opacity":"1"}, this.config.startAnimationTime, this.config.startAnimationType);
-
-  // animate label
-  this.txtLabel.animate({"fill-opacity":"1"}, this.config.startAnimationTime, this.config.startAnimationType);
-};
-
-/** Refresh gauge level */
-JustGage.prototype.refresh = function(val, max) {
-
-  var originalVal, displayVal, color, max = max || null;
-
-  // set new max
-  if(max !== null) {
-    this.config.max = max;
-
-    this.txtMaximum = this.config.max;
-    if( this.config.humanFriendly ) this.txtMaximum = humanFriendlyNumber( this.config.max, this.config.humanFriendlyDecimal );
-    this.txtMax.attr({"text" : this.config.max});
-    setDy(this.txtMax, this.params.maxFontSize, this.params.maxY);
-  }
-
-  // overflow values
-  originalVal = val;
-  displayVal = val;
-  if ((val * 1) > (this.config.max * 1)) {val = (this.config.max * 1);}
-  if ((val * 1) < (this.config.min * 1)) {val = (this.config.min * 1);}
-
-  color = getColor(val, (val - this.config.min) / (this.config.max - this.config.min), this.config.levelColors, this.config.noGradient, this.config.customSectors);
-
-  if(this.config.textRenderer) {
-    displayVal = this.config.textRenderer(displayVal);
-  } else if( this.config.humanFriendly ) {
-    displayVal = humanFriendlyNumber( displayVal, this.config.humanFriendlyDecimal ) + this.config.symbol;
-  } else {
-    displayVal = (displayVal * 1).toFixed(this.config.decimals) + this.config.symbol;
-  }
-
-  if(!this.config.counter) {
-    this.canvas.getById(this.config.id+"-txtvalue").attr({"text":displayVal});
-    setDy(this.canvas.getById(this.config.id+"-txtvalue"), this.params.valueFontSize, this.params.valueY);
-  }
-
-  this.canvas.getById(this.config.id+"-level").animate({pki: [val, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut], "fill":color},  this.config.refreshAnimationTime, this.config.refreshAnimationType);
-  this.config.value = val * 1;
-
-  // var clear
-  originalVal, displayVal, color, max = null;
-};
-
-/** Generate shadow */
-JustGage.prototype.generateShadow = function(svg, defs) {
-
-  var gaussFilter, feOffset, feGaussianBlur, feComposite1, feFlood, feComposite2, feComposite3;
-
-  // FILTER
-  gaussFilter=document.createElementNS(svg,"filter");
-  gaussFilter.setAttribute("id", this.config.id + "-inner-shadow");
-  defs.appendChild(gaussFilter);
-
-  // offset
-  feOffset = document.createElementNS(svg,"feOffset");
-  feOffset.setAttribute("dx", 0);
-  feOffset.setAttribute("dy", this.config.shadowVerticalOffset);
-  gaussFilter.appendChild(feOffset);
-
-  // blur
-  feGaussianBlur = document.createElementNS(svg,"feGaussianBlur");
-  feGaussianBlur.setAttribute("result","offset-blur");
-  feGaussianBlur.setAttribute("stdDeviation", this.config.shadowSize);
-  gaussFilter.appendChild(feGaussianBlur);
-
-  // composite 1
-  feComposite1 = document.createElementNS(svg,"feComposite");
-  feComposite1.setAttribute("operator","out");
-  feComposite1.setAttribute("in", "SourceGraphic");
-  feComposite1.setAttribute("in2","offset-blur");
-  feComposite1.setAttribute("result","inverse");
-  gaussFilter.appendChild(feComposite1);
-
-  // flood
-  feFlood = document.createElementNS(svg,"feFlood");
-  feFlood.setAttribute("flood-color","black");
-  feFlood.setAttribute("flood-opacity", this.config.shadowOpacity);
-  feFlood.setAttribute("result","color");
-  gaussFilter.appendChild(feFlood);
-
-  // composite 2
-  feComposite2 = document.createElementNS(svg,"feComposite");
-  feComposite2.setAttribute("operator","in");
-  feComposite2.setAttribute("in", "color");
-  feComposite2.setAttribute("in2","inverse");
-  feComposite2.setAttribute("result","shadow");
-  gaussFilter.appendChild(feComposite2);
-
-  // composite 3
-  feComposite3 = document.createElementNS(svg,"feComposite");
-  feComposite3.setAttribute("operator","over");
-  feComposite3.setAttribute("in", "shadow");
-  feComposite3.setAttribute("in2","SourceGraphic");
-  gaussFilter.appendChild(feComposite3);
-
-  // set shadow
-  if (!this.config.hideInnerShadow) {
-    this.canvas.canvas.childNodes[2].setAttribute("filter", "url(#" + this.config.id + "-inner-shadow)");
-    this.canvas.canvas.childNodes[3].setAttribute("filter", "url(#" + this.config.id + "-inner-shadow)");
-  }
-
-  // var clear
-  gaussFilter, feOffset, feGaussianBlur, feComposite1, feFlood, feComposite2, feComposite3 = null;
-
-};
-
-/** Get color for value */
-function getColor(val, pct, col, noGradient, custSec) {
-
-  var no, inc, colors, percentage, rval, gval, bval, lower, upper, range, rangePct, pctLower, pctUpper, color;
-  var noGradient = noGradient || custSec.length > 0;
-
-  if(custSec.length > 0) {
-    for(var i = 0; i < custSec.length; i++) {
-      if(val > custSec[i].lo && val <= custSec[i].hi) {
-        return custSec[i].color;
-      }
-    }
-  }
-
-  no = col.length;
-  if (no === 1) return col[0];
-  inc = (noGradient) ? (1 / no) : (1 / (no - 1));
-  colors = [];
-  for (var i = 0; i < col.length; i++) {
-    percentage = (noGradient) ? (inc * (i + 1)) : (inc * i);
-    rval = parseInt((cutHex(col[i])).substring(0,2),16);
-    gval = parseInt((cutHex(col[i])).substring(2,4),16);
-    bval = parseInt((cutHex(col[i])).substring(4,6),16);
-    colors[i] = { pct: percentage, color: { r: rval, g: gval, b: bval  } };
-  }
-
-  if(pct === 0) {
-    return 'rgb(' + [colors[0].color.r, colors[0].color.g, colors[0].color.b].join(',') + ')';
-  }
-
-  for (var j = 0; j < colors.length; j++) {
-    if (pct <= colors[j].pct) {
-      if (noGradient) {
-        return 'rgb(' + [colors[j].color.r, colors[j].color.g, colors[j].color.b].join(',') + ')';
-      } else {
-        lower = colors[j - 1];
-        upper = colors[j];
-        range = upper.pct - lower.pct;
-        rangePct = (pct - lower.pct) / range;
-        pctLower = 1 - rangePct;
-        pctUpper = rangePct;
-        color = {
-          r: Math.floor(lower.color.r * pctLower + upper.color.r * pctUpper),
-          g: Math.floor(lower.color.g * pctLower + upper.color.g * pctUpper),
-          b: Math.floor(lower.color.b * pctLower + upper.color.b * pctUpper)
-        };
-        return 'rgb(' + [color.r, color.g, color.b].join(',') + ')';
-      }
-    }
-  }
-
-}
-
-/** Fix Raphael display:none tspan dy attribute bug */
-function setDy(elem, fontSize, txtYpos) {
-  if ((!ie || ie > 9) && (elem.node.firstChild.attributes.dy)) {
-    elem.node.firstChild.attributes.dy.value = 0;
-  }
-}
-
-/** Random integer  */
-function getRandomInt (min, max) {
-  return Math.floor(Math.random() * (max - min + 1)) + min;
-}
-
-/**  Cut hex  */
-function cutHex(str) {
-  return (str.charAt(0)=="#") ? str.substring(1,7):str;
-}
-
-/**  Human friendly number suffix - From: http://stackoverflow.com/questions/2692323/code-golf-friendly-number-abbreviator */
-function humanFriendlyNumber( n, d ) {
-  var p, d2, i, s;
-
-  p = Math.pow;
-  d2 = p(10, d);
-  i = 7;
-  while( i ) {
-    s = p(10,i--*3);
-    if( s <= n ) {
-     n = Math.round(n*d2/s)/d2+"KMGTPE"[i];
-   }
- }
- return n;
-}
-
-/**  Get style  */
-function getStyle(oElm, strCssRule){
-  var strValue = "";
-  if(document.defaultView && document.defaultView.getComputedStyle){
-    strValue = document.defaultView.getComputedStyle(oElm).getPropertyValue(strCssRule);
-  }
-  else if(oElm.currentStyle){
-    strCssRule = strCssRule.replace(/\-(\w)/g, function (strMatch, p1){
-      return p1.toUpperCase();
-    });
-    strValue = oElm.currentStyle[strCssRule];
-  }
-  return strValue;
-}
-
-/**  Create Element NS Ready  */
-function onCreateElementNsReady(func) {
-  if (document.createElementNS !== undefined) {
-    func();
-  } else {
-    setTimeout(function() { onCreateElementNsReady(func); }, 100);
-  }
-}
-
-/**  Get IE version  */
-// ----------------------------------------------------------
-// A short snippet for detecting versions of IE in JavaScript
-// without resorting to user-agent sniffing
-// ----------------------------------------------------------
-// If you're not in IE (or IE version is less than 5) then:
-// ie === undefined
-// If you're in IE (>=5) then you can determine which version:
-// ie === 7; // IE7
-// Thus, to detect IE:
-// if (ie) {}
-// And to detect the version:
-// ie === 6 // IE6
-// ie > 7 // IE8, IE9 ...
-// ie < 9 // Anything less than IE9
-// ----------------------------------------------------------
-// UPDATE: Now using Live NodeList idea from @jdalton
-var ie = (function(){
-
-  var undef,
-  v = 3,
-  div = document.createElement('div'),
-  all = div.getElementsByTagName('i');
-
-  while (
-    div.innerHTML = '<!--[if gt IE ' + (++v) + ']><i></i><![endif]-->',
-    all[0]
-    );
-    return v > 4 ? v : undef;
-}());
\ No newline at end of file
diff --git a/addons/sale_crm/static/src/js/sale_crm.js b/addons/sale_crm/static/src/js/sale_crm.js
deleted file mode 100644
index 207ac959af3..00000000000
--- a/addons/sale_crm/static/src/js/sale_crm.js
+++ /dev/null
@@ -1,108 +0,0 @@
-openerp.sale_crm = function(openerp) {
-var _t = openerp.web._t;
-
-openerp.sale_crm.GaugeWidget = openerp.web_kanban.AbstractField.extend({
-    className: "oe_gage",
-    start: function() {
-        var self = this;
-
-        var parent = this.getParent();
-        var max = this.options.max_field ? parent.record[this.options.max_field].raw_value : 100;
-        var label = this.options.label_field ? parent.record[this.options.label_field].raw_value : "";
-        var title = this.$node.html();
-        var val = this.field.value;
-        var value = _.isArray(val) && val.length ? val[val.length-1]['value'] : val;
-        var unique_id = _.uniqueId("JustGage");
-        
-        this.$el.empty()
-            .attr('style', this.$node.attr('style') + ';position:relative; display:inline-block;')
-            .attr('id', unique_id);
-        this.gage = new JustGage({
-            id: unique_id,
-            node: this.$el[0],
-            title: title,
-            value: value,
-            min: 0,
-            max: max,
-            relativeGaugeSize: true,
-            humanFriendly: true,
-            titleFontColor: '#333333',
-            valueFontColor: '#333333',
-            labelFontColor: '#000',
-            label: label,
-            levelColors: [
-                "#ff0000",
-                "#f9c802",
-                "#a9d70b"
-            ],
-        });
-
-        var flag_open = false;
-        if (self.options.action_change) {
-            var $svg = self.$el.find('svg');
-            var css = {
-                'text-align': 'center',
-                'position': 'absolute',
-                'width': self.$el.outerWidth() + 'px',
-                'top': (self.$el.outerHeight()/2-5) + 'px'
-            };
-
-            self.$el.click(function (event) {
-                event.stopPropagation();
-                flag_open = false;
-                if (!parent.view.is_action_enabled('edit')) {
-                    return;
-                }
-                if (!self.$el.find(".oe_justgage_edit").size()) {
-                    $div = $('<div class="oe_justgage_edit" style="z-index:1"/>');
-                    $div.css(css);
-                    $input = $('<input/>').val(value);
-                    $input.css({
-                        'text-align': 'center',
-                        'margin': 'auto',
-                        'width': ($svg.outerWidth()-40) + 'px'
-                    });
-                    $div.append($input);
-                    self.$el.prepend($div)
-                    $input.focus()
-                        .keydown(function (event) {
-                            event.stopPropagation();
-                            if (event.keyCode == 13 || event.keyCode == 9) {
-                                if ($input.val() != value) {
-                                    parent.view.dataset.call(self.options.action_change, [parent.id, $input.val()]).then(function () {
-                                        parent.do_reload();
-                                    });
-                                } else {
-                                    $div.remove();
-                                }
-                            }
-                        })
-                        .click(function (event) {
-                            event.stopPropagation();
-                            flag_open = false;
-                        })
-                        .blur(function (event) {
-                            if(!flag_open) {
-                                self.$el.find(".oe_justgage_edit").remove();
-                            } else {
-                                flag_open = false;
-                                setTimeout(function () {$input.focus();}, 0);
-                            }
-                        });
-                }
-            }).mousedown(function () {
-                flag_open = true;
-            });
-
-            if (!+value) {
-                $svg.fadeTo(0, 0.3);
-                $div = $('<div/>').text(_t("Click to change value"));
-                $div.css(css);
-                self.$el.append($div);
-            }
-        }
-    },
-});
-openerp.web_kanban.fields_registry.add("gage", "openerp.sale_crm.GaugeWidget");
-
-};

From bf1fd1d071e709ae246018a6cd75c3015fab20ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 3 Sep 2013 17:20:28 +0200
Subject: [PATCH 109/164] [FIX] sparkline widget: fixed some default values
 computation

bzr revid: tde@openerp.com-20130903152028-6gr51965tmva0npu
---
 addons/web_kanban/static/src/js/kanban.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index aff3673f687..bd1c116aded 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -1249,15 +1249,15 @@ instance.web_kanban.SparklineBarWidget = instance.web_kanban.AbstractField.exten
             var sparkline_options = _.extend({
                     type: 'bar',
                     barWidth: 5,
-                    height: '50px',
-                    barWidth: '10px',
-                    barSpacing: '5px',
+                    height: '20px',
+                    barWidth: 4,
+                    barSpacing: 1,
                     barColor: '#96d854',
                     tooltipFormat: '{{offset:offset}} {{value}}',
                     tooltipValueLookups: {
                         'offset': tooltips
                     }
-                }, this.options);
+                }, self.options);
             self.$el.sparkline(value, sparkline_options);
             self.$el.tipsy({'delayIn': 0, 'html': true, 'title': function(){return title}, 'gravity': 'n'});
         }, 0);
@@ -1287,7 +1287,6 @@ instance.web_kanban.GaugeWidget = instance.web_kanban.AbstractField.extend({
         var val = this.field.value;
         var value = _.isArray(val) && val.length ? val[val.length-1]['value'] : val;
         var title = this.$node.html() || this.field.string;
-        console.log(value, title, max);
         this.gage = new JustGage({
             parentNode: this.$el[0],
             value: value,

From c971e0c17539ec43c4bad4d121fe92b292f6b986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 3 Sep 2013 17:20:36 +0200
Subject: [PATCH 110/164] [FIX] mass_mailing, crm: fixed sparkline options

bzr revid: tde@openerp.com-20130903152036-wqcdpn2fn28ukrpo
---
 addons/crm/crm_case_section_view.xml      | 4 ++--
 addons/mass_mailing/mass_mailing_view.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index c957311b47f..6293db7dc4c 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -99,11 +99,11 @@
                                     <div class="oe_items_list">
                                         <div class="oe_salesteams_leads" t-if="record.use_leads.raw_value">
                                             <a name="%(crm_case_form_view_salesteams_lead)d" type="action">Leads</a>
-                                            <a name="%(action_report_crm_lead)d" type="action" class="oe_sparkline_bar_link"><field name="monthly_open_leads" widget="sparkline_bar">Open Leads per Month<br/>Click to see a detailed analysis of leads.</field></a>
+                                            <a name="%(action_report_crm_lead)d" type="action" class="oe_sparkline_bar_link"><field name="monthly_open_leads" widget="sparkline_bar" options="{'height': '20px', 'barWidth': 4, 'barSpacing': 1}">Open Leads per Month<br/>Click to see a detailed analysis of leads.</field></a>
                                         </div>
                                         <div class="oe_salesteams_opportunities">
                                             <a name="%(crm_case_form_view_salesteams_opportunity)d" type="action">Opportunities</a>
-                                            <a name="%(action_report_crm_opportunity)d" type="action"><field name="monthly_planned_revenue" widget="sparkline_bar">Planned Revenue per Month<br/>Click to see a detailed analysis of opportunities.</field></a>
+                                            <a name="%(action_report_crm_opportunity)d" type="action"><field name="monthly_planned_revenue" widget="sparkline_bar" height="20px" barWidth="4" barSpacing="1">Planned Revenue per Month<br/>Click to see a detailed analysis of opportunities.</field></a>
                                         </div>
                                     </div>
                                 </div>
diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index b847a89db53..c85bb136bd3 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -165,11 +165,11 @@
                                     <div>
                                         <div class="oe_sparkline_container">
                                             <h4 class="oe_sparkline_bar_title">Opened</h4><br />
-                                            <field name="opened_monthly" widget="sparkline_bar" height="50px" barWidth="10px" barSpacing="15px"/>
+                                            <field name="opened_monthly" widget="sparkline_bar" options="{'height': '50px', 'barWidth': 10, 'barSpacing': 5}"/>
                                         </div>
                                         <div class="oe_sparkline_container">
                                             <h4 class="oe_sparkline_bar_title">Replied</h4><br />
-                                            <field name="replied_monthly" widget="sparkline_bar" height="50px" barWidth="10px" barSpacing="15px"/>
+                                            <field name="replied_monthly" widget="sparkline_bar" options="{'height': '50px', 'barWidth': 10, 'barSpacing': 5}"/>
                                         </div>
                                     </div>
                                 </div>

From 68f9b63c73823514602429df9c6a1d7b5851d725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 3 Sep 2013 17:25:53 +0200
Subject: [PATCH 111/164] [IMP] mass_mailing: added fields on segment form view
 + rules for segment model

bzr revid: tde@openerp.com-20130903152553-y0s4jhqagu0ff92m
---
 addons/mass_mailing/mass_mailing_view.xml        | 13 +++++++++----
 addons/mass_mailing/security/ir.model.access.csv |  4 +++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index c85bb136bd3..ab421dda881 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -116,10 +116,15 @@
                 <form string="Mass Mailing Campaign" version="7.0">
                     <sheet>
                         <group>
-                            <field name="name"/>
-                            <field name="mass_mailing_campaign_id"/>
-                            <field name="date"/>
-                            <field name="template_id"/>
+                            <group>
+                                <field name="name"/>
+                                <field name="date"/>
+                            </group>
+                            <group>
+                                <field name="mass_mailing_campaign_id"/>
+                                <field name="template_id"/>
+                                <field name="domain"/>
+                            </group>
                         </group>
                     </sheet>
                 </form>
diff --git a/addons/mass_mailing/security/ir.model.access.csv b/addons/mass_mailing/security/ir.model.access.csv
index af6eaa7bb06..54f3413e9f1 100644
--- a/addons/mass_mailing/security/ir.model.access.csv
+++ b/addons/mass_mailing/security/ir.model.access.csv
@@ -1,3 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_mass_mailing_campaign,mail.mass_mailing.campaign.template,model_mail_mass_mailing_campaign,,1,1,1,0
+access_mass_mailing_campaign,mail.mass_mailing.campaign,model_mail_mass_mailing_campaign,,1,1,1,0
 access_mass_mailing_campaign_system,mail.mass_mailing.campaign.system,model_mail_mass_mailing_campaign,base.group_system,1,1,1,1
+access_mass_mailing_segment,mail.mass_mailing.segment,model_mail_mass_mailing_segment,,1,1,1,0
+access_mass_mailing_segment_system,mail.mass_mailing.segment.system,model_mail_mass_mailing_segment,base.group_system,1,1,1,1
\ No newline at end of file

From a937b5679ba6b829f769cc4e119de7a22009a8e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 6 Sep 2013 11:32:21 +0200
Subject: [PATCH 112/164] [IMP] [FIX] kanban: updated justgage and sparklin
 libraries; fixed gauge widget showing 0 as value by forcing a refresh

bzr revid: tde@openerp.com-20130906093221-n94whqrrj2meknwf
---
 addons/web/__openerp__.py                     |  2 +-
 .../lib/jquery.sparkline/jquery.sparkline.js  | 61 +++++++++++--------
 .../{justgage.1.0.1.js => justgage.js}        |  0
 addons/web_kanban/static/src/js/kanban.js     | 25 +++++---
 4 files changed, 53 insertions(+), 35 deletions(-)
 rename addons/web/static/lib/justgage/{justgage.1.0.1.js => justgage.js} (100%)

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 32a108c131d..9b13fd48b0a 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -36,7 +36,7 @@ This module provides the core of the OpenERP Web Client.
         "static/lib/jquery.tipsy/jquery.tipsy.js",
         "static/lib/jquery.textext/jquery.textext.js",
         "static/lib/jquery.timeago/jquery.timeago.js",
-        "static/lib/justgage/justgage.1.0.1.js",
+        "static/lib/justgage/justgage.js",
         "static/lib/qweb/qweb2.js",
         "static/lib/underscore/underscore.js",
         "static/lib/underscore.string/lib/underscore.string.js",
diff --git a/addons/web/static/lib/jquery.sparkline/jquery.sparkline.js b/addons/web/static/lib/jquery.sparkline/jquery.sparkline.js
index 8069db45fe9..43b24c080a6 100644
--- a/addons/web/static/lib/jquery.sparkline/jquery.sparkline.js
+++ b/addons/web/static/lib/jquery.sparkline/jquery.sparkline.js
@@ -2,7 +2,7 @@
 *
 * jquery.sparkline.js
 *
-* v2.1.1
+* v2.1.2
 * (c) Splunk, Inc
 * Contact: Gareth Watts (gareth@splunk.com)
 * http://omnipotent.net/jquery.sparkline/
@@ -202,11 +202,11 @@
 
 /*jslint regexp: true, browser: true, jquery: true, white: true, nomen: false, plusplus: false, maxerr: 500, indent: 4 */
 
+(function(document, Math, undefined) { // performance/minified-size optimization
 (function(factory) {
     if(typeof define === 'function' && define.amd) {
         define(['jquery'], factory);
-    }
-    else {
+    } else if (jQuery && !jQuery.fn.sparkline) {
         factory(jQuery);
     }
 }
@@ -597,19 +597,41 @@
         if (useExisting && (target = this.data('_jqs_vcanvas'))) {
             return target;
         }
+
+        if ($.fn.sparkline.canvas === false) {
+            // We've already determined that neither Canvas nor VML are available
+            return false;
+
+        } else if ($.fn.sparkline.canvas === undefined) {
+            // No function defined yet -- need to see if we support Canvas or VML
+            var el = document.createElement('canvas');
+            if (!!(el.getContext && el.getContext('2d'))) {
+                // Canvas is available
+                $.fn.sparkline.canvas = function(width, height, target, interact) {
+                    return new VCanvas_canvas(width, height, target, interact);
+                };
+            } else if (document.namespaces && !document.namespaces.v) {
+                // VML is available
+                document.namespaces.add('v', 'urn:schemas-microsoft-com:vml', '#default#VML');
+                $.fn.sparkline.canvas = function(width, height, target, interact) {
+                    return new VCanvas_vml(width, height, target);
+                };
+            } else {
+                // Neither Canvas nor VML are available
+                $.fn.sparkline.canvas = false;
+                return false;
+            }
+        }
+
         if (width === undefined) {
             width = $(this).innerWidth();
         }
         if (height === undefined) {
             height = $(this).innerHeight();
         }
-        if ($.fn.sparkline.hasCanvas) {
-            target = new VCanvas_canvas(width, height, this, interact);
-        } else if ($.fn.sparkline.hasVML) {
-            target = new VCanvas_vml(width, height, this);
-        } else {
-            return false;
-        }
+
+        target = $.fn.sparkline.canvas(width, height, this, interact);
+
         mhandler = $(this).data('_jqs_mhandler');
         if (mhandler) {
             mhandler.registerCanvas(target);
@@ -977,8 +999,7 @@
                     mhandler.registerSparkline(sp);
                 }
             };
-            // jQuery 1.3.0 completely changed the meaning of :hidden :-/
-            if (($(this).html() && !options.get('disableHiddenCheck') && $(this).is(':hidden')) || ($.fn.jquery < '1.3.0' && $(this).parents().is(':hidden')) || !$(this).parents('body').length) {
+            if (($(this).html() && !options.get('disableHiddenCheck') && $(this).is(':hidden')) || !$(this).parents('body').length) {
                 if (!options.get('composite') && $.data(this, '_jqs_pending')) {
                     // remove any existing references to the element
                     for (i = pending.length; i; i--) {
@@ -2528,20 +2549,6 @@
     // Setup a very simple "virtual canvas" to make drawing the few shapes we need easier
     // This is accessible as $(foo).simpledraw()
 
-    // Detect browser renderer support
-    (function() {
-        if (document.namespaces && !document.namespaces.v) {
-            $.fn.sparkline.hasVML = true;
-            document.namespaces.add('v', 'urn:schemas-microsoft-com:vml', '#default#VML');
-        } else {
-            $.fn.sparkline.hasVML = false;
-        }
-
-        var el = document.createElement('canvas');
-        $.fn.sparkline.hasCanvas = !!(el.getContext && el.getContext('2d'));
-
-    })()
-
     VShape = createClass({
         init: function (target, id, type, args) {
             this.target = target;
@@ -3044,4 +3051,4 @@
         }
     });
 
-}));
+}))}(document, Math));
\ No newline at end of file
diff --git a/addons/web/static/lib/justgage/justgage.1.0.1.js b/addons/web/static/lib/justgage/justgage.js
similarity index 100%
rename from addons/web/static/lib/justgage/justgage.1.0.1.js
rename to addons/web/static/lib/justgage/justgage.js
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index bd1c116aded..9bc8e3bd785 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -1276,6 +1276,7 @@ instance.web_kanban.GaugeWidget = instance.web_kanban.AbstractField.extend({
     className: "oe_gauge",
     start: function() {
         var self = this;
+        var parent = this.getParent();
         var max = 100;
         if (this.options.max_field) {
             max = this.getParent().record[this.options.max_field].raw_value;
@@ -1287,33 +1288,43 @@ instance.web_kanban.GaugeWidget = instance.web_kanban.AbstractField.extend({
         var val = this.field.value;
         var value = _.isArray(val) && val.length ? val[val.length-1]['value'] : val;
         var title = this.$node.html() || this.field.string;
+        // var unique_id = _.uniqueId("JustGage");
+
+        this.$el.empty()
+            .attr('style', this.$node.attr('style') + ';position:relative; display:inline-block;');
+
         this.gage = new JustGage({
             parentNode: this.$el[0],
+            // id: unique_id,
             value: value,
             title: title,
             min: 0,
             max: max,
             relativeGaugeSize: true,
             humanFriendly: true,
+            titleFontColor: '#333333',
+            valueFontColor: '#333333',
+            labelFontColor: '#000',
             label: label,
             levelColors: [
                 "#ff0000",
                 "#f9c802",
                 "#a9d70b"
-            ]
+            ],
         });
+        this.gage.refresh(value, max);
 
         var flag_open = false;
-        if (self.options.action_change) {
-            var $svg = self.$el.find('svg');
+        if (this.options.action_change) {
+            var $svg = this.$el.find('svg');
             var css = {
                 'text-align': 'center',
                 'position': 'absolute',
-                'width': self.$el.outerWidth() + 'px',
-                'top': (self.$el.outerHeight()/2-5) + 'px'
+                'width': this.$el.outerWidth() + 'px',
+                'top': (this.$el.outerHeight()/2-5) + 'px'
             };
 
-            self.$el.click(function (event) {
+            this.$el.click(function (event) {
                 event.stopPropagation();
                 flag_open = false;
                 if (!parent.view.is_action_enabled('edit')) {
@@ -1364,7 +1375,7 @@ instance.web_kanban.GaugeWidget = instance.web_kanban.AbstractField.extend({
                 $svg.fadeTo(0, 0.3);
                 $div = $('<div/>').text(_t("Click to change value"));
                 $div.css(css);
-                self.$el.append($div);
+                this.$el.append($div);
             }
         }
     },

From 5245e732bc31dfe65d2480565bf0b9f3be307dd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 6 Sep 2013 12:05:28 +0200
Subject: [PATCH 113/164] [MOV] [ADD] Moved gauge and sparkline widgets into
 their own modules.

Introducing two new web modules: web_kanban_gauge and web_kanban_sparkline.

bzr revid: tde@openerp.com-20130906100528-rfk9u9op5u8kadl9
---
 addons/web/__openerp__.py                     |   2 -
 addons/web_kanban/static/src/js/kanban.js     | 151 ------------------
 addons/web_kanban_gauge/__init__.py           |   0
 addons/web_kanban_gauge/__openerp__.py        |  18 +++
 .../static/lib/justgage/justgage.js           |   0
 .../static/src/js/kanban_gauge.js             | 119 ++++++++++++++
 addons/web_kanban_sparkline/__init__.py       |   0
 addons/web_kanban_sparkline/__openerp__.py    |  18 +++
 .../lib/jquery.sparkline/jquery.sparkline.js  |   0
 .../static/src/js/kanban_sparkline.js         |  37 +++++
 10 files changed, 192 insertions(+), 153 deletions(-)
 create mode 100644 addons/web_kanban_gauge/__init__.py
 create mode 100644 addons/web_kanban_gauge/__openerp__.py
 rename addons/{web => web_kanban_gauge}/static/lib/justgage/justgage.js (100%)
 create mode 100644 addons/web_kanban_gauge/static/src/js/kanban_gauge.js
 create mode 100644 addons/web_kanban_sparkline/__init__.py
 create mode 100644 addons/web_kanban_sparkline/__openerp__.py
 rename addons/{web => web_kanban_sparkline}/static/lib/jquery.sparkline/jquery.sparkline.js (100%)
 create mode 100644 addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 9b13fd48b0a..5c8d27e11cb 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -32,11 +32,9 @@ This module provides the core of the OpenERP Web Client.
         "static/lib/jquery.ui.notify/js/jquery.notify.js",
         "static/lib/jquery.deferred-queue/jquery.deferred-queue.js",
         "static/lib/jquery.scrollTo/jquery.scrollTo-min.js",
-        "static/lib/jquery.sparkline/jquery.sparkline.js",
         "static/lib/jquery.tipsy/jquery.tipsy.js",
         "static/lib/jquery.textext/jquery.textext.js",
         "static/lib/jquery.timeago/jquery.timeago.js",
-        "static/lib/justgage/justgage.js",
         "static/lib/qweb/qweb2.js",
         "static/lib/underscore/underscore.js",
         "static/lib/underscore.string/lib/underscore.string.js",
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 9bc8e3bd785..8ec11e37d25 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -1232,157 +1232,6 @@ instance.web_kanban.AbstractField = instance.web.Widget.extend(instance.web_kanb
 
 instance.web_kanban.fields_registry = new instance.web.Registry({});
 
-
-/**
- * Kanban widgets: Sparkline
- *
- */
-
-instance.web_kanban.SparklineBarWidget = instance.web_kanban.AbstractField.extend({
-    className: "oe_sparkline_bar",
-    start: function() {
-        var self = this;
-        var title = this.$node.html() || this.field.string;
-        setTimeout(function () {
-            var value = _.pluck(self.field.value, 'value');
-            var tooltips = _.pluck(self.field.value, 'tooltip');
-            var sparkline_options = _.extend({
-                    type: 'bar',
-                    barWidth: 5,
-                    height: '20px',
-                    barWidth: 4,
-                    barSpacing: 1,
-                    barColor: '#96d854',
-                    tooltipFormat: '{{offset:offset}} {{value}}',
-                    tooltipValueLookups: {
-                        'offset': tooltips
-                    }
-                }, self.options);
-            self.$el.sparkline(value, sparkline_options);
-            self.$el.tipsy({'delayIn': 0, 'html': true, 'title': function(){return title}, 'gravity': 'n'});
-        }, 0);
-    },
-});
-
-instance.web_kanban.fields_registry.add("sparkline_bar", "instance.web_kanban.SparklineBarWidget");
-
-
-/**
- * Kanban widgets: GaugeWidget
- *
- */
-
-instance.web_kanban.GaugeWidget = instance.web_kanban.AbstractField.extend({
-    className: "oe_gauge",
-    start: function() {
-        var self = this;
-        var parent = this.getParent();
-        var max = 100;
-        if (this.options.max_field) {
-            max = this.getParent().record[this.options.max_field].raw_value;
-        }
-        var label = this.options.label || "";
-        if (this.options.label_field) {
-            label = this.getParent().record[this.options.label_field].raw_value;
-        }
-        var val = this.field.value;
-        var value = _.isArray(val) && val.length ? val[val.length-1]['value'] : val;
-        var title = this.$node.html() || this.field.string;
-        // var unique_id = _.uniqueId("JustGage");
-
-        this.$el.empty()
-            .attr('style', this.$node.attr('style') + ';position:relative; display:inline-block;');
-
-        this.gage = new JustGage({
-            parentNode: this.$el[0],
-            // id: unique_id,
-            value: value,
-            title: title,
-            min: 0,
-            max: max,
-            relativeGaugeSize: true,
-            humanFriendly: true,
-            titleFontColor: '#333333',
-            valueFontColor: '#333333',
-            labelFontColor: '#000',
-            label: label,
-            levelColors: [
-                "#ff0000",
-                "#f9c802",
-                "#a9d70b"
-            ],
-        });
-        this.gage.refresh(value, max);
-
-        var flag_open = false;
-        if (this.options.action_change) {
-            var $svg = this.$el.find('svg');
-            var css = {
-                'text-align': 'center',
-                'position': 'absolute',
-                'width': this.$el.outerWidth() + 'px',
-                'top': (this.$el.outerHeight()/2-5) + 'px'
-            };
-
-            this.$el.click(function (event) {
-                event.stopPropagation();
-                flag_open = false;
-                if (!parent.view.is_action_enabled('edit')) {
-                    return;
-                }
-                if (!self.$el.find(".oe_justgage_edit").size()) {
-                    $div = $('<div class="oe_justgage_edit" style="z-index:1"/>');
-                    $div.css(css);
-                    $input = $('<input/>').val(value);
-                    $input.css({
-                        'text-align': 'center',
-                        'margin': 'auto',
-                        'width': ($svg.outerWidth()-40) + 'px'
-                    });
-                    $div.append($input);
-                    self.$el.prepend($div)
-                    $input.focus()
-                        .keydown(function (event) {
-                            event.stopPropagation();
-                            if (event.keyCode == 13 || event.keyCode == 9) {
-                                if ($input.val() != value) {
-                                    parent.view.dataset.call(self.options.action_change, [parent.id, $input.val()]).then(function () {
-                                        parent.do_reload();
-                                    });
-                                } else {
-                                    $div.remove();
-                                }
-                            }
-                        })
-                        .click(function (event) {
-                            event.stopPropagation();
-                            flag_open = false;
-                        })
-                        .blur(function (event) {
-                            if(!flag_open) {
-                                self.$el.find(".oe_justgage_edit").remove();
-                            } else {
-                                flag_open = false;
-                                setTimeout(function () {$input.focus();}, 0);
-                            }
-                        });
-                }
-            }).mousedown(function () {
-                flag_open = true;
-            });
-
-            if (!+value) {
-                $svg.fadeTo(0, 0.3);
-                $div = $('<div/>').text(_t("Click to change value"));
-                $div.css(css);
-                this.$el.append($div);
-            }
-        }
-    },
-});
-
-instance.web_kanban.fields_registry.add("gauge", "instance.web_kanban.GaugeWidget");
-
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/web_kanban_gauge/__init__.py b/addons/web_kanban_gauge/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/web_kanban_gauge/__openerp__.py b/addons/web_kanban_gauge/__openerp__.py
new file mode 100644
index 00000000000..19b2d6f0da3
--- /dev/null
+++ b/addons/web_kanban_gauge/__openerp__.py
@@ -0,0 +1,18 @@
+{
+    'name': 'Gauge Widget for Kanban',
+    'category': 'Hidden',
+    'description': """
+This widget allows to display gauges using jquery.sparkline library.
+""",
+    'version': '1.0',
+    'depends': ['web_kanban'],
+    'js': [
+        'static/lib/justgage/justgage.js',
+        'static/src/js/kanban_gauge.js'
+    ],
+    'css': [
+    ],
+    'qweb': [
+    ],
+    'auto_install': False,
+}
diff --git a/addons/web/static/lib/justgage/justgage.js b/addons/web_kanban_gauge/static/lib/justgage/justgage.js
similarity index 100%
rename from addons/web/static/lib/justgage/justgage.js
rename to addons/web_kanban_gauge/static/lib/justgage/justgage.js
diff --git a/addons/web_kanban_gauge/static/src/js/kanban_gauge.js b/addons/web_kanban_gauge/static/src/js/kanban_gauge.js
new file mode 100644
index 00000000000..cb2faf6874b
--- /dev/null
+++ b/addons/web_kanban_gauge/static/src/js/kanban_gauge.js
@@ -0,0 +1,119 @@
+openerp.web_kanban_gauge = function (instance) {
+
+/**
+ * Kanban widgets: GaugeWidget
+ *
+ */
+
+instance.web_kanban.GaugeWidget = instance.web_kanban.AbstractField.extend({
+    className: "oe_gauge",
+    start: function() {
+        var self = this;
+        var parent = this.getParent();
+        var max = 100;
+        if (this.options.max_field) {
+            max = this.getParent().record[this.options.max_field].raw_value;
+        }
+        var label = this.options.label || "";
+        if (this.options.label_field) {
+            label = this.getParent().record[this.options.label_field].raw_value;
+        }
+        var val = this.field.value;
+        var value = _.isArray(val) && val.length ? val[val.length-1]['value'] : val;
+        var title = this.$node.html() || this.field.string;
+        // var unique_id = _.uniqueId("JustGage");
+
+        this.$el.empty()
+            .attr('style', this.$node.attr('style') + ';position:relative; display:inline-block;');
+
+        this.gage = new JustGage({
+            parentNode: this.$el[0],
+            // id: unique_id,
+            value: value,
+            title: title,
+            min: 0,
+            max: max,
+            relativeGaugeSize: true,
+            humanFriendly: true,
+            titleFontColor: '#333333',
+            valueFontColor: '#333333',
+            labelFontColor: '#000',
+            label: label,
+            levelColors: [
+                "#ff0000",
+                "#f9c802",
+                "#a9d70b"
+            ],
+        });
+        this.gage.refresh(value, max);
+
+        var flag_open = false;
+        if (this.options.action_change) {
+            var $svg = this.$el.find('svg');
+            var css = {
+                'text-align': 'center',
+                'position': 'absolute',
+                'width': this.$el.outerWidth() + 'px',
+                'top': (this.$el.outerHeight()/2-5) + 'px'
+            };
+
+            this.$el.click(function (event) {
+                event.stopPropagation();
+                flag_open = false;
+                if (!parent.view.is_action_enabled('edit')) {
+                    return;
+                }
+                if (!self.$el.find(".oe_justgage_edit").size()) {
+                    $div = $('<div class="oe_justgage_edit" style="z-index:1"/>');
+                    $div.css(css);
+                    $input = $('<input/>').val(value);
+                    $input.css({
+                        'text-align': 'center',
+                        'margin': 'auto',
+                        'width': ($svg.outerWidth()-40) + 'px'
+                    });
+                    $div.append($input);
+                    self.$el.prepend($div)
+                    $input.focus()
+                        .keydown(function (event) {
+                            event.stopPropagation();
+                            if (event.keyCode == 13 || event.keyCode == 9) {
+                                if ($input.val() != value) {
+                                    parent.view.dataset.call(self.options.action_change, [parent.id, $input.val()]).then(function () {
+                                        parent.do_reload();
+                                    });
+                                } else {
+                                    $div.remove();
+                                }
+                            }
+                        })
+                        .click(function (event) {
+                            event.stopPropagation();
+                            flag_open = false;
+                        })
+                        .blur(function (event) {
+                            if(!flag_open) {
+                                self.$el.find(".oe_justgage_edit").remove();
+                            } else {
+                                flag_open = false;
+                                setTimeout(function () {$input.focus();}, 0);
+                            }
+                        });
+                }
+            }).mousedown(function () {
+                flag_open = true;
+            });
+
+            if (!+value) {
+                $svg.fadeTo(0, 0.3);
+                $div = $('<div/>').text(_t("Click to change value"));
+                $div.css(css);
+                this.$el.append($div);
+            }
+        }
+    },
+});
+
+instance.web_kanban.fields_registry.add("gauge", "instance.web_kanban.GaugeWidget");
+
+}
diff --git a/addons/web_kanban_sparkline/__init__.py b/addons/web_kanban_sparkline/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/web_kanban_sparkline/__openerp__.py b/addons/web_kanban_sparkline/__openerp__.py
new file mode 100644
index 00000000000..3fb4e13b4f7
--- /dev/null
+++ b/addons/web_kanban_sparkline/__openerp__.py
@@ -0,0 +1,18 @@
+{
+    'name': 'Sparkline Widget for Kanban',
+    'category': 'Hidden',
+    'description': """
+This widget allows to display sparklines using jquery.sparkline library.
+""",
+    'version': '1.0',
+    'depends': ['web_kanban'],
+    'js': [
+        "static/lib/jquery.sparkline/jquery.sparkline.js",
+        'static/src/js/kanban_sparkline.js'
+    ],
+    'css': [
+    ],
+    'qweb': [
+    ],
+    'auto_install': False,
+}
diff --git a/addons/web/static/lib/jquery.sparkline/jquery.sparkline.js b/addons/web_kanban_sparkline/static/lib/jquery.sparkline/jquery.sparkline.js
similarity index 100%
rename from addons/web/static/lib/jquery.sparkline/jquery.sparkline.js
rename to addons/web_kanban_sparkline/static/lib/jquery.sparkline/jquery.sparkline.js
diff --git a/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js b/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js
new file mode 100644
index 00000000000..de21cbba945
--- /dev/null
+++ b/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js
@@ -0,0 +1,37 @@
+openerp.web_kanban_sparkline = function (instance) {
+
+/**
+ * Kanban widgets: Sparkline
+ *
+ */
+
+instance.web_kanban.SparklineBarWidget = instance.web_kanban.AbstractField.extend({
+    className: "oe_sparkline_bar",
+    start: function() {
+        var self = this;
+        var title = this.$node.html() || this.field.string;
+        setTimeout(function () {
+            var value = _.pluck(self.field.value, 'value');
+            var tooltips = _.pluck(self.field.value, 'tooltip');
+            var sparkline_options = _.extend({
+                    type: 'bar',
+                    barWidth: 5,
+                    height: '20px',
+                    barWidth: 4,
+                    barSpacing: 1,
+                    barColor: '#96d854',
+                    tooltipFormat: '{{offset:offset}} {{value}}',
+                    tooltipValueLookups: {
+                        'offset': tooltips
+                    }
+                }, self.options);
+            self.$el.sparkline(value, sparkline_options);
+            self.$el.tipsy({'delayIn': 0, 'html': true, 'title': function(){return title}, 'gravity': 'n'});
+        }, 0);
+    },
+});
+
+instance.web_kanban.fields_registry.add("sparkline_bar", "instance.web_kanban.SparklineBarWidget");
+
+
+}

From 20ba3bd349647750452e35703dc78c0869957ed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 6 Sep 2013 12:05:54 +0200
Subject: [PATCH 114/164] [IMP] crm, mass_mailing, sale_crm: added dependencies
 to web_kanban_gauge/sparkline newly introduced modules

bzr revid: tde@openerp.com-20130906100554-vcg4rux2f5omyq3t
---
 addons/crm/__openerp__.py                 | 3 ++-
 addons/mass_mailing/__openerp__.py        | 7 ++++++-
 addons/mass_mailing/mass_mailing_view.xml | 4 ----
 addons/sale_crm/__openerp__.py            | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index ae9da7ade08..176186f016c 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -57,7 +57,8 @@ Dashboard for CRM will include:
         'base_calendar',
         'resource',
         'board',
-        'fetchmail'
+        'fetchmail',
+        'web_kanban_sparkline',
     ],
     'data': [
         'crm_data.xml',
diff --git a/addons/mass_mailing/__openerp__.py b/addons/mass_mailing/__openerp__.py
index 9bb5b746f63..147b9bea89c 100644
--- a/addons/mass_mailing/__openerp__.py
+++ b/addons/mass_mailing/__openerp__.py
@@ -25,7 +25,12 @@
     'author': 'OpenERP',
     'website': 'http://www.openerp.com',
     'category': 'Marketing',
-    'depends': ['mail', 'email_template'],
+    'depends': [
+        'mail',
+        'email_template',
+        'web_kanban_gauge',
+        'web_kanban_sparkline',
+    ],
     'description': """TODO""",
     'data': [
         'mass_mailing_view.xml',
diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index ab421dda881..4a3c2b5db07 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -193,10 +193,6 @@
             <field name="view_mode">kanban,tree,form</field>
         </record>
 
-        <!-- Add followers related menu entries in Settings/Email -->
-        <menuitem name="Mass mailing campaigns" id="menu_email_campaigns" parent="base.menu_email"
-                    action="action_view_mass_mailing_campaigns" sequence="60" groups="base.group_no_one"/>
-
         <!-- Top menu item -->
         <menuitem name="Marketing" id="base.marketing_menu" sequence="85"/>
 
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 0cc4ad3fad2..7a57484eab8 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -37,7 +37,7 @@ modules.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/crm_statistics_dashboard.jpeg', 'images/opportunity_to_quote.jpeg'],
-    'depends': ['sale', 'crm'],
+    'depends': ['sale', 'crm', 'web_kanban_gauge'],
     'data': [
         'wizard/crm_make_sale_view.xml',
         'sale_crm_view.xml',

From 205a5c37c0925d82507ea97884ef427f0794ef27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 6 Sep 2013 12:11:55 +0200
Subject: [PATCH 115/164] [CLEAN] qweb, kanban: removed forgotten console.log +
 unnecessary void line

bzr revid: tde@openerp.com-20130906101155-0o58oycwb992s093
---
 addons/web/static/lib/qweb/qweb2.js       | 1 -
 addons/web_kanban/static/src/js/kanban.js | 1 -
 2 files changed, 2 deletions(-)

diff --git a/addons/web/static/lib/qweb/qweb2.js b/addons/web/static/lib/qweb/qweb2.js
index 44db469cd89..52e975322e5 100644
--- a/addons/web/static/lib/qweb/qweb2.js
+++ b/addons/web/static/lib/qweb/qweb2.js
@@ -384,7 +384,6 @@ QWeb2.Engine = (function() {
                 this.compiled_templates[template] = tcompiled;
                 return this.render(template, dict);
             } else {
-                console.log(this.compiled_templates, template);
                 return this.tools.exception("Template '" + template + "' not found");
             }
         },
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 8ec11e37d25..6f47f9c128d 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -1231,7 +1231,6 @@ instance.web_kanban.AbstractField = instance.web.Widget.extend(instance.web_kanb
 });
 
 instance.web_kanban.fields_registry = new instance.web.Registry({});
-
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:

From cd63d4d21a171c0c35e593cd04631ad25f8e1d1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 6 Sep 2013 12:33:25 +0200
Subject: [PATCH 116/164] [ADD] mass_mailing: added directories + skeletons for
 doc and tests

bzr revid: tde@openerp.com-20130906103325-e15fmq49puldcwu3
---
 addons/mass_mailing/doc/changelog.rst  |  9 ++++++++
 addons/mass_mailing/doc/index.rst      | 13 ++++++++++++
 addons/mass_mailing/tests/__init__.py  | 26 +++++++++++++++++++++++
 addons/mass_mailing/tests/test_mail.py | 29 ++++++++++++++++++++++++++
 4 files changed, 77 insertions(+)
 create mode 100644 addons/mass_mailing/doc/changelog.rst
 create mode 100644 addons/mass_mailing/doc/index.rst
 create mode 100644 addons/mass_mailing/tests/__init__.py
 create mode 100644 addons/mass_mailing/tests/test_mail.py

diff --git a/addons/mass_mailing/doc/changelog.rst b/addons/mass_mailing/doc/changelog.rst
new file mode 100644
index 00000000000..a000c4ae396
--- /dev/null
+++ b/addons/mass_mailing/doc/changelog.rst
@@ -0,0 +1,9 @@
+.. _changelog:
+
+Changelog
+=========
+
+`trunk (saas-2)`
+----------------
+
+ - added module
\ No newline at end of file
diff --git a/addons/mass_mailing/doc/index.rst b/addons/mass_mailing/doc/index.rst
new file mode 100644
index 00000000000..3d991c7d9dd
--- /dev/null
+++ b/addons/mass_mailing/doc/index.rst
@@ -0,0 +1,13 @@
+Mass Mailing module documentation
+=================================
+
+Mass Mailing documentation topics
+'''''''''''''''''''''''''''''''''
+
+Changelog
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   changelog.rst
diff --git a/addons/mass_mailing/tests/__init__.py b/addons/mass_mailing/tests/__init__.py
new file mode 100644
index 00000000000..f8610905393
--- /dev/null
+++ b/addons/mass_mailing/tests/__init__.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 openerp.addons.mass_mailing.tests import test_mail
+
+checks = [
+    test_mail,
+]
diff --git a/addons/mass_mailing/tests/test_mail.py b/addons/mass_mailing/tests/test_mail.py
new file mode 100644
index 00000000000..0e3b4b8608e
--- /dev/null
+++ b/addons/mass_mailing/tests/test_mail.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 openerp.addons.mail.tests.common import TestMail
+
+
+class test_message_compose(TestMail):
+
+    def test_OO_mail_mail_tracking(self):
+        """ Tests designed for mail_mail tracking (opened, replied, bounced) """
+        pass

From 87ff039a2aa41435e4fc593b97aaf58ce275f140 Mon Sep 17 00:00:00 2001
From: "Sunil Sharma (OpenERP Trainee)" <sunilsharma.sharma07@gmail.com>
Date: Fri, 6 Sep 2013 16:27:05 +0530
Subject: [PATCH 117/164] [IMP]:trunk account chart template data

bzr revid: sunilsharma.sharma07@gmail.com-20130906105705-j2u30ldytf3qev3r
---
 addons/l10n_ar/l10n_ar_chart.xml                | 1 +
 addons/l10n_at/account_chart.xml                | 1 +
 addons/l10n_be/account_chart_template.xml       | 1 +
 addons/l10n_bo/l10n_bo_chart.xml                | 1 +
 addons/l10n_br/data/account_chart_template.xml  | 1 +
 addons/l10n_ca/account_chart_template_en.xml    | 1 +
 addons/l10n_ca/account_chart_template_fr.xml    | 1 +
 addons/l10n_ch/sterchi_chart/account.xml        | 1 +
 addons/l10n_cl/l10n_cl_chart.xml                | 1 +
 addons/l10n_cn/account_chart.xml                | 1 +
 addons/l10n_co/data/account_chart.xml           | 1 +
 addons/l10n_cr/data/account_chart_template.xml  | 2 ++
 addons/l10n_de/account_chart_template_skr03.xml | 1 +
 addons/l10n_de/account_chart_template_skr04.xml | 1 +
 addons/l10n_ec/account_chart.xml                | 3 ++-
 addons/l10n_es/account_chart.xml                | 1 +
 addons/l10n_es/account_chart_assoc.xml          | 1 +
 addons/l10n_es/account_chart_pymes.xml          | 1 +
 addons/l10n_fr/fr_pcg_taxes.xml                 | 1 +
 addons/l10n_gr/account_tax.xml                  | 1 +
 addons/l10n_gt/l10n_gt_base.xml                 | 1 +
 addons/l10n_hn/l10n_hn_base.xml                 | 1 +
 addons/l10n_hr/l10n_hr_chart_template.xml       | 1 +
 addons/l10n_in/l10n_in_private_chart.xml        | 1 +
 addons/l10n_in/l10n_in_public_chart.xml         | 1 +
 addons/l10n_it/account_chart.xml                | 1 +
 addons/l10n_lu/account_chart_template.xml       | 1 +
 addons/l10n_ma/l10n_ma_tax.xml                  | 1 +
 addons/l10n_mx/data/account_chart.xml           | 1 +
 addons/l10n_nl/account_chart_netherlands.xml    | 1 +
 addons/l10n_pa/l10n_pa_chart.xml                | 1 +
 addons/l10n_pe/l10n_pe_chart.xml                | 3 ++-
 addons/l10n_pl/account_chart.xml                | 1 +
 addons/l10n_pt/account_chart_template.xml       | 1 +
 addons/l10n_ro/account_chart.xml                | 2 +-
 addons/l10n_syscohada/l10n_syscohada_data.xml   | 1 +
 addons/l10n_th/account_data.xml                 | 1 +
 addons/l10n_tr/account_chart_template.xml       | 1 +
 addons/l10n_us/account_chart_template_after.xml | 8 ++++++++
 addons/l10n_uy/account_chart_template.xml       | 1 +
 addons/l10n_ve/data/account_chart.xml           | 1 +
 addons/l10n_vn/account_chart.xml                | 4 ++--
 42 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/addons/l10n_ar/l10n_ar_chart.xml b/addons/l10n_ar/l10n_ar_chart.xml
index 062697d5aa6..02b2f3e97bf 100644
--- a/addons/l10n_ar/l10n_ar_chart.xml
+++ b/addons/l10n_ar/l10n_ar_chart.xml
@@ -252,6 +252,7 @@
 	  <field name="property_account_payable" ref="211"/>
 	  <field name="property_account_expense_categ" ref="61_01"/>
 	  <field name="property_account_income_categ" ref="411_01"/>
+	  <field name="currency_id" ref="base.ARS"/>
 	</record>	
 
 
diff --git a/addons/l10n_at/account_chart.xml b/addons/l10n_at/account_chart.xml
index 51d0c9a85a8..eca220994e6 100644
--- a/addons/l10n_at/account_chart.xml
+++ b/addons/l10n_at/account_chart.xml
@@ -2518,6 +2518,7 @@
             <field name="property_account_income_categ" ref="chart4000"/>
             <field name="property_account_expense" ref="chart5000"/>
             <field name="property_account_income" ref="chart4000"/>
+            <field name="currency_id" ref="base.EUR"/>
         </record>
         
         
diff --git a/addons/l10n_be/account_chart_template.xml b/addons/l10n_be/account_chart_template.xml
index 55726fdc335..48e506ded79 100644
--- a/addons/l10n_be/account_chart_template.xml
+++ b/addons/l10n_be/account_chart_template.xml
@@ -13,6 +13,7 @@
             <field name="property_account_expense_categ" ref="a_expense"/>
             <field name="property_account_income_categ" ref="a_sale"/>
             <field name="spoken_languages" eval="'nl_BE'"/>
+            <field name="currency_id" ref="base.EUR"/>
         </record>
 
 
diff --git a/addons/l10n_bo/l10n_bo_chart.xml b/addons/l10n_bo/l10n_bo_chart.xml
index dc9e9598909..3d7e5cc1935 100644
--- a/addons/l10n_bo/l10n_bo_chart.xml
+++ b/addons/l10n_bo/l10n_bo_chart.xml
@@ -249,6 +249,7 @@
 	  <field name="property_account_payable" ref="211"/>
 	  <field name="property_account_expense_categ" ref="61_01"/>
 	  <field name="property_account_income_categ" ref="411_01"/>
+	  <field name="currency_id" ref="base.BOB"/>
 	</record>	
 
 
diff --git a/addons/l10n_br/data/account_chart_template.xml b/addons/l10n_br/data/account_chart_template.xml
index c99bbd03d2f..598c3191cba 100644
--- a/addons/l10n_br/data/account_chart_template.xml
+++ b/addons/l10n_br/data/account_chart_template.xml
@@ -11,6 +11,7 @@
 			<field name="property_account_payable" ref="account_template_201010100" />
 			<field name="property_account_expense_categ" ref="account_template_3010103010000" />
 			<field name="property_account_income_categ" ref="account_template_3010101010200" />
+			<field name="currency_id" ref="base.BRL"/>
 		</record>
 	
 	</data>	
diff --git a/addons/l10n_ca/account_chart_template_en.xml b/addons/l10n_ca/account_chart_template_en.xml
index 635fa7b8bb1..64e0632382e 100644
--- a/addons/l10n_ca/account_chart_template_en.xml
+++ b/addons/l10n_ca/account_chart_template_en.xml
@@ -13,6 +13,7 @@
         <field name="property_account_payable" ref="chart2111_en"/>
         <field name="property_account_income_categ" ref="chart411_en"/>
         <field name="property_account_expense_categ" ref="chart5111_en"/>
+        <field name="currency_id" ref="base.CAD"/>
     </record>
 
     <record id="stock.property_stock_account_input_categ" model="ir.property">
diff --git a/addons/l10n_ca/account_chart_template_fr.xml b/addons/l10n_ca/account_chart_template_fr.xml
index 7d1cc0a9ae2..510153200c6 100644
--- a/addons/l10n_ca/account_chart_template_fr.xml
+++ b/addons/l10n_ca/account_chart_template_fr.xml
@@ -12,6 +12,7 @@
 		<field name="property_account_payable" ref="chart2111_fr"/>
 		<field name="property_account_income_categ" ref="chart411_fr"/>
 		<field name="property_account_expense_categ" ref="chart5111_fr"/>
+		<field name="currency_id" ref="base.CAD"/>
 	</record>
 
         <record id="stock.property_stock_account_input_categ" model="ir.property">
diff --git a/addons/l10n_ch/sterchi_chart/account.xml b/addons/l10n_ch/sterchi_chart/account.xml
index ddad62946ae..acee99cad4a 100644
--- a/addons/l10n_ch/sterchi_chart/account.xml
+++ b/addons/l10n_ch/sterchi_chart/account.xml
@@ -11812,6 +11812,7 @@
             <field name="property_reserve_and_surplus_account" ref="ch_2991"/>
             <field name="code_digits" eval="0"/>
             <field name="spoken_languages" eval="'it_IT;de_DE'"/>
+            <field name="currency_id" ref="base.CHF"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/l10n_cl/l10n_cl_chart.xml b/addons/l10n_cl/l10n_cl_chart.xml
index 8bc4272c2eb..e6d7b1d75bd 100644
--- a/addons/l10n_cl/l10n_cl_chart.xml
+++ b/addons/l10n_cl/l10n_cl_chart.xml
@@ -248,6 +248,7 @@
 	  <field name="property_account_payable" ref="211"/>
 	  <field name="property_account_expense_categ" ref="61_01"/>
 	  <field name="property_account_income_categ" ref="411_01"/>
+	  <field name="currency_id" ref="base.CLP"/>
 	</record>	
 
 
diff --git a/addons/l10n_cn/account_chart.xml b/addons/l10n_cn/account_chart.xml
index afcb3e04b0c..fe4690e306c 100644
--- a/addons/l10n_cn/account_chart.xml
+++ b/addons/l10n_cn/account_chart.xml
@@ -957,6 +957,7 @@
             <field name="property_account_payable" ref="chart2202"/>
             <field name="property_account_expense_categ" ref="chart1401"/>
             <field name="property_account_income_categ" ref="chart6001"/>
+            <field name="currency_id" ref="base.CNY"/>
         </record>
         <!-- 增值税 -->
         <record id="vats" model="account.tax.template">
diff --git a/addons/l10n_co/data/account_chart.xml b/addons/l10n_co/data/account_chart.xml
index 2fe4ac9a1b9..06d6d471e1e 100644
--- a/addons/l10n_co/data/account_chart.xml
+++ b/addons/l10n_co/data/account_chart.xml
@@ -103348,6 +103348,7 @@ participacion, de conformidad con las disposiciones legales vigentes.
         <field name="property_account_payable" ref="chart238095999"/>
         <field name="property_account_expense_categ" ref="chart529595999"/>
         <field name="property_account_income_categ" ref="chart413595999"/>
+        <field name="currency_id" ref="base.COP"/>
 	</record>
    
 </data>
diff --git a/addons/l10n_cr/data/account_chart_template.xml b/addons/l10n_cr/data/account_chart_template.xml
index e84ea73fbed..a8a08647c00 100644
--- a/addons/l10n_cr/data/account_chart_template.xml
+++ b/addons/l10n_cr/data/account_chart_template.xml
@@ -16,6 +16,7 @@
             <field name="property_account_expense" ref="account_account_template_0_511301"/>
             <field name="property_account_income_categ" ref="account_account_template_0_410001"/>
             <field name="property_account_expense_categ" ref="account_account_template_0_511301"/>
+            <field name="currency_id" ref="base.CRC"/>
         </record>
         <record id="account_chart_template_x" model="account.chart.template">
             <field name="name">Costa Rica - Company 1</field>
@@ -28,6 +29,7 @@
             <field name="property_account_expense" ref="account_account_template_x511301"/>
             <field name="property_account_income_categ" ref="account_account_template_x410001"/>
             <field name="property_account_expense_categ" ref="account_account_template_x511301"/>
+            <field name="currency_id" ref="base.CRC"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/l10n_de/account_chart_template_skr03.xml b/addons/l10n_de/account_chart_template_skr03.xml
index 058424188f6..ce71f132de3 100644
--- a/addons/l10n_de/account_chart_template_skr03.xml
+++ b/addons/l10n_de/account_chart_template_skr03.xml
@@ -12,6 +12,7 @@
             <field name="property_account_payable" ref="account_1610"/>
             <field name="property_account_expense_categ" ref="account_3400"/>
             <field name="property_account_income_categ" ref="account_8400"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
    </data>
 </openerp>
diff --git a/addons/l10n_de/account_chart_template_skr04.xml b/addons/l10n_de/account_chart_template_skr04.xml
index c33c0d415eb..fee680af379 100644
--- a/addons/l10n_de/account_chart_template_skr04.xml
+++ b/addons/l10n_de/account_chart_template_skr04.xml
@@ -12,6 +12,7 @@
             <field name="property_account_payable" ref="chart_skr04_3301"/>
             <field name="property_account_expense_categ" ref="chart_skr04_5400"/>
             <field name="property_account_income_categ" ref="chart_skr04_4400"/>
+            <field name="currency_id" ref="base.EUR"/>
         </record>
    </data>
 </openerp>
diff --git a/addons/l10n_ec/account_chart.xml b/addons/l10n_ec/account_chart.xml
index 17f1b71d047..1cf12529c6c 100644
--- a/addons/l10n_ec/account_chart.xml
+++ b/addons/l10n_ec/account_chart.xml
@@ -4202,7 +4202,8 @@
       <field name="property_account_receivable" ref="4"/>
       <field name="property_account_payable" ref="5"/>
       <field name="property_account_expense_categ" ref="60101"/>
-      <field name="property_account_income_categ" ref="710101"/>            
+      <field name="property_account_income_categ" ref="710101"/>    
+      <field name="currency_id" ref="base.USD"/>
     </record>    
 
   </data>
diff --git a/addons/l10n_es/account_chart.xml b/addons/l10n_es/account_chart.xml
index 1bc63f6419f..8260a76dca1 100644
--- a/addons/l10n_es/account_chart.xml
+++ b/addons/l10n_es/account_chart.xml
@@ -13333,6 +13333,7 @@
             <field name="property_account_payable" ref="pgc_4100_child"/>
             <field name="property_account_expense_categ" ref="pgc_600_child"/>
             <field name="property_account_income_categ" ref="pgc_7000_child"/>
+            <field name="currency_id" ref="base.EUR"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/l10n_es/account_chart_assoc.xml b/addons/l10n_es/account_chart_assoc.xml
index 670eed53c9b..105be447ca8 100644
--- a/addons/l10n_es/account_chart_assoc.xml
+++ b/addons/l10n_es/account_chart_assoc.xml
@@ -12420,6 +12420,7 @@
             <field name="property_account_payable" ref="pgc_assoc_4100_child"/>
             <field name="property_account_expense_categ" ref="pgc_assoc_600_child"/>
             <field name="property_account_income_categ" ref="pgc_assoc_7000_child"/>
+            <field name="currency_id" ref="base.EUR"/>
         </record>
 
     </data>
diff --git a/addons/l10n_es/account_chart_pymes.xml b/addons/l10n_es/account_chart_pymes.xml
index 223d80e3193..1986a532a66 100644
--- a/addons/l10n_es/account_chart_pymes.xml
+++ b/addons/l10n_es/account_chart_pymes.xml
@@ -11464,6 +11464,7 @@
             <field name="property_account_payable" ref="pgc_pymes_4100_child"/>
             <field name="property_account_expense_categ" ref="pgc_pymes_600_child"/>
             <field name="property_account_income_categ" ref="pgc_pymes_7000_child"/>
+            <field name="currency_id" ref="base.EUR"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/l10n_fr/fr_pcg_taxes.xml b/addons/l10n_fr/fr_pcg_taxes.xml
index 78b34f2d696..2279b077383 100644
--- a/addons/l10n_fr/fr_pcg_taxes.xml
+++ b/addons/l10n_fr/fr_pcg_taxes.xml
@@ -441,6 +441,7 @@
             <field name="property_account_payable" ref="fr_pcg_pay"/>
             <field name="property_account_expense_categ" ref="pcg_6071"/>
             <field name="property_account_income_categ" ref="pcg_7071"/>
+            <field name="currency_id" ref="base.EUR"/>
         </record>
 
   </data>
diff --git a/addons/l10n_gr/account_tax.xml b/addons/l10n_gr/account_tax.xml
index c3de033869b..36148f49a9b 100644
--- a/addons/l10n_gr/account_tax.xml
+++ b/addons/l10n_gr/account_tax.xml
@@ -21,6 +21,7 @@
         <field name="property_account_payable" ref="chartgr_50_00"/>
         <field name="property_account_expense_categ" ref="chartgr_64_98"/>
         <field name="property_account_income_categ" ref="chartgr_71_00"/>
+        <field name="currency_id" ref="base.EUR"/>
     </record>
 
 
diff --git a/addons/l10n_gt/l10n_gt_base.xml b/addons/l10n_gt/l10n_gt_base.xml
index 8caf6ebe48c..bfc91ddb83e 100644
--- a/addons/l10n_gt/l10n_gt_base.xml
+++ b/addons/l10n_gt/l10n_gt_base.xml
@@ -31,6 +31,7 @@
             <field name="property_account_payable" ref="cta210101"/>
             <field name="property_account_income_categ" ref="cta410101"/>
             <field name="property_account_expense_categ" ref="cta510101"/>
+            <field name="currency_id" ref="base.QTQ"/>
         </record>
 
         <!-- Compras e IVA por Cobrar -->
diff --git a/addons/l10n_hn/l10n_hn_base.xml b/addons/l10n_hn/l10n_hn_base.xml
index b8b85c3f2a7..8b9acf5c50a 100644
--- a/addons/l10n_hn/l10n_hn_base.xml
+++ b/addons/l10n_hn/l10n_hn_base.xml
@@ -17,6 +17,7 @@
             <field name="property_account_payable" ref="cta210101"/>
             <field name="property_account_income_categ" ref="cta410101"/>
             <field name="property_account_expense_categ" ref="cta510101"/>
+            <field name="currency_id" ref="base.HNL"/>
         </record>
 
         <!-- Compras e ISV por Cobrar -->
diff --git a/addons/l10n_hr/l10n_hr_chart_template.xml b/addons/l10n_hr/l10n_hr_chart_template.xml
index d9a7db5710c..1cd998115c6 100644
--- a/addons/l10n_hr/l10n_hr_chart_template.xml
+++ b/addons/l10n_hr/l10n_hr_chart_template.xml
@@ -15,6 +15,7 @@
 
 			<field name="property_account_expense_categ" ref="kp_rrif4199"/>
 			<field name="property_account_income_categ"  ref="kp_rrif7500"/>
+			<field name="currency_id" ref="base.HRK"/>
 		</record>
 
     </data>
diff --git a/addons/l10n_in/l10n_in_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml
index 4b8e4be55bf..efaa9844416 100644
--- a/addons/l10n_in/l10n_in_private_chart.xml
+++ b/addons/l10n_in/l10n_in_private_chart.xml
@@ -550,6 +550,7 @@
             <field name="property_account_payable" ref="a215"/>
             <field name="property_account_expense_categ" ref="a540"/>
             <field name="property_account_income_categ" ref="a311"/>
+            <field name="currency_id" ref="base.INR"/>
         </record>
         
         
diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml
index 91d285408d5..18633af054f 100644
--- a/addons/l10n_in/l10n_in_public_chart.xml
+++ b/addons/l10n_in/l10n_in_public_chart.xml
@@ -988,6 +988,7 @@
             <field name="property_account_payable" ref="p21000"/>
             <field name="property_account_expense_categ" ref="p41010"/>
             <field name="property_account_income_categ" ref="p31010"/>
+            <field name="currency_id" ref="base.INR"/>
         </record>
         
     </data>
diff --git a/addons/l10n_it/account_chart.xml b/addons/l10n_it/account_chart.xml
index 6dd7b539b49..ca64348d482 100644
--- a/addons/l10n_it/account_chart.xml
+++ b/addons/l10n_it/account_chart.xml
@@ -11,6 +11,7 @@
             <field name="property_account_payable" ref="2501"/>
             <field name="property_account_expense_categ" ref="4101"/>
             <field name="property_account_income_categ" ref="3101"/>
+            <field name="currency_id" ref="base.EUR"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/l10n_lu/account_chart_template.xml b/addons/l10n_lu/account_chart_template.xml
index f0986277343..254feaa932e 100644
--- a/addons/l10n_lu/account_chart_template.xml
+++ b/addons/l10n_lu/account_chart_template.xml
@@ -13,6 +13,7 @@
             <field name="property_account_income_categ" ref="lu_2011_account_7051"/>
             <field name="property_account_income_opening" ref="lu_2011_account_141"/>
             <field name="property_account_expense_opening" ref="lu_2011_account_141"/>
+            <field name="currency_id" ref="base.EUR"/>
         </record>
     
     </data>
diff --git a/addons/l10n_ma/l10n_ma_tax.xml b/addons/l10n_ma/l10n_ma_tax.xml
index f296b22edca..5bc59035861 100644
--- a/addons/l10n_ma/l10n_ma_tax.xml
+++ b/addons/l10n_ma/l10n_ma_tax.xml
@@ -744,6 +744,7 @@
         <field name="bank_account_view_id" ref="pcg_514"/>
         <field name="property_account_receivable" ref="pcg_3488"/>
         <field name="property_account_payable" ref="pcg_4488"/>
+        <field name="currency_id" ref="base.MAD"/>
     </record>
 
   <record model="account.tax.template" id="tva_exo">
diff --git a/addons/l10n_mx/data/account_chart.xml b/addons/l10n_mx/data/account_chart.xml
index 491942e4b72..daa564fd10e 100644
--- a/addons/l10n_mx/data/account_chart.xml
+++ b/addons/l10n_mx/data/account_chart.xml
@@ -3695,6 +3695,7 @@ Cuentas del plan
         <field name="property_account_income_categ" ref="cuenta5111001000"/>
         <field name="property_stock_account_input_categ" ref="cuenta4111003000"/>
         <field name="property_stock_account_output_categ" ref="cuenta4511003000"/>
+        <field name="currency_id" ref="base.MXN"/>
 	</record>
    
   
diff --git a/addons/l10n_nl/account_chart_netherlands.xml b/addons/l10n_nl/account_chart_netherlands.xml
index c7eefb42cde..03d9879a100 100644
--- a/addons/l10n_nl/account_chart_netherlands.xml
+++ b/addons/l10n_nl/account_chart_netherlands.xml
@@ -4102,6 +4102,7 @@
             <field name="property_account_payable" ref="a_pay"/>          <!-- crediteuren -->
             <field name="property_account_expense_categ" ref="a_expense"/><!-- aankoop grondstoffen -->
             <field name="property_account_income_categ" ref="a_sale"/>    <!-- verkoop rekening -->
+            <field name="currency_id" ref="base.EUR"/>
         </record>
 
 <!-- BTW  Template
diff --git a/addons/l10n_pa/l10n_pa_chart.xml b/addons/l10n_pa/l10n_pa_chart.xml
index 3f9c1b316ca..bddb7abcfe7 100644
--- a/addons/l10n_pa/l10n_pa_chart.xml
+++ b/addons/l10n_pa/l10n_pa_chart.xml
@@ -242,6 +242,7 @@
       <field name="property_account_payable" ref="211"/>
       <field name="property_account_expense_categ" ref="62_01"/>
       <field name="property_account_income_categ" ref="411_01"/>
+      <field name="currency_id" ref="base.PAB"/>
     </record>    
 
 
diff --git a/addons/l10n_pe/l10n_pe_chart.xml b/addons/l10n_pe/l10n_pe_chart.xml
index 29559de605e..c0b1ed7bda5 100644
--- a/addons/l10n_pe/l10n_pe_chart.xml
+++ b/addons/l10n_pe/l10n_pe_chart.xml
@@ -2257,7 +2257,8 @@
       <field name="property_account_receivable" ref="121100"/>
       <field name="property_account_payable" ref="421100"/>
       <field name="property_account_expense_categ" ref="6011_01"/>
-      <field name="property_account_income_categ" ref="70111_01"/>            
+      <field name="property_account_income_categ" ref="70111_01"/> 
+      <field name="currency_id" ref="base.PEN"/>           
     </record>    
 
 
diff --git a/addons/l10n_pl/account_chart.xml b/addons/l10n_pl/account_chart.xml
index 57ab12beb5d..fcd1d216762 100644
--- a/addons/l10n_pl/account_chart.xml
+++ b/addons/l10n_pl/account_chart.xml
@@ -3202,6 +3202,7 @@
         <field name="property_account_payable" ref="chart221000000"/>
         <field name="property_account_expense_categ" ref="chart330020000"/>
         <field name="property_account_income_categ" ref="chart773010000"/>
+        <field name="currency_id" ref="base.PLN"/>
     </record>
     
 </data>
diff --git a/addons/l10n_pt/account_chart_template.xml b/addons/l10n_pt/account_chart_template.xml
index 25ddc500def..49adfa393ef 100644
--- a/addons/l10n_pt/account_chart_template.xml
+++ b/addons/l10n_pt/account_chart_template.xml
@@ -16,6 +16,7 @@
         <field name="property_account_income_categ" ref="chart_711"/>
         <field name="property_account_expense_categ" ref="chart_311"/>
         <field name="property_reserve_and_surplus_account" ref="chart_811"/>
+        <field name="currency_id" ref="base.EUR"/>
     </record>
 
     </data>
diff --git a/addons/l10n_ro/account_chart.xml b/addons/l10n_ro/account_chart.xml
index 1e0a9b749f7..8f531d1ffbf 100644
--- a/addons/l10n_ro/account_chart.xml
+++ b/addons/l10n_ro/account_chart.xml
@@ -4587,7 +4587,7 @@
 	    <field name="property_account_payable" ref="ro_pcg_pay"/> <!-- 4011 -->
 	    <field name="property_account_expense_categ" ref="ro_pcg_expense"/> <!-- 607 --> 
         <field name="property_account_income_categ" ref="ro_pcg_sale"/> <!-- 707 -->
-		    
+        <field name="currency_id" ref="base.RON"/>
 		</record>
 </data>
 </openerp>
diff --git a/addons/l10n_syscohada/l10n_syscohada_data.xml b/addons/l10n_syscohada/l10n_syscohada_data.xml
index d90988e00e3..d4be067bfa2 100644
--- a/addons/l10n_syscohada/l10n_syscohada_data.xml
+++ b/addons/l10n_syscohada/l10n_syscohada_data.xml
@@ -1850,6 +1850,7 @@
         <field name="property_account_payable" ref="pcg_4011"/>
         <field name="property_account_expense_categ" ref="pcg_6011" /> 
         <field name="property_account_income_categ" ref="pcg_7011" /> 
+        <field name="currency_id" ref="base.XOF"/>
     </record>    
         
     <record model="account.tax.code.template" id="tax_col_ht">
diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml
index 9ae3d9e3364..a6de0ced477 100644
--- a/addons/l10n_th/account_data.xml
+++ b/addons/l10n_th/account_data.xml
@@ -477,6 +477,7 @@
     <field name="property_account_income_categ" ref="a_sales"/>
     <field name="property_account_expense" ref="a_exp_office"/>
     <field name="property_account_income" ref="a_sales"/>
+    <field name="currency_id" ref="base.THB"/>
 </record>
 
 
diff --git a/addons/l10n_tr/account_chart_template.xml b/addons/l10n_tr/account_chart_template.xml
index 3e10353298e..60853ff7127 100644
--- a/addons/l10n_tr/account_chart_template.xml
+++ b/addons/l10n_tr/account_chart_template.xml
@@ -12,6 +12,7 @@
             <field name="property_account_payable" ref="tr320"/>
             <field name="property_account_expense_categ" ref="tr150"/>
             <field name="property_account_income_categ" ref="tr600"/>
+            <field name="currency_id" ref="base.TRY"/>
         </record>
 
 
diff --git a/addons/l10n_us/account_chart_template_after.xml b/addons/l10n_us/account_chart_template_after.xml
index 4dea930f09f..4cd1472773d 100644
--- a/addons/l10n_us/account_chart_template_after.xml
+++ b/addons/l10n_us/account_chart_template_after.xml
@@ -8,33 +8,41 @@
             <field name="tax_code_root_id" ref="tax_code_chart_root"/>
             <field name="property_account_receivable" ref="account_receivable"/>
             <field name="property_account_payable" ref="account_payable"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
         <record id="account_chart_template_advertising" model="account.chart.template">
             <field name="bank_account_view_id" ref="cash_expenditure"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
 
         <record id="account_chart_template_agriculture" model="account.chart.template">
             <field name="bank_account_view_id" ref="cash_expenditure"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
 
         <record id="account_chart_template_construction" model="account.chart.template">
             <field name="bank_account_view_id" ref="cash_expenditure"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
 
         <record id="account_chart_template_financial_service" model="account.chart.template">
             <field name="bank_account_view_id" ref="cash_expenditure"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
 
         <record id="account_chart_template_general_service" model="account.chart.template">
             <field name="bank_account_view_id" ref="cash_expenditure"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
 
         <record id="account_chart_template_legal_service" model="account.chart.template">
             <field name="bank_account_view_id" ref="cash_expenditure"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
 
         <record id="account_chart_template_general_product" model="account.chart.template">
             <field name="bank_account_view_id" ref="cash_expenditure"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/l10n_uy/account_chart_template.xml b/addons/l10n_uy/account_chart_template.xml
index 4ce35184967..8433ed18c25 100644
--- a/addons/l10n_uy/account_chart_template.xml
+++ b/addons/l10n_uy/account_chart_template.xml
@@ -1895,6 +1895,7 @@
             <field name="property_account_payable"       ref="uy_code_21100"/>
             <field name="property_account_income_categ"  ref="uy_code_4100"/>
             <field name="property_account_expense_categ" ref="uy_code_5100"/>
+            <field name="currency_id" ref="base.UYU"/>
         </record>
 
 
diff --git a/addons/l10n_ve/data/account_chart.xml b/addons/l10n_ve/data/account_chart.xml
index 05645805a84..7c859083aed 100644
--- a/addons/l10n_ve/data/account_chart.xml
+++ b/addons/l10n_ve/data/account_chart.xml
@@ -3315,6 +3315,7 @@
     <field name="property_account_payable" ref="account_activa_account_2122001"/>
     <field name="property_account_expense_categ" ref="account_activa_account_7151001"/>
     <field name="property_account_income_categ" ref="account_activa_account_5111001"/>
+    <field name="currency_id" ref="base.VEF"/>
   </record>
   </data>
 </openerp>
diff --git a/addons/l10n_vn/account_chart.xml b/addons/l10n_vn/account_chart.xml
index c7d3f6a9ee3..a4d63681e01 100755
--- a/addons/l10n_vn/account_chart.xml
+++ b/addons/l10n_vn/account_chart.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data noupdate="True">
 
@@ -2015,7 +2015,7 @@
         <field name="property_account_payable" ref="chart331" />
         <field name="property_account_expense_categ" ref="chart1561" />
         <field name="property_account_income_categ" ref="chart5111" />
-
+        <field name="currency_id" ref="base.VND"/>
     </record>
 
 </data>

From 7650083606d0eaac4572d71f4bf08601d22268ee Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 6 Sep 2013 18:18:36 +0530
Subject: [PATCH 118/164] [IMP] l10n_de: improved currency.

bzr revid: tpa@tinyerp.com-20130906124836-40p7xtnu0qwl8g94
---
 addons/l10n_de/account_chart_template_skr03.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_de/account_chart_template_skr03.xml b/addons/l10n_de/account_chart_template_skr03.xml
index ce71f132de3..0e2e239fd19 100644
--- a/addons/l10n_de/account_chart_template_skr03.xml
+++ b/addons/l10n_de/account_chart_template_skr03.xml
@@ -12,7 +12,7 @@
             <field name="property_account_payable" ref="account_1610"/>
             <field name="property_account_expense_categ" ref="account_3400"/>
             <field name="property_account_income_categ" ref="account_8400"/>
-            <field name="currency_id" ref="base.USD"/>
+            <field name="currency_id" ref="base.UER"/>
         </record>
    </data>
 </openerp>

From 099fedc7a47efe82bf411a00531367a3f072138d Mon Sep 17 00:00:00 2001
From: "Sunil Sharma (OpenERP Trainee)" <sunilsharma.sharma07@gmail.com>
Date: Mon, 9 Sep 2013 10:29:51 +0530
Subject: [PATCH 119/164] [IMP]:improved currency.

bzr revid: sunilsharma.sharma07@gmail.com-20130909045951-t2wjsr5xu5ajw432
---
 addons/l10n_cl/l10n_cl_chart.xml                | 2 +-
 addons/l10n_de/account_chart_template_skr03.xml | 2 +-
 addons/l10n_ec/account_chart.xml                | 2 +-
 addons/l10n_pl/account_chart.xml                | 2 +-
 addons/l10n_ro/account_chart.xml                | 2 +-
 addons/l10n_tr/account_chart_template.xml       | 2 +-
 addons/l10n_uy/account_chart_template.xml       | 2 +-
 addons/l10n_ve/data/account_chart.xml           | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/l10n_cl/l10n_cl_chart.xml b/addons/l10n_cl/l10n_cl_chart.xml
index e6d7b1d75bd..2e2339f212e 100644
--- a/addons/l10n_cl/l10n_cl_chart.xml
+++ b/addons/l10n_cl/l10n_cl_chart.xml
@@ -248,7 +248,7 @@
 	  <field name="property_account_payable" ref="211"/>
 	  <field name="property_account_expense_categ" ref="61_01"/>
 	  <field name="property_account_income_categ" ref="411_01"/>
-	  <field name="currency_id" ref="base.CLP"/>
+	  <field name="currency_id" ref="base.AUD"/>
 	</record>	
 
 
diff --git a/addons/l10n_de/account_chart_template_skr03.xml b/addons/l10n_de/account_chart_template_skr03.xml
index 0e2e239fd19..ea3c0cff3d7 100644
--- a/addons/l10n_de/account_chart_template_skr03.xml
+++ b/addons/l10n_de/account_chart_template_skr03.xml
@@ -12,7 +12,7 @@
             <field name="property_account_payable" ref="account_1610"/>
             <field name="property_account_expense_categ" ref="account_3400"/>
             <field name="property_account_income_categ" ref="account_8400"/>
-            <field name="currency_id" ref="base.UER"/>
+            <field name="currency_id" ref="base.EUR"/>
         </record>
    </data>
 </openerp>
diff --git a/addons/l10n_ec/account_chart.xml b/addons/l10n_ec/account_chart.xml
index 1cf12529c6c..afa847ea5a9 100644
--- a/addons/l10n_ec/account_chart.xml
+++ b/addons/l10n_ec/account_chart.xml
@@ -4203,7 +4203,7 @@
       <field name="property_account_payable" ref="5"/>
       <field name="property_account_expense_categ" ref="60101"/>
       <field name="property_account_income_categ" ref="710101"/>    
-      <field name="currency_id" ref="base.USD"/>
+      <field name="currency_id" ref="base.ECS"/>
     </record>    
 
   </data>
diff --git a/addons/l10n_pl/account_chart.xml b/addons/l10n_pl/account_chart.xml
index fcd1d216762..c2213c801dc 100644
--- a/addons/l10n_pl/account_chart.xml
+++ b/addons/l10n_pl/account_chart.xml
@@ -3202,7 +3202,7 @@
         <field name="property_account_payable" ref="chart221000000"/>
         <field name="property_account_expense_categ" ref="chart330020000"/>
         <field name="property_account_income_categ" ref="chart773010000"/>
-        <field name="currency_id" ref="base.PLN"/>
+        <field name="currency_id" ref="base.PLZ"/>
     </record>
     
 </data>
diff --git a/addons/l10n_ro/account_chart.xml b/addons/l10n_ro/account_chart.xml
index 8f531d1ffbf..169e4bfa206 100644
--- a/addons/l10n_ro/account_chart.xml
+++ b/addons/l10n_ro/account_chart.xml
@@ -4587,7 +4587,7 @@
 	    <field name="property_account_payable" ref="ro_pcg_pay"/> <!-- 4011 -->
 	    <field name="property_account_expense_categ" ref="ro_pcg_expense"/> <!-- 607 --> 
         <field name="property_account_income_categ" ref="ro_pcg_sale"/> <!-- 707 -->
-        <field name="currency_id" ref="base.RON"/>
+        <field name="currency_id" ref="base.ROL"/>
 		</record>
 </data>
 </openerp>
diff --git a/addons/l10n_tr/account_chart_template.xml b/addons/l10n_tr/account_chart_template.xml
index 60853ff7127..a15af467932 100644
--- a/addons/l10n_tr/account_chart_template.xml
+++ b/addons/l10n_tr/account_chart_template.xml
@@ -12,7 +12,7 @@
             <field name="property_account_payable" ref="tr320"/>
             <field name="property_account_expense_categ" ref="tr150"/>
             <field name="property_account_income_categ" ref="tr600"/>
-            <field name="currency_id" ref="base.TRY"/>
+            <field name="currency_id" ref="base.TRL"/>
         </record>
 
 
diff --git a/addons/l10n_uy/account_chart_template.xml b/addons/l10n_uy/account_chart_template.xml
index 8433ed18c25..2e800e4c5cb 100644
--- a/addons/l10n_uy/account_chart_template.xml
+++ b/addons/l10n_uy/account_chart_template.xml
@@ -1895,7 +1895,7 @@
             <field name="property_account_payable"       ref="uy_code_21100"/>
             <field name="property_account_income_categ"  ref="uy_code_4100"/>
             <field name="property_account_expense_categ" ref="uy_code_5100"/>
-            <field name="currency_id" ref="base.UYU"/>
+            <field name="currency_id" ref="base.UYP"/>
         </record>
 
 
diff --git a/addons/l10n_ve/data/account_chart.xml b/addons/l10n_ve/data/account_chart.xml
index 7c859083aed..2dba15f1b18 100644
--- a/addons/l10n_ve/data/account_chart.xml
+++ b/addons/l10n_ve/data/account_chart.xml
@@ -3315,7 +3315,7 @@
     <field name="property_account_payable" ref="account_activa_account_2122001"/>
     <field name="property_account_expense_categ" ref="account_activa_account_7151001"/>
     <field name="property_account_income_categ" ref="account_activa_account_5111001"/>
-    <field name="currency_id" ref="base.VEF"/>
+    <field name="currency_id" ref="base.VUB"/>
   </record>
   </data>
 </openerp>

From aca5e7606209cd3382c07f1a4aeedce3960650a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Sep 2013 12:45:00 +0200
Subject: [PATCH 120/164] [IMP] orm: first draft of improvign group_by on date
 field, allowing to tune the grain, format and interval when grouping on a
 date field. Default behavior is the old one, grouping on month.

bzr revid: tde@openerp.com-20130910104500-sfjosqkmpfxa2jxk
---
 openerp/osv/orm.py | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 51b0c2b56b9..f081e11b9e2 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -2641,11 +2641,26 @@ class BaseModel(object):
         fget = self.fields_get(cr, uid, fields)
         flist = ''
         group_count = group_by = groupby
+        group_by_params = {}
         if groupby:
             if fget.get(groupby):
                 groupby_type = fget[groupby]['type']
                 if groupby_type in ('date', 'datetime'):
-                    qualified_groupby_field = "to_char(%s,'yyyy-mm')" % qualified_groupby_field
+                    if context.get('datetime_format') and isinstance(context['datetime_format'], dict) \
+                            and context['datetime_format'].get(groupby) and isinstance(context['datetime_format'][groupby], dict):
+                        groupby_format = context['datetime_format'][groupby].get('groupby_format', 'yyyy-mm')
+                        display_format = context['datetime_format'][groupby].get('display_format', 'MMMM yyyy')
+                        interval = context['datetime_format'][groupby].get('interval', 'month')
+                    else:
+                        groupby_format = 'yyyy-mm'
+                        display_format = 'MMMM yyyy'
+                        interval = 'month'
+                    group_by_params = {
+                        'groupby_format': groupby_format,
+                        'display_format': display_format,
+                        'interval': interval,
+                    }
+                    qualified_groupby_field = "to_char(%s,%%s)" % qualified_groupby_field
                     flist = "%s as %s " % (qualified_groupby_field, groupby)
                 elif groupby_type == 'boolean':
                     qualified_groupby_field = "coalesce(%s,false)" % qualified_groupby_field
@@ -2672,6 +2687,8 @@ class BaseModel(object):
         gb = groupby and (' GROUP BY ' + qualified_groupby_field) or ''
 
         from_clause, where_clause, where_clause_params = query.get_sql()
+        if group_by_params and group_by_params.get('groupby_format'):
+            where_clause_params = [group_by_params['groupby_format']] + where_clause_params + [group_by_params['groupby_format']]
         where_clause = where_clause and ' WHERE ' + where_clause
         limit_str = limit and ' limit %d' % limit or ''
         offset_str = offset and ' offset %d' % offset or ''
@@ -2708,14 +2725,17 @@ class BaseModel(object):
                         d['__context'] = {'group_by': groupby_list[1:]}
             if groupby and groupby in fget:
                 if d[groupby] and fget[groupby]['type'] in ('date', 'datetime'):
-                    dt = datetime.datetime.strptime(alldata[d['id']][groupby][:7], '%Y-%m')
-                    days = calendar.monthrange(dt.year, dt.month)[1]
-
-                    date_value = datetime.datetime.strptime(d[groupby][:10], '%Y-%m-%d')
+                    groupby_datetime = datetime.datetime.strptime(alldata[d['id']][groupby], '%Y-%m-%d')
                     d[groupby] = babel.dates.format_date(
-                        date_value, format='MMMM yyyy', locale=context.get('lang', 'en_US'))
-                    d['__domain'] = [(groupby, '>=', alldata[d['id']][groupby] and datetime.datetime.strptime(alldata[d['id']][groupby][:7] + '-01', '%Y-%m-%d').strftime('%Y-%m-%d') or False),\
-                                     (groupby, '<=', alldata[d['id']][groupby] and datetime.datetime.strptime(alldata[d['id']][groupby][:7] + '-' + str(days), '%Y-%m-%d').strftime('%Y-%m-%d') or False)] + domain
+                        groupby_datetime, format=group_by_params.get('display_format', 'MMMM yyyy'), locale=context.get('lang', 'en_US'))
+                    if group_by_params.get('interval') == 'day':
+                        domain_dt_begin = groupby_datetime.replace(hour=0, minute=0)
+                        domain_dt_end = groupby_datetime.replace(hour=23, minute=59, second=59)
+                    else:
+                        days = calendar.monthrange(groupby_datetime.year, groupby_datetime.month)[1]
+                        domain_dt_begin = groupby_datetime.replace(day=1)
+                        domain_dt_end = groupby_datetime.replace(day=days)
+                    d['__domain'] = [(group_by, '>=', domain_dt_begin.strftime('%Y-%m-%d')), (group_by, '<=', domain_dt_end.strftime('%Y-%m-%d'))] + domain
                 del alldata[d['id']][groupby]
             d.update(alldata[d['id']])
             del d['id']

From 316ce91243aaf6974f87ed3b0664f4522a391a5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Sep 2013 12:46:23 +0200
Subject: [PATCH 121/164] [IMP] mass_mailing Added delivered field, number of
 delivered emails Improved kanban view of mass mailing campaign Improved
 statistics of segments, now daily instead of monthly

bzr revid: tde@openerp.com-20130910104623-7ljg0q9pebbcqk7m
---
 addons/mass_mailing/mass_mailing.py           | 40 +++++++++++++++----
 addons/mass_mailing/mass_mailing_demo.xml     | 20 +++++-----
 addons/mass_mailing/mass_mailing_view.xml     | 17 ++++++--
 .../static/src/css/mass_mailing.css           |  2 +-
 4 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/addons/mass_mailing/mass_mailing.py b/addons/mass_mailing/mass_mailing.py
index f37f86e385a..ba56bc57d4f 100644
--- a/addons/mass_mailing/mass_mailing.py
+++ b/addons/mass_mailing/mass_mailing.py
@@ -41,6 +41,8 @@ class MassMailingCampaign(osv.Model):
                 'opened': len([mail for mail in campaign.mail_ids if mail.opened]),
                 'replied': len([mail for mail in campaign.mail_ids if mail.replied]),
                 'bounced': len([mail for mail in campaign.mail_ids if mail.bounced]),
+                # delivered: shouldn't be: all mails - (failed + bounced) ?
+                'delivered': len([mail for mail in campaign.mail_ids if mail.state == 'sent' and not mail.bounced]),
             }
         return results
 
@@ -73,12 +75,18 @@ class MassMailingCampaign(osv.Model):
             'mail.mail', 'mass_mailing_campaign_id',
             'Sent Emails',
         ),
+        'color': fields.integer('Color Index'),
         # stat fields
         'sent': fields.function(
             _get_statistics,
             string='Sent Emails',
             type='integer', multi='_get_statistics'
         ),
+        'delivered': fields.function(
+            _get_statistics,
+            string='Delivered',
+            type='integer', multi='_get_statistics',
+        ),
         'opened': fields.function(
             _get_statistics,
             string='Opened',
@@ -120,16 +128,16 @@ class MassMailingSegment(osv.Model):
                                                 }
                                             ]
         """
-        month_begin = date.today().replace(day=1)
+        # month_begin = date.today().replace(day=1)
+        date_begin = date.today()
         section_result = [{'value': 0,
-                           'tooltip': (month_begin + relativedelta.relativedelta(months=-i)).strftime('%B'),
+                           'tooltip': (date_begin + relativedelta.relativedelta(days=-i)).strftime('%d %B %Y'),
                            } for i in range(self._period_number - 1, -1, -1)]
         group_obj = obj.read_group(cr, uid, domain, read_fields, groupby_field, context=context)
-        print group_obj
         for group in group_obj:
             group_begin_date = datetime.strptime(group['__domain'][0][2], tools.DEFAULT_SERVER_DATE_FORMAT)
-            month_delta = relativedelta.relativedelta(month_begin, group_begin_date)
-            section_result[self._period_number - (month_delta.months + 1)] = {'value': group.get(value_field, 0), 'tooltip': group_begin_date.strftime('%B')}
+            month_delta = relativedelta.relativedelta(date_begin, group_begin_date)
+            section_result[self._period_number - (month_delta.days + 1)] = {'value': group.get(value_field, 0), 'tooltip': group.get(groupby_field)}
         return section_result
 
     def _get_monthly_statistics(self, cr, uid, ids, field_name, arg, context=None):
@@ -137,8 +145,20 @@ class MassMailingSegment(osv.Model):
         """
         obj = self.pool.get('mail.mail')
         res = dict.fromkeys(ids, False)
-        month_begin = date.today().replace(day=1)
-        groupby_begin = (month_begin + relativedelta.relativedelta(months=-4)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+        date_begin = date.today()
+        context['datetime_format'] = {
+            'opened': {
+                'interval': 'day',
+                'groupby_format': 'yyyy-mm-dd',
+                'display_format': 'dd MMMM YYYY'
+            },
+            'replied': {
+                'interval': 'day',
+                'groupby_format': 'yyyy-mm-dd',
+                'display_format': 'dd MMMM YYYY'
+            },
+        }
+        groupby_begin = (date_begin + relativedelta.relativedelta(days=-4)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
         for id in ids:
             res[id] = dict()
             domain = [('mass_mailing_segment_id', '=', id), ('opened', '>=', groupby_begin)]
@@ -153,6 +173,7 @@ class MassMailingSegment(osv.Model):
         for segment in self.browse(cr, uid, ids, context=context):
             results[segment.id] = {
                 'sent': len(segment.mail_ids),
+                'delivered': len([mail for mail in segment.mail_ids if mail.state == 'sent' and not mail.bounced]),
                 'opened': len([mail for mail in segment.mail_ids if mail.opened]),
                 'replied': len([mail for mail in segment.mail_ids if mail.replied]),
                 'bounced': len([mail for mail in segment.mail_ids if mail.bounced]),
@@ -181,6 +202,11 @@ class MassMailingSegment(osv.Model):
             string='Sent Emails',
             type='integer', multi='_get_statistics'
         ),
+        'delivered': fields.function(
+            _get_statistics,
+            string='Delivered',
+            type='integer', multi='_get_statistics',
+        ),
         'opened': fields.function(
             _get_statistics,
             string='Opened',
diff --git a/addons/mass_mailing/mass_mailing_demo.xml b/addons/mass_mailing/mass_mailing_demo.xml
index 3e04baf7cef..9f525d61c3a 100644
--- a/addons/mass_mailing/mass_mailing_demo.xml
+++ b/addons/mass_mailing/mass_mailing_demo.xml
@@ -25,31 +25,31 @@
         <record id="mass_mail_segment_1" model="mail.mass_mailing.segment">
             <field name="name">First Newsletter</field>
             <field name="template_id" eval="ref('mass_mail_template_1')"/>
-            <field name="date" eval="(DateTime.today() - relativedelta(month=2)).replace(day=1)"/>
+            <field name="date" eval="(DateTime.today() - relativedelta(day=3)"/>
             <field name="mass_mailing_campaign_id" eval="ref('mass_mail_campaign_1')"/>
         </record>
         <record id="mass_mail_segment_2" model="mail.mass_mailing.segment">
             <field name="name">Second Newsletter</field>
             <field name="template_id" eval="ref('mass_mail_template_2')"/>
-            <field name="date" eval="(DateTime.today() - relativedelta(month=1)).replace(day=1)"/>
+            <field name="date" eval="(DateTime.today() - relativedelta(day=3)"/>
             <field name="mass_mailing_campaign_id" eval="ref('mass_mail_campaign_1')"/>
         </record>
 
         <record id="mass_mail_email_1" model="mail.mail">
             <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_1')"/>
-            <field name="opened" eval="(DateTime.today() - relativedelta(days=15)).strftime('%Y-%m-%d %H:%M')"/>
-            <field name="replied" eval="(DateTime.today() - relativedelta(days=10)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="opened" eval="(DateTime.today() - relativedelta(days=2)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="replied" eval="(DateTime.today() - relativedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="state">sent</field>
         </record>
         <record id="mass_mail_email_2" model="mail.mail">
             <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_1')"/>
-            <field name="opened" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M')"/>
-            <field name="replied" eval="(DateTime.today() - relativedelta(days=0)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="opened" eval="(DateTime.today() - relativedelta(days=2)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="replied" eval="(DateTime.today() - relativedelta(days=0)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="state">sent</field>
         </record>
         <record id="mass_mail_email_3" model="mail.mail">
             <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_1')"/>
-            <field name="opened" eval="(DateTime.today() - relativedelta(days=0)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="opened" eval="(DateTime.today() - relativedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="state">sent</field>
         </record>
         <record id="mass_mail_email_4" model="mail.mail">
@@ -58,18 +58,18 @@
         </record>
         <record id="mass_mail_email_5" model="mail.mail">
             <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_1')"/>
-            <field name="bounced" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="bounced" eval="(DateTime.today() - relativedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="state">sent</field>
         </record>
 
         <record id="mass_mail_email_2_1" model="mail.mail">
             <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_2')"/>
-            <field name="opened" eval="(DateTime.today() - relativedelta(days=15)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="opened" eval="(DateTime.today() - relativedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="state">sent</field>
         </record>
         <record id="mass_mail_email_2_2" model="mail.mail">
             <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_2')"/>
-            <field name="opened" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="opened" eval="(DateTime.today() - relativedelta(days=2)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="state">sent</field>
         </record>
         <record id="mass_mail_email_2_3" model="mail.mail">
diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index 4a3c2b5db07..8d2d003d08b 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -23,6 +23,7 @@
                         <group>
                             <field name="name"/>
                             <field name="sent"/>
+                            <field name="delivered"/>
                             <field name="opened"/>
                             <field name="replied"/>
                             <field name="bounced"/>
@@ -41,6 +42,7 @@
                 <kanban>
                     <field name="segment_kanban_ids"/>
                     <field name='sent'/>
+                    <field name='color'/>
                     <templates>
                         <t t-name="mass_mailing.segment">
                             <div>
@@ -66,16 +68,23 @@
                             </div>
                         </t>
                         <t t-name="kanban-box">
-                            <!-- <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click"> -->
-                            <div t-attf-class="oe_kanban_card oe_kanban_global_click oe_kanban_mass_mailing oe_kanban_mass_mailing_campaign">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_kanban_mass_mailing oe_kanban_mass_mailing_campaign">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                    <span class="oe_e">i</span>
+                                    <ul class="oe_dropdown_menu">
+                                        <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                                    </ul>
+                                </div>
                                  <div class="oe_kanban_content">
                                     <h3>
                                         <field name="name"/>
                                     </h3>
                                     <div>
-                                        <field name="opened" widget="gauge" style="width:120px; height: 80px;"
+                                        <field name="delivered" widget="gauge" style="width:160px; height: 120px;"
                                             options="{'max_field': 'sent'}"/>
-                                        <field name="replied" widget="gauge" style="width:120px; height: 80px;"
+                                        <field name="opened" widget="gauge" style="width:160px; height: 120px;"
+                                            options="{'max_field': 'sent'}"/>
+                                        <field name="replied" widget="gauge" style="width:160px; height: 120px;"
                                             options="{'max_field': 'sent'}"/>
                                     </div>
                                     <t t-foreach='record.segment_kanban_ids.value' t-as='segment'>
diff --git a/addons/mass_mailing/static/src/css/mass_mailing.css b/addons/mass_mailing/static/src/css/mass_mailing.css
index 8b217d8d588..94f8e4ed070 100644
--- a/addons/mass_mailing/static/src/css/mass_mailing.css
+++ b/addons/mass_mailing/static/src/css/mass_mailing.css
@@ -1,5 +1,5 @@
 .openerp .oe_kanban_view .oe_kanban_mass_mailing.oe_kanban_mass_mailing_campaign {
-    width: 270px;
+    width: 540px;
 }
 
 .openerp .oe_kanban_view .oe_kanban_mass_mailing.oe_kanban_mass_mailing_segment {

From a89547aab615b7bde8e8804b8d66a1b48daa847e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Sep 2013 13:01:04 +0200
Subject: [PATCH 122/164] [FIX] mass_mailing: forgotten brackets

bzr revid: tde@openerp.com-20130910110104-a0pr7q06k3i1lv6h
---
 addons/mass_mailing/mass_mailing_demo.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mass_mailing/mass_mailing_demo.xml b/addons/mass_mailing/mass_mailing_demo.xml
index 9f525d61c3a..f09fb2d05da 100644
--- a/addons/mass_mailing/mass_mailing_demo.xml
+++ b/addons/mass_mailing/mass_mailing_demo.xml
@@ -25,13 +25,13 @@
         <record id="mass_mail_segment_1" model="mail.mass_mailing.segment">
             <field name="name">First Newsletter</field>
             <field name="template_id" eval="ref('mass_mail_template_1')"/>
-            <field name="date" eval="(DateTime.today() - relativedelta(day=3)"/>
+            <field name="date" eval="(DateTime.today() - relativedelta(day=3))"/>
             <field name="mass_mailing_campaign_id" eval="ref('mass_mail_campaign_1')"/>
         </record>
         <record id="mass_mail_segment_2" model="mail.mass_mailing.segment">
             <field name="name">Second Newsletter</field>
             <field name="template_id" eval="ref('mass_mail_template_2')"/>
-            <field name="date" eval="(DateTime.today() - relativedelta(day=3)"/>
+            <field name="date" eval="(DateTime.today() - relativedelta(day=3))"/>
             <field name="mass_mailing_campaign_id" eval="ref('mass_mail_campaign_1')"/>
         </record>
 

From 43bfef6918f7947c2733cb4f0e93cff480360040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Sep 2013 14:11:23 +0200
Subject: [PATCH 123/164] [FIX] mass_mailing: fixed sparkline computation for
 opened and replied emails, using dates and group_by; fixed demo data

bzr revid: tde@openerp.com-20130910121123-uu4hplm91xb5aexi
---
 addons/mass_mailing/mass_mailing.py       | 38 +++++++++++------------
 addons/mass_mailing/mass_mailing_demo.xml |  4 +--
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/addons/mass_mailing/mass_mailing.py b/addons/mass_mailing/mass_mailing.py
index ba56bc57d4f..f116cb67c87 100644
--- a/addons/mass_mailing/mass_mailing.py
+++ b/addons/mass_mailing/mass_mailing.py
@@ -106,13 +106,15 @@ class MassMailingCampaign(osv.Model):
 
 
 class MassMailingSegment(osv.Model):
-    """ TODO """
+    """ MassMailingSegment models a segment for a mass mailign campaign. A segment
+    is an occurence of sending emails. """
+
     _name = 'mail.mass_mailing.segment'
     _description = 'Segment of a mass mailing campaign'
     # number of periods for tracking mail_mail statistics
     _period_number = 6
 
-    def __get_bar_values(self, cr, uid, obj, domain, read_fields, value_field, groupby_field, context=None):
+    def __get_bar_values(self, cr, uid, id, obj, domain, read_fields, value_field, groupby_field, context=None):
         """ Generic method to generate data for bar chart values using SparklineBarWidget.
             This method performs obj.read_group(cr, uid, domain, read_fields, groupby_field).
 
@@ -128,24 +130,22 @@ class MassMailingSegment(osv.Model):
                                                 }
                                             ]
         """
-        # month_begin = date.today().replace(day=1)
-        date_begin = date.today()
+        date_begin = datetime.strptime(self.browse(cr, uid, id, context=context).date, tools.DEFAULT_SERVER_DATETIME_FORMAT).date()
         section_result = [{'value': 0,
-                           'tooltip': (date_begin + relativedelta.relativedelta(days=-i)).strftime('%d %B %Y'),
-                           } for i in range(self._period_number - 1, -1, -1)]
+                           'tooltip': (date_begin + relativedelta.relativedelta(days=i)).strftime('%d %B %Y'),
+                           } for i in range(0, self._period_number)]
         group_obj = obj.read_group(cr, uid, domain, read_fields, groupby_field, context=context)
         for group in group_obj:
-            group_begin_date = datetime.strptime(group['__domain'][0][2], tools.DEFAULT_SERVER_DATE_FORMAT)
-            month_delta = relativedelta.relativedelta(date_begin, group_begin_date)
-            section_result[self._period_number - (month_delta.days + 1)] = {'value': group.get(value_field, 0), 'tooltip': group.get(groupby_field)}
+            group_begin_date = datetime.strptime(group['__domain'][0][2], tools.DEFAULT_SERVER_DATE_FORMAT).date()
+            timedelta = relativedelta.relativedelta(group_begin_date, date_begin)
+            section_result[timedelta.days] = {'value': group.get(value_field, 0), 'tooltip': group.get(groupby_field)}
         return section_result
 
     def _get_monthly_statistics(self, cr, uid, ids, field_name, arg, context=None):
         """ TODO
         """
-        obj = self.pool.get('mail.mail')
-        res = dict.fromkeys(ids, False)
-        date_begin = date.today()
+        obj = self.pool['mail.mail']
+        res = {}
         context['datetime_format'] = {
             'opened': {
                 'interval': 'day',
@@ -158,13 +158,13 @@ class MassMailingSegment(osv.Model):
                 'display_format': 'dd MMMM YYYY'
             },
         }
-        groupby_begin = (date_begin + relativedelta.relativedelta(days=-4)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
         for id in ids:
-            res[id] = dict()
-            domain = [('mass_mailing_segment_id', '=', id), ('opened', '>=', groupby_begin)]
-            res[id]['opened_monthly'] = self.__get_bar_values(cr, uid, obj, domain, ['opened'], 'opened_count', 'opened', context=context)
-            domain = [('mass_mailing_segment_id', '=', id), ('replied', '>=', groupby_begin)]
-            res[id]['replied_monthly'] = self.__get_bar_values(cr, uid, obj, domain, ['replied'], 'replied_count', 'replied', context=context)
+            res[id] = {}
+            date_begin = self.browse(cr, uid, id, context=context).date
+            domain = [('mass_mailing_segment_id', '=', id), ('opened', '>=', date_begin)]
+            res[id]['opened_monthly'] = self.__get_bar_values(cr, uid, id, obj, domain, ['opened'], 'opened_count', 'opened', context=context)
+            domain = [('mass_mailing_segment_id', '=', id), ('replied', '>=', date_begin)]
+            res[id]['replied_monthly'] = self.__get_bar_values(cr, uid, id, obj, domain, ['replied'], 'replied_count', 'replied', context=context)
         return res
 
     def _get_statistics(self, cr, uid, ids, name, arg, context=None):
@@ -225,7 +225,7 @@ class MassMailingSegment(osv.Model):
         # monthly ratio
         'opened_monthly': fields.function(
             _get_monthly_statistics,
-            string='Sent Emails',
+            string='Opened',
             type='char', multi='_get_monthly_statistics',
         ),
         'replied_monthly': fields.function(
diff --git a/addons/mass_mailing/mass_mailing_demo.xml b/addons/mass_mailing/mass_mailing_demo.xml
index f09fb2d05da..b2278064d36 100644
--- a/addons/mass_mailing/mass_mailing_demo.xml
+++ b/addons/mass_mailing/mass_mailing_demo.xml
@@ -25,13 +25,13 @@
         <record id="mass_mail_segment_1" model="mail.mass_mailing.segment">
             <field name="name">First Newsletter</field>
             <field name="template_id" eval="ref('mass_mail_template_1')"/>
-            <field name="date" eval="(DateTime.today() - relativedelta(day=3))"/>
+            <field name="date" eval="(DateTime.today() - relativedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="mass_mailing_campaign_id" eval="ref('mass_mail_campaign_1')"/>
         </record>
         <record id="mass_mail_segment_2" model="mail.mass_mailing.segment">
             <field name="name">Second Newsletter</field>
             <field name="template_id" eval="ref('mass_mail_template_2')"/>
-            <field name="date" eval="(DateTime.today() - relativedelta(day=3))"/>
+            <field name="date" eval="(DateTime.today() - relativedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="mass_mailing_campaign_id" eval="ref('mass_mail_campaign_1')"/>
         </record>
 

From c063f54691a5726a8ab90d273a70fe46bdaff844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Sep 2013 14:47:54 +0200
Subject: [PATCH 124/164] [IMP] mail: in mass mail mode, default value is now
 to send emails, not to perform a mass post on documents.

bzr revid: tde@openerp.com-20130910124754-jssus6l43nil4qad
---
 addons/email_template/tests/test_mail.py      |  6 ++---
 addons/mail/tests/test_mail_features.py       |  2 ++
 addons/mail/wizard/mail_compose_message.py    |  5 ++--
 .../mail/wizard/mail_compose_message_view.xml | 24 +++++++++++--------
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/addons/email_template/tests/test_mail.py b/addons/email_template/tests/test_mail.py
index adb550aa617..ccc8a49b875 100644
--- a/addons/email_template/tests/test_mail.py
+++ b/addons/email_template/tests/test_mail.py
@@ -73,7 +73,7 @@ class test_message_compose(TestMail):
 
         # 1. Comment on pigs
         compose_id = mail_compose.create(cr, uid,
-            {'subject': 'Forget me subject', 'body': '<p>Dummy body</p>'},
+            {'subject': 'Forget me subject', 'body': '<p>Dummy body</p>', 'post': True},
             {'default_composition_mode': 'comment',
                 'default_model': 'mail.group',
                 'default_res_id': self.group_pigs_id,
@@ -101,7 +101,7 @@ class test_message_compose(TestMail):
             'default_template_id': email_template_id,
             'active_ids': [self.group_pigs_id, self.group_bird_id]
         }
-        compose_id = mail_compose.create(cr, uid, {'subject': 'Forget me subject', 'body': 'Dummy body'}, context)
+        compose_id = mail_compose.create(cr, uid, {'subject': 'Forget me subject', 'body': 'Dummy body', 'post': True}, context)
         compose = mail_compose.browse(cr, uid, compose_id, context)
         onchange_res = compose.onchange_template_id(email_template_id, 'comment', 'mail.group', self.group_pigs_id)['value']
         onchange_res['partner_ids'] = [(4, partner_id) for partner_id in onchange_res.pop('partner_ids', [])]
@@ -145,7 +145,7 @@ class test_message_compose(TestMail):
             'default_partner_ids': [p_a_id],
             'active_ids': [self.group_pigs_id, self.group_bird_id]
         }
-        compose_id = mail_compose.create(cr, uid, {'subject': 'Forget me subject', 'body': 'Dummy body'}, context)
+        compose_id = mail_compose.create(cr, uid, {'subject': 'Forget me subject', 'body': 'Dummy body', 'post': True}, context)
         compose = mail_compose.browse(cr, uid, compose_id, context)
         onchange_res = compose.onchange_template_id(email_template_id, 'mass_mail', 'mail.group', self.group_pigs_id)['value']
         onchange_res['partner_ids'] = [(4, partner_id) for partner_id in onchange_res.pop('partner_ids', [])]
diff --git a/addons/mail/tests/test_mail_features.py b/addons/mail/tests/test_mail_features.py
index 970f07f519e..0688bf02606 100644
--- a/addons/mail/tests/test_mail_features.py
+++ b/addons/mail/tests/test_mail_features.py
@@ -631,6 +631,7 @@ class test_mail(TestMail):
             {
                 'subject': _subject,
                 'body': '${object.description}',
+                'post': True,
                 'partner_ids': [(4, p_c_id), (4, p_d_id)],
             }, context={
                 'default_composition_mode': 'mass_mail',
@@ -684,6 +685,7 @@ class test_mail(TestMail):
             {
                 'subject': _subject,
                 'body': '${object.description}',
+                'post': True,
                 'partner_ids': [(4, p_c_id), (4, p_d_id)],
             }, context={
                 'default_composition_mode': 'mass_mail',
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 82f01d35e05..1b3f6010893 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -134,8 +134,9 @@ class mail_compose_message(osv.TransientModel):
         'body': lambda self, cr, uid, ctx={}: '',
         'subject': lambda self, cr, uid, ctx={}: False,
         'partner_ids': lambda self, cr, uid, ctx={}: [],
-        'post': lambda self, cr, uid, ctx={}: True,
-        'same_thread': lambda self, cr, uid, ctx={}: True,
+        'post': False,
+        'notify': False,
+        'same_thread': True,
     }
 
     def check_access_rule(self, cr, uid, ids, operation, context=None):
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index ed1a211ce8c..ff1dd96229e 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -14,20 +14,11 @@
                         <field name="parent_id" invisible="1"/>
                         <field name="mail_server_id" invisible="1"/>
                         <field name="use_active_domain" invisible="1"/>
-                        <field name="active_domain" invisible="1"/>
                         <!-- visible wizard -->
                         <field name="email_from"
                             attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
                         <field name="subject" placeholder="Subject..." required="True"/>
-                        <field name="post"
-                            attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
-                        <field name="notify"
-                            attrs="{'invisible':['|', ('post', '!=', True), ('composition_mode', '!=', 'mass_mail')]}"/>
-                        <field name="same_thread"
-                            attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
-                        <field name="reply_to" placeholder="Email address te redirect replies..."
-                            attrs="{'invisible':['|', ('same_thread', '=', True), ('composition_mode', '!=', 'mass_mail')],
-                                    'required':[('same_thread', '!=', True)]}"/>
+                        <!-- classic message composer -->
                         <label for="partner_ids" string="Recipients"
                             attrs="{'invisible':[('composition_mode', '=', 'mass_mail')]}"/>
                         <div groups="base.group_user"
@@ -40,6 +31,19 @@
                             <field name="partner_ids" widget="many2many_tags_email" placeholder="Add contacts to notify..."
                                 context="{'force_email':True, 'show_email':True}"/>
                         </div>
+                        <!-- mass post / mass mailing -->
+                        <field name="active_domain"
+                            attrs="{'invisible': [('composition_mode', '!=', 'mass_mail')],
+                                    'readonly': True}"/>
+                        <field name="post"
+                            attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
+                        <field name="notify"
+                            attrs="{'invisible':['|', ('post', '!=', True), ('composition_mode', '!=', 'mass_mail')]}"/>
+                        <field name="same_thread"
+                            attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
+                        <field name="reply_to" placeholder="Email address te redirect replies..."
+                            attrs="{'invisible':['|', ('same_thread', '=', True), ('composition_mode', '!=', 'mass_mail')],
+                                    'required':[('same_thread', '!=', True)]}"/>
                     </group>
                     <field name="body"/>
                     <field name="attachment_ids" widget="many2many_binary" string="Attach a file"/>

From 2982257521897f9a2bff110def0d324188145126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Sep 2013 17:18:22 +0200
Subject: [PATCH 125/164] [IMP] mail: added catchall and bounce aliases to
 config

bzr revid: tde@openerp.com-20130910151822-jg78ff0fojjqdiwj
---
 addons/mail/res_config.py       | 33 ++++++++++++++++++++++++++++++---
 addons/mail/res_config_view.xml |  8 ++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/addons/mail/res_config.py b/addons/mail/res_config.py
index c19eb4a38ee..750c82d54ba 100644
--- a/addons/mail/res_config.py
+++ b/addons/mail/res_config.py
@@ -28,9 +28,18 @@ class project_configuration(osv.TransientModel):
     _inherit = 'base.config.settings'
 
     _columns = {
-        'alias_domain': fields.char('Alias Domain',
-                                     help="If you have setup a catch-all email domain redirected to "
-                                          "the OpenERP server, enter the domain name here."),
+        'alias_domain': fields.char(
+            'Alias Domain',
+            help="If you have setup a catch-all email domain redirected to the OpenERP server, enter the domain name here."
+        ),
+        'alias_bounce': fields.char(
+            'Return-Path for Emails',
+            help="Return-Path of send Emails. Used to compute bounced emails.",
+        ),
+        'alias_catchall': fields.char(
+            'Default Alias',
+            help='Default email alias',
+        ),
     }
 
     def get_default_alias_domain(self, cr, uid, ids, context=None):
@@ -47,3 +56,21 @@ class project_configuration(osv.TransientModel):
         config_parameters = self.pool.get("ir.config_parameter")
         for record in self.browse(cr, uid, ids, context=context):
             config_parameters.set_param(cr, uid, "mail.catchall.domain", record.alias_domain or '', context=context)
+
+    def get_default_alias_bounce(self, cr, uid, ids, context=None):
+        alias_bounce = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.bounce.alias", context=context)
+        return {'alias_bounce': alias_bounce}
+
+    def set_alias_bounce(self, cr, uid, ids, context=None):
+        config_parameters = self.pool.get("ir.config_parameter")
+        for record in self.browse(cr, uid, ids, context=context):
+            config_parameters.set_param(cr, uid, "mail.bounce.alias", record.alias_bounce or '', context=context)
+
+    def get_default_alias_catchall(self, cr, uid, ids, context=None):
+        alias_catchall = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.alias", context=context)
+        return {'alias_catchall': alias_catchall}
+
+    def set_alias_catchall(self, cr, uid, ids, context=None):
+        config_parameters = self.pool.get("ir.config_parameter")
+        for record in self.browse(cr, uid, ids, context=context):
+            config_parameters.set_param(cr, uid, "mail.catchall.alias", record.alias_catchall or '', context=context)
diff --git a/addons/mail/res_config_view.xml b/addons/mail/res_config_view.xml
index d3797ba2dcc..440cf358e47 100644
--- a/addons/mail/res_config_view.xml
+++ b/addons/mail/res_config_view.xml
@@ -11,6 +11,14 @@
                         <label for="alias_domain" class="oe_inline"/>
                         <field name="alias_domain" placeholder="mycompany.my.openerp.com" class="oe_inline"/>
                     </div>
+                    <div>
+                        <label for="alias_bounce" class="oe_inline"/>
+                        <field name="alias_bounce" placeholder="bounce" class="oe_inline"/>
+                    </div>
+                    <div>
+                        <label for="alias_catchall" class="oe_inline"/>
+                        <field name="alias_catchall" placeholder="catchall" class="oe_inline"/>
+                    </div>
                 </xpath>
             </field>
         </record>

From ce8c987089037b75f73f487851d8efdbee40ed28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Sep 2013 17:19:01 +0200
Subject: [PATCH 126/164] [IMP] mail, email_template, mass_mailing: improvev
 mass mailing management in mail.compose.message + form view cleanings + some
 fixes in mail_mail about set_opened/replied/bounced, now checking that ids
 effectively exist

bzr revid: tde@openerp.com-20130910151901-nhuwvtrkbwekyh7x
---
 .../wizard/mail_compose_message_view.xml      |  2 +-
 addons/mail/mail_mail.py                      |  9 +++--
 addons/mail/mail_mail_view.xml                |  1 +
 addons/mail/mail_thread.py                    |  4 ++-
 .../mail/wizard/mail_compose_message_view.xml |  4 +--
 addons/mass_mailing/mail_mail.py              |  8 +++++
 addons/mass_mailing/mail_mail_view.xml        |  1 +
 addons/mass_mailing/mass_mailing.py           | 10 +++++-
 addons/mass_mailing/mass_mailing_view.xml     | 28 +++++++++++++--
 .../static/src/css/mass_mailing.css           |  1 +
 .../wizard/mail_compose_message.py            | 34 +++++++++++--------
 .../wizard/mail_compose_message_view.xml      | 23 ++++++++++---
 12 files changed, 96 insertions(+), 29 deletions(-)

diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index 3cb83896ca2..b7c57af2679 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -11,7 +11,7 @@
                     <label string="Template Recipients" for="partner_to"
                             groups="base.group_no_one"
                             attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
-                    <div groups="base.group_no_one"
+                    <div groups="base.group_no_one" name="template_recipients"
                             attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}">
                         <group class="oe_grey">
                             <!-- <label string="Partners" for="partner_to"/> -->
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 73fb148c0ed..127d1502028 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -108,21 +108,24 @@ class mail_mail(osv.Model):
 
     def set_opened(self, cr, uid, ids, context=None):
         """ Set as opened """
-        for mail in self.browse(cr, uid, ids, context=context):
+        existing_ids = self.exists(cr, uid, ids, context=context)
+        for mail in self.browse(cr, uid, existing_ids, context=context):
             if not mail.opened:
                 self.write(cr, uid, [mail.id], {'opened': fields.datetime.now()}, context=context)
         return True
 
     def set_replied(self, cr, uid, ids, context=None):
         """ Set as replied """
-        for mail in self.browse(cr, uid, ids, context=context):
+        existing_ids = self.exists(cr, uid, ids, context=context)
+        for mail in self.browse(cr, uid, existing_ids, context=context):
             if not mail.replied:
                 self.write(cr, uid, [mail.id], {'replied': fields.datetime.now()}, context=context)
         return True
 
     def set_bounced(self, cr, uid, ids, context=None):
         """ Set as bounced """
-        for mail in self.browse(cr, uid, ids, context=context):
+        existing_ids = self.exists(cr, uid, ids, context=context)
+        for mail in self.browse(cr, uid, existing_ids, context=context):
             if not mail.bounced:
                 self.write(cr, uid, [mail.id], {'bounced': fields.datetime.now()}, context=context)
         return True
diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index 3901a192225..9a2a178d61c 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -44,6 +44,7 @@
                                         <group string="Tracking">
                                             <field name="opened"/>
                                             <field name="replied"/>
+                                            <field name="bounced"/>
                                         </group>
                                     </div>
                                     <div>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 9a5d3e3580d..8c51e99a94c 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -792,6 +792,7 @@ class mail_thread(osv.AbstractModel):
             bounce_match = tools.bounce_re.search(email_to)
             if bounce_match:
                 bounced_mail_id = bounce_match.group(1)
+                self.pool['mail.mail'].set_bounced(cr, uid, [bounced_mail_id], context=context)
                 if self.pool['mail.mail'].exists(cr, uid, bounced_mail_id):
                     mail = self.pool['mail.mail'].browse(cr, uid, bounced_mail_id, context=context)
                     bounced_model = mail.model
@@ -1426,7 +1427,8 @@ class mail_thread(osv.AbstractModel):
             # update original mail_mail if exists
             if type == 'email':
                 mail_mail_ids = self.pool['mail.mail'].search(cr, SUPERUSER_ID, [('mail_message_id', '=', parent_id)], context=context)
-                self.pool['mail.mail'].set_replied(cr, SUPERUSER_ID, mail_mail_ids, context=context)
+                if mail_mail_ids:
+                    self.pool['mail.mail'].set_replied(cr, SUPERUSER_ID, mail_mail_ids, context=context)
 
             message_ids = mail_message.search(cr, SUPERUSER_ID, [('id', '=', parent_id), ('parent_id', '!=', False)], context=context)
             # avoid loops when finding ancestors
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index ff1dd96229e..0c86bae7e5f 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -14,6 +14,7 @@
                         <field name="parent_id" invisible="1"/>
                         <field name="mail_server_id" invisible="1"/>
                         <field name="use_active_domain" invisible="1"/>
+                        <field name="active_domain" invisible="1"/>
                         <!-- visible wizard -->
                         <field name="email_from"
                             attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
@@ -32,9 +33,6 @@
                                 context="{'force_email':True, 'show_email':True}"/>
                         </div>
                         <!-- mass post / mass mailing -->
-                        <field name="active_domain"
-                            attrs="{'invisible': [('composition_mode', '!=', 'mass_mail')],
-                                    'readonly': True}"/>
                         <field name="post"
                             attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
                         <field name="notify"
diff --git a/addons/mass_mailing/mail_mail.py b/addons/mass_mailing/mail_mail.py
index 529c6c73e7b..2ecf38fd31e 100644
--- a/addons/mass_mailing/mail_mail.py
+++ b/addons/mass_mailing/mail_mail.py
@@ -36,6 +36,14 @@ class MailMail(osv.Model):
             'mass_mailing_segment_id', 'mass_mailing_campaign_id',
             type='many2one', ondelete='set null',
             relation='mail.mass_mailing.campaign',
+            string='Mass Mailing Campaign',
+            store=True, readonly=True,
+        ),
+        'template_id': fields.related(
+            'mass_mailing_segment_id', 'template_id',
+            type='many2one', ondelete='set null',
+            relation='email.template',
+            string='Email Template',
             store=True, readonly=True,
         ),
     }
diff --git a/addons/mass_mailing/mail_mail_view.xml b/addons/mass_mailing/mail_mail_view.xml
index 957ee0f6f93..11fa08776f7 100644
--- a/addons/mass_mailing/mail_mail_view.xml
+++ b/addons/mass_mailing/mail_mail_view.xml
@@ -11,6 +11,7 @@
                 <xpath expr="//field[@name='opened']" position="before">
                     <field name="mass_mailing_campaign_id"/>
                     <field name="mass_mailing_segment_id"/>
+                    <field name="template_id"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/mass_mailing/mass_mailing.py b/addons/mass_mailing/mass_mailing.py
index f116cb67c87..be31b04957c 100644
--- a/addons/mass_mailing/mass_mailing.py
+++ b/addons/mass_mailing/mass_mailing.py
@@ -184,7 +184,7 @@ class MassMailingSegment(osv.Model):
         'name': fields.char('Name', required=True),
         'mass_mailing_campaign_id': fields.many2one(
             'mail.mass_mailing.campaign', 'Mass Mailing Campaign',
-            ondelete='cascade',
+            ondelete='cascade', required=True,
         ),
         'template_id': fields.many2one(
             'email.template', 'Email Template',
@@ -192,6 +192,10 @@ class MassMailingSegment(osv.Model):
         ),
         'domain': fields.char('Domain'),
         'date': fields.datetime('Date'),
+        'color': fields.related(
+            'mass_mailing_campaign_id', 'color',
+            type='integer', string='Color Index',
+        ),
         # mail_mail data
         'mail_ids': fields.one2many(
             'mail.mail', 'mass_mailing_segment_id',
@@ -234,3 +238,7 @@ class MassMailingSegment(osv.Model):
             type='char', multi='_get_monthly_statistics',
         ),
     }
+
+    _defaults = {
+        'date': fields.datetime.now(),
+    }
diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index 8d2d003d08b..91c68d8d734 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -122,7 +122,7 @@
             <field name="name">mail.mass_mailing.segment.form</field>
             <field name="model">mail.mass_mailing.segment</field>
             <field name="arch" type="xml">
-                <form string="Mass Mailing Campaign" version="7.0">
+                <form string="Mass Mailing Segment" version="7.0">
                     <sheet>
                         <group>
                             <group>
@@ -140,14 +140,38 @@
             </field>
         </record>
 
+        <record model="ir.ui.view" id="view_mail_mass_mailing_segment_form_readonly">
+            <field name="name">mail.mass_mailing.segment.form</field>
+            <field name="model">mail.mass_mailing.segment</field>
+            <field name="priority">18</field>
+            <field name="arch" type="xml">
+                <form string="Mass Mailing Segment" version="7.0">
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="date" readonly="True"/>
+                            </group>
+                            <group>
+                                <field name="mass_mailing_campaign_id" readonly="True"/>
+                                <field name="template_id" readonly="True"/>
+                                <field name="domain" readonly="True"/>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="view_mail_mass_mailing_segment_kanban">
             <field name="name">mail.mass_mailing.segment.kanban</field>
             <field name="model">mail.mass_mailing.segment</field>
             <field name="arch" type="xml">
                 <kanban>
+                    <field name='color'/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_card oe_kanban_global_click oe_kanban_mass_mailing oe_kanban_mass_mailing_segment">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_kanban_mass_mailing oe_kanban_mass_mailing_segment">
                                  <div class="oe_kanban_content">
                                     <div>
                                         <h3>
diff --git a/addons/mass_mailing/static/src/css/mass_mailing.css b/addons/mass_mailing/static/src/css/mass_mailing.css
index 94f8e4ed070..ca5455d6323 100644
--- a/addons/mass_mailing/static/src/css/mass_mailing.css
+++ b/addons/mass_mailing/static/src/css/mass_mailing.css
@@ -14,6 +14,7 @@
     border: 1px solid rgba(0, 0, 0, 0.16);
     -webkit-border-radius: 2px;
     border-radius: 2px;
+    background-color: #FFFFFF;
 }
 
 .openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_mail_result {
diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py
index 2f74ef2c732..2b36389cb7b 100644
--- a/addons/mass_mailing/wizard/mail_compose_message.py
+++ b/addons/mass_mailing/wizard/mail_compose_message.py
@@ -28,24 +28,30 @@ class MailComposeMessage(osv.TransientModel):
     _inherit = 'mail.compose.message'
 
     _columns = {
-        'mass_mail_campaign_id': fields.many2one(
-            'mail.mass_mailing.campaign', 'Mass mailing campaign'
+        'use_mass_mailing_campaign': fields.boolean(
+            'Use mass mailing campaigns',
+        ),
+        'mass_mailing_campaign_id': fields.many2one(
+            'mail.mass_mailing.campaign', 'Mass mailing campaign',
+        ),
+        'mass_mailing_segment_id': fields.many2one(
+            'mail.mass_mailing.segment', 'Mass mailing segment',
+            domain="[('mass_mailing_campaign_id', '=', mass_mailing_campaign_id)]",
         ),
     }
 
-    def onchange_mass_mail_campaign_id(self, cr, uid, ids, mass_mail_campaign_id, context=None):
-        values = {}
-        if mass_mail_campaign_id:
-            campaign = self.pool['mail.mass_mailing.campaign'].browse(cr, uid, mass_mail_campaign_id, context=context)
-            if campaign and campaign.template_id:
-                values['template_id'] = campaign.template_id.id
-        return {'value': values}
+    _defaults = {
+        'use_mass_mailing_campaign': True,
+    }
 
-    def render_message(self, cr, uid, wizard, res_id, context=None):
+    def onchange_mass_mail_campaign_id(self, cr, uid, ids, mass_mail_campaign_id, context=None):
+        return {'value': {'mass_mailing_segment_id': False}}
+
+    def render_message_batch(self, cr, uid, wizard, res_ids, context=None):
         """ Override method that generated the mail content by adding the mass
         mailing campaign, when doing pure email mass mailing. """
-        res = super(MailComposeMessage, self).render_message(cr, uid, wizard, res_id, context=context)
-        print res, wizard.mass_mail_campaign_id
-        if wizard.composition_mode == 'mass_mail' and wizard.mass_mail_campaign_id:  # TODO: which kind of mass mailing ?
-            res['mass_mailing_campaign_id'] = wizard.mass_mail_campaign_id.id
+        res = super(MailComposeMessage, self).render_message_batch(cr, uid, wizard, res_ids, context=context)
+        if wizard.composition_mode == 'mass_mail' and wizard.mass_mailing_segment_id:  # TODO: which kind of mass mailing ?
+            for res_id in res_ids:
+                res[res_id]['mass_mailing_segment_id'] = wizard.mass_mailing_segment_id.id
         return res
diff --git a/addons/mass_mailing/wizard/mail_compose_message_view.xml b/addons/mass_mailing/wizard/mail_compose_message_view.xml
index bc5f1a9eb6a..fda29f33399 100644
--- a/addons/mass_mailing/wizard/mail_compose_message_view.xml
+++ b/addons/mass_mailing/wizard/mail_compose_message_view.xml
@@ -8,10 +8,25 @@
             <field name="model">mail.compose.message</field>
             <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='subject']" position="after">
-                    <field name="mass_mail_campaign_id"
-                            on_change="onchange_mass_mail_campaign_id(mass_mail_campaign_id)"
-                            attrs="{'invisible': [('composition_mode', '!=', 'mass_mail')]}"/>
+                <xpath expr="//field[@name='notify']" position="after">
+                    <field name="use_mass_mailing_campaign"
+                                attrs="{'invisible': [('composition_mode', '!=', 'mass_mail')]}"/>
+                    <label for="mass_mailing_campaign_id" string=" "/>
+                    <div>
+                        <group>
+                            <field name="mass_mailing_campaign_id"
+                                on_change="onchange_mass_mail_campaign_id(mass_mailing_campaign_id)"
+                                attrs="{'invisible': ['|', ('composition_mode', '!=', 'mass_mail'), ('use_mass_mailing_campaign', '=', False)],
+                                        'required': [('composition_mode', '=', 'mass_mail'), ('use_mass_mailing_campaign', '=', True)]}"/>
+                            <field name="mass_mailing_segment_id"
+                                attrs="{'invisible': ['|', ('composition_mode', '!=', 'mass_mail'), ('use_mass_mailing_campaign', '=', False)],
+                                        'required': [('composition_mode', '=', 'mass_mail'), ('use_mass_mailing_campaign', '=', True)]}"
+                                context="{'default_mass_mailing_campaign_id': mass_mailing_campaign_id,
+                                          'default_template_id': template_id,
+                                          'default_domain': active_domain,
+                                          'form_view_ref': 'mass_mailing.view_mail_mass_mailing_segment_form_readonly'}"/>
+                        </group>
+                    </div>
                 </xpath>
             </field>
         </record>

From 128d7f39c89ad860615a4a923bf01c516483a62e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Sep 2013 17:29:33 +0200
Subject: [PATCH 127/164] [IMP] mass_mailing: using delivered instead of
 bounced in kanban views

bzr revid: tde@openerp.com-20130910152933-3xb34l0xyhj9yh21
---
 addons/mass_mailing/mass_mailing.py       |  4 ++--
 addons/mass_mailing/mass_mailing_view.xml | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/mass_mailing/mass_mailing.py b/addons/mass_mailing/mass_mailing.py
index be31b04957c..31122bf514c 100644
--- a/addons/mass_mailing/mass_mailing.py
+++ b/addons/mass_mailing/mass_mailing.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from datetime import date, datetime
+from datetime import datetime
 from dateutil import relativedelta
 
 from openerp import tools
@@ -52,7 +52,7 @@ class MassMailingCampaign(osv.Model):
             segment_results = []
             for segment in campaign.segment_ids:
                 segment_object = {}
-                for attr in ['name', 'sent', 'opened', 'replied', 'bounced']:
+                for attr in ['name', 'sent', 'delivered', 'opened', 'replied', 'bounced']:
                     segment_object[attr] = getattr(segment, attr)
                 segment_results.append(segment_object)
             results[campaign.id] = segment_results
diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index 91c68d8d734..9dddd82ad5e 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -53,6 +53,10 @@
                                     <span class="oe_mail_result"><t t-raw="segment.sent"/></span><br />
                                     Sent
                                 </p>
+                                <p class="oe_mail_stats">
+                                    <span class="oe_mail_result"><t t-raw="segment.delivered"/></span><br />
+                                    Delivered
+                                </p>
                                 <p class="oe_mail_stats">
                                     <span class="oe_mail_result"><t t-raw="segment.opened"/></span><br />
                                     Opened
@@ -61,10 +65,6 @@
                                     <span class="oe_mail_result"><t t-raw="segment.replied"/></span><br />
                                     Replied
                                 </p>
-                                <p class="oe_mail_stats">
-                                    <span class="oe_mail_result"><t t-raw="segment.bounced"/></span><br />
-                                    Bounced
-                                </p>
                             </div>
                         </t>
                         <t t-name="kanban-box">
@@ -187,6 +187,10 @@
                                             <span class="oe_mail_result"><field name="sent"/></span><br />
                                             Sent
                                         </p>
+                                        <p class="oe_mail_stats">
+                                            <span class="oe_mail_result"><field name="delivered"/></span><br />
+                                            Delivered
+                                        </p>
                                         <p class="oe_mail_stats">
                                             <span class="oe_mail_result"><field name="opened"/></span><br />
                                             Opened
@@ -195,10 +199,6 @@
                                             <span class="oe_mail_result"><field name="replied"/></span><br />
                                             Replied
                                         </p>
-                                        <p class="oe_mail_stats">
-                                            <span class="oe_mail_result"><field name="bounced"/></span><br />
-                                            Bounced
-                                        </p>
                                     </div>
                                     <div>
                                         <div class="oe_sparkline_container">

From dd84b00b0b122b2e80d0be4b1ec6f45bb37a683f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 11 Sep 2013 13:21:08 +0200
Subject: [PATCH 128/164] [IMP] revert changes in yaml_import

bzr revid: mat@openerp.com-20130911112108-z0ivfwqy1zlqhnec
---
 openerp/tools/yaml_import.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index b115799129c..aba9db25f13 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -322,7 +322,7 @@ class YamlInterpreter(object):
 
             record_dict = self._create_record(model, fields, view_info, default=default)
             _logger.debug("RECORD_DICT %s" % record_dict)
-            id = self.pool['ir.model.data']._update(self.cr, self.uid, record.model, \
+            id = self.pool['ir.model.data']._update(self.cr, SUPERUSER_ID, record.model, \
                     self.module, record_dict, record.id, noupdate=self.isnoupdate(record), mode=self.mode, context=context)
             self.id_map[record.id] = int(id)
             if config.get('import_partial'):
@@ -781,6 +781,7 @@ class YamlInterpreter(object):
 
     def process_url(self, node):
         self.validate_xml_id(node.id)
+
         res = {'name': node.name, 'url': node.url, 'target': node.target}
 
         id = self.pool['ir.model.data']._update(self.cr, SUPERUSER_ID, \

From c312cac0fa40c6bddd7785f29c6feaadd1ff384d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 11 Sep 2013 14:11:32 +0200
Subject: [PATCH 129/164] [IMP] remove merged conflict

bzr revid: mat@openerp.com-20130911121132-47g2d267ld4b2cyl
---
 addons/project_issue/test/issue_process.yml | 46 ---------------------
 1 file changed, 46 deletions(-)

diff --git a/addons/project_issue/test/issue_process.yml b/addons/project_issue/test/issue_process.yml
index 08e576d86dd..61ebe2e646c 100644
--- a/addons/project_issue/test/issue_process.yml
+++ b/addons/project_issue/test/issue_process.yml
@@ -1,32 +1,4 @@
 -
-<<<<<<< TREE
-  Project user can subscribe issue, so let's check data with giving the access rights of user.
--
-  !context
-    uid: 'res_users_project_issue_user'
--
-  In order to test process of issue tracking in OpenERP, I Open the Issue.
--
-  !python {model: project.issue}: |
-    self.case_open(cr, uid, [ref("crm_case_buginaccountsmodule0")])
-- 
-  I check state of Issue after opened it.
-- 
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in open state}:
-    - state == 'open'       
-- 
-  Now I put Issue in pending due to need more information.
-- 
-  !python {model: project.issue}: |
-    self.case_pending(cr, uid, [ref("crm_case_buginaccountsmodule0")])
-- 
-  I check state after put in pending.
--  
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in pending state}:
-    - state == 'pending'
--
-=======
->>>>>>> MERGE-SOURCE
   I send mail to get more details. TODO revert mail.mail to mail.compose.message (conversion to customer should be automatic).
 -
   !python {model: mail.mail }: |
@@ -48,21 +20,3 @@
 -
   !python {model: project.issue}: |
     self.convert_issue_task(cr, uid, [ref("crm_case_buginaccountsmodule0")])
-<<<<<<< TREE
--
-  After resolving Issue Project user can close issue, so let's check data with giving the access rights of user.
--
-  !context
-    uid: 'res_users_project_issue_user'
--
-  I close Issue after resolving it
--
-  !python {model: project.issue}: |
-    self.case_close(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--  
-  I Check state of Issue after closed.
-- 
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in done state}:
-    - state == 'done'
-=======
->>>>>>> MERGE-SOURCE

From 5e051e9484d8e44da9742d623326c1e09b21aec3 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 11 Sep 2013 16:25:49 +0200
Subject: [PATCH 130/164] [FIX] resource: better access rights

bzr revid: mat@openerp.com-20130911142549-cpzg8588ol31b8k1
---
 addons/hr_holidays/security/ir_rule.xml        | 7 +++++++
 addons/resource/security/ir.model.access.csv   | 2 +-
 addons/resource/security/resource_security.xml | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml
index e2c0ffb1a6f..1ff12f41244 100644
--- a/addons/hr_holidays/security/ir_rule.xml
+++ b/addons/hr_holidays/security/ir_rule.xml
@@ -15,5 +15,12 @@
         <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
     </record>
     
+    <record id="resource_leaves_officer" model="ir.rule">
+        <field name="name">Leaves Officer</field>
+        <field name="model_id" ref="model_resource_calendar_leaves"/>
+        <field name="domain_force">[(1,'=',1)]</field>
+        <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
+    </record>
+
   </data>
 </openerp>
diff --git a/addons/resource/security/ir.model.access.csv b/addons/resource/security/ir.model.access.csv
index 058626831c6..bf8504e2f46 100644
--- a/addons/resource/security/ir.model.access.csv
+++ b/addons/resource/security/ir.model.access.csv
@@ -3,5 +3,5 @@ access_resource_calendar,resource.calendar,model_resource_calendar,base.group_sy
 access_resource_calendar_attendance,resource.calendar.attendance,model_resource_calendar_attendance,base.group_system,1,1,1,1
 access_resource_resource,resource.resource,model_resource_resource,base.group_system,1,0,0,0
 access_resource_resource_all,resource.resource all,model_resource_resource,,1,0,0,0
-access_resource_calendar_leaves_all,resource.calendar.leaves,model_resource_calendar_leaves,,1,0,0,0
+access_resource_calendar_leaves_user,resource.calendar.leaves,model_resource_calendar_leaves,base.group_user,1,0,0,0
 access_resource_calendar_leaves,resource.calendar.leaves,model_resource_calendar_leaves,base.group_system,1,1,1,1
diff --git a/addons/resource/security/resource_security.xml b/addons/resource/security/resource_security.xml
index 77d9a11751a..43bfa6c3a4b 100644
--- a/addons/resource/security/resource_security.xml
+++ b/addons/resource/security/resource_security.xml
@@ -5,7 +5,7 @@
     <record model="ir.rule" id="resource_own_leaves">
         <field name="name">Resource: see own leaves</field>
         <field name="model_id" ref="model_resource_calendar_leaves"/>
-        <field name="global" eval="True"/>
+        <field name="groups" eval="[(4, ref('base.group_user'))]"/>
         <field name="domain_force">['|',
                                         ('resource_id', '=', False),
                                         ('resource_id.user_id', '=', user.id),

From f5d8d2a451f719b98440203deed26a6ace41e1b4 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 11 Sep 2013 17:31:50 +0200
Subject: [PATCH 131/164] [FIX] crm: better test

bzr revid: mat@openerp.com-20130911153150-uje35usg4jj8710l
---
 addons/crm/test/crm_lead_onchange.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/test/crm_lead_onchange.yml b/addons/crm/test/crm_lead_onchange.yml
index 6e11c7c54c3..ca6dd88d085 100644
--- a/addons/crm/test/crm_lead_onchange.yml
+++ b/addons/crm/test/crm_lead_onchange.yml
@@ -24,6 +24,7 @@
   !record {model: crm.phonecall, id: crm_phonecall_5}:
     name: 'Bad time'
     partner_id: base.res_partner_5
+-
   Sales manager set the next stage to "New" for the lead.
 -
   !python {model: crm.lead}: |

From bed4a740d48916569b9e120079eacf42b7b4006c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 12 Sep 2013 09:06:47 +0200
Subject: [PATCH 132/164] [FIX] crm: removed useless test with state -> stage

bzr revid: mat@openerp.com-20130912070647-abvqj0j57nazap6l
---
 addons/crm/test/crm_lead_onchange.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/crm/test/crm_lead_onchange.yml b/addons/crm/test/crm_lead_onchange.yml
index ca6dd88d085..c9ce6210c17 100644
--- a/addons/crm/test/crm_lead_onchange.yml
+++ b/addons/crm/test/crm_lead_onchange.yml
@@ -1,4 +1,3 @@
-
 -
   Sales manager create a lead record to call a partner onchange, stage onchange and mailing opt-in onchange method.
 -
@@ -24,8 +23,3 @@
   !record {model: crm.phonecall, id: crm_phonecall_5}:
     name: 'Bad time'
     partner_id: base.res_partner_5
--
-  Sales manager set the next stage to "New" for the lead.
--
-  !python {model: crm.lead}: |
-    self.stage_next(cr, uid, [ref("crm_case_4")], context={'stage_type': 'lead'})

From 5175ce9e77f6343637309c7e05bc178a07768d2e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 12 Sep 2013 09:53:53 +0200
Subject: [PATCH 133/164] [IMP] ir_model_data: restrict ir_model_data rule to
 read only for user and add create to group_user

bzr revid: mat@openerp.com-20130912075353-s1hjsz3b0lvzhzj3
---
 openerp/addons/base/security/ir.model.access.csv | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv
index 77687c09ae1..fe5d622ca82 100644
--- a/openerp/addons/base/security/ir.model.access.csv
+++ b/openerp/addons/base/security/ir.model.access.csv
@@ -17,7 +17,8 @@
 "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,1,1,0
+"access_ir_model_data_all","ir_model_data all","model_ir_model_data",,1,0,0,0
+"access_ir_model_data_user","ir_model_data user","model_ir_model_data",base.group_user,1,0,1,0
 "access_ir_model_fields_all","ir_model_fields all","model_ir_model_fields",,1,0,0,0
 "access_ir_module_category_group_user","ir_module_category group_user","model_ir_module_category",,1,0,0,0
 "access_ir_module_module_group_user","ir_module_module group_user","model_ir_module_module","group_system",1,1,1,1

From 837f2c7cb4d634ab5c5f069ce91a2d09b8a36ca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 12 Sep 2013 10:00:22 +0200
Subject: [PATCH 134/164] [DOC] web_kanban_gauge, web_kanban_sparkline: added
 doc with changelog

bzr revid: tde@openerp.com-20130912080022-fmzl4hll4wca2yy2
---
 addons/web_kanban_gauge/__openerp__.py        |  2 +-
 addons/web_kanban_gauge/doc/changelog.rst     | 10 ++++++++++
 addons/web_kanban_gauge/doc/index.rst         | 10 ++++++++++
 addons/web_kanban_sparkline/doc/changelog.rst | 10 ++++++++++
 addons/web_kanban_sparkline/doc/index.rst     | 10 ++++++++++
 5 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 addons/web_kanban_gauge/doc/changelog.rst
 create mode 100644 addons/web_kanban_gauge/doc/index.rst
 create mode 100644 addons/web_kanban_sparkline/doc/changelog.rst
 create mode 100644 addons/web_kanban_sparkline/doc/index.rst

diff --git a/addons/web_kanban_gauge/__openerp__.py b/addons/web_kanban_gauge/__openerp__.py
index 19b2d6f0da3..fd4c2cfba66 100644
--- a/addons/web_kanban_gauge/__openerp__.py
+++ b/addons/web_kanban_gauge/__openerp__.py
@@ -2,7 +2,7 @@
     'name': 'Gauge Widget for Kanban',
     'category': 'Hidden',
     'description': """
-This widget allows to display gauges using jquery.sparkline library.
+This widget allows to display gauges using justgage library.
 """,
     'version': '1.0',
     'depends': ['web_kanban'],
diff --git a/addons/web_kanban_gauge/doc/changelog.rst b/addons/web_kanban_gauge/doc/changelog.rst
new file mode 100644
index 00000000000..5b3e8fb6857
--- /dev/null
+++ b/addons/web_kanban_gauge/doc/changelog.rst
@@ -0,0 +1,10 @@
+.. _changelog:
+
+Changelog
+=========
+
+`trunk (saas-2)`
+----------------
+
+ - Module ``web_kanban_gauge`` created. It comes from the refactoring of
+   custom kanban widgets used in other modules, now standardized.
diff --git a/addons/web_kanban_gauge/doc/index.rst b/addons/web_kanban_gauge/doc/index.rst
new file mode 100644
index 00000000000..5c5740853d4
--- /dev/null
+++ b/addons/web_kanban_gauge/doc/index.rst
@@ -0,0 +1,10 @@
+Gauge for Kanban module documentation
+======================================
+
+Changelog
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   changelog.rst
diff --git a/addons/web_kanban_sparkline/doc/changelog.rst b/addons/web_kanban_sparkline/doc/changelog.rst
new file mode 100644
index 00000000000..4c920a005ff
--- /dev/null
+++ b/addons/web_kanban_sparkline/doc/changelog.rst
@@ -0,0 +1,10 @@
+.. _changelog:
+
+Changelog
+=========
+
+`trunk (saas-2)`
+----------------
+
+ - Module ``web_kanban_sparkline`` created. It comes from the refactoring of
+   custom kanban widgets used in other modules, now standardized.
diff --git a/addons/web_kanban_sparkline/doc/index.rst b/addons/web_kanban_sparkline/doc/index.rst
new file mode 100644
index 00000000000..869a323c62f
--- /dev/null
+++ b/addons/web_kanban_sparkline/doc/index.rst
@@ -0,0 +1,10 @@
+Sparkline for Kanban module documentation
+=========================================
+
+Changelog
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   changelog.rst

From f5639479dbd6102013d64bf6e9059cb9ef68ea99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 12 Sep 2013 12:08:29 +0200
Subject: [PATCH 135/164] [DOC] mail: updated changelog

bzr revid: tde@openerp.com-20130912100829-nnp723by9nvwjozb
---
 addons/mail/doc/changelog.rst | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/addons/mail/doc/changelog.rst b/addons/mail/doc/changelog.rst
index a7a2cfcf2b5..852c548aa0f 100644
--- a/addons/mail/doc/changelog.rst
+++ b/addons/mail/doc/changelog.rst
@@ -6,6 +6,20 @@ Changelog
 `trunk (saas-2)`
 ----------------
 
+ - ``mass_mailing_campaign`` update
+
+  - ``mail_mail``: added ``opened``, ``replied`` and ``bounced`` datetime fields
+    holding the first time the mail has been respectively opened, replied or has
+    bounced.
+  - controllers: added a web controller to track opened mail
+  - ``mail_mail`: moved ``reply_to`` computation from ``mail_mail`` to ``mail_message``
+    where it belongs, as the field is located onto the ``mail_message`` model.
+  - ``mail_compose_message``: template rendering is now done in batch. Each template
+    is rendered for all res_ids, instead of all templates one id at a time.
+  - ``mail_thread``: added support for bounce alias. Using an alias on Return-Path
+    the mail gateway now flags emails and models having a ``message_bounce`` field
+    as bounced.
+
  - added support of ``active_domain`` form context, coming from the list view.
    When checking the header hook, the mass mailing will be done on all records
    matching the ``active_domain``.

From f8922d6b168b1563cfbaa437f1039e4c7e4fedd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 12 Sep 2013 12:09:09 +0200
Subject: [PATCH 136/164] [IMP] [ADD] mass_mailing: added a wizard to create
 new segments. It can be called directly from within the campaign form view,
 using a button. It allows to easily create new segments and launch the
 composer.

bzr revid: tde@openerp.com-20130912100909-ofalececxn64a389
---
 addons/mail/wizard/mail_compose_message.py    |   2 +-
 addons/mass_mailing/__openerp__.py            |   3 +-
 addons/mass_mailing/mass_mailing.py           |  18 +++
 addons/mass_mailing/mass_mailing_view.xml     |  10 ++
 addons/mass_mailing/wizard/__init__.py        |   1 +
 .../wizard/mail_compose_message.py            |  10 +-
 .../wizard/mail_compose_message_view.xml      |   2 +-
 .../mail_mass_mailing_create_segment.py       | 122 ++++++++++++++++++
 .../mail_mass_mailing_create_segment.xml      |  71 ++++++++++
 9 files changed, 233 insertions(+), 6 deletions(-)
 create mode 100644 addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py
 create mode 100644 addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 1b3f6010893..f129e5bf0f9 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -75,7 +75,7 @@ class mail_compose_message(osv.TransientModel):
         if 'active_domain' in context:  # not context.get() because we want to keep global [] domains
             result['use_active_domain'] = True
             result['active_domain'] = '%s' % context.get('active_domain')
-        else:
+        elif not result.get('active_domain'):
             result['active_domain'] = ''
         # get default values according to the composition mode
         if composition_mode == 'reply':
diff --git a/addons/mass_mailing/__openerp__.py b/addons/mass_mailing/__openerp__.py
index 147b9bea89c..7f2c26e4a28 100644
--- a/addons/mass_mailing/__openerp__.py
+++ b/addons/mass_mailing/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2013-today OpenERP SA (<http://www.openerp.com>)
+#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -37,6 +37,7 @@
         'mass_mailing_demo.xml',
         'mail_mail_view.xml',
         'wizard/mail_compose_message_view.xml',
+        'wizard/mail_mass_mailing_create_segment.xml',
         'security/ir.model.access.csv',
     ],
     'js': [],
diff --git a/addons/mass_mailing/mass_mailing.py b/addons/mass_mailing/mass_mailing.py
index 31122bf514c..b255f3163c9 100644
--- a/addons/mass_mailing/mass_mailing.py
+++ b/addons/mass_mailing/mass_mailing.py
@@ -23,6 +23,7 @@ from datetime import datetime
 from dateutil import relativedelta
 
 from openerp import tools
+from openerp.tools.translate import _
 from openerp.osv import osv, fields
 
 
@@ -104,6 +105,23 @@ class MassMailingCampaign(osv.Model):
         ),
     }
 
+    def launch_segment_create_wizard(self, cr, uid, ids, context=None):
+        ctx = dict(context)
+        ctx.update({
+            'default_mass_mailing_campaign_id': ids[0],
+        })
+        return {
+            'name': _('Create a Segment for the Campaign'),
+            'type': 'ir.actions.act_window',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'mail.mass_mailing.segment.create',
+            'views': [(False, 'form')],
+            'view_id': False,
+            'target': 'new',
+            'context': ctx,
+        }
+
 
 class MassMailingSegment(osv.Model):
     """ MassMailingSegment models a segment for a mass mailign campaign. A segment
diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index 9dddd82ad5e..cc2ffc9cb25 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -19,6 +19,10 @@
             <field name="model">mail.mass_mailing.campaign</field>
             <field name="arch" type="xml">
                 <form string="Mass Mailing Campaign" version="7.0">
+                    <header>
+                        <button name="launch_segment_create_wizard" type="object"
+                            class="oe_highlight" string="Create a New Segment"/>
+                    </header>
                     <sheet>
                         <group>
                             <field name="name"/>
@@ -28,6 +32,8 @@
                             <field name="replied"/>
                             <field name="bounced"/>
                         </group>
+                        <label for="segment_ids"/>
+                        <field name="segment_ids"/>
                     </sheet>
                 </form>
             </field>
@@ -114,6 +120,10 @@
             <field name="arch" type="xml">
                 <tree string="Mass Mailing Segments">
                     <field name="name"/>
+                    <field name="sent"/>
+                    <field name="delivered"/>
+                    <field name="opened"/>
+                    <field name="replied"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/mass_mailing/wizard/__init__.py b/addons/mass_mailing/wizard/__init__.py
index 155849362cd..669d12289c2 100644
--- a/addons/mass_mailing/wizard/__init__.py
+++ b/addons/mass_mailing/wizard/__init__.py
@@ -20,3 +20,4 @@
 ##############################################################################
 
 import mail_compose_message
+import mail_mass_mailing_create_segment
diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py
index 2b36389cb7b..4fe858734fe 100644
--- a/addons/mass_mailing/wizard/mail_compose_message.py
+++ b/addons/mass_mailing/wizard/mail_compose_message.py
@@ -41,17 +41,21 @@ class MailComposeMessage(osv.TransientModel):
     }
 
     _defaults = {
-        'use_mass_mailing_campaign': True,
+        'use_mass_mailing_campaign': False,
     }
 
-    def onchange_mass_mail_campaign_id(self, cr, uid, ids, mass_mail_campaign_id, context=None):
+    def onchange_mass_mail_campaign_id(self, cr, uid, ids, mass_mailing_campaign_id, mass_mail_segment_id, context=None):
+        if mass_mail_segment_id:
+            segment = self.pool['mail.mass_mailing.segment'].browse(cr, uid, mass_mail_segment_id, context=context)
+            if segment.mass_mailing_campaign_id.id == mass_mailing_campaign_id:
+                return {}
         return {'value': {'mass_mailing_segment_id': False}}
 
     def render_message_batch(self, cr, uid, wizard, res_ids, context=None):
         """ Override method that generated the mail content by adding the mass
         mailing campaign, when doing pure email mass mailing. """
         res = super(MailComposeMessage, self).render_message_batch(cr, uid, wizard, res_ids, context=context)
-        if wizard.composition_mode == 'mass_mail' and wizard.mass_mailing_segment_id:  # TODO: which kind of mass mailing ?
+        if wizard.composition_mode == 'mass_mail' and wizard.use_mass_mailing_campaign and wizard.mass_mailing_segment_id:  # TODO: which kind of mass mailing ?
             for res_id in res_ids:
                 res[res_id]['mass_mailing_segment_id'] = wizard.mass_mailing_segment_id.id
         return res
diff --git a/addons/mass_mailing/wizard/mail_compose_message_view.xml b/addons/mass_mailing/wizard/mail_compose_message_view.xml
index fda29f33399..9dcf57682f6 100644
--- a/addons/mass_mailing/wizard/mail_compose_message_view.xml
+++ b/addons/mass_mailing/wizard/mail_compose_message_view.xml
@@ -15,7 +15,7 @@
                     <div>
                         <group>
                             <field name="mass_mailing_campaign_id"
-                                on_change="onchange_mass_mail_campaign_id(mass_mailing_campaign_id)"
+                                on_change="onchange_mass_mail_campaign_id(mass_mailing_campaign_id, mass_mailing_segment_id, context)"
                                 attrs="{'invisible': ['|', ('composition_mode', '!=', 'mass_mail'), ('use_mass_mailing_campaign', '=', False)],
                                         'required': [('composition_mode', '=', 'mass_mail'), ('use_mass_mailing_campaign', '=', True)]}"/>
                             <field name="mass_mailing_segment_id"
diff --git a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py
new file mode 100644
index 00000000000..ffb7c004415
--- /dev/null
+++ b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py
@@ -0,0 +1,122 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 openerp.osv import osv, fields
+
+from openerp.tools.translate import _
+
+
+class MailMassMailingSegmentCreate(osv.TransientModel):
+    """Wizard to help creating mass mailing segments for a campaign. """
+
+    _name = 'mail.mass_mailing.segment.create'
+    _description = 'Mass mailing segment creation'
+
+    _columns = {
+        'mass_mailing_campaign_id': fields.many2one(
+            'mail.mass_mailing.campaign', 'Mass mailing campaign',
+            required=True,
+        ),
+        'model_id': fields.many2one(
+            'ir.model', 'Model',
+            required=True,
+        ),
+        'model_model': fields.related(
+            'model_id', 'name',
+            type='char', string='Model Name'
+        ),
+        'filter_id': fields.many2one(
+            'ir.filters', 'Filter',
+            domain="[('model_id', '=', model_model)]",
+        ),
+        'domain': fields.related(
+            'filter_id', 'domain',
+            type='char', string='Domain',
+        ),
+        'template_id': fields.many2one(
+            'email.template', 'Template', required=True,
+            domain="[('model_id', '=', model_id)]",
+        ),
+        'segment_name': fields.char(
+            'Segment name', required=True,
+        ),
+        'mass_mailing_segment_id': fields.many2one(
+            'mail.mass_mailing.segment', 'Mass Mailing Segment',
+        ),
+    }
+
+    _defaults = {
+    }
+
+    def on_change_model_id(self, cr, uid, ids, model_id, context=None):
+        if model_id:
+            model_model = self.pool['ir.model'].browse(cr, uid, model_id, context=context).model
+        else:
+            model_model = False
+        return {'value': {'model_model': model_model}}
+
+    def on_change_filter_id(self, cr, uid, ids, filter_id, context=None):
+        if filter_id:
+            domain = self.pool['ir.filters'].browse(cr, uid, filter_id, context=context).domain
+        else:
+            domain = False
+        return {'value': {'domain': domain}}
+
+    def create_segment(self, cr, uid, ids, context=None):
+        """ Create a segment based on wizard data, and update the wizard """
+        for wizard in self.browse(cr, uid, ids, context=context):
+            segment_values = {
+                'name': wizard.segment_name,
+                'mass_mailing_campaign_id': wizard.mass_mailing_campaign_id.id,
+                'domain': wizard.domain,
+                'template_id': wizard.template_id.id,
+            }
+            segment_id = self.pool['mail.mass_mailing.segment'].create(cr, uid, segment_values, context=context)
+            self.write(cr, uid, [wizard.id], {'mass_mailing_segment_id': segment_id}, context=context)
+        return True
+
+    def launch_composer(self, cr, uid, ids, context=None):
+        """ Main wizard action: create a new segment and launch the mail.compose.message
+        email composer with wizard data. """
+        self.create_segment(cr, uid, ids, context=context)
+
+        wizard = self.browse(cr, uid, ids[0], context=context)
+        ctx = dict(context)
+        ctx.update({
+            'default_composition_mode': 'mass_mail',
+            'default_template_id': wizard.template_id.id,
+            'default_use_mass_mailing_campaign': True,
+            'default_use_active_domain': True,
+            'default_active_domain': wizard.domain,
+            'default_mass_mailing_campaign_id': wizard.mass_mailing_campaign_id.id,
+            'default_mass_mailing_segment_id': wizard.mass_mailing_segment_id.id,
+        })
+        return {
+            'name': _('Compose Email for Mass Mailing'),
+            'type': 'ir.actions.act_window',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'mail.compose.message',
+            'views': [(False, 'form')],
+            'view_id': False,
+            'target': 'new',
+            'context': ctx,
+        }
diff --git a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
new file mode 100644
index 00000000000..5d211bb9eb4
--- /dev/null
+++ b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- Wizard form view -->
+        <record model="ir.ui.view" id="view_mail_mass_mailing_segment_create_form">
+            <field name="name">mail.mass_mailing.segment.create.form</field>
+            <field name="model">mail.mass_mailing.segment.create</field>
+            <field name="arch" type="xml">
+                <form string="Create a Mass Mailing Segment" version="7.0">
+                    <group>
+                        <field name="model_model" invisible="1"/>
+                        <field name="domain" invisible="1"/>
+                        <p class="oe_grey" colspan="2"
+                            attrs="{'invisible': [('mass_mailing_campaign_id', '!=', False)]}">
+                            Please choose a mass mailing campaign that will hold the new segment.
+                        </p>
+                        <field name="mass_mailing_campaign_id"/>
+
+                        <p class="oe_grey" colspan="2"
+                            attrs="{'invisible': ['|', ('model_id', '!=', False), ('mass_mailing_campaign_id', '=', False)]}">
+                            Please choose a model on which you will run the mass mailing.
+                        </p>
+                        <field name="model_id"
+                            on_change="on_change_model_id(model_id, context)"
+                            attrs="{'invisible': [('mass_mailing_campaign_id', '=', False)]}"/>
+
+                        <p class="oe_grey" colspan="2"
+                            attrs="{'invisible': ['|', ('filter_id', '!=', False), ('model_id', '=', False)]}">
+                            Please choose a filter that will be applied on the model
+                            to find the records on which you will run the mass mailing.
+                        </p>
+                        <field name="filter_id"
+                            on_change="on_change_filter_id(filter_id, context)"
+                            attrs="{'invisible': [('model_id', '=', False)]}"/>
+
+                        <p class="oe_grey" colspan="2"
+                            attrs="{'invisible': ['|', ('template_id', '!=', False), ('filter_id', '=', False)]}">
+                            Please choose the template to use to render the emails
+                            to send.
+                        </p>
+                        <field name="template_id"
+                            attrs="{'invisible': [('filter_id', '=', False)]}"/>
+
+                        <p class="oe_grey" colspan="2"
+                            attrs="{'invisible': ['|', ('segment_name', '!=', False), ('template_id', '=', False)]}">
+                            Please choose the name of the campaign segment.
+                        </p>
+                        <field name="segment_name"
+                            attrs="{'invisible': [('template_id', '=', False)]}"/>
+
+                        <button name="launch_composer" type="object"
+                            string="Create segment and launch email composer"
+                            attrs="{'invisible': [('segment_name', '=', False)]}"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_mail_mass_mailing_segment_create">
+            <field name="name">Create Mass Mailing Segment</field>
+            <field name="res_model">mail.mass_mailing.segment.create</field>
+            <field name="src_model">mail.mass_mailing.campaign</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+    </data>
+</openerp>

From 651f76e274093fb4b8a0a34fb7065896e20daa1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Thu, 12 Sep 2013 15:50:44 +0200
Subject: [PATCH 137/164] [IMP] point_of_sale: log pushed orders to the backend
 + disable proxy rpcs when the proxy is disconnected

bzr revid: fva@openerp.com-20130912135044-93c6va8e8yttkir1
---
 addons/point_of_sale/controllers/main.py      | 21 +++++++------------
 addons/point_of_sale/static/src/js/devices.js | 19 ++++++++++++++++-
 addons/point_of_sale/static/src/js/models.js  |  1 +
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/addons/point_of_sale/controllers/main.py b/addons/point_of_sale/controllers/main.py
index e0bd19545a6..de757238d6f 100644
--- a/addons/point_of_sale/controllers/main.py
+++ b/addons/point_of_sale/controllers/main.py
@@ -10,6 +10,8 @@ from openerp.addons.web import http
 from openerp.addons.web.http import request
 from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template
 
+_logger = logging.getLogger(__name__)
+
 class PointOfSaleController(http.Controller):
     def __init__(self):
         self.scale = 'closed'
@@ -71,7 +73,7 @@ class PointOfSaleController(http.Controller):
 
     @http.route('/pos/test_connection', type='json', auth='admin')
     def test_connection(self):
-        return
+        _logger.info('Received Connection Test from the Point of Sale');
 
     @http.route('/pos/scan_item_success', type='json', auth='admin')
     def scan_item_success(self, ean):
@@ -79,7 +81,6 @@ class PointOfSaleController(http.Controller):
         A product has been scanned with success
         """
         print 'scan_item_success: ' + str(ean)
-        return 
 
     @http.route('/pos/scan_item_error_unrecognized')
     def scan_item_error_unrecognized(self, ean):
@@ -87,7 +88,6 @@ class PointOfSaleController(http.Controller):
         A product has been scanned without success
         """
         print 'scan_item_error_unrecognized: ' + str(ean)
-        return 
 
     @http.route('/pos/help_needed', type='json', auth='admin')
     def help_needed(self):
@@ -95,7 +95,6 @@ class PointOfSaleController(http.Controller):
         The user wants an help (ex: light is on)
         """
         print "help_needed"
-        return 
 
     @http.route('/pos/help_canceled', type='json', auth='admin')
     def help_canceled(self):
@@ -103,7 +102,6 @@ class PointOfSaleController(http.Controller):
         The user stops the help request
         """
         print "help_canceled"
-        return 
 
     @http.route('/pos/weighting_start', type='json', auth='admin')
     def weighting_start(self):
@@ -115,7 +113,6 @@ class PointOfSaleController(http.Controller):
             print "... Scale Open."
         else:
             print "WARNING: Scale already Connected !!!"
-        return 
 
     @http.route('/pos/weighting_read_kg', type='json', auth='admin')
     def weighting_read_kg(self):
@@ -156,41 +153,37 @@ class PointOfSaleController(http.Controller):
     @http.route('/pos/payment_cancel', type='json', auth='admin')
     def payment_cancel(self):
         print "payment_cancel"
-        return 
 
     @http.route('/pos/transaction_start', type='json', auth='admin')
     def transaction_start(self):
         print 'transaction_start'
-        return 
 
     @http.route('/pos/transaction_end', type='json', auth='admin')
     def transaction_end(self):
         print 'transaction_end'
-        return 
 
     @http.route('/pos/cashier_mode_activated', type='json', auth='admin')
     def cashier_mode_activated(self):
         print 'cashier_mode_activated'
-        return 
 
     @http.route('/pos/cashier_mode_deactivated', type='json', auth='admin')
     def cashier_mode_deactivated(self):
         print 'cashier_mode_deactivated'
-        return 
 
     @http.route('/pos/open_cashbox', type='json', auth='admin')
     def open_cashbox(self):
         print 'open_cashbox'
-        return
 
     @http.route('/pos/print_receipt', type='json', auth='admin')
     def print_receipt(self, receipt):
         print 'print_receipt' + str(receipt)
-        return
+
+    @http.route('/pos/log', type='json', auth='admin')
+    def log(self, arguments):
+        _logger.info(' '.join(str(v) for v in arguments))
 
     @http.route('/pos/print_pdf_invoice', type='json', auth='admin')
     def print_pdf_invoice(self, pdfinvoice):
         print 'print_pdf_invoice' + str(pdfinvoice)
-        return
 
 
diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js
index 0c737ec1e1a..89f705d09bc 100644
--- a/addons/point_of_sale/static/src/js/devices.js
+++ b/addons/point_of_sale/static/src/js/devices.js
@@ -82,6 +82,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
 
     module.ProxyDevice  = instance.web.Class.extend({
         init: function(options){
+            var self = this;
             options = options || {};
             url = options.url || 'http://localhost:8069';
             
@@ -101,8 +102,13 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
 
             this.connection = new instance.web.Session(undefined,url);
             this.connection.session_id = _.uniqueId('posproxy');
+            this.connected = true;
             this.bypass_proxy = false;
             this.notifications = {};
+            this.message('test_connection').fail(function(){
+                self.connected = false;
+                console.error('Could not connect to the OpenERP Device Proxy Server');
+            });
             
         },
         close: function(){
@@ -113,7 +119,11 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
             for(var i = 0; i < callbacks.length; i++){
                 callbacks[i](params);
             }
-            return this.connection.rpc('/pos/' + name, params || {});       
+            if(this.connected){
+                return this.connection.rpc('/pos/' + name, params || {});       
+            }else{
+                return (new $.Deferred()).reject();
+            }
         },
 
         // this allows the client to be notified when a proxy call is made. The notification 
@@ -124,6 +134,8 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
             }
             this.notifications[name].push(callback);
         },
+
+        
         
         //a product has been scanned and recognized with success
         // ean is a parsed ean object
@@ -316,6 +328,11 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
             return this.message('print_receipt',{receipt: receipt});
         },
 
+        // asks the proxy to log some information, as with the debug.log you can provide several arguments.
+        log: function(){
+            return this.message('log',{'arguments': _.toArray(arguments)});
+        },
+
         // asks the proxy to print an invoice in pdf form ( used to print invoices generated by the server ) 
         print_pdf_invoice: function(pdfinvoice){
             return this.message('print_pdf_invoice',{pdfinvoice: pdfinvoice});
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index fbbb15af9c7..55984d0032d 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -270,6 +270,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
         // it returns a deferred that succeeds after having tried to send the order and all the other pending orders.
         push_order: function(order) {
             var self = this;
+            this.proxy.log('push_order',order.export_as_JSON());
             var order_id = this.db.add_order(order.export_as_JSON());
             var pushed = new $.Deferred();
 

From 8f78d705a6a39ea01ea32ba22ff496460b8d33be Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 13 Sep 2013 05:39:30 +0000
Subject: [PATCH 138/164] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130913053904-ur2s9sv8ghejd8ui
bzr revid: launchpad_translations_on_behalf_of_openerp-20130913053930-0bdx9o2i5047r20e
---
 addons/mrp/i18n/da.po             |    38 +-
 openerp/addons/base/i18n/es_BO.po | 15319 ++++++++++++++++++++++++++++
 2 files changed, 15342 insertions(+), 15 deletions(-)
 create mode 100644 openerp/addons/base/i18n/es_BO.po

diff --git a/addons/mrp/i18n/da.po b/addons/mrp/i18n/da.po
index 8020bb4afcf..11bb2b377cc 100644
--- a/addons/mrp/i18n/da.po
+++ b/addons/mrp/i18n/da.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-12-21 17:04+0000\n"
-"PO-Revision-Date: 2011-11-09 21:53+0000\n"
-"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
+"PO-Revision-Date: 2013-09-12 17:27+0000\n"
+"Last-Translator: John Mertens Pallesen <Unknown>\n"
 "Language-Team: Danish <da@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: 2013-09-12 05:03+0000\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:39+0000\n"
 "X-Generator: Launchpad (build 16761)\n"
 
 #. module: mrp
@@ -29,6 +29,14 @@ msgid ""
 "                    * Notes for the technician and for the final customer.\n"
 "                This installs the module mrp_repair."
 msgstr ""
+"Tillad at administrere alle reperationer på produkter.\n"
+"                    * Tilføj/fjern varer under reparation\n"
+"                    * Påvirkning lager\n"
+"                    * Fakturering (varer og/eller ydelser)\n"
+"                    * Garanti behandling\n"
+"                    * Tilbuds rapport reparation\n"
+"                    * Notes for the technician and for the final customer.\n"
+"                This installs the module mrp_repair."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -38,7 +46,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
-msgstr ""
+msgstr "Lokation hvor systemet vil lede efter komponenter."
 
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
@@ -68,12 +76,12 @@ msgstr ""
 #: code:addons/mrp/report/price.py:130
 #, python-format
 msgid "Hourly Cost"
-msgstr ""
+msgstr "Kostpris pr. time."
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Scrap Products"
-msgstr ""
+msgstr "Kasser vare"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -113,7 +121,7 @@ msgstr ""
 #. module: mrp
 #: view:product.product:0
 msgid "False"
-msgstr ""
+msgstr "Falsk"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -125,12 +133,12 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Finished Products"
-msgstr ""
+msgstr "Færdigproduceret vare"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are currently in production."
-msgstr ""
+msgstr "Produktionsordre igang"
 
 #. module: mrp
 #: help:mrp.bom,message_summary:0
@@ -145,7 +153,7 @@ msgstr ""
 #: model:process.transition,name:mrp.process_transition_servicerfq0
 #: model:process.transition,name:mrp.process_transition_stockrfq0
 msgid "To Buy"
-msgstr ""
+msgstr "Indkøb"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
@@ -187,12 +195,12 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
 msgid "For purchased material"
-msgstr ""
+msgstr "Indkøbte matrialer"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
 msgid "Order Planning"
-msgstr ""
+msgstr "Ordreplanlægning"
 
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
@@ -203,7 +211,7 @@ msgstr ""
 #: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
-msgstr ""
+msgstr "Det er ikke muligt at annullere produktionsordre !"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle_account_id:0
@@ -250,7 +258,7 @@ msgstr ""
 #: view:mrp.production:0
 #: field:mrp.production,move_created_ids2:0
 msgid "Produced Products"
-msgstr ""
+msgstr "Produceret vare"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -265,7 +273,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_byproduct:0
 msgid "Produce several products from one manufacturing order"
-msgstr ""
+msgstr "Producer flere varer på samme produktionsordre"
 
 #. module: mrp
 #: help:mrp.config.settings,group_mrp_properties:0
diff --git a/openerp/addons/base/i18n/es_BO.po b/openerp/addons/base/i18n/es_BO.po
new file mode 100644
index 00000000000..dcda7fac9c2
--- /dev/null
+++ b/openerp/addons/base/i18n/es_BO.po
@@ -0,0 +1,15319 @@
+# Spanish (Bolivia) translation for openobject-server
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-server package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2013-09-12 21:36+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Bolivia) <es_BO@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: 2013-09-13 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_check_writing
+msgid ""
+"\n"
+"Module for the Check Writing and Check Printing.\n"
+"================================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sh
+msgid "Saint Helena"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "Other Configuration"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "DateTime"
+msgstr ""
+
+#. module: base
+#: code:addons/fields.py:652
+#, python-format
+msgid ""
+"The second argument of the many2many field %s must be a SQL table !You used "
+"%s, which is not a valid SQL table name."
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view,arch:0
+#: field:ir.ui.view.custom,arch:0
+msgid "View Architecture"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_sale_stock
+msgid "Quotation, Sale Orders, Delivery & Invoicing Control"
+msgstr ""
+
+#. module: base
+#: selection:ir.sequence,implementation:0
+msgid "No gap"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Hungarian / Magyar"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (PY) / Español (PY)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_project_management
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_point_of_sale
+msgid "Touchscreen Interface for Shops"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_in_hr_payroll
+msgid "Indian Payroll"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,model:0
+msgid ""
+"Model name on which the method to be called is located, e.g. 'res.partner'."
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Created Views"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_product_manufacturer
+msgid ""
+"\n"
+"A module that adds manufacturers and attributes on the product form.\n"
+"====================================================================\n"
+"\n"
+"You can now define the following for a product:\n"
+"-----------------------------------------------\n"
+"    * Manufacturer\n"
+"    * Manufacturer Product Name\n"
+"    * Manufacturer Product Code\n"
+"    * Product Attributes\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.client,params:0
+msgid "Supplementary arguments"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_google_base_account
+msgid ""
+"\n"
+"The module adds google user in res user.\n"
+"========================================\n"
+msgstr ""
+
+#. module: base
+#: help:res.partner,employee:0
+msgid "Check this box if this contact is an Employee."
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,domain:0
+msgid ""
+"The optional domain to restrict possible values for relationship fields, "
+"specified as a Python expression defining a list of triplets. For example: "
+"[('color','=','red')]"
+msgstr ""
+
+#. module: base
+#: field:res.partner,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_invoice_bba
+msgid "Belgium - Structured Communication"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,target:0
+msgid "Target Window"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_rml:0
+msgid "Main Report File Path"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
+msgid "Sales Analytic Distribution"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_timesheet_invoice
+msgid ""
+"\n"
+"Generate your Invoices from Expenses, Timesheet Entries.\n"
+"========================================================\n"
+"\n"
+"Module to generate invoices based on costs (human resources, expenses, "
+"...).\n"
+"\n"
+"You can define price lists in analytic account, make some theoretical "
+"revenue\n"
+"reports."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_sequence.py:134
+#: code:addons/base/ir/ir_sequence.py:160
+#: code:addons/base/res/res_users.py:473
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:405
+#, python-format
+msgid ""
+"Properties of base fields cannot be altered in this manner! Please modify "
+"them through Python code, preferably through a custom addon!"
+msgstr ""
+
+#. module: base
+#: code:addons/osv.py:151
+#, python-format
+msgid "Constraint Error"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view_custom
+msgid "ir.ui.view.custom"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:374
+#, python-format
+msgid "Renaming sparse field \"%s\" is not allowed"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sz
+msgid "Swaziland"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4485
+#, python-format
+msgid "created."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_xsl:0
+msgid "XSL Path"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_tr
+msgid "Turkey - Accounting"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,number_increment:0
+msgid "Increment Number"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_company_tree
+#: model:ir.ui.menu,name:base.menu_action_res_company_tree
+msgid "Company's Structure"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_multi_currency
+msgid "Multi Currencies"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_cl
+msgid ""
+"\n"
+"Chilean accounting chart and tax localization.\n"
+"==============================================\n"
+"Plan contable chileno e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale
+msgid "Sales Management"
+msgstr ""
+
+#. module: base
+#: help:res.partner,user_id:0
+msgid ""
+"The internal user that is in charge of communicating with this contact if "
+"any."
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Search Partner"
+msgstr ""
+
+#. module: base
+#: field:ir.module.category,module_nr:0
+msgid "Number of Modules"
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,company_dest_id:0
+msgid "Company to store the current record"
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank.type.field,size:0
+msgid "Max. Size"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,res_id:0
+msgid ""
+"Database ID of record to open in form view, when ``view_mode`` is set to "
+"'form' only"
+msgstr ""
+
+#. module: base
+#: help:ir.values,key2:0
+msgid ""
+"For actions, one of the possible action slots: \n"
+"  - client_action_multi\n"
+"  - client_print_multi\n"
+"  - client_action_relate\n"
+"  - tree_but_open\n"
+"For defaults, an optional condition"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.lang:0
+msgid "The name of the language must be unique !"
+msgstr ""
+
+#. module: base
+#: selection:res.request,state:0
+msgid "active"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.wizard,wiz_name:0
+msgid "Wizard Name"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_knowledge
+msgid ""
+"\n"
+"Installer for knowledge-based Hidden.\n"
+"=====================================\n"
+"\n"
+"Makes the Knowledge Application Configuration available from where you can "
+"install\n"
+"document and Wiki based Hidden.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_customer_relationship_management
+msgid "Customer Relationship Management"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_delivery
+msgid ""
+"\n"
+"Allows you to add delivery methods in sale orders and picking.\n"
+"==============================================================\n"
+"\n"
+"You can define your own carrier and delivery grids for prices. When creating "
+"\n"
+"invoices from picking, OpenERP is able to add and compute the shipping "
+"line.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_filters.py:80
+#, python-format
+msgid ""
+"There is already a shared filter set as default for %(model)s, delete or "
+"change it before setting a new default"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2649
+#, python-format
+msgid "Invalid group_by"
+msgstr ""
+
+#. module: base
+#: field:ir.module.category,child_ids:0
+msgid "Child Applications"
+msgstr ""
+
+#. module: base
+#: field:res.partner,credit_limit:0
+msgid "Credit Limit"
+msgstr ""
+
+#. module: base
+#: field:ir.model.constraint,date_update:0
+#: field:ir.model.data,date_update:0
+#: field:ir.model.relation,date_update:0
+msgid "Update Date"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_action_rule
+msgid "Automated Action Rules"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
+msgid "Owner"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+msgid "Source Object"
+msgstr ""
+
+#. module: base
+#: model:res.partner.bank.type,format_layout:base.bank_normal
+msgid "%(bank_name)s: %(acc_number)s"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Config Wizard Steps"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view_sc
+msgid "ir.ui.view_sc"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+#: field:ir.model.access,group_id:0
+#: view:res.groups:0
+msgid "Group"
+msgstr ""
+
+#. module: base
+#: constraint:res.lang:0
+msgid ""
+"Invalid date/time format directive specified. Please refer to the list of "
+"allowed directives, displayed when you edit a language."
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4153
+#, python-format
+msgid ""
+"One of the records you are trying to modify has already been deleted "
+"(Document type: %s)."
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,views:0
+msgid ""
+"This function field computes the ordered list of views that should be "
+"enabled when displaying the result of an action, federating view mode, views "
+"and reference view. The result is returned as an ordered list of pairs "
+"(view_id,view_mode)."
+msgstr ""
+
+#. module: base
+#: field:ir.model.relation,name:0
+msgid "Relation Name"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Create Access Right"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tv
+msgid "Tuvalu"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.configuration.wizard,note:0
+msgid "Next Wizard"
+msgstr ""
+
+#. module: base
+#: field:res.lang,date_format:0
+msgid "Date Format"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_report_designer
+msgid "OpenOffice Report Designer"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.an
+msgid "Netherlands Antilles"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:311
+#, python-format
+msgid ""
+"You can not remove the admin user as it is used internally for resources "
+"created by OpenERP (updates, module installation, ...)"
+msgstr ""
+
+#. module: base
+#: view:workflow.transition:0
+msgid "Workflow Transition"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gf
+msgid "French Guyana"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_hr
+msgid "Jobs, Departments, Employees Details"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_analytic
+msgid ""
+"\n"
+"Module for defining analytic accounting object.\n"
+"===============================================\n"
+"\n"
+"In OpenERP, analytic accounts are linked to general accounts but are "
+"treated\n"
+"totally independently. So, you can enter various different analytic "
+"operations\n"
+"that have no counterpart in the general financial accounts.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_event
+msgid ""
+"\n"
+"Organization and management of Events.\n"
+"======================================\n"
+"\n"
+"The event module allows you to efficiently organise events and all related "
+"tasks: planification, registration tracking,\n"
+"attendances, etc.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Manage your Events and Registrations\n"
+"* Use emails to automatically confirm and send acknowledgements for any "
+"event registration\n"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Bosnian / bosanski jezik"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,attachment_use:0
+msgid ""
+"If you check this, then the second time the user prints with same attachment "
+"name, it returns the previous report."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (VE) / Español (VE)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_timesheet_invoice
+msgid "Invoice on Timesheets"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "Your system will be updated."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.todo,note:0
+#: selection:ir.property,type:0
+msgid "Text"
+msgstr ""
+
+#. module: base
+#: field:res.country,name:0
+msgid "Country Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.co
+msgid "Colombia"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_mister
+msgid "Mister"
+msgstr ""
+
+#. module: base
+#: help:res.country,code:0
+msgid ""
+"The ISO country code in two chars.\n"
+"You can use this field for quick search."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pw
+msgid "Palau"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+msgid "Untranslated"
+msgstr ""
+
+#. module: base
+#: view:ir.mail_server:0
+msgid "Outgoing Mail Server"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,context:0
+#: help:ir.actions.client,context:0
+msgid ""
+"Context dictionary as Python expression, empty by default (Default: {})"
+msgstr ""
+
+#. module: base
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:344
+#, python-format
+msgid "Custom fields must have a name that starts with 'x_' !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_mx
+msgid "Mexico - Accounting"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,action_id:0
+msgid "Select the Action Window, Report, Wizard to be executed."
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.config_parameter:0
+msgid "Key must be unique."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_plugin_outlook
+msgid "Outlook Plug-In"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account
+msgid ""
+"\n"
+"Accounting and Financial Management.\n"
+"====================================\n"
+"\n"
+"Financial and accounting module that covers:\n"
+"--------------------------------------------\n"
+"    * General Accounting\n"
+"    * Cost/Analytic accounting\n"
+"    * Third party accounting\n"
+"    * Taxes management\n"
+"    * Budgets\n"
+"    * Customer and Supplier Invoices\n"
+"    * Bank statements\n"
+"    * Reconciliation process by partner\n"
+"\n"
+"Creates a dashboard for accountants that includes:\n"
+"--------------------------------------------------\n"
+"    * List of Customer Invoice to Approve\n"
+"    * Company Analysis\n"
+"    * Graph of Treasury\n"
+"\n"
+"The processes like maintaining of general ledger is done through the defined "
+"financial Journals (entry move line orgrouping is maintained through "
+"journal) \n"
+"for a particular financial year and for preparation of vouchers there is a "
+"module named account_voucher.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+#: field:ir.model,name:0
+msgid "Model Description"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_marketing
+msgid ""
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_linkedin
+msgid ""
+"\n"
+"OpenERP Web LinkedIn module.\n"
+"============================\n"
+"This module provides the Integration of the LinkedIn with OpenERP.\n"
+"        "
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,src_model:0
+msgid ""
+"Optional model name of the objects on which this action should be visible"
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,trigger_expr_id:0
+msgid "Trigger Expression"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.jo
+msgid "Jordan"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,nextcall:0
+msgid "Next planned execution date for this job."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.er
+msgid "Eritrea"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_base_action_rule_admin
+msgid "Automated Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ro
+msgid "Romania - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#. module: base
+#: help:res.partner,image_small:0
+msgid ""
+"Small-sized image of this contact. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,mobile:0
+msgid ""
+"Provides fields that be used to fetch the mobile number, e.g. you select the "
+"invoice, then `object.invoice_address_id.mobile` is the field which gives "
+"the correct mobile number"
+msgstr ""
+
+#. module: base
+#: view:ir.mail_server:0
+msgid "Security and Authentication"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_calendar
+msgid "Web Calendar"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Swedish / svenska"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,name:0
+#: field:ir.attachment,datas_fname:0
+msgid "File Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.rs
+msgid "Serbia"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Wizard View"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kh
+msgid "Cambodia, Kingdom of"
+msgstr ""
+
+#. module: base
+#: field:base.language.import,overwrite:0
+#: field:base.language.install,overwrite:0
+msgid "Overwrite Existing Terms"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_holidays
+msgid ""
+"\n"
+"Manage leaves and allocation requests\n"
+"=====================================\n"
+"\n"
+"This application controls the holiday schedule of your company. It allows "
+"employees to request holidays. Then, managers can review requests for "
+"holidays and approve or reject them. This way you can control the overall "
+"holiday planning for the company or department.\n"
+"\n"
+"You can configure several kinds of leaves (sickness, holidays, paid days, "
+"...) and allocate leaves to an employee or department quickly using "
+"allocation requests. An employee can also make a request for more days off "
+"by making a new Allocation. It will increase the total of available days for "
+"that leave type (if the request is accepted).\n"
+"\n"
+"You can keep track of leaves in different ways by following reports: \n"
+"\n"
+"* Leaves Summary\n"
+"* Leaves by Department\n"
+"* Leaves Analysis\n"
+"\n"
+"A synchronization with an internal agenda (Meetings of the CRM module) is "
+"also possible in order to automatically create a meeting when a holiday "
+"request is accepted by setting up a type of meeting in Leave Type.\n"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Albanian / Shqip"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_crm_config_opportunity
+msgid "Opportunities"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_language_export
+msgid "base.language.export"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,report_type:0
+msgid "Report Type, e.g. pdf, html, raw, sxw, odt, html2html, mako2html, ..."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_document_webdav
+msgid "Shared Repositories (WebDAV)"
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Email Preferences"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:195
+#, python-format
+msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "My Partners"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.zw
+msgid "Zimbabwe"
+msgstr ""
+
+#. module: base
+#: help:ir.model.constraint,type:0
+msgid ""
+"Type of the constraint: `f` for a foreign key, `u` for other constraints."
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "XML Report"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.es
+msgid "Spain"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,domain:0
+msgid ""
+"Optional domain filtering of the destination data, as a Python expression"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_module_upgrade
+msgid "Module Upgrade"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (UY) / Español (UY)"
+msgstr ""
+
+#. module: base
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.om
+msgid "Oman"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_mrp
+msgid "MRP"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_attendance
+msgid ""
+"\n"
+"This module aims to manage employee's attendances.\n"
+"==================================================\n"
+"\n"
+"Keeps account of the attendances of the employees on the basis of the\n"
+"actions(Sign in/Sign out) performed by them.\n"
+"       "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nu
+msgid "Niue"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_membership
+msgid "Membership Management"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "Other OSI Approved Licence"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_gantt
+msgid "Web Gantt"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.act_menu_create
+#: view:wizard.ir.model.menu.create:0
+msgid "Create Menu"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.in
+msgid "India"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.res_request_link-act
+#: model:ir.ui.menu,name:base.menu_res_request_link_act
+msgid "Request Reference Types"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_google_base_account
+msgid "Google Users"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_fleet
+msgid "Fleet Management"
+msgstr ""
+
+#. module: base
+#: help:ir.server.object.lines,value:0
+msgid ""
+"Expression containing a value specification. \n"
+"When Formula type is selected, this field may be a Python expression  that "
+"can use the same values as for the condition field on the server action.\n"
+"If Value type is selected, the value will be used directly without "
+"evaluation."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ad
+msgid "Andorra, Principality of"
+msgstr ""
+
+#. module: base
+#: field:ir.rule,perm_read:0
+msgid "Apply for Read"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mn
+msgid "Mongolia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
+
+#. module: base
+#: selection:base.language.export,format:0
+msgid "TGZ Archive"
+msgstr ""
+
+#. module: base
+#: view:res.groups:0
+msgid ""
+"Users added to this group are automatically added in the following groups."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/base/ir/ir_model.py:735
+#, python-format
+msgid "Document model"
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%B - Full month name."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.todo,type:0
+#: view:ir.attachment:0
+#: field:ir.attachment,type:0
+#: field:ir.model,state:0
+#: field:ir.model.fields,state:0
+#: field:ir.property,type:0
+#: field:ir.server.object.lines,type:0
+#: field:ir.translation,type:0
+#: view:ir.ui.view:0
+#: view:ir.values:0
+#: field:ir.values,key:0
+msgid "Type"
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_user:0
+msgid "Username"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
+#, python-format
+msgid ""
+"Language with code \"%s\" is not defined in your system !\n"
+"Define it through the Administration menu."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gu
+msgid "Guam (USA)"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.country:0
+msgid "The name of the country must be unique !"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,installed_version:0
+msgid "Latest Version"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Delete Access Right"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:214
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+#: selection:workflow.activity,kind:0
+msgid "Dummy"
+msgstr ""
+
+#. module: base
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ky
+msgid "Cayman Islands"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Record Rule"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kr
+msgid "South Korea"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4920
+#, python-format
+msgid "Record #%d of %s not found, cannot copy!"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,contributors:0
+msgid "Contributors"
+msgstr ""
+
+#. module: base
+#: field:ir.rule,perm_unlink:0
+msgid "Apply for Delete"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Char"
+msgstr ""
+
+#. module: base
+#: field:ir.module.category,visible:0
+msgid "Visible"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.client,name:base.action_client_base_menu
+msgid "Open Settings Menu"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (AR) / Español (AR)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ug
+msgid "Uganda"
+msgstr ""
+
+#. module: base
+#: field:ir.model.access,perm_unlink:0
+msgid "Delete Access"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ne
+msgid "Niger"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Chinese (HK)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ba
+msgid "Bosnia-Herzegovina"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Wizard Field"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (GT) / Español (GT)"
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_port:0
+msgid "SMTP Port"
+msgstr ""
+
+#. module: base
+#: help:res.users,login:0
+msgid "Used to log into the system"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid ""
+"TGZ format: this is a compressed archive containing a PO file, directly "
+"suitable\n"
+"                                for uploading to OpenERP's translation "
+"platform,"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid ""
+"%W - Week number of the year (Monday as the first day of the week) as a "
+"decimal number [00,53]. All days in a new year preceding the first Monday "
+"are considered to be in week 0."
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_language_install.py:53
+#, python-format
+msgid "Language Pack"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_tests
+msgid "Tests"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,attachment:0
+msgid "Save as Attachment Prefix"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view_sc,res_id:0
+msgid "Resource Ref."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_url,url:0
+msgid "Action URL"
+msgstr ""
+
+#. module: base
+#: field:base.module.import,module_name:0
+#: field:ir.module.module,shortdesc:0
+msgid "Module Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mh
+msgid "Marshall Islands"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:429
+#, python-format
+msgid "Changing the model of a field is forbidden!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ht
+msgid "Haiti"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_fr_hr_payroll
+msgid "French Payroll"
+msgstr ""
+
+#. module: base
+#: view:ir.ui.view:0
+#: selection:ir.ui.view,type:0
+msgid "Search"
+msgstr ""
+
+#. module: base
+#: code:addons/osv.py:154
+#, python-format
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
+msgstr ""
+
+#. module: base
+#: field:ir.module.category,parent_id:0
+msgid "Parent Application"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
+#, python-format
+msgid "Operation Canceled"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_document
+msgid "Document Management System"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_claim
+msgid "Claims Management"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_document_webdav
+msgid ""
+"\n"
+"With this module, the WebDAV server for documents is activated.\n"
+"===============================================================\n"
+"\n"
+"You can then use any compatible browser to remotely see the attachments of "
+"OpenObject.\n"
+"\n"
+"After installation, the WebDAV server can be controlled by a [webdav] "
+"section in \n"
+"the server's config.\n"
+"\n"
+"Server Configuration Parameter:\n"
+"-------------------------------\n"
+"[webdav]:\n"
+"+++++++++ \n"
+"    * enable = True ; Serve webdav over the http(s) servers\n"
+"    * vdir = webdav ; the directory that webdav will be served at\n"
+"    * this default val means that webdav will be\n"
+"    * on \"http://localhost:8069/webdav/\n"
+"    * verbose = True ; Turn on the verbose messages of webdav\n"
+"    * debug = True ; Turn on the debugging messages of webdav\n"
+"    * since the messages are routed to the python logging, with\n"
+"    * levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
+"    * these options on\n"
+"\n"
+"Also implements IETF RFC 5785 for services discovery on a http server,\n"
+"which needs explicit configuration in openerp-server.conf too.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_purchase_management
+#: model:ir.ui.menu,name:base.menu_purchase_root
+msgid "Purchases"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.md
+msgid "Moldavia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_iban
+msgid ""
+"\n"
+"This module installs the base for IBAN (International Bank Account Number) "
+"bank accounts and checks for it's validity.\n"
+"============================================================================="
+"=========================================\n"
+"\n"
+"The ability to extract the correctly represented local accounts from IBAN "
+"accounts \n"
+"with a single statement.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Features"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Data"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_claim
+msgid ""
+"\n"
+"This module adds claim menu and features to your portal if claim and portal "
+"are installed.\n"
+"============================================================================="
+"=============\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_res_partner_bank_account_form
+msgid ""
+"Configure your company's bank accounts and select those that must appear on "
+"the report footer. You can reorder bank accounts from the list view. If you "
+"use the accounting application of OpenERP, journals and accounts will be "
+"created automatically based on these data."
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Version"
+msgstr ""
+
+#. module: base
+#: help:res.users,action_id:0
+msgid ""
+"If specified, this action will be opened at logon for this user, in addition "
+"to the standard menu."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mf
+msgid "Saint Martin (French part)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_exports
+msgid "ir.exports"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
+#, python-format
+msgid "No language with code \"%s\" exists"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_social_network
+#: model:ir.module.module,shortdesc:base.module_mail
+msgid "Social Network"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%Y - Year with century."
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "Report Footer Configuration"
+msgstr ""
+
+#. module: base
+#: field:ir.translation,comments:0
+msgid "Translation comments"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_lunch
+msgid ""
+"\n"
+"The base module to manage lunch.\n"
+"================================\n"
+"\n"
+"Many companies order sandwiches, pizzas and other, from usual suppliers, for "
+"their employees to offer them more facilities. \n"
+"\n"
+"However lunches management within the company requires proper administration "
+"especially when the number of employees or suppliers is important. \n"
+"\n"
+"The “Lunch Order” module has been developed to make this management easier "
+"but also to offer employees more tools and usability. \n"
+"\n"
+"In addition to a full meal and supplier management, this module offers the "
+"possibility to display warning and provides quick order selection based on "
+"employee’s preferences.\n"
+"\n"
+"If you want to save your employees' time and avoid them to always have coins "
+"in their pockets, this module is essential.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:wizard.ir.model.menu.create:0
+msgid "Create _Menu"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,trigger_obj_id:0
+msgid ""
+"The field on the current object that links to the target object record (must "
+"be a many2one, or an integer field with the record ID)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_bank
+#: view:res.bank:0
+#: field:res.partner.bank,bank:0
+msgid "Bank"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_exports_line
+msgid "ir.exports.line"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_purchase_management
+msgid ""
+"Helps you manage your purchase-related processes such as requests for "
+"quotations, supplier invoices, etc..."
+msgstr ""
+
+#. module: base
+#: help:res.partner,website:0
+msgid "Website of Partner or Company"
+msgstr ""
+
+#. module: base
+#: help:base.language.install,overwrite:0
+msgid ""
+"If you check this box, your customized translations will be overwritten and "
+"replaced by the official ones."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_action_report_xml
+#: field:ir.module.module,reports_by_module:0
+#: model:ir.ui.menu,name:base.menu_ir_action_report_xml
+msgid "Reports"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window.view,multi:0
+#: help:ir.actions.report.xml,multi:0
+msgid ""
+"If set to true, the action will not be displayed on the right toolbar of a "
+"form view."
+msgstr ""
+
+#. module: base
+#: field:workflow,on_create:0
+msgid "On Create"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:913
+#, python-format
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
+msgstr ""
+
+#. module: base
+#: field:res.users,login:0
+msgid "Login"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid ""
+"Access all the fields related to the current object using expressions, i.e. "
+"object.partner_id.name "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_project_issue
+msgid "Portal Issue"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_tools
+msgid "Tools"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Float"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.todo,type:0
+msgid ""
+"Manual: Launched manually.\n"
+"Automatic: Runs whenever the system is reconfigured.\n"
+"Launch Manually Once: after having been launched manually, it sets "
+"automatically to Done."
+msgstr ""
+
+#. module: base
+#: field:res.partner,image_small:0
+msgid "Small-sized image"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_stock
+msgid "Warehouse Management"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_request_link
+msgid "res.request.link"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.wizard,name:0
+msgid "Wizard Info"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_wizard_lang_export
+#: model:ir.ui.menu,name:base.menu_wizard_lang_export
+msgid "Export Translation"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_server_action
+#: view:ir.actions.server:0
+#: model:ir.ui.menu,name:base.menu_server_action
+msgid "Server Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_lu
+msgid "Luxembourg - Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tp
+msgid "East Timor"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:414
+#: view:ir.module.module:0
+#, python-format
+msgid "Install"
+msgstr ""
+
+#. module: base
+#: field:res.currency,accuracy:0
+msgid "Computational Accuracy"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_at
+msgid ""
+"\n"
+"This module provides the standard Accounting Chart for Austria which is "
+"based on the Template from BMF.gv.at.\n"
+"============================================================================="
+"================================ \n"
+"Please keep in mind that you should review and adapt it with your "
+"Accountant, before using it in a live Environment.\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kg
+msgid "Kyrgyz Republic (Kyrgyzstan)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_accountant
+msgid ""
+"\n"
+"Accounting Access Rights\n"
+"========================\n"
+"It gives the Administrator user access to all accounting features such as "
+"journal items and the chart of accounts.\n"
+"\n"
+"It assigns manager and user access rights to the Administrator and only user "
+"rights to the Demo user. \n"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Day: %(day)s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_point_of_sale
+msgid ""
+"Helps you get the most out of your points of sales with fast sale encoding, "
+"simplified payment mode encoding, automatic picking lists generation and "
+"more."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:164
+#, python-format
+msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nl
+msgid "Netherlands"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_event
+msgid "Portal Event"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,state:0
+msgid "Translation in Progress"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_rule
+msgid "ir.rule"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Days"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_fleet
+msgid "Vehicle, leasing, insurances, costs"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+#: field:ir.model.access,perm_read:0
+msgid "Read Access"
+msgstr ""
+
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_share
+msgid ""
+"\n"
+"This module adds generic sharing tools to your current OpenERP database.\n"
+"========================================================================\n"
+"\n"
+"It specifically adds a 'share' button that is available in the Web client "
+"to\n"
+"share any kind of OpenERP data with colleagues, customers, friends.\n"
+"\n"
+"The system will work by creating new users and groups on the fly, and by\n"
+"combining the appropriate access rights and ir.rules to ensure that the "
+"shared\n"
+"users only have access to the data that has been shared with them.\n"
+"\n"
+"This is extremely useful for collaborative work, knowledge sharing,\n"
+"synchronization with other companies.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_process
+msgid "Enterprise Process"
+msgstr ""
+
+#. module: base
+#: help:res.partner,supplier:0
+msgid ""
+"Check this box if this contact is a supplier. If it's not checked, purchase "
+"people will not see it when encoding a purchase order."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_evaluation
+msgid "Employee Appraisals"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+msgid "Write Object"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:68
+#, python-format
+msgid " (copy)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tm
+msgid "Turkmenistan"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "7.  %H:%M:%S      ==> 18:25:20"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: field:res.partner.category,partner_ids:0
+msgid "Partners"
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,parent_left:0
+msgid "Left parent"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_mrp
+msgid "Create Tasks on SO"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:320
+#, python-format
+msgid "This column contains module data and cannot be removed!"
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank,footer:0
+msgid "Display on Reports"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_timesheet
+msgid ""
+"\n"
+"Synchronization of project task work entries with timesheet entries.\n"
+"====================================================================\n"
+"\n"
+"This module lets you transfer the entries under tasks defined for Project\n"
+"Management to the Timesheet line entries for particular date and particular "
+"user\n"
+"with the effect of creating, editing and deleting either ways.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_model_access
+msgid "ir.model.access"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_multilang
+msgid ""
+"\n"
+"    * Multi language support for Chart of Accounts, Taxes, Tax Codes, "
+"Journals,\n"
+"      Accounting Templates, Analytic Chart of Accounts and Analytic "
+"Journals.\n"
+"    * Setup wizard changes\n"
+"        - Copy translations for COA, Tax, Tax Code and Fiscal Position from\n"
+"          templates to target objects.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,act_from:0
+msgid "Source Activity"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Legend (for prefix, suffix)"
+msgstr ""
+
+#. module: base
+#: selection:ir.server.object.lines,type:0
+msgid "Formula"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:311
+#, python-format
+msgid "Can not remove root user!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mw
+msgid "Malawi"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ec
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Ecuador in "
+"OpenERP.\n"
+"============================================================================="
+"=\n"
+"\n"
+"Accounting chart and localization for Ecuador.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:339
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:335
+#: code:addons/base/res/res_users.py:337
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_chart
+msgid "Template of Charts of Accounts"
+msgstr ""
+
+#. module: base
+#: field:res.partner,type:0
+msgid "Address Type"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_stock
+msgid ""
+"\n"
+"Manage sales quotations and orders\n"
+"==================================\n"
+"\n"
+"This module makes the link between the sales and warehouses management "
+"applications.\n"
+"\n"
+"Preferences\n"
+"-----------\n"
+"* Shipping: Choice of delivery at once or partial delivery\n"
+"* Invoicing: choose how invoices will be paid\n"
+"* Incoterms: International Commercial terms\n"
+"\n"
+"You can choose flexible invoicing methods:\n"
+"\n"
+"* *On Demand*: Invoices are created manually from Sales Orders when needed\n"
+"* *On Delivery Order*: Invoices are generated from picking (delivery)\n"
+"* *Before Delivery*: A Draft invoice is created and must be paid before "
+"delivery\n"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,complete_name:0
+msgid "Full Path"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "The next step depends on the file format:"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid ""
+"%U - Week number of the year (Sunday as the first day of the week) as a "
+"decimal number [00,53]. All days in a new year preceding the first Sunday "
+"are considered to be in week 0."
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "PO(T) format: you should edit it with a PO editor such as"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_administration
+#: model:res.groups,name:base.group_system
+msgid "Settings"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window,view_type:0
+#: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
+#: selection:ir.ui.view,type:0
+msgid "Tree"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Create / Write / Copy"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Second: %(sec)s"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,view_mode:0
+msgid "View Mode"
+msgstr ""
+
+#. module: base
+#: help:res.partner.bank,footer:0
+msgid ""
+"Display this bank account on the footer of printed documents like invoices "
+"and sales orders."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish / Español"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Korean (KP) / 한국어 (KP)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ax
+msgid "Åland Islands"
+msgstr ""
+
+#. module: base
+#: field:res.company,logo:0
+msgid "Logo"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_cr
+msgid "Costa Rica - Accounting"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_url,target:0
+#: selection:ir.actions.act_window,target:0
+msgid "New Window"
+msgstr ""
+
+#. module: base
+#: field:ir.values,action_id:0
+msgid "Action (change only)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_subscription
+msgid "Recurring Documents"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bs
+msgid "Bahamas"
+msgstr ""
+
+#. module: base
+#: field:ir.rule,perm_create:0
+msgid "Apply for Create"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_tools
+msgid "Extra Tools"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Attachment"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ie
+msgid "Ireland"
+msgstr ""
+
+#. module: base
+#: help:res.company,rml_header1:0
+msgid ""
+"Appears by default on the top right corner of your printed documents (report "
+"header)."
+msgstr ""
+
+#. module: base
+#: field:base.module.update,update:0
+msgid "Number of modules updated"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,function:0
+msgid "Method"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+msgid "Workflow Activity"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_timesheet_sheet
+msgid ""
+"\n"
+"Record and validate timesheets and attendances easily\n"
+"=====================================================\n"
+"\n"
+"This application supplies a new screen enabling you to manage both "
+"attendances (Sign in/Sign out) and your work encoding (timesheet) by period. "
+"Timesheet entries are made by employees each day. At the end of the defined "
+"period, employees validate their sheet and the manager must then approve his "
+"team's entries. Periods are defined in the company forms and you can set "
+"them to run monthly or weekly.\n"
+"\n"
+"The complete timesheet validation process is:\n"
+"---------------------------------------------\n"
+"* Draft sheet\n"
+"* Confirmation at the end of the period by the employee\n"
+"* Validation by the project manager\n"
+"\n"
+"The validation can be configured in the company:\n"
+"------------------------------------------------\n"
+"* Period size (Day, Week, Month)\n"
+"* Maximal difference between timesheet and attendances\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:341
+#, python-format
+msgid ""
+"No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
+msgstr ""
+
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_ui_view
+msgid ""
+"Views allows you to personalize each view of OpenERP. You can add new "
+"fields, move fields, rename them or delete the ones that you do not need."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_setup
+msgid "Initial Setup Tools"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,groups_id:0
+#: model:ir.actions.act_window,name:base.action_res_groups
+#: field:ir.actions.report.xml,groups_id:0
+#: view:ir.actions.todo:0
+#: field:ir.actions.todo,groups_id:0
+#: field:ir.actions.wizard,groups_id:0
+#: view:ir.model:0
+#: field:ir.model.fields,groups:0
+#: field:ir.rule,groups:0
+#: view:ir.ui.menu:0
+#: field:ir.ui.menu,groups_id:0
+#: model:ir.ui.menu,name:base.menu_action_res_groups
+#: view:ir.ui.view:0
+#: field:ir.ui.view,groups_id:0
+#: view:res.groups:0
+#: field:res.users,groups_id:0
+msgid "Groups"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (CL) / Español (CL)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bz
+msgid "Belize"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,header:0
+msgid "Add or not the corporate RML header"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ge
+msgid "Georgia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_be_invoice_bba
+msgid ""
+"\n"
+"    \n"
+"Belgian localization for in- and outgoing invoices (prereq to "
+"account_coda):\n"
+"============================================================================"
+"\n"
+"    - Rename 'reference' field labels to 'Communication'\n"
+"    - Add support for Belgian Structured Communication\n"
+"\n"
+"A Structured Communication can be generated automatically on outgoing "
+"invoices according to the following algorithms:\n"
+"-----------------------------------------------------------------------------"
+"----------------------------------------\n"
+"    1) Random : +++RRR/RRRR/RRRDD+++\n"
+"        **R..R =** Random Digits, **DD =** Check Digits\n"
+"    2) Date : +++DOY/YEAR/SSSDD+++\n"
+"        **DOY =** Day of the Year, **SSS =** Sequence Number, **DD =** Check "
+"Digits\n"
+"    3) Customer Reference +++RRR/RRRR/SSSDDD+++\n"
+"        **R..R =** Customer Reference without non-numeric characters, **SSS "
+"=** Sequence Number, **DD =** Check Digits  \n"
+"        \n"
+"The preferred type of Structured Communication and associated Algorithm can "
+"be\n"
+"specified on the Partner records. A 'random' Structured Communication will\n"
+"generated if no algorithm is specified on the Partner record. \n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pl
+msgid "Poland"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,view_mode:0
+msgid ""
+"Comma-separated list of allowed view modes, such as 'form', 'tree', "
+"'calendar', etc. (Default: tree,form)"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3843
+#, python-format
+msgid "A document was modified since you last viewed it (%s:%d)"
+msgstr ""
+
+#. module: base
+#: view:workflow:0
+msgid "Workflow Editor"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,state:0
+#: selection:ir.module.module.dependency,state:0
+msgid "To be removed"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_sequence
+msgid "ir.sequence"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,expression:0
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_debug:0
+msgid "Debugging"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_helpdesk
+msgid ""
+"\n"
+"Helpdesk Management.\n"
+"====================\n"
+"\n"
+"Like records and processing of claims, Helpdesk and Support are good tools\n"
+"to trace your interventions. This menu is more adapted to oral "
+"communication,\n"
+"which is not necessarily related to a claim. Select a customer, add notes\n"
+"and categorize your interventions with a channel and a priority level.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,view_type:0
+msgid ""
+"View type: Tree type to use for the tree view, set to 'tree' for a "
+"hierarchical tree view, or 'form' for a regular list view"
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.ui.view_sc:0
+msgid "Shortcut for this menu already exists!"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Groups (no group = global)"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Extra"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.st
+msgid "Saint Tome (Sao Tome) and Principe"
+msgstr ""
+
+#. module: base
+#: selection:res.partner,type:0
+msgid "Invoice"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_product
+msgid ""
+"\n"
+"This is the base module for managing products and pricelists in OpenERP.\n"
+"========================================================================\n"
+"\n"
+"Products support variants, different pricing methods, suppliers "
+"information,\n"
+"make to stock/order, different unit of measures, packaging and properties.\n"
+"\n"
+"Pricelists support:\n"
+"-------------------\n"
+"    * Multiple-level of discount (by product, category, quantities)\n"
+"    * Compute price based on different criteria:\n"
+"        * Other pricelist\n"
+"        * Cost price\n"
+"        * List price\n"
+"        * Supplier price\n"
+"\n"
+"Pricelists preferences by product and/or partners.\n"
+"\n"
+"Print product labels with barcode.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_analytic_default
+msgid ""
+"\n"
+"Set default values for your analytic accounts.\n"
+"==============================================\n"
+"\n"
+"Allows to automatically select analytic accounts based on criterions:\n"
+"---------------------------------------------------------------------\n"
+"    * Product\n"
+"    * Partner\n"
+"    * User\n"
+"    * Company\n"
+"    * Date\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bb
+msgid "Barbados"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mg
+msgid "Madagascar"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:127
+#, python-format
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_oauth_signup
+msgid "Signup with OAuth2 Authentication"
+msgstr ""
+
+#. module: base
+#: selection:ir.model,state:0
+msgid "Custom Object"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_menu_admin
+#: view:ir.ui.menu:0
+#: field:ir.ui.menu,name:0
+msgid "Menu"
+msgstr ""
+
+#. module: base
+#: field:res.currency,rate:0
+msgid "Current Rate"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Greek / Ελληνικά"
+msgstr ""
+
+#. module: base
+#: field:res.company,custom_footer:0
+msgid "Custom Footer"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_crm
+msgid "Opportunity to Quotation"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_analytic_plans
+msgid ""
+"\n"
+"The base module to manage analytic distribution and sales orders.\n"
+"=================================================================\n"
+"\n"
+"Using this module you will be able to link analytic accounts to sales "
+"orders.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_us
+msgid ""
+"\n"
+"United States - Chart of accounts.\n"
+"==================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_url,target:0
+msgid "Action Target"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ai
+msgid "Anguilla"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.report.xml,name:base.report_ir_model_overview
+msgid "Model Overview"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_product_margin
+msgid "Margins by Products"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_invoiced
+msgid "Invoicing"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view_sc,name:0
+msgid "Shortcut Name"
+msgstr ""
+
+#. module: base
+#: field:res.partner,contact_address:0
+msgid "Complete Address"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,limit:0
+msgid "Default limit for the list view"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "RML Report"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_translation_export
+msgid "Import / Export"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale
+msgid ""
+"\n"
+"Manage sales quotations and orders\n"
+"==================================\n"
+"\n"
+"This application allows you to manage your sales goals in an effective and "
+"efficient manner by keeping track of all sales orders and history.\n"
+"\n"
+"It handles the full sales workflow:\n"
+"\n"
+"* **Quotation** -> **Sales order** -> **Invoice**\n"
+"\n"
+"Preferences (only with Warehouse Management installed)\n"
+"------------------------------------------------------\n"
+"\n"
+"If you also installed the Warehouse Management, you can deal with the "
+"following preferences:\n"
+"\n"
+"* Shipping: Choice of delivery at once or partial delivery\n"
+"* Invoicing: choose how invoices will be paid\n"
+"* Incoterms: International Commercial terms\n"
+"\n"
+"You can choose flexible invoicing methods:\n"
+"\n"
+"* *On Demand*: Invoices are created manually from Sales Orders when needed\n"
+"* *On Delivery Order*: Invoices are generated from picking (delivery)\n"
+"* *Before Delivery*: A Draft invoice is created and must be paid before "
+"delivery\n"
+"\n"
+"\n"
+"The Dashboard for the Sales Manager will include\n"
+"------------------------------------------------\n"
+"* My Quotations\n"
+"* Monthly Turnover (Graph)\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,res_id:0
+#: field:ir.model.data,res_id:0
+#: field:ir.translation,res_id:0
+#: field:ir.values,res_id:0
+msgid "Record ID"
+msgstr ""
+
+#. module: base
+#: view:ir.filters:0
+msgid "My Filters"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,email:0
+msgid "Email Address"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_google_docs
+msgid ""
+"\n"
+"Module to attach a google document to any model.\n"
+"================================================\n"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:333
+#, python-format
+msgid "Found multiple matches for field '%%(field)s' (%d matches)"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "French (BE) / Français (BE)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pe
+msgid ""
+"\n"
+"Peruvian accounting chart and tax localization. According the PCGE 2010.\n"
+"========================================================================\n"
+"\n"
+"Plan contable peruano e impuestos de acuerdo a disposiciones vigentes de la\n"
+"SUNAT 2011 (PCGE 2010).\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+#: field:workflow.activity,action_id:0
+msgid "Server Action"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.client,params:0
+msgid "Arguments sent to the client along withthe view tag"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_contacts
+msgid "Contacts, People and Companies"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tt
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lv
+msgid "Latvia"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Field Mappings"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "Export Translations"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_hr_manager
+#: model:res.groups,name:base.group_sale_manager
+#: model:res.groups,name:base.group_tool_manager
+msgid "Manager"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:726
+#, python-format
+msgid "Sorry, you are not allowed to access this document."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.py
+msgid "Paraguay"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fj
+msgid "Fiji"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "Report Xml"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_purchase
+msgid ""
+"\n"
+"Manage goods requirement by Purchase Orders easily\n"
+"==================================================\n"
+"\n"
+"Purchase management enables you to track your suppliers' price quotations "
+"and convert them into purchase orders if necessary.\n"
+"OpenERP has several methods of monitoring invoices and tracking the receipt "
+"of ordered goods. You can handle partial deliveries in OpenERP, so you can "
+"keep track of items that are still to be delivered in your orders, and you "
+"can issue reminders automatically.\n"
+"\n"
+"OpenERP’s replenishment management rules enable the system to generate draft "
+"purchase orders automatically, or you can configure it to run a lean process "
+"driven entirely by current production needs.\n"
+"\n"
+"Dashboard / Reports for Purchase Management will include:\n"
+"---------------------------------------------------------\n"
+"* Request for Quotations\n"
+"* Purchase Orders Waiting Approval \n"
+"* Monthly Purchases by Category\n"
+"* Receptions Analysis\n"
+"* Purchase Analysis\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_act_window_close
+msgid "ir.actions.act_window_close"
+msgstr ""
+
+#. module: base
+#: field:ir.server.object.lines,col1:0
+msgid "Destination"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lt
+msgid "Lithuania"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_graph
+msgid ""
+"\n"
+"Graph Views for Web Client.\n"
+"===========================\n"
+"\n"
+"    * Parse a <graph> view but allows changing dynamically the presentation\n"
+"    * Graph Types: pie, lines, areas, bars, radar\n"
+"    * Stacked/Not Stacked for areas and bars\n"
+"    * Legends: top, inside (top/left), hidden\n"
+"    * Features: download as PNG or CSV, browse data grid, switch "
+"orientation\n"
+"    * Unlimited \"Group By\" levels (not stacked), two cross level analysis "
+"(stacked)\n"
+msgstr ""
+
+#. module: base
+#: view:res.groups:0
+msgid "Inherited"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "yes"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,serialization_field_id:0
+msgid "Serialization Field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_be_hr_payroll
+msgid ""
+"\n"
+"Belgian Payroll Rules.\n"
+"======================\n"
+"\n"
+"    * Employee Details\n"
+"    * Employee Contracts\n"
+"    * Passport based Contract\n"
+"    * Allowances/Deductions\n"
+"    * Allow to configure Basic/Gross/Net Salary\n"
+"    * Employee Payslip\n"
+"    * Monthly Payroll Register\n"
+"    * Integrated with Holiday Management\n"
+"    * Salary Maj, ONSS, Withholding Tax, Child Allowance, ...\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:174
+#, python-format
+msgid "'%s' does not seem to be an integer for field '%%(field)s'"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_report_designer
+msgid ""
+"Lets you install various tools to simplify and enhance OpenERP's report "
+"creation."
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%y - Year without century [00,99]."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_anglo_saxon
+msgid ""
+"\n"
+"This module supports the Anglo-Saxon accounting methodology by changing the "
+"accounting logic with stock transactions.\n"
+"============================================================================="
+"========================================\n"
+"\n"
+"The difference between the Anglo-Saxon accounting countries and the Rhine \n"
+"(or also called Continental accounting) countries is the moment of taking \n"
+"the Cost of Goods Sold versus Cost of Sales. Anglo-Saxons accounting does \n"
+"take the cost when sales invoice is created, Continental accounting will \n"
+"take the cost at the moment the goods are shipped.\n"
+"\n"
+"This module will add this functionality by using a interim account, to \n"
+"store the value of shipped goods and will contra book this interim \n"
+"account when the invoice is created to transfer this amount to the \n"
+"debtor or creditor account. Secondly, price differences between actual \n"
+"purchase price and fixed product standard price are booked on a separate \n"
+"account."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.si
+msgid "Slovenia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_status
+msgid ""
+"\n"
+"This module handles state and stage. It is derived from the crm_base and "
+"crm_case classes from crm.\n"
+"============================================================================="
+"======================\n"
+"\n"
+"    * ``base_state``: state management\n"
+"    * ``base_stage``: stage management\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_linkedin
+msgid "LinkedIn Integration"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2021
+#: code:addons/orm.py:2032
+#, python-format
+msgid "Invalid Object Architecture!"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:372
+#: code:addons/base/ir/ir_model.py:374
+#: code:addons/base/ir/ir_model.py:404
+#: code:addons/base/ir/ir_model.py:418
+#: code:addons/base/ir/ir_model.py:420
+#: code:addons/base/ir/ir_model.py:422
+#: code:addons/base/ir/ir_model.py:429
+#: code:addons/base/ir/ir_model.py:432
+#: code:addons/base/module/wizard/base_module_import.py:58
+#: code:addons/base/module/wizard/base_module_import.py:66
+#: code:addons/base/module/wizard/base_update_translations.py:39
+#: code:addons/base/res/res_currency.py:52
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_fr_rib
+msgid "French RIB Bank Details"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%p - Equivalent of either AM or PM."
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Iteration Actions"
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,company_id:0
+msgid "Company where the user is connected"
+msgstr ""
+
+#. module: base
+#: model:res.groups,comment:base.group_sale_manager
+msgid ""
+"the user will have an access to the sales configuration as well as statistic "
+"reports."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nz
+msgid "New Zealand"
+msgstr ""
+
+#. module: base
+#: field:ir.exports.line,name:0
+#: view:ir.model.fields:0
+#: field:res.partner.bank.type.field,name:0
+msgid "Field Name"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_country
+msgid ""
+"Display and manage the list of all countries that can be assigned to your "
+"partner records. You can create or delete countries to make sure the ones "
+"you are working on will be maintained."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nf
+msgid "Norfolk Island"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Korean (KR) / 한국어 (KR)"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,model:0
+msgid "The technical name of the model this field belongs to"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,action_id:0
+#: selection:ir.actions.server,state:0
+#: view:ir.values:0
+msgid "Client Action"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_subscription
+msgid ""
+"\n"
+"Create recurring documents.\n"
+"===========================\n"
+"\n"
+"This module allows to create new documents and add subscriptions on that "
+"document.\n"
+"\n"
+"e.g. To have an invoice generated automatically periodically:\n"
+"-------------------------------------------------------------\n"
+"    * Define a document type based on Invoice object\n"
+"    * Define a subscription whose source document is the document defined "
+"as\n"
+"      above. Specify the interval information and partner to be invoice.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:674
+#: model:ir.model,name:base.model_ir_module_category
+#: field:ir.module.module,application:0
+#: field:res.groups,category_id:0
+#: view:res.users:0
+#, python-format
+msgid "Application"
+msgstr ""
+
+#. module: base
+#: model:res.groups,comment:base.group_hr_manager
+msgid ""
+"the user will have an access to the human resources configuration as well as "
+"statistic reports."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pl
+msgid ""
+"\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
+"\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.client,params_store:0
+msgid "Params storage"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:525
+#, python-format
+msgid "Can not upgrade module '%s'. It is not installed."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cu
+msgid "Cuba"
+msgstr ""
+
+#. module: base
+#: code:addons/report_sxw.py:443
+#, python-format
+msgid "Unknown report type: %s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_hr_expense
+msgid "Expenses Validation, Invoicing"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_be_hr_payroll_account
+msgid ""
+"\n"
+"Accounting Data for Belgian Payroll Rules.\n"
+"==========================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.am
+msgid "Armenia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_hr_evaluation
+msgid "Periodical Evaluations, Appraisals, Surveys"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_property_form
+#: model:ir.ui.menu,name:base.menu_ir_property_form_all
+msgid "Configuration Parameters"
+msgstr ""
+
+#. module: base
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.se
+msgid "Sweden"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_file:0
+msgid "Report File"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Gantt"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_in_hr_payroll
+msgid ""
+"\n"
+"Indian Payroll Salary Rules.\n"
+"============================\n"
+"\n"
+"    -Configuration of hr_payroll for India localization\n"
+"    -All main contributions rules for India payslip.\n"
+"    * New payslip report\n"
+"    * Employee Contracts\n"
+"    * Allow to configure Basic / Gross / Net Salary\n"
+"    * Employee PaySlip\n"
+"    * Allowance / Deduction\n"
+"    * Integrated with Holiday Management\n"
+"    * Medical Allowance, Travel Allowance, Child Allowance, ...\n"
+"    - Payroll Advice and Report\n"
+"    - Yearly Salary by Head and Yearly Salary by Employee Report\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
+#, python-format
+msgid "Missing document(s)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_partner_bank_type
+#: field:res.partner.bank,state:0
+#: view:res.partner.bank.type:0
+msgid "Bank Account Type"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid ""
+"For more details about translating OpenERP in your language, please refer to "
+"the"
+msgstr ""
+
+#. module: base
+#: field:res.partner,image:0
+msgid "Image"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.at
+msgid "Austria"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window.view,view_mode:0
+#: model:ir.module.module,shortdesc:base.module_base_calendar
+#: model:ir.ui.menu,name:base.menu_calendar_configuration
+#: selection:ir.ui.view,type:0
+msgid "Calendar"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_knowledge_management
+msgid "Knowledge"
+msgstr ""
+
+#. module: base
+#: field:workflow.activity,signal_send:0
+msgid "Signal (subflow.*)"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4685
+#, python-format
+msgid ""
+"Invalid \"order\" specified. A valid \"order\" specification is a comma-"
+"separated list of valid field names (optionally followed by asc/desc for the "
+"direction)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_module_module_dependency
+msgid "Module dependency"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bd
+msgid "Bangladesh"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_title_contact
+msgid ""
+"Manage the contact titles you want to have available in your system and the "
+"way you want to print them in letters and other documents. Some example: "
+"Mr., Mrs. "
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+#: view:res.groups:0
+#: field:res.groups,model_access:0
+msgid "Access Controls"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:277
+#, python-format
+msgid ""
+"The Selection Options expression is not a valid Pythonic expression.Please "
+"provide an expression in the [('key','Label'), ...] format."
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_survey_user
+msgid "Survey / User"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+#: field:ir.module.module,dependencies_id:0
+msgid "Dependencies"
+msgstr ""
+
+#. module: base
+#: field:multi_company.default,company_id:0
+msgid "Main Company"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,web_icon_hover:0
+msgid "Web Icon File (hover)"
+msgstr ""
+
+#. module: base
+#: help:res.currency,name:0
+msgid "Currency Code (ISO 4217)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_contract
+msgid "Employee Contracts"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid ""
+"If you use a formula type, use a python expression using the variable "
+"'object'."
+msgstr ""
+
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: base
+#: field:res.partner,birthdate:0
+msgid "Birthdate"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_title_contact
+#: model:ir.ui.menu,name:base.menu_partner_title_contact
+msgid "Contact Titles"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_product_manufacturer
+msgid "Products Manufacturers"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:240
+#, python-format
+msgid "SMTP-over-SSL mode unavailable"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_survey
+#: model:ir.ui.menu,name:base.next_id_10
+msgid "Survey"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (DO) / Español (DO)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow_activity
+msgid "workflow.activity"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "Export Complete"
+msgstr ""
+
+#. module: base
+#: help:ir.ui.view_sc,res_id:0
+msgid ""
+"Reference of the target resource, whose model/table depends on the 'Resource "
+"Name' field."
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,select_level:0
+msgid "Searchable"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.uy
+msgid "Uruguay"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Finnish / Suomi"
+msgstr ""
+
+#. module: base
+#: view:ir.config_parameter:0
+msgid "System Properties"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "German / Deutsch"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Fields Mapping"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_sir
+#: model:res.partner.title,shortcut:base.res_partner_title_sir
+msgid "Sir"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ca
+msgid ""
+"\n"
+"This is the module to manage the English and French - Canadian accounting "
+"chart in OpenERP.\n"
+"============================================================================="
+"==============\n"
+"\n"
+"Canadian accounting charts and localizations.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+msgid "Select module package to import (.zip file):"
+msgstr ""
+
+#. module: base
+#: view:ir.filters:0
+msgid "Personal"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,modules:0
+msgid "Modules To Export"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mt
+msgid "Malta"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:732
+#, python-format
+msgid ""
+"Only users with the following access level are currently allowed to do that"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,fields_lines:0
+msgid "Field Mappings."
+msgstr ""
+
+#. module: base
+#: selection:res.request,priority:0
+msgid "High"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mrp
+msgid ""
+"\n"
+"Manage the Manufacturing process in OpenERP\n"
+"===========================================\n"
+"\n"
+"The manufacturing module allows you to cover planning, ordering, stocks and "
+"the manufacturing or assembly of products from raw materials and components. "
+"It handles the consumption and production of products according to a bill of "
+"materials and the necessary operations on machinery, tools or human "
+"resources according to routings.\n"
+"\n"
+"It supports complete integration and planification of stockable goods, "
+"consumables or services. Services are completely integrated with the rest of "
+"the software. For instance, you can set up a sub-contracting service in a "
+"bill of materials to automatically purchase on order the assembly of your "
+"production.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Make to Stock/Make to Order\n"
+"* Multi-level bill of materials, no limit\n"
+"* Multi-level routing, no limit\n"
+"* Routing and work center integrated with analytic accounting\n"
+"* Periodical scheduler computation \n"
+"* Allows to browse bills of materials in a complete structure that includes "
+"child and phantom bills of materials\n"
+"\n"
+"Dashboard / Reports for MRP will include:\n"
+"-----------------------------------------\n"
+"* Procurements in Exception (Graph)\n"
+"* Stock Value Variation (Graph)\n"
+"* Work Order Analysis\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: field:ir.attachment,description:0
+#: field:ir.mail_server,name:0
+#: field:ir.module.category,description:0
+#: view:ir.module.module:0
+#: field:ir.module.module,description:0
+msgid "Description"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_instance_form
+#: model:ir.ui.menu,name:base.menu_workflow_instance
+msgid "Instances"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_purchase_requisition
+msgid ""
+"\n"
+"This module allows you to manage your Purchase Requisition.\n"
+"===========================================================\n"
+"\n"
+"When a purchase order is created, you now have the opportunity to save the\n"
+"related requisition. This new object will regroup and will allow you to "
+"easily\n"
+"keep track and order all your purchase orders.\n"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_host:0
+msgid "Hostname or IP of SMTP server"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.aq
+msgid "Antarctica"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Persons"
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+msgid "_Import"
+msgstr ""
+
+#. module: base
+#: field:res.users,action_id:0
+msgid "Home Action"
+msgstr ""
+
+#. module: base
+#: field:res.lang,grouping:0
+msgid "Separator Format"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_report_webkit
+msgid "Webkit Report Engine"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_9
+msgid "Database Structure"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_mass_mail
+msgid "Mass Mailing"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.yt
+msgid "Mayotte"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_todo
+msgid "Tasks on CRM"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,relation_field:0
+msgid ""
+"For one2many fields, the field on the target model that implement the "
+"opposite many2one relationship"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Interaction between rules"
+msgstr ""
+
+#. module: base
+#: field:res.company,rml_footer:0
+#: field:res.company,rml_footer_readonly:0
+msgid "Report Footer"
+msgstr ""
+
+#. module: base
+#: selection:res.lang,direction:0
+msgid "Right-to-Left"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sx
+msgid "Sint Maarten (Dutch part)"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: model:ir.actions.act_window,name:base.actions_ir_filters_view
+#: view:ir.filters:0
+#: model:ir.model,name:base.model_ir_filters
+msgid "Filters"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_cron_act
+#: view:ir.cron:0
+#: model:ir.ui.menu,name:base.menu_ir_cron_act
+msgid "Scheduled Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_reporting
+#: model:ir.ui.menu,name:base.menu_lunch_reporting
+#: model:ir.ui.menu,name:base.menu_reporting
+msgid "Reporting"
+msgstr ""
+
+#. module: base
+#: field:res.partner,title:0
+#: field:res.partner.title,name:0
+msgid "Title"
+msgstr ""
+
+#. module: base
+#: help:ir.property,res_id:0
+msgid "If not set, acts as a default value for new resources"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4246
+#, python-format
+msgid "Recursivity Detected."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_analytic_user_function
+msgid ""
+"\n"
+"This module allows you to define what is the default function of a specific "
+"user on a given account.\n"
+"============================================================================="
+"=======================\n"
+"\n"
+"This is mostly used when a user encodes his timesheet: the values are "
+"retrieved\n"
+"and the fields are auto-filled. But the possibility to change these values "
+"is\n"
+"still available.\n"
+"\n"
+"Obviously if no data has been recorded for the current account, the default\n"
+"value is given as usual by the employee data so that this module is "
+"perfectly\n"
+"compatible with older configurations.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+msgid "Create a Menu"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tg
+msgid "Togo"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,res_model:0
+#: field:ir.actions.client,res_model:0
+msgid "Destination Model"
+msgstr ""
+
+#. module: base
+#: selection:ir.sequence,implementation:0
+msgid "Standard"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ru
+msgid "Russian Federation"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Urdu / اردو"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:739
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
+#: code:addons/orm.py:3902
+#, python-format
+msgid "Access Denied"
+msgstr ""
+
+#. module: base
+#: field:res.company,name:0
+msgid "Company Name"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2808
+#, python-format
+msgid ""
+"Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
+"integer): \"%s\""
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_country
+#: model:ir.ui.menu,name:base.menu_country_partner
+msgid "Countries"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "RML  (deprecated - use Report)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Search Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_calendar
+msgid ""
+"\n"
+"This is a full-featured calendar system.\n"
+"========================================\n"
+"\n"
+"It supports:\n"
+"------------\n"
+"    - Calendar of events\n"
+"    - Recurring events\n"
+"\n"
+"If you need to manage your meetings, you should install the CRM module.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.je
+msgid "Jersey"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "12. %w              ==> 5 ( Friday is the 6th day)"
+msgstr ""
+
+#. module: base
+#: constraint:res.partner.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%x - Appropriate date representation."
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Tag"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%d - Day of the month [01,31]."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tj
+msgid "Tajikistan"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "GPL-2 or later version"
+msgstr ""
+
+#. module: base
+#: selection:workflow.activity,kind:0
+msgid "Stop All"
+msgstr ""
+
+#. module: base
+#: field:res.company,paper_format:0
+msgid "Paper Format"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:644
+#, python-format
+msgid ""
+"Can not create the module file:\n"
+" %s"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sk
+msgid "Slovakia"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nr
+msgid "Nauru"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:166
+#, python-format
+msgid "Reg"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_property
+msgid "ir.property"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window,view_type:0
+#: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
+#: selection:ir.ui.view,type:0
+msgid "Form"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pf
+msgid "Polynesia (French)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_it
+msgid ""
+"\n"
+"Piano dei conti italiano di un'impresa generica.\n"
+"================================================\n"
+"\n"
+"Italian accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.me
+msgid "Montenegro"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_fetchmail
+msgid "Email Gateway"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:470
+#, python-format
+msgid ""
+"Mail delivery failed via SMTP server '%s'.\n"
+"%s: %s"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tk
+msgid "Tokelau"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
+#: view:ir.module.module:0
+msgid "Technical Data"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_bank_statement_extensions
+msgid ""
+"\n"
+"Module that extends the standard account_bank_statement_line object for "
+"improved e-banking support.\n"
+"============================================================================="
+"======================\n"
+"\n"
+"This module adds:\n"
+"-----------------\n"
+"    - valuta date\n"
+"    - batch payments\n"
+"    - traceability of changes to bank statement lines\n"
+"    - bank statement line views\n"
+"    - bank statements balances report\n"
+"    - performance improvements for digital import of bank statement (via \n"
+"      'ebanking_import' context flag)\n"
+"    - name_search on res.partner.bank enhanced to allow search on bank \n"
+"      and iban account numbers\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,state:0
+#: selection:ir.module.module.dependency,state:0
+msgid "To be upgraded"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ly
+msgid "Libya"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cf
+msgid "Central African Republic"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.li
+msgid "Liechtenstein"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_issue_sheet
+msgid "Timesheet on Issues"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_ltd
+msgid "Ltd"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
+#. module: base
+#: field:res.partner,ean13:0
+msgid "EAN13"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2247
+#, python-format
+msgid "Invalid Architecture!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pt
+msgid "Portugal"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_share
+msgid "Share any Document"
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "6.  %d, %m         ==> 05, 12"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_it
+msgid "Italy - Accounting"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_url,help:0
+#: field:ir.actions.act_window,help:0
+#: field:ir.actions.act_window_close,help:0
+#: field:ir.actions.actions,help:0
+#: field:ir.actions.client,help:0
+#: field:ir.actions.report.xml,help:0
+#: field:ir.actions.server,help:0
+#: field:ir.actions.wizard,help:0
+msgid "Action description"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ma
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Maroc.\n"
+"=================================================================\n"
+"\n"
+"Ce Module charge le modèle du plan de comptes standard Marocain et permet "
+"de\n"
+"générer les états comptables aux normes marocaines (Bilan, CPC (comptes de\n"
+"produits et charges), balance générale à 6 colonnes, Grand livre "
+"cumulatif...).\n"
+"L'intégration comptable a été validé avec l'aide du Cabinet d'expertise "
+"comptable\n"
+"Seddik au cours du troisième trimestre 2010."
+msgstr ""
+
+#. module: base
+#: help:ir.module.module,auto_install:0
+msgid ""
+"An auto-installable module is automatically installed by the system when all "
+"its dependencies are satisfied. If the module has no dependency, it is "
+"always installed."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.res_lang_act_window
+#: model:ir.model,name:base.model_res_lang
+#: model:ir.ui.menu,name:base.menu_res_lang_act_window
+#: view:res.lang:0
+msgid "Languages"
+msgstr ""
+
+#. module: base
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_localization_account_charts
+msgid "Account Charts"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_event_main
+msgid "Events Organization"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_customer_form
+#: model:ir.actions.act_window,name:base.action_partner_form
+#: model:ir.ui.menu,name:base.menu_partner_form
+#: view:res.partner:0
+msgid "Customers"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.au
+msgid "Australia"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Menu :"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,state:0
+msgid "Base Field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_managing_vehicles_and_contracts
+msgid "Managing vehicles and contracts"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_setup
+msgid ""
+"\n"
+"This module helps to configure the system at the installation of a new "
+"database.\n"
+"============================================================================="
+"===\n"
+"\n"
+"Shows you a list of applications features to install from.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_config
+msgid "res.config"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pl
+msgid "Poland - Accounting"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
+msgid "Action to Trigger"
+msgstr ""
+
+#. module: base
+#: field:ir.model.constraint,name:0
+#: selection:ir.translation,type:0
+msgid "Constraint"
+msgstr ""
+
+#. module: base
+#: selection:ir.values,key:0
+#: selection:res.partner,type:0
+msgid "Default"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_lunch
+msgid "Lunch Order, Meal, Food"
+msgstr ""
+
+#. module: base
+#: view:ir.model.fields:0
+#: field:ir.model.fields,required:0
+#: field:res.partner.bank.type.field,required:0
+msgid "Required"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ro
+msgid "Romania"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,summary:0
+#: field:res.request.history,name:0
+msgid "Summary"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_hidden_dependency
+msgid "Dependency"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal
+msgid ""
+"\n"
+"Customize access to your OpenERP database to external users by creating "
+"portals.\n"
+"============================================================================="
+"===\n"
+"A portal defines a specific user menu and access rights for its members.  "
+"This\n"
+"menu can ben seen by portal members, anonymous users and any other user "
+"that\n"
+"have the access to technical features (e.g. the administrator).\n"
+"Also, each portal member is linked to a specific partner.\n"
+"\n"
+"The module also associates user groups to the portal users (adding a group "
+"in\n"
+"the portal automatically adds it to the portal users, etc).  That feature "
+"is\n"
+"very handy when used in combination with the module 'share'.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:multi_company.default,expression:0
+msgid "Expression"
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "Header/Footer"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,sequence:0
+msgid ""
+"When no specific mail server is requested for a mail, the highest priority "
+"one is used. Default priority is 10 (smaller number = higher priority)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
+#. module: base
+#: field:res.partner,parent_id:0
+msgid "Related Company"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_url,help:0
+#: help:ir.actions.act_window,help:0
+#: help:ir.actions.act_window_close,help:0
+#: help:ir.actions.actions,help:0
+#: help:ir.actions.client,help:0
+#: help:ir.actions.report.xml,help:0
+#: help:ir.actions.server,help:0
+#: help:ir.actions.wizard,help:0
+msgid ""
+"Optional help text for the users with a description of the target view, such "
+"as its usage and purpose."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.va
+msgid "Holy See (Vatican City State)"
+msgstr ""
+
+#. module: base
+#: field:base.module.import,module_file:0
+msgid "Module .ZIP file"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_17
+msgid "Telecom sector"
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,trigger_model:0
+msgid "Trigger Object"
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.sequence.type:0
+msgid "`code` must be unique."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_knowledge
+msgid "Knowledge Management System"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: field:workflow.activity,in_transitions:0
+msgid "Incoming Transitions"
+msgstr ""
+
+#. module: base
+#: field:ir.values,value_unpickle:0
+msgid "Default value or action reference"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_sequence
+msgid ""
+"\n"
+"This module maintains internal sequence number for accounting entries.\n"
+"======================================================================\n"
+"\n"
+"Allows you to configure the accounting sequences to be maintained.\n"
+"\n"
+"You can customize the following attributes of the sequence:\n"
+"-----------------------------------------------------------\n"
+"    * Prefix\n"
+"    * Suffix\n"
+"    * Next Number\n"
+"    * Increment Number\n"
+"    * Number Padding\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_timesheet
+msgid "Bill Time on Tasks"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_marketing
+#: model:ir.module.module,shortdesc:base.module_marketing
+#: model:ir.ui.menu,name:base.marketing_menu
+#: model:ir.ui.menu,name:base.menu_report_marketing
+msgid "Marketing"
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "Bank account"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_calendar
+msgid ""
+"\n"
+"OpenERP Web Calendar view.\n"
+"==========================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (HN) / Español (HN)"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence.type:0
+msgid "Sequence Type"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "Unicode/UTF-8"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Hindi / हिंदी"
+msgstr ""
+
+#. module: base
+#: view:base.language.install:0
+#: model:ir.actions.act_window,name:base.action_view_base_language_install
+#: model:ir.ui.menu,name:base.menu_view_base_language_install
+msgid "Load a Translation"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,latest_version:0
+msgid "Installed Version"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,license:0
+msgid "License"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,url:0
+msgid "Url"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "SQL Constraint"
+msgstr ""
+
+#. module: base
+#: help:ir.ui.menu,groups_id:0
+msgid ""
+"If you have groups, the visibility of this menu will be based on these "
+"groups. If this field is empty, OpenERP will compute visibility based on the "
+"related object's read access."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,srcmodel_id:0
+#: view:ir.filters:0
+#: field:ir.filters,model_id:0
+#: view:ir.model:0
+#: field:ir.model,model:0
+#: field:ir.model.constraint,model:0
+#: field:ir.model.fields,model_id:0
+#: field:ir.model.relation,model:0
+#: view:ir.values:0
+msgid "Model"
+msgstr ""
+
+#. module: base
+#: view:base.language.install:0
+msgid ""
+"The selected language has been successfully installed. You must change the "
+"preferences of the user and open a new menu to view the changes."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window.view,view_id:0
+#: field:ir.default,page:0
+#: selection:ir.translation,type:0
+#: view:ir.ui.view:0
+msgid "View"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_partner_assign
+msgid ""
+"\n"
+"This is the module used by OpenERP SA to redirect customers to its partners, "
+"based on geolocalization.\n"
+"============================================================================="
+"=========================\n"
+"\n"
+"You can geolocalize your opportunities by using this module.\n"
+"\n"
+"Use geolocalization when assigning opportunities to partners.\n"
+"Determine the GPS coordinates according to the address of the partner.\n"
+"\n"
+"The most appropriate partner can be assigned.\n"
+"You can also use the geolocalization without using the GPS coordinates.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+msgid "Open a Window"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gq
+msgid "Equatorial Guinea"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_api
+msgid "OpenERP Web API"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_fr_rib
+msgid ""
+"\n"
+"This module lets users enter the banking details of Partners in the RIB "
+"format (French standard for bank accounts details).\n"
+"============================================================================="
+"==============================================\n"
+"\n"
+"RIB Bank Accounts can be entered in the \"Accounting\" tab of the Partner "
+"form by specifying the account type \"RIB\". \n"
+"\n"
+"The four standard RIB fields will then become mandatory:\n"
+"--------------------------------------------------------    \n"
+"    - Bank Code\n"
+"    - Office Code\n"
+"    - Account number\n"
+"    - RIB key\n"
+"    \n"
+"As a safety measure, OpenERP will check the RIB key whenever a RIB is saved, "
+"and\n"
+"will refuse to record the data if the key is incorrect. Please bear in mind "
+"that\n"
+"this can only happen when the user presses the 'save' button, for example on "
+"the\n"
+"Partner Form. Since each bank account may relate to a Bank, users may enter "
+"the\n"
+"RIB Bank Code in the Bank form - it will the pre-fill the Bank Code on the "
+"RIB\n"
+"when they select the Bank. To make this easier, this module will also let "
+"users\n"
+"find Banks using their RIB code.\n"
+"\n"
+"The module base_iban can be a useful addition to this module, because French "
+"banks\n"
+"are now progressively adopting the international IBAN format instead of the "
+"RIB format.\n"
+"The RIB and IBAN codes for a single account can be entered by recording two "
+"Bank\n"
+"Accounts in OpenERP: the first with the type 'RIB', the second with the type "
+"'IBAN'. \n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ps
+msgid "Palestinian Territory, Occupied"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ch
+msgid "Switzerland - Accounting"
+msgstr ""
+
+#. module: base
+#: field:res.bank,zip:0
+#: field:res.company,zip:0
+#: field:res.partner,zip:0
+#: field:res.partner.bank,zip:0
+msgid "Zip"
+msgstr "Casilla"
+
+#. module: base
+#: view:ir.module.module:0
+#: field:ir.module.module,author:0
+msgid "Author"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%c - Appropriate date and time representation."
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_config.py:420
+#, python-format
+msgid ""
+"Your database is now fully configured.\n"
+"\n"
+"Click 'Continue' and enjoy your OpenERP experience..."
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_marketing
+msgid "Helps you manage your marketing campaigns step by step."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Hebrew / עִבְרִי"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bo
+msgid "Bolivia"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gh
+msgid "Ghana"
+msgstr ""
+
+#. module: base
+#: field:res.lang,direction:0
+msgid "Direction"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: model:ir.actions.act_window,name:base.action_ui_view
+#: field:ir.actions.act_window,view_ids:0
+#: field:ir.actions.act_window,views:0
+#: view:ir.model:0
+#: field:ir.model,view_ids:0
+#: field:ir.module.module,views_by_module:0
+#: model:ir.ui.menu,name:base.menu_action_ui_view
+#: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
+msgid "Views"
+msgstr ""
+
+#. module: base
+#: view:res.groups:0
+#: field:res.groups,rule_groups:0
+msgid "Rules"
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_host:0
+msgid "SMTP Server"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:320
+#, python-format
+msgid "You try to remove a module that is installed or will be installed"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "The selected modules have been updated / installed !"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (PR) / Español (PR)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_profiling
+msgid ""
+"\n"
+"This module allows users to perform segmentation within partners.\n"
+"=================================================================\n"
+"\n"
+"It uses the profiles criteria from the earlier segmentation module and "
+"improve it. \n"
+"Thanks to the new concept of questionnaire. You can now regroup questions "
+"into a \n"
+"questionnaire and directly use it on a partner.\n"
+"\n"
+"It also has been merged with the earlier CRM & SRM segmentation tool because "
+"they \n"
+"were overlapping.\n"
+"\n"
+"    **Note:** this module is not compatible with the module segmentation, "
+"since it's the same which has been renamed.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gt
+msgid "Guatemala"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,message:0
+msgid ""
+"Email contents, may contain expressions enclosed in double brackets based on "
+"the same values as those available in the condition field, e.g. `Dear [[ "
+"object.partner_id.name ]]`"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_form
+#: model:ir.ui.menu,name:base.menu_workflow
+#: model:ir.ui.menu,name:base.menu_workflow_root
+msgid "Workflows"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_73
+msgid "Purchase"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Portuguese (BR) / Português (BR)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_needaction_mixin
+msgid "ir.needaction_mixin"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "This file was generated using the universal"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_7
+msgid "IT Services"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_specific_industry_applications
+msgid "Specific Industry Applications"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_google_docs
+msgid "Google Docs integration"
+msgstr ""
+
+#. module: base
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
+#, python-format
+msgid "name"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mrp_operations
+msgid ""
+"\n"
+"This module adds state, date_start, date_stop in manufacturing order "
+"operation lines (in the 'Work Orders' tab).\n"
+"============================================================================="
+"===================================\n"
+"\n"
+"Status: draft, confirm, done, cancel\n"
+"When finishing/confirming, cancelling manufacturing orders set all state "
+"lines\n"
+"to the according state.\n"
+"\n"
+"Create menus:\n"
+"-------------\n"
+"    **Manufacturing** > **Manufacturing** > **Work Orders**\n"
+"\n"
+"Which is a view on 'Work Orders' lines in manufacturing order.\n"
+"\n"
+"Add buttons in the form view of manufacturing order under workorders tab:\n"
+"-------------------------------------------------------------------------\n"
+"    * start (set state to confirm), set date_start\n"
+"    * done (set state to done), set date_stop\n"
+"    * set to draft (set state to draft)\n"
+"    * cancel set state to cancel\n"
+"\n"
+"When the manufacturing order becomes 'ready to produce', operations must\n"
+"become 'confirmed'. When the manufacturing order is done, all operations\n"
+"must become done.\n"
+"\n"
+"The field 'Working Hours' is the delay(stop date - start date).\n"
+"So, that we can compare the theoretic delay and real delay. \n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.config.installer:0
+msgid "Skip"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_event_sale
+msgid "Events Sales"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ls
+msgid "Lesotho"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid ", or your preferred text editor"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_partner_assign
+msgid "Partners Geo-Localization"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ke
+msgid "Kenya"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_translation
+#: model:ir.ui.menu,name:base.menu_action_translation
+msgid "Translated Terms"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Abkhazian / аҧсуа"
+msgstr ""
+
+#. module: base
+#: view:base.module.configuration:0
+msgid "System Configuration Done"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:1540
+#, python-format
+msgid "Error occurred while validating the field(s) %s: %s"
+msgstr ""
+
+#. module: base
+#: view:ir.property:0
+msgid "Generic"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_document_ftp
+msgid "Shared Repositories (FTP)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sm
+msgid "San Marino"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bm
+msgid "Bermuda"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pe
+msgid "Peru"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,on_delete:0
+msgid "Set NULL"
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Save"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_xml:0
+msgid "XML Path"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bj
+msgid "Benin"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_partner_bank_type_form
+#: model:ir.ui.menu,name:base.menu_action_res_partner_bank_typeform
+msgid "Bank Account Types"
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_user:0
+msgid "Optional username for SMTP authentication"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_actions
+msgid "ir.actions.actions"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,select_level:0
+msgid "Not Searchable"
+msgstr ""
+
+#. module: base
+#: view:ir.config_parameter:0
+#: field:ir.config_parameter,key:0
+msgid "Key"
+msgstr ""
+
+#. module: base
+#: field:res.company,rml_header:0
+msgid "RML Header"
+msgstr ""
+
+#. module: base
+#: help:res.country,address_format:0
+msgid ""
+"You can state here the usual format to use for the addresses belonging to "
+"this country.\n"
+"\n"
+"You can use the python-style string patern with all the field of the address "
+"(for example, use '%(street)s' to display the field 'street') plus\n"
+"            \n"
+"%(state_name)s: the name of the state\n"
+"            \n"
+"%(state_code)s: the code of the state\n"
+"            \n"
+"%(country_name)s: the name of the country\n"
+"            \n"
+"%(country_code)s: the code of the country"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mu
+msgid "Mauritius"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+msgid "Full Access"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: view:ir.actions.report.xml:0
+#: model:ir.ui.menu,name:base.menu_security
+msgid "Security"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Portuguese / Português"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:372
+#, python-format
+msgid "Changing the storing system for field \"%s\" is not allowed."
+msgstr ""
+
+#. module: base
+#: help:res.partner.bank,company_id:0
+msgid "Only if this bank account belong to your company"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:337
+#, python-format
+msgid "Unknown sub-field '%s'"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.za
+msgid "South Africa"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+#: selection:ir.module.module,state:0
+#: selection:ir.module.module.dependency,state:0
+msgid "Installed"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Ukrainian / українська"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sn
+msgid "Senegal"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.hu
+msgid "Hungary"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_recruitment
+msgid "Recruitment Process"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.br
+msgid "Brazil"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%M - Minute [00,59]."
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "Affero GPL-3"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,number_next:0
+#: field:ir.sequence,number_next_actual:0
+msgid "Next Number"
+msgstr ""
+
+#. module: base
+#: help:workflow.transition,condition:0
+msgid "Expression to be satisfied if we want the transition done."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (PA) / Español (PA)"
+msgstr ""
+
+#. module: base
+#: view:res.currency:0
+#: field:res.currency,rate_ids:0
+msgid "Rates"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_email_template
+msgid "Email Templates"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sy
+msgid "Syria"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "======================================================"
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.model:0
+msgid "Each model must be unique!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_localization
+#: model:ir.ui.menu,name:base.menu_localisation
+msgid "Localization"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_api
+msgid ""
+"\n"
+"Openerp Web API.\n"
+"================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: selection:res.request,state:0
+msgid "draft"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+#: field:res.currency,date:0
+#: field:res.currency.rate,name:0
+#: field:res.partner,date:0
+#: field:res.request,date_sent:0
+msgid "Date"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_event_moodle
+msgid "Event Moodle"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_email_template
+msgid ""
+"\n"
+"Email Templating (simplified version of the original Power Email by "
+"Openlabs).\n"
+"============================================================================="
+"=\n"
+"\n"
+"Lets you design complete email templates related to any OpenERP document "
+"(Sale\n"
+"Orders, Invoices and so on), including sender, recipient, subject, body "
+"(HTML and\n"
+"Text). You may also automatically attach files to your templates, or print "
+"and\n"
+"attach a report.\n"
+"\n"
+"For advanced use, the templates may include dynamic attributes of the "
+"document\n"
+"they are related to. For example, you may use the name of a Partner's "
+"country\n"
+"when writing to them, also providing a safe default in case the attribute "
+"is\n"
+"not defined. Each template contains a built-in assistant to help with the\n"
+"inclusion of these dynamic values.\n"
+"\n"
+"If you enable the option, a composition assistant will also appear in the "
+"sidebar\n"
+"of the OpenERP documents to which the template applies (e.g. Invoices).\n"
+"This serves as a quick way to send a new email based on the template, after\n"
+"reviewing and adapting the contents, if needed.\n"
+"This composition assistant will also turn into a mass mailing system when "
+"called\n"
+"for multiple documents at once.\n"
+"\n"
+"These email templates are also at the heart of the marketing campaign "
+"system\n"
+"(see the ``marketing_campaign`` application), if you need to automate "
+"larger\n"
+"campaigns on any OpenERP document.\n"
+"\n"
+"    **Technical note:** only the templating system of the original Power "
+"Email by Openlabs was kept.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_partner_category_form
+msgid "Partner Tags"
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "Preview Header/Footer"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,parent_id:0
+#: field:wizard.ir.model.menu.create,menu_id:0
+msgid "Parent Menu"
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank,owner_name:0
+msgid "Account Owner Name"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:420
+#, python-format
+msgid "Cannot rename column to %s, because that column already exists!"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Attached To"
+msgstr ""
+
+#. module: base
+#: field:res.lang,decimal_point:0
+msgid "Decimal Separator"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:5319
+#, python-format
+msgid "Missing required value for the field '%s'."
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Write Access Right"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_res_groups
+msgid ""
+"A group is a set of functional areas that will be assigned to the user in "
+"order to give them access and rights to specific applications and tasks in "
+"the system. You can create custom groups or edit the ones existing by "
+"default in order to customize the view of the menu that users will be able "
+"to see. Whether they can have a read, write, create and delete access right "
+"can be managed from here."
+msgstr ""
+
+#. module: base
+#: view:ir.filters:0
+#: field:ir.filters,name:0
+msgid "Filter Name"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: view:res.partner:0
+#: field:res.request,history:0
+msgid "History"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.im
+msgid "Isle of Man"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.client,res_model:0
+msgid "Optional model, mostly used for needactions."
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bv
+msgid "Bouvet Island"
+msgstr ""
+
+#. module: base
+#: field:ir.model.constraint,type:0
+msgid "Constraint Type"
+msgstr ""
+
+#. module: base
+#: field:res.company,child_ids:0
+msgid "Child Companies"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ni
+msgid "Nicaragua"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_stock_invoice_directly
+msgid ""
+"\n"
+"Invoice Wizard for Delivery.\n"
+"============================\n"
+"\n"
+"When you send or deliver goods, this module automatically launch the "
+"invoicing\n"
+"wizard if the delivery is to be invoiced.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Wizard Button"
+msgstr ""
+
+#. module: base
+#: view:ir.model.fields:0
+#: field:ir.property,fields_id:0
+#: selection:ir.translation,type:0
+#: field:multi_company.default,field_id:0
+msgid "Field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_long_term
+msgid "Long Term Projects"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ve
+msgid "Venezuela"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "9.  %j              ==> 340"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.zm
+msgid "Zambia"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Launch Configuration Wizard"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_mrp
+msgid "Manufacturing Orders, Bill of Materials, Routing"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Cancel Upgrade"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_report_webkit
+msgid ""
+"\n"
+"This module adds a new Report Engine based on WebKit library (wkhtmltopdf) "
+"to support reports designed in HTML + CSS.\n"
+"============================================================================="
+"========================================\n"
+"\n"
+"The module structure and some code is inspired by the report_openoffice "
+"module.\n"
+"\n"
+"The module allows:\n"
+"------------------\n"
+"    - HTML report definition\n"
+"    - Multi header support\n"
+"    - Multi logo\n"
+"    - Multi company support\n"
+"    - HTML and CSS-3 support (In the limit of the actual WebKIT version)\n"
+"    - JavaScript support\n"
+"    - Raw HTML debugger\n"
+"    - Book printing capabilities\n"
+"    - Margins definition\n"
+"    - Paper size definition\n"
+"\n"
+"Multiple headers and logos can be defined per company. CSS style, header "
+"and\n"
+"footer body are defined per company.\n"
+"\n"
+"For a sample report see also the webkit_report_sample module, and this "
+"video:\n"
+"    http://files.me.com/nbessi/06n92k.mov\n"
+"\n"
+"Requirements and Installation:\n"
+"------------------------------\n"
+"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"as\n"
+"PDF. Version 0.9.9 or later is necessary, and can be found at\n"
+"http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
+"(32bits).\n"
+"\n"
+"After installing the library on the OpenERP Server machine, you need to set "
+"the\n"
+"path to the ``wkthtmltopdf`` executable file on each Company.\n"
+"\n"
+"If you are experiencing missing header/footer problems on Linux, be sure to\n"
+"install a 'static' version of the library. The default ``wkhtmltopdf`` on\n"
+"Ubuntu is known to have this issue.\n"
+"\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    * JavaScript support activation deactivation\n"
+"    * Collated and book format support\n"
+"    * Zip return for separated PDF\n"
+"    * Web client WYSIWYG\n"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_sale_salesman_all_leads
+msgid "See all Leads"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ci
+msgid "Ivory Coast (Cote D'Ivoire)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kz
+msgid "Kazakhstan"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%w - Weekday number [0(Sunday),6]."
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_ir_filters
+msgid "User-defined Filters"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window_close,name:0
+#: field:ir.actions.actions,name:0
+#: field:ir.actions.report.xml,name:0
+#: field:ir.actions.todo,name:0
+#: field:ir.cron,name:0
+#: field:ir.model.access,name:0
+#: field:ir.model.fields,name:0
+#: field:ir.module.category,name:0
+#: field:ir.module.module.dependency,name:0
+#: report:ir.module.reference:0
+#: view:ir.property:0
+#: field:ir.property,name:0
+#: field:ir.rule,name:0
+#: field:ir.sequence,name:0
+#: field:ir.sequence.type,name:0
+#: field:ir.values,name:0
+#: view:multi_company.default:0
+#: field:multi_company.default,name:0
+#: field:res.bank,name:0
+#: view:res.currency.rate.type:0
+#: field:res.currency.rate.type,name:0
+#: field:res.groups,name:0
+#: field:res.lang,name:0
+#: view:res.partner:0
+#: field:res.partner,name:0
+#: view:res.partner.bank:0
+#: field:res.partner.bank.type,name:0
+#: field:res.request.link,name:0
+#: view:res.users:0
+#: field:workflow,name:0
+#: field:workflow.activity,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,multi:0
+msgid ""
+"If set to true, the action will not be displayed on the right toolbar of a "
+"form view"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ms
+msgid "Montserrat"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_decimal_precision
+msgid "Decimal Precision Configuration"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_act_url
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.act_url"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_translation_app
+msgid "Application Terms"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.open_module_tree
+msgid ""
+"<p><b>No module found!</b></p>\n"
+"              <p>You should try others search criteria.</p>\n"
+"            "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_module_module
+#: field:ir.model.constraint,module:0
+#: view:ir.model.data:0
+#: field:ir.model.data,module:0
+#: field:ir.model.relation,module:0
+#: view:ir.module.module:0
+#: field:ir.module.module.dependency,module_id:0
+#: report:ir.module.reference:0
+#: field:ir.translation,module:0
+msgid "Module"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "English (UK)"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Japanese / 日本語"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_language_import
+msgid "Language Import"
+msgstr ""
+
+#. module: base
+#: help:workflow.transition,act_from:0
+msgid ""
+"Source activity. When this activity is over, the condition is tested to "
+"determine if we can start the ACT_TO activity."
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_generic_modules_accounting
+#: view:res.company:0
+msgid "Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_vat
+msgid ""
+"\n"
+"VAT validation for Partner's VAT numbers.\n"
+"=========================================\n"
+"\n"
+"After installing this module, values entered in the VAT field of Partners "
+"will\n"
+"be validated for all supported countries. The country is inferred from the\n"
+"2-letter country code that prefixes the VAT number, e.g. ``BE0477472701``\n"
+"will be validated using the Belgian rules.\n"
+"\n"
+"There are two different levels of VAT number validation:\n"
+"--------------------------------------------------------\n"
+"    * By default, a simple off-line check is performed using the known "
+"validation\n"
+"      rules for the country, usually a simple check digit. This is quick and "
+"\n"
+"      always available, but allows numbers that are perhaps not truly "
+"allocated,\n"
+"      or not valid anymore.\n"
+"      \n"
+"    * When the \"VAT VIES Check\" option is enabled (in the configuration of "
+"the user's\n"
+"      Company), VAT numbers will be instead submitted to the online EU VIES\n"
+"      database, which will truly verify that the number is valid and "
+"currently\n"
+"      allocated to a EU company. This is a little bit slower than the "
+"simple\n"
+"      off-line check, requires an Internet connection, and may not be "
+"available\n"
+"      all the time. If the service is not available or does not support the\n"
+"      requested country (e.g. for non-EU countries), a simple check will be "
+"performed\n"
+"      instead.\n"
+"\n"
+"Supported countries currently include EU countries, and a few non-EU "
+"countries\n"
+"such as Chile, Colombia, Mexico, Norway or Russia. For unsupported "
+"countries,\n"
+"only the country code will be validated.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_act_window_view
+msgid "ir.actions.act_window.view"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web
+#: report:ir.module.reference:0
+msgid "Web"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_lunch
+msgid "Lunch Orders"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "English (CA)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_human_resources
+msgid "Human Resources"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_syscohada
+msgid ""
+"\n"
+"This module implements the accounting chart for OHADA area.\n"
+"===========================================================\n"
+"    \n"
+"It allows any company or association to manage its financial accounting.\n"
+"\n"
+"Countries that use OHADA are the following:\n"
+"-------------------------------------------\n"
+"    Benin, Burkina Faso, Cameroon, Central African Republic, Comoros, "
+"Congo,\n"
+"    \n"
+"    Ivory Coast, Gabon, Guinea, Guinea Bissau, Equatorial Guinea, Mali, "
+"Niger,\n"
+"    \n"
+"    Replica of Democratic Congo, Senegal, Chad, Togo.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+msgid "Comments"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.et
+msgid "Ethiopia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_authentication
+msgid "Authentication"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sj
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_wizard
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.wizard"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_kanban
+msgid "Base Kanban"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: view:ir.actions.report.xml:0
+#: view:ir.actions.server:0
+msgid "Group By"
+msgstr ""
+
+#. module: base
+#: view:res.config.installer:0
+msgid "title"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "true"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_language_install
+msgid "Install Language"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_11
+msgid "Services"
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+msgid "Translation"
+msgstr ""
+
+#. module: base
+#: selection:res.request,state:0
+msgid "closed"
+msgstr ""
+
+#. module: base
+#: selection:base.language.export,state:0
+msgid "get"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,on_delete:0
+msgid "On delete property for many2one fields"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_accounting_and_finance
+msgid "Accounting & Finance"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,write_id:0
+msgid "Write Id"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_product
+msgid "Products"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.act_values_form_defaults
+#: model:ir.ui.menu,name:base.menu_values_form_defaults
+#: view:ir.values:0
+msgid "User-defined Defaults"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_usability
+#: view:res.users:0
+msgid "Usability"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,domain:0
+msgid "Domain Value"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_association
+msgid ""
+"\n"
+"This module is to configure modules related to an association.\n"
+"==============================================================\n"
+"\n"
+"It installs the profile for associations to manage events, registrations, "
+"memberships, \n"
+"membership products (schemes).\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_base_config
+#: model:ir.ui.menu,name:base.menu_config
+#: model:ir.ui.menu,name:base.menu_definitions
+#: model:ir.ui.menu,name:base.menu_event_config
+#: model:ir.ui.menu,name:base.menu_lunch_survey_root
+#: model:ir.ui.menu,name:base.menu_marketing_config_association
+#: model:ir.ui.menu,name:base.menu_marketing_config_root
+#: model:ir.ui.menu,name:base.menu_reporting_config
+#: view:res.company:0
+#: view:res.config:0
+msgid "Configuration"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_edi
+msgid ""
+"\n"
+"Provides a common EDI platform that other Applications can use.\n"
+"===============================================================\n"
+"\n"
+"OpenERP specifies a generic EDI format for exchanging business documents "
+"between \n"
+"different systems, and provides generic mechanisms to import and export "
+"them.\n"
+"\n"
+"More details about OpenERP's EDI format may be found in the technical "
+"OpenERP \n"
+"documentation at http://doc.openerp.com.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/workflow/workflow.py:99
+#, python-format
+msgid "Operation forbidden"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "SMS Configuration"
+msgstr ""
+
+#. module: base
+#: help:ir.rule,active:0
+msgid ""
+"If you uncheck the active field, it will disable the record rule without "
+"deleting it (if you delete a native record rule, it may be re-created when "
+"you reload the module."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (BO) / Español (BO)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_board
+msgid ""
+"\n"
+"Lets the user create a custom dashboard.\n"
+"========================================\n"
+"\n"
+"Allows users to create custom dashboard.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_access_act
+#: model:ir.ui.menu,name:base.menu_ir_access_act
+msgid "Access Controls List"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.um
+msgid "USA Minor Outlying Islands"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,numbercall:0
+msgid ""
+"How many times the method is called,\n"
+"a negative number indicates no limit."
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank.type.field,bank_type_id:0
+msgid "Bank Type"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:99
+#, python-format
+msgid "The name of the group can not start with \"-\""
+msgstr ""
+
+#. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
+#: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
+msgid "Apps"
+msgstr ""
+
+#. module: base
+#: view:ir.ui.view_sc:0
+msgid "Shortcut"
+msgstr ""
+
+#. module: base
+#: field:ir.model.data,date_init:0
+msgid "Init Date"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Gujarati / ગુજરાતી"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:361
+#, python-format
+msgid ""
+"Unable to process module \"%s\" because an external dependency is not met: %s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll
+msgid "Belgium - Payroll"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: field:workflow.activity,flow_start:0
+msgid "Flow Start"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_partner_title
+msgid "res.partner.title"
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "Bank Account Owner"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_uncategorized
+msgid "Uncategorized"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
+
+#. module: base
+#: field:res.partner,is_company:0
+msgid "Is a Company"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Hours"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gp
+msgid "Guadeloupe (French)"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:185
+#: code:addons/base/res/res_lang.py:187
+#: code:addons/base/res/res_lang.py:189
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: help:workflow.transition,signal:0
+msgid ""
+"When the operation of transition comes from a button pressed in the client "
+"form, signal tests the name of the pressed button. If signal is NULL, no "
+"button is necessary to validate this transition."
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_kanban
+msgid ""
+"\n"
+"OpenERP Web kanban view.\n"
+"========================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:182
+#, python-format
+msgid "'%s' does not seem to be a number for field '%%(field)s'"
+msgstr ""
+
+#. module: base
+#: help:res.country.state,name:0
+msgid ""
+"Administrative divisions of a country. E.g. Fed. State, Departement, Canton"
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "My Banks"
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.filters:0
+msgid "Filter names must be unique"
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,object_id:0
+msgid "Object affected by this rule"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window,target:0
+msgid "Inline View"
+msgstr ""
+
+#. module: base
+#: field:ir.filters,is_default:0
+msgid "Default filter"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Directory"
+msgstr ""
+
+#. module: base
+#: field:wizard.ir.model.menu.create,name:0
+msgid "Menu Name"
+msgstr ""
+
+#. module: base
+#: field:ir.values,key2:0
+msgid "Qualifier"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_be_coda
+msgid ""
+"\n"
+"Module to import CODA bank statements.\n"
+"======================================\n"
+"\n"
+"Supported are CODA flat files in V2 format from Belgian bank accounts.\n"
+"----------------------------------------------------------------------\n"
+"    * CODA v1 support.\n"
+"    * CODA v2.2 support.\n"
+"    * Foreign Currency support.\n"
+"    * Support for all data record types (0, 1, 2, 3, 4, 8, 9).\n"
+"    * Parsing & logging of all Transaction Codes and Structured Format \n"
+"      Communications.\n"
+"    * Automatic Financial Journal assignment via CODA configuration "
+"parameters.\n"
+"    * Support for multiple Journals per Bank Account Number.\n"
+"    * Support for multiple statements from different bank accounts in a "
+"single \n"
+"      CODA file.\n"
+"    * Support for 'parsing only' CODA Bank Accounts (defined as type='info' "
+"in \n"
+"      the CODA Bank Account configuration records).\n"
+"    * Multi-language CODA parsing, parsing configuration data provided for "
+"EN, \n"
+"      NL, FR.\n"
+"\n"
+"The machine readable CODA Files are parsed and stored in human readable "
+"format in \n"
+"CODA Bank Statements. Also Bank Statements are generated containing a subset "
+"of \n"
+"the CODA information (only those transaction lines that are required for the "
+"\n"
+"creation of the Financial Accounting records). The CODA Bank Statement is a "
+"\n"
+"'read-only' object, hence remaining a reliable representation of the "
+"original\n"
+"CODA file whereas the Bank Statement will get modified as required by "
+"accounting \n"
+"business processes.\n"
+"\n"
+"CODA Bank Accounts configured as type 'Info' will only generate CODA Bank "
+"Statements.\n"
+"\n"
+"A removal of one object in the CODA processing results in the removal of the "
+"\n"
+"associated objects. The removal of a CODA File containing multiple Bank \n"
+"Statements will also remove those associated statements.\n"
+"\n"
+"The following reconciliation logic has been implemented in the CODA "
+"processing:\n"
+"-----------------------------------------------------------------------------"
+"--\n"
+"    1) The Company's Bank Account Number of the CODA statement is compared "
+"against \n"
+"       the Bank Account Number field of the Company's CODA Bank Account \n"
+"       configuration records (whereby bank accounts defined in type='info' \n"
+"       configuration records are ignored). If this is the case an 'internal "
+"transfer'\n"
+"       transaction is generated using the 'Internal Transfer Account' field "
+"of the \n"
+"       CODA File Import wizard.\n"
+"    2) As a second step the 'Structured Communication' field of the CODA "
+"transaction\n"
+"       line is matched against the reference field of in- and outgoing "
+"invoices \n"
+"       (supported : Belgian Structured Communication Type).\n"
+"    3) When the previous step doesn't find a match, the transaction "
+"counterparty is \n"
+"       located via the Bank Account Number configured on the OpenERP "
+"Customer and \n"
+"       Supplier records.\n"
+"    4) In case the previous steps are not successful, the transaction is "
+"generated \n"
+"       by using the 'Default Account for Unrecognized Movement' field of the "
+"CODA \n"
+"       File Import wizard in order to allow further manual processing.\n"
+"\n"
+"In stead of a manual adjustment of the generated Bank Statements, you can "
+"also \n"
+"re-import the CODA after updating the OpenERP database with the information "
+"that \n"
+"was missing to allow automatic reconciliation.\n"
+"\n"
+"Remark on CODA V1 support:\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+"In some cases a transaction code, transaction category or structured \n"
+"communication code has been given a new or clearer description in CODA "
+"V2.The\n"
+"description provided by the CODA configuration tables is based upon the CODA "
+"\n"
+"V2.2 specifications.\n"
+"If required, you can manually adjust the descriptions via the CODA "
+"configuration menu.\n"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Month"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.my
+msgid "Malaysia"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_sequence.py:134
+#: code:addons/base/ir/ir_sequence.py:160
+#, python-format
+msgid "Increment number must not be zero."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_cancel
+msgid "Cancel Journal Entries"
+msgstr ""
+
+#. module: base
+#: field:res.partner,tz_offset:0
+msgid "Timezone offset"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_marketing_campaign
+msgid ""
+"\n"
+"This module provides leads automation through marketing campaigns (campaigns "
+"can in fact be defined on any resource, not just CRM Leads).\n"
+"============================================================================="
+"============================================================\n"
+"\n"
+"The campaigns are dynamic and multi-channels. The process is as follows:\n"
+"------------------------------------------------------------------------\n"
+"    * Design marketing campaigns like workflows, including email templates "
+"to\n"
+"      send, reports to print and send by email, custom actions\n"
+"    * Define input segments that will select the items that should enter "
+"the\n"
+"      campaign (e.g leads from certain countries.)\n"
+"    * Run you campaign in simulation mode to test it real-time or "
+"accelerated,\n"
+"      and fine-tune it\n"
+"    * You may also start the real campaign in manual mode, where each "
+"action\n"
+"      requires manual validation\n"
+"    * Finally launch your campaign live, and watch the statistics as the\n"
+"      campaign does everything fully automatically.\n"
+"\n"
+"While the campaign runs you can of course continue to fine-tune the "
+"parameters,\n"
+"input segments, workflow.\n"
+"\n"
+"**Note:** If you need demo data, you can install the "
+"marketing_campaign_crm_demo\n"
+"      module, but this will also install the CRM application as it depends "
+"on\n"
+"      CRM Leads.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_debug:0
+msgid ""
+"If enabled, the full output of SMTP sessions will be written to the server "
+"log at DEBUG level(this is very verbose and may include confidential info!)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_margin
+msgid ""
+"\n"
+"This module adds the 'Margin' on sales order.\n"
+"=============================================\n"
+"\n"
+"This gives the profitability by calculating the difference between the Unit\n"
+"Price and Cost Price.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,type:0
+msgid "Launch Automatically"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,translate:0
+msgid ""
+"Whether values for this field can be translated (enables the translation "
+"mechanism for that field)"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Indonesian / Bahasa Indonesia"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cv
+msgid "Cape Verde"
+msgstr ""
+
+#. module: base
+#: model:res.groups,comment:base.group_sale_salesman
+msgid "the user will have access to his own data in the sales application."
+msgstr ""
+
+#. module: base
+#: model:res.groups,comment:base.group_user
+msgid ""
+"the user will be able to manage his own human resources stuff (leave "
+"request, timesheets, ...), if he is linked to an employee in the system."
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2247
+#, python-format
+msgid "There is no view of type '%s' defined for the structure!"
+msgstr ""
+
+#. module: base
+#: help:ir.values,key:0
+msgid ""
+"- Action: an action attached to one slot of the given model\n"
+"- Default: a default value for a model field"
+msgstr ""
+
+#. module: base
+#: field:base.module.update,add:0
+msgid "Number of modules added"
+msgstr ""
+
+#. module: base
+#: view:res.currency:0
+msgid "Price Accuracy"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Latvian / latviešu valoda"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "French / Français"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Created Menus"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:502
+#: view:ir.module.module:0
+#, python-format
+msgid "Uninstall"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_budget
+msgid "Budgets Management"
+msgstr ""
+
+#. module: base
+#: field:workflow.triggers,workitem_id:0
+msgid "Workitem"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_anonymization
+msgid "Database Anonymization"
+msgstr ""
+
+#. module: base
+#: selection:ir.mail_server,smtp_encryption:0
+msgid "SSL/TLS"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: field:ir.actions.act_window.view,act_window_id:0
+#: view:ir.actions.actions:0
+#: field:ir.actions.todo,action_id:0
+#: field:ir.ui.menu,action:0
+#: selection:ir.values,key:0
+msgid "Action"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Email Configuration"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_cron
+msgid "ir.cron"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cw
+msgid "Curaçao"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Current Year without Century: %(y)s"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.client,tag:0
+msgid ""
+"An arbitrary string, interpreted by the client according to its own needs "
+"and wishes. There is no central tag repository across clients."
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.rule:0
+msgid "Rule must have at least one checked access right !"
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank.type,format_layout:0
+msgid "Format Layout"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_document_ftp
+msgid ""
+"\n"
+"This is a support FTP Interface with document management system.\n"
+"================================================================\n"
+"\n"
+"With this module you would not only be able to access documents through "
+"OpenERP\n"
+"but you would also be able to connect with them through the file system "
+"using the\n"
+"FTP client.\n"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,size:0
+msgid "Size"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_audittrail
+msgid "Audit Trail"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:264
+#, python-format
+msgid "Value '%s' not found in selection field '%%(field)s'"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sd
+msgid "Sudan"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_currency_rate_type_form
+#: model:ir.model,name:base.model_res_currency_rate_type
+#: field:res.currency.rate,currency_rate_type_id:0
+#: view:res.currency.rate.type:0
+msgid "Currency Rate Type"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_fr
+msgid ""
+"\n"
+"This is the module to manage the accounting chart for France in OpenERP.\n"
+"========================================================================\n"
+"\n"
+"This module applies to companies based in France mainland. It doesn't apply "
+"to\n"
+"companies based in the DOM-TOMs (Guadeloupe, Martinique, Guyane, Réunion, "
+"Mayotte).\n"
+"\n"
+"This localisation module creates the VAT taxes of type 'tax included' for "
+"purchases\n"
+"(it is notably required when you use the module 'hr_expense'). Beware that "
+"these\n"
+"'tax included' VAT taxes are not managed by the fiscal positions provided by "
+"this\n"
+"module (because it is complex to manage both 'tax excluded' and 'tax "
+"included'\n"
+"scenarios in fiscal positions).\n"
+"\n"
+"This localisation module doesn't properly handle the scenario when a France-"
+"mainland\n"
+"company sells services to a company based in the DOMs. We could manage it in "
+"the\n"
+"fiscal positions, but it would require to differentiate between 'product' "
+"VAT taxes\n"
+"and 'service' VAT taxes. We consider that it is too 'heavy' to have this by "
+"default\n"
+"in l10n_fr; companies that sell services to DOM-based companies should "
+"update the\n"
+"configuration of their taxes and fiscal positions manually.\n"
+"\n"
+"**Credits:** Sistheo, Zeekom, CrysaLEAD, Akretion and Camptocamp.\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fm
+msgid "Micronesia"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,menus_by_module:0
+#: view:res.groups:0
+msgid "Menus"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,type:0
+msgid "Launch Manually Once"
+msgstr ""
+
+#. module: base
+#: view:workflow:0
+#: view:workflow.activity:0
+#: field:workflow.activity,wkf_id:0
+#: field:workflow.instance,wkf_id:0
+#: field:workflow.transition,wkf_id:0
+#: field:workflow.workitem,wkf_id:0
+msgid "Workflow"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Serbian (Latin) / srpski"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.il
+msgid "Israel"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_config.py:475
+#, python-format
+msgid "Cannot duplicate configuration!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_syscohada
+msgid "OHADA - Accounting"
+msgstr ""
+
+#. module: base
+#: help:res.bank,bic:0
+msgid "Sometimes called BIC or Swift."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_in
+msgid "Indian - Accounting"
+msgstr ""
+
+#. module: base
+#: field:res.lang,time_format:0
+msgid "Time Format"
+msgstr ""
+
+#. module: base
+#: field:res.company,rml_header3:0
+msgid "RML Internal Header for Landscape Reports"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_partner_manager
+msgid "Contact Creation"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Defined Reports"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_gtd
+msgid "Todo Lists"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "Report xml"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_module_open_categ
+#: field:ir.module.category,module_ids:0
+#: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.menu_management
+msgid "Modules"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: selection:workflow.activity,kind:0
+#: field:workflow.activity,subflow_id:0
+#: field:workflow.workitem,subflow_id:0
+msgid "Subflow"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_bank_form
+#: model:ir.ui.menu,name:base.menu_action_res_bank_form
+#: view:res.bank:0
+#: field:res.partner,bank_ids:0
+msgid "Banks"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web
+msgid ""
+"\n"
+"OpenERP Web core module.\n"
+"========================\n"
+"\n"
+"This module provides the core of the OpenERP Web Client.\n"
+"        "
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Week of the Year: %(woy)s"
+msgstr ""
+
+#. module: base
+#: field:res.users,id:0
+msgid "ID"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,doall:0
+msgid "Repeat Missed"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_import.py:67
+#, python-format
+msgid "Can not create the module file: %s !"
+msgstr ""
+
+#. module: base
+#: field:ir.server.object.lines,server_id:0
+msgid "Object Mapping"
+msgstr ""
+
+#. module: base
+#: field:ir.module.category,xml_id:0
+#: field:ir.ui.view,xml_id:0
+msgid "External ID"
+msgstr ""
+
+#. module: base
+#: help:res.currency.rate,rate:0
+msgid "The rate of the currency to the currency of rate 1"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.uk
+msgid "United Kingdom"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
+
+#. module: base
+#: help:res.partner.category,active:0
+msgid "The active field allows you to hide the category without removing it."
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Object:"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bw
+msgid "Botswana"
+msgstr ""
+
+#. module: base
+#: view:res.partner.title:0
+msgid "Partner Titles"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
+#, python-format
+msgid "Use the format '%s'"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,auto_refresh:0
+msgid "Add an auto-refresh on the view"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_profiling
+msgid "Customer Profiling"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Work Days"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_multi_company
+msgid "Multi-Company"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_workitem_form
+#: model:ir.ui.menu,name:base.menu_workflow_workitem
+msgid "Workitems"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_bank.py:195
+#, python-format
+msgid "Invalid Bank Account Type Name format."
+msgstr ""
+
+#. module: base
+#: view:ir.filters:0
+msgid "Filters visible only for one user"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4348
+#, python-format
+msgid ""
+"You cannot perform this operation. New Record Creation is not allowed for "
+"this object as this object is for reporting purpose."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_import
+msgid ""
+"\n"
+"New extensible file import for OpenERP\n"
+"======================================\n"
+"\n"
+"Re-implement openerp's file import system:\n"
+"\n"
+"* Server side, the previous system forces most of the logic into the\n"
+"  client which duplicates the effort (between clients), makes the\n"
+"  import system much harder to use without a client (direct RPC or\n"
+"  other forms of automation) and makes knowledge about the\n"
+"  import/export system much harder to gather as it is spread over\n"
+"  3+ different projects.\n"
+"\n"
+"* In a more extensible manner, so users and partners can build their\n"
+"  own front-end to import from other file formats (e.g. OpenDocument\n"
+"  files) which may be simpler to handle in their work flow or from\n"
+"  their data production sources.\n"
+"\n"
+"* In a module, so that administrators and users of OpenERP who do not\n"
+"  need or want an online import can avoid it being available to users.\n"
+msgstr ""
+
+#. module: base
+#: selection:res.currency,position:0
+msgid "After Amount"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Lithuanian / Lietuvių kalba"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,record_id:0
+msgid ""
+"Provide the field name where the record id is stored after the create "
+"operations. If it is empty, you can not track the new record."
+msgstr ""
+
+#. module: base
+#: model:res.groups,comment:base.group_hr_user
+msgid "the user will be able to approve document created by employees."
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,needaction_enabled:0
+msgid "Target model uses the need action mechanism"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,relation:0
+msgid "For relationship fields, the technical name of the target model"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%S - Seconds [00,61]."
+msgstr ""
+
+#. module: base
+#: help:base.language.import,overwrite:0
+msgid ""
+"If you enable this option, existing translations (including custom ones) "
+"will be overwritten and replaced by those in this file"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view,inherit_id:0
+msgid "Inherited View"
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+msgid "Source Term"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_project_management
+#: model:ir.ui.menu,name:base.menu_main_pm
+#: model:ir.ui.menu,name:base.menu_project_config
+#: model:ir.ui.menu,name:base.menu_project_report
+msgid "Project"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,web_icon_hover_data:0
+msgid "Web Icon Image (hover)"
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+msgid "Module file successfully imported!"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_model_constraint
+#: view:ir.model.constraint:0
+#: model:ir.ui.menu,name:base.ir_model_constraint_menu
+msgid "Model Constraints"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_timesheet
+#: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr ""
+
+#. module: base
+#: help:ir.values,company_id:0
+msgid "If set, action binding only applies for this company"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_cn
+msgid ""
+"\n"
+"添加中文省份数据\n"
+"科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
+"============================================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lc
+msgid "Saint Lucia"
+msgstr ""
+
+#. module: base
+#: help:res.users,new_password:0
+msgid ""
+"Specify a value only when creating a user or if you're changing the user's "
+"password, otherwise leave empty. After a change of password, the user has to "
+"login again."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.so
+msgid "Somalia"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_doctor
+msgid "Dr."
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_user
+#: field:res.partner,employee:0
+#: model:res.partner.category,name:base.res_partner_category_3
+msgid "Employee"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_issue
+msgid ""
+"\n"
+"Track Issues/Bugs Management for Projects\n"
+"=========================================\n"
+"This application allows you to manage the issues you might face in a project "
+"like bugs in a system, client complaints or material breakdowns. \n"
+"\n"
+"It allows the manager to quickly check the issues, assign them and decide on "
+"their status quickly as they evolve.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.model.access,perm_create:0
+msgid "Create Access"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_timesheet
+msgid ""
+"\n"
+"This module implements a timesheet system.\n"
+"==========================================\n"
+"\n"
+"Each employee can encode and track their time spent on the different "
+"projects.\n"
+"A project is an analytic account and the time spent on a project generates "
+"costs on\n"
+"the analytic account.\n"
+"\n"
+"Lots of reporting on time and employee tracking are provided.\n"
+"\n"
+"It is completely integrated with the cost accounting module. It allows you "
+"to set\n"
+"up a management by affair.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.bank,state:0
+#: field:res.company,state_id:0
+#: field:res.partner.bank,state_id:0
+msgid "Fed. State"
+msgstr "Departamento"
+
+#. module: base
+#: field:ir.actions.server,copy_object:0
+msgid "Copy Of"
+msgstr ""
+
+#. module: base
+#: field:ir.model.data,display_name:0
+msgid "Record Name"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_client
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.client"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.io
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.server,name:base.action_server_module_immediate_install
+msgid "Module Immediate Install"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Field Mapping"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,ttype:0
+msgid "Field Type"
+msgstr ""
+
+#. module: base
+#: field:res.country.state,code:0
+msgid "State Code"
+msgstr "Código Departamento"
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_multilang
+msgid "Multi Language Chart of Accounts"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_gt
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Guatemala.\n"
+"=====================================================================\n"
+"\n"
+"Agrega una nomenclatura contable para Guatemala. También icluye impuestos y\n"
+"la moneda del Quetzal. -- Adds accounting chart for Guatemala. It also "
+"includes\n"
+"taxes and the Quetzal currency."
+msgstr ""
+
+#. module: base
+#: selection:res.lang,direction:0
+msgid "Left-to-Right"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,translate:0
+#: view:res.lang:0
+#: field:res.lang,translatable:0
+msgid "Translatable"
+msgstr ""
+
+#. module: base
+#: help:base.language.import,code:0
+msgid "ISO Language and Country code, e.g. en_US"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.vn
+msgid "Vietnam"
+msgstr ""
+
+#. module: base
+#: field:res.users,signature:0
+msgid "Signature"
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,complete_name:0
+msgid "Full Name"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "on"
+msgstr ""
+
+#. module: base
+#: view:ir.property:0
+msgid "Parameters that are used by all resources."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mz
+msgid "Mozambique"
+msgstr ""
+
+#. module: base
+#: help:ir.values,action_id:0
+msgid ""
+"Action bound to this entry - helper field for binding an action, will "
+"automatically set the correct reference"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_project_long_term
+msgid "Long Term Planning"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,message:0
+msgid "Message"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window.view,multi:0
+#: field:ir.actions.report.xml,multi:0
+msgid "On Multiple Doc."
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+#: view:base.language.import:0
+#: view:base.language.install:0
+#: view:base.module.import:0
+#: view:base.module.update:0
+#: view:base.module.upgrade:0
+#: view:base.update.translations:0
+#: view:change.password.wizard:0
+#: view:ir.actions.configuration.wizard:0
+#: view:res.config:0
+#: view:res.config.installer:0
+#: view:res.users:0
+#: view:wizard.ir.model.menu.create:0
+msgid "or"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_accountant
+msgid "Accounting and Finance"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Upgrade"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_action_rule
+msgid ""
+"\n"
+"This module allows to implement action rules for any object.\n"
+"============================================================\n"
+"\n"
+"Use automated actions to automatically trigger actions for various screens.\n"
+"\n"
+"**Example:** A lead created by a specific user may be automatically set to a "
+"specific\n"
+"sales team, or an opportunity which still has status pending after 14 days "
+"might\n"
+"trigger an automatic reminder email.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.partner,function:0
+msgid "Job Position"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: field:res.partner,child_ids:0
+msgid "Contacts"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fo
+msgid "Faroe Islands"
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_encryption:0
+msgid "Connection Security"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_actions.py:606
+#, python-format
+msgid "Please specify an action to launch !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ec
+msgid "Ecuador - Accounting"
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,name:0
+msgid "Category Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mp
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hn
+msgid "Honduras - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_report_intrastat
+msgid "Intrastat Reporting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
+#, python-format
+msgid ""
+"Please use the change password wizard (in User Preferences or User menu) to "
+"change your own password."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_long_term
+msgid ""
+"\n"
+"Long Term Project management module that tracks planning, scheduling, "
+"resources allocation.\n"
+"============================================================================="
+"==============\n"
+"\n"
+"Features:\n"
+"---------\n"
+"    * Manage Big project\n"
+"    * Define various Phases of Project\n"
+"    * Compute Phase Scheduling: Compute start date and end date of the "
+"phases\n"
+"      which are in draft, open and pending state of the project given. If "
+"no\n"
+"      project given then all the draft, open and pending state phases will "
+"be taken.\n"
+"    * Compute Task Scheduling: This works same as the scheduler button on\n"
+"      project.phase. It takes the project as argument and computes all the "
+"open,\n"
+"      draft and pending tasks.\n"
+"    * Schedule Tasks: All the tasks which are in draft, pending and open "
+"state\n"
+"      are scheduled with taking the phase's start date.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2021
+#, python-format
+msgid "Insufficient fields for Calendar View!"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Integer"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,report_rml:0
+msgid ""
+"The path to the main report file (depending on Report Type) or NULL if the "
+"content is in another data field"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_14
+msgid "Manufacturer"
+msgstr ""
+
+#. module: base
+#: help:res.users,company_id:0
+msgid "The company this user is currently working for."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_wizard_ir_model_menu_create
+msgid "wizard.ir.model.menu.create"
+msgstr ""
+
+#. module: base
+#: view:workflow.transition:0
+msgid "Transition"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,active:0
+#: field:ir.mail_server,active:0
+#: field:ir.model.access,active:0
+#: field:ir.rule,active:0
+#: field:ir.sequence,active:0
+#: field:res.bank,active:0
+#: field:res.currency,active:0
+#: field:res.lang,active:0
+#: field:res.partner,active:0
+#: field:res.partner.category,active:0
+#: field:res.request,active:0
+#: field:res.users,active:0
+#: view:workflow.instance:0
+#: view:workflow.workitem:0
+msgid "Active"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.na
+msgid "Namibia"
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,child_ids:0
+msgid "Child Categories"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_actions.py:606
+#: code:addons/base/ir/ir_actions.py:702
+#: code:addons/base/ir/ir_actions.py:705
+#: code:addons/base/ir/ir_model.py:165
+#: code:addons/base/ir/ir_model.py:276
+#: code:addons/base/ir/ir_model.py:290
+#: code:addons/base/ir/ir_model.py:320
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:344
+#: code:addons/base/ir/ir_model.py:347
+#: code:addons/base/ir/ir_translation.py:341
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:525
+#: code:addons/base/module/module.py:539
+#: code:addons/base/module/module.py:644
+#: code:addons/base/res/res_currency.py:194
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:787
+#: code:addons/orm.py:3961
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base
+#: help:res.partner,tz:0
+msgid ""
+"The partner's timezone, used to output proper date and time values inside "
+"printed reports. It is important to set a value for this field. You should "
+"use the same timezone that is otherwise used to pick and render date and "
+"time values: your computer's timezone."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_analytic_default
+msgid "Account Analytic Defaults"
+msgstr ""
+
+#. module: base
+#: selection:ir.ui.view,type:0
+msgid "mdx"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
+msgid "Scheduled Action"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bi
+msgid "Burundi"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+#: view:base.language.install:0
+#: view:base.module.configuration:0
+#: view:base.module.update:0
+msgid "Close"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (MX) / Español (MX)"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Wizards to be Launched"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bt
+msgid "Bhutan"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_event
+msgid ""
+"\n"
+"This module adds event menu and features to your portal if event and portal "
+"are installed.\n"
+"============================================================================="
+"=============\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,number_next:0
+msgid "Next number of this sequence"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "at"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Rule Definition (Domain Filter)"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_url,target:0
+msgid "This Window"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,format:0
+msgid "File Format"
+msgstr ""
+
+#. module: base
+#: field:res.lang,iso_code:0
+msgid "ISO code"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_association
+msgid "Associations Management"
+msgstr ""
+
+#. module: base
+#: help:ir.model,modules:0
+msgid "List of modules in which the object is defined or inherited"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_localization_payroll
+#: model:ir.module.module,shortdesc:base.module_hr_payroll
+msgid "Payroll"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_country_state
+msgid ""
+"If you are working on the American market, you can manage the different "
+"federal states you are working on from here. Each state is attached to one "
+"country."
+msgstr ""
+
+#. module: base
+#: view:workflow.workitem:0
+msgid "Workflow Workitems"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.vc
+msgid "Saint Vincent & Grenadines"
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_pass:0
+#: field:res.users,password:0
+msgid "Password"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_claim
+msgid "Portal Claim"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pe
+msgid "Peru Localization Chart Account"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_auth_oauth
+msgid ""
+"\n"
+"Allow users to login through OAuth2 Provider.\n"
+"=============================================\n"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_model_fields
+#: view:ir.model:0
+#: field:ir.model,field_id:0
+#: model:ir.model,name:base.model_ir_model_fields
+#: view:ir.model.fields:0
+#: model:ir.ui.menu,name:base.ir_model_model_fields
+msgid "Fields"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_employee_form
+msgid "Employees"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.company,rml_header2:0
+msgid "RML Internal Header"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,search_view_id:0
+msgid "Search View Ref."
+msgstr ""
+
+#. module: base
+#: help:res.users,partner_id:0
+msgid "Partner-related data of the user"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_todo
+msgid ""
+"\n"
+"Todo list for CRM leads and opportunities.\n"
+"==========================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.mail_server:0
+msgid "Test Connection"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mm
+msgid "Myanmar"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,modules:0
+msgid "List of modules in which the field is defined"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Chinese (CN) / 简体中文"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,selection:0
+msgid "Selection Options"
+msgstr ""
+
+#. module: base
+#: field:res.bank,street:0
+#: field:res.company,street:0
+#: field:res.partner,street:0
+#: view:res.partner.bank:0
+#: field:res.partner.bank,street:0
+msgid "Street"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.yu
+msgid "Yugoslavia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_fetchmail
+msgid ""
+"\n"
+"Retrieve incoming email on POP/IMAP servers.\n"
+"============================================\n"
+"\n"
+"Enter the parameters of your POP/IMAP account(s), and any incoming emails "
+"on\n"
+"these accounts will be automatically downloaded into your OpenERP system. "
+"All\n"
+"POP3/IMAP-compatible servers are supported, included those that require an\n"
+"encrypted SSL/TLS connection.\n"
+"\n"
+"This can be used to easily create email-based workflows for many email-"
+"enabled OpenERP documents, such as:\n"
+"-----------------------------------------------------------------------------"
+"-----------------------------\n"
+"    * CRM Leads/Opportunities\n"
+"    * CRM Claims\n"
+"    * Project Issues\n"
+"    * Project Tasks\n"
+"    * Human Resource Recruitments (Applicants)\n"
+"\n"
+"Just install the relevant application, and you can assign any of these "
+"document\n"
+"types (Leads, Project Issues) to your incoming email accounts. New emails "
+"will\n"
+"automatically spawn new documents of the chosen type, so it's a snap to "
+"create a\n"
+"mailbox-to-OpenERP integration. Even better: these documents directly act as "
+"mini\n"
+"conversations synchronized by email. You can reply from within OpenERP, and "
+"the\n"
+"answers will automatically be collected when they come back, and attached to "
+"the\n"
+"same *conversation* document.\n"
+"\n"
+"For more specific needs, you may also assign custom-defined actions\n"
+"(technically: Server Actions) to be triggered for each incoming mail.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.currency,rounding:0
+msgid "Rounding Factor"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ca
+msgid "Canada"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "Launchpad"
+msgstr ""
+
+#. module: base
+#: help:res.currency.rate,currency_rate_type_id:0
+msgid ""
+"Allow you to define your own currency rate types, like 'Average' or 'Year to "
+"Date'. Leave empty if you simply want to use the normal 'spot' rate type"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module.dependency,state:0
+msgid "Unknown"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_users_my
+msgid "Change My Preferences"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_actions.py:171
+#, python-format
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ro
+msgid ""
+"\n"
+"This is the module to manage the accounting chart, VAT structure and "
+"Registration Number for Romania in OpenERP.\n"
+"============================================================================="
+"===================================\n"
+"\n"
+"Romanian accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cm
+msgid "Cameroon"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bf
+msgid "Burkina Faso"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,state:0
+msgid "Custom Field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_account_accountant
+msgid "Financial and Analytic Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_project
+msgid "Portal Project"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cc
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,state:0
+#: selection:base.module.import,state:0
+#: selection:base.module.update,state:0
+msgid "init"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: field:res.partner,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "11. %U or %W       ==> 48 (49th week)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_partner_bank_type_field
+msgid "Bank type fields"
+msgstr ""
+
+#. module: base
+#: constraint:ir.rule:0
+msgid "Rules can not be applied on Transient models."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Dutch / Nederlands"
+msgstr ""
+
+#. module: base
+#: selection:res.company,paper_format:0
+msgid "US Letter"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.bank_account_update
+msgid "Company Bank Accounts"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:473
+#, python-format
+msgid "Setting empty passwords is not allowed for security reasons!"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_pass:0
+msgid "Optional password for SMTP authentication"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:727
+#, python-format
+msgid "Sorry, you are not allowed to modify this document."
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_config.py:380
+#, python-format
+msgid ""
+"\n"
+"\n"
+"This addon is already installed on your system"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,interval_number:0
+msgid "Repeat every x."
+msgstr ""
+
+#. module: base
+#: model:res.partner.bank.type,name:base.bank_normal
+msgid "Normal Bank Account"
+msgstr ""
+
+#. module: base
+#: field:change.password.user,wizard_id:0
+#: view:ir.actions.wizard:0
+msgid "Wizard"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:303
+#, python-format
+msgid "database id"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_import
+msgid "Base import"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "1cm 28cm 20cm 28cm"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,maintainer:0
+msgid "Maintainer"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,suffix:0
+msgid "Suffix"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mo
+msgid "Macau"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.report.xml,name:base.res_partner_address_report
+msgid "Labels"
+msgstr ""
+
+#. module: base
+#: help:res.partner,use_parent_address:0
+msgid ""
+"Select this if you want to set company's address information  for this "
+"contact"
+msgstr ""
+
+#. module: base
+#: field:ir.default,field_name:0
+msgid "Object Field"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (PE) / Español (PE)"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "French (CH) / Français (CH)"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_13
+msgid "Distributor"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,subject:0
+msgid ""
+"Email subject, may contain expressions enclosed in double brackets based on "
+"the same values as those available in the condition field, e.g. `Hello [[ "
+"object.partner_id.name ]]`"
+msgstr ""
+
+#. module: base
+#: help:res.partner,image:0
+msgid ""
+"This field holds the image used as avatar for this contact, limited to "
+"1024x1024px"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.to
+msgid "Tonga"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,serialization_field_id:0
+msgid ""
+"If set, this field will be stored in the sparse structure of the "
+"serialization field, instead of having its own database column. This cannot "
+"be changed after creation."
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "Bank accounts belonging to one of your companies"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_analytic_plans
+msgid ""
+"\n"
+"This module allows to use several analytic plans according to the general "
+"journal.\n"
+"============================================================================="
+"=====\n"
+"\n"
+"Here multiple analytic lines are created when the invoice or the entries\n"
+"are confirmed.\n"
+"\n"
+"For example, you can define the following analytic structure:\n"
+"-------------------------------------------------------------\n"
+"  * **Projects**\n"
+"      * Project 1\n"
+"          + SubProj 1.1\n"
+"          \n"
+"          + SubProj 1.2\n"
+"\n"
+"      * Project 2\n"
+"      \n"
+"  * **Salesman**\n"
+"      * Eric\n"
+"      \n"
+"      * Fabien\n"
+"\n"
+"Here, we have two plans: Projects and Salesman. An invoice line must be able "
+"to write analytic entries in the 2 plans: SubProj 1.1 and Fabien. The amount "
+"can also be split.\n"
+" \n"
+"The following example is for an invoice that touches the two subprojects and "
+"assigned to one salesman:\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+"**Plan1:**\n"
+"\n"
+"    * SubProject 1.1 : 50%\n"
+"    \n"
+"    * SubProject 1.2 : 50%\n"
+"    \n"
+"**Plan2:**\n"
+"    Eric: 100%\n"
+"\n"
+"So when this line of invoice will be confirmed, it will generate 3 analytic "
+"lines,for one account entry.\n"
+"\n"
+"The analytic plan validates the minimum and maximum percentage at the time "
+"of creation of distribution models.\n"
+"        "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_sequence
+msgid "Entries Sequence Numbering"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "POEdit"
+msgstr ""
+
+#. module: base
+#: view:ir.values:0
+msgid "Client Actions"
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank.type,field_ids:0
+msgid "Type Fields"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_hr_recruitment
+msgid "Jobs, Recruitment, Applications, Job Interviews"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:539
+#, python-format
+msgid ""
+"You try to upgrade a module that depends on the module: %s.\n"
+"But this module is not available in your system."
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,act_to:0
+msgid "Destination Activity"
+msgstr ""
+
+#. module: base
+#: help:res.currency,position:0
+msgid ""
+"Determines where the currency symbol should be placed after or before the "
+"amount."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_pad_project
+msgid "Pad on tasks"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_update_translations
+msgid "base.update.translations"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Full Access Right"
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,parent_id:0
+msgid "Parent Category"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fi
+msgid "Finland"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_shortcuts
+msgid "Web Shortcuts"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: selection:res.partner,type:0
+#: selection:res.partner.title,domain:0
+#: view:res.users:0
+msgid "Contact"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_at
+msgid "Austria - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_menu
+msgid "ir.ui.menu"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project
+msgid "Project Management"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Cancel Uninstall"
+msgstr ""
+
+#. module: base
+#: view:res.bank:0
+msgid "Communication"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_analytic
+msgid "Analytic Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_model_constraint
+msgid "ir.model.constraint"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_graph
+msgid "Graph Views"
+msgstr ""
+
+#. module: base
+#: help:ir.model.relation,name:0
+msgid "PostgreSQL table name implementing a many2many relation."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base
+msgid ""
+"\n"
+"The kernel of OpenERP, needed for all installation.\n"
+"===================================================\n"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_server_object_lines
+msgid "ir.server.object.lines"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be
+msgid "Belgium - Accounting"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+msgid "Access Control"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kw
+msgid "Kuwait"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_followup
+msgid "Payment Follow-up Management"
+msgstr ""
+
+#. module: base
+#: field:workflow.workitem,inst_id:0
+msgid "Instance"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,attachment:0
+msgid ""
+"This is the filename of the attachment used to store the printing result. "
+"Keep empty to not save the printed reports. You can use a python expression "
+"with the object and time variables."
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.model.data:0
+msgid ""
+"You cannot have multiple records with the same external ID in the same "
+"module!"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Many2One"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ng
+msgid "Nigeria"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:339
+#, python-format
+msgid "For selection fields, the Selection Options must be given!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_iban
+msgid "IBAN Bank Accounts"
+msgstr ""
+
+#. module: base
+#: field:res.company,user_ids:0
+msgid "Accepted Users"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,web_icon_data:0
+msgid "Web Icon Image"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,wkf_model_id:0
+msgid "Target Object"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,select_level:0
+msgid "Always Searchable"
+msgstr ""
+
+#. module: base
+#: help:res.country.state,code:0
+msgid "The state code in max. three chars."
+msgstr "El código de departamento en tres caracteres como máximo."
+
+#. module: base
+#: model:res.country,name:base.hk
+msgid "Hong Kong"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_sale
+msgid "Portal Sale"
+msgstr ""
+
+#. module: base
+#: field:ir.default,ref_id:0
+msgid "ID Ref."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ph
+msgid "Philippines"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_hr_timesheet_sheet
+msgid "Timesheets, Attendances, Activities"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ma
+msgid "Morocco"
+msgstr ""
+
+#. module: base
+#: help:ir.values,model_id:0
+msgid ""
+"Model to which this entry applies - helper field for setting a model, will "
+"automatically set the correct model name"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "2.  %a ,%A         ==> Fri, Friday"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_translation.py:341
+#, python-format
+msgid ""
+"Translation features are unavailable until you install an extra OpenERP "
+"translation."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_nl
+msgid ""
+"\n"
+"This is the module to manage the accounting chart for Netherlands in "
+"OpenERP.\n"
+"============================================================================="
+"\n"
+"\n"
+"Read changelog in file __openerp__.py for version information.\n"
+"Dit is een basismodule om een uitgebreid grootboek- en BTW schema voor\n"
+"Nederlandse bedrijven te installeren in OpenERP versie 7.0.\n"
+"\n"
+"De BTW rekeningen zijn waar nodig gekoppeld om de juiste rapportage te "
+"genereren,\n"
+"denk b.v. aan intracommunautaire verwervingen waarbij u 21% BTW moet "
+"opvoeren,\n"
+"maar tegelijkertijd ook 21% als voorheffing weer mag aftrekken.\n"
+"\n"
+"Na installatie van deze module word de configuratie wizard voor 'Accounting' "
+"aangeroepen.\n"
+"    * U krijgt een lijst met grootboektemplates aangeboden waarin zich ook "
+"het\n"
+"      Nederlandse grootboekschema bevind.\n"
+"\n"
+"    * Als de configuratie wizard start, wordt u gevraagd om de naam van uw "
+"bedrijf\n"
+"      in te voeren, welke grootboekschema te installeren, uit hoeveel "
+"cijfers een\n"
+"      grootboekrekening mag bestaan, het rekeningnummer van uw bank en de "
+"currency\n"
+"      om Journalen te creeren.\n"
+"\n"
+"Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit "
+"4\n"
+"cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal "
+"verhogen.\n"
+"De extra cijfers worden dan achter het rekeningnummer aangevult met "
+"'nullen'.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.rule,global:0
+msgid "If no group is specified the rule is global and applied to everyone"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.td
+msgid "Chad"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,priority:0
+msgid ""
+"The priority of the job, as an integer: 0 means higher priority, 10 means "
+"lower priority."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow_transition
+msgid "workflow.transition"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%a - Abbreviated weekday name."
+msgstr ""
+
+#. module: base
+#: view:ir.ui.menu:0
+msgid "Submenus"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Introspection report on objects"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_analytics
+msgid "Google Analytics"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_note
+msgid ""
+"\n"
+"This module allows users to create their own notes inside OpenERP\n"
+"=================================================================\n"
+"\n"
+"Use notes to write meeting minutes, organize ideas, organize personnal todo\n"
+"lists, etc. Each user manages his own personnal Notes. Notes are available "
+"to\n"
+"their authors only, but they can share notes to others users so that "
+"several\n"
+"people can work on the same note in real time. It's very efficient to share\n"
+"meeting minutes.\n"
+"\n"
+"Notes can be found in the 'Home' menu.\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.dm
+msgid "Dominica"
+msgstr ""
+
+#. module: base
+#: field:ir.translation,name:0
+msgid "Translated field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_stock_location
+msgid "Advanced Routes"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_pad
+msgid "Collaborative Pads"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.np
+msgid "Nepal"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_document_page
+msgid "Document Page"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ar
+msgid "Argentina Localization Chart Account"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,description_html:0
+msgid "Description HTML"
+msgstr ""
+
+#. module: base
+#: help:res.groups,implied_ids:0
+msgid "Users of this group automatically inherit those groups"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_note
+msgid "Sticky notes, Collaborative, Memos"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_attendance
+#: model:res.groups,name:base.group_hr_attendance
+msgid "Attendances"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_warning
+msgid "Warning Messages and Alerts"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_ui_view_custom
+#: model:ir.ui.menu,name:base.menu_action_ui_view_custom
+#: view:ir.ui.view.custom:0
+msgid "Customized Views"
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+#: model:ir.actions.act_window,name:base.action_view_base_module_import
+msgid "Module Import"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.act_values_form_action
+#: model:ir.ui.menu,name:base.menu_values_form_action
+#: view:ir.values:0
+msgid "Action Bindings"
+msgstr ""
+
+#. module: base
+#: help:res.partner,lang:0
+msgid ""
+"If the selected language is loaded in the system, all documents related to "
+"this contact will be printed in this language. If not, it will be English."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_evaluation
+msgid ""
+"\n"
+"Periodical Employees evaluation and appraisals\n"
+"==============================================\n"
+"\n"
+"By using this application you can maintain the motivational process by doing "
+"periodical evaluations of your employees' performance. The regular "
+"assessment of human resources can benefit your people as well your "
+"organization. \n"
+"\n"
+"An evaluation plan can be assigned to each employee. These plans define the "
+"frequency and the way you manage your periodic personal evaluations. You "
+"will be able to define steps and attach interview forms to each step. \n"
+"\n"
+"Manages several types of evaluations: bottom-up, top-down, self-evaluations "
+"and the final evaluation by the manager.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Ability to create employees evaluations.\n"
+"* An evaluation can be created by an employee for subordinates, juniors as "
+"well as his manager.\n"
+"* The evaluation is done according to a plan in which various surveys can be "
+"created. Each survey can be answered by a particular level in the employees "
+"hierarchy. The final review and evaluation is done by the manager.\n"
+"* Every evaluation filled by employees can be viewed in a PDF form.\n"
+"* Interview Requests are generated automatically by OpenERP according to "
+"employees evaluation plans. Each user receives automatic emails and requests "
+"to perform a periodical evaluation of their colleagues.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_view_base_module_update
+msgid "Update Modules List"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:359
+#, python-format
+msgid ""
+"Unable to upgrade module \"%s\" because an external dependency is not met: %s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account
+msgid "eInvoicing"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:171
+#, python-format
+msgid ""
+"Please keep in mind that documents currently displayed may not be relevant "
+"after switching to another company. If you have unsaved changes, please make "
+"sure to save and close all forms before switching to a different company. "
+"(You can click on Cancel in the User Preferences now)"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2818
+#, python-format
+msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.configuration.wizard:0
+msgid "Continue"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Thai / ภาษาไทย"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%j - Day of the year [001,366]."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Slovenian / slovenščina"
+msgstr ""
+
+#. module: base
+#: field:res.currency,position:0
+msgid "Symbol Position"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_de
+msgid ""
+"\n"
+"Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem "
+"SKR03.\n"
+"============================================================================="
+"=\n"
+"\n"
+"German accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,attachment_use:0
+msgid "Reload from Attachment"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mx
+msgid "Mexico"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3903
+#, python-format
+msgid ""
+"For this kind of document, you may only access records you created "
+"yourself.\n"
+"\n"
+"(Document type: %s)"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "documentation"
+msgstr ""
+
+#. module: base
+#: help:ir.model,osv_memory:0
+msgid ""
+"This field specifies whether the model is transient or not (i.e. if records "
+"are automatically deleted from the database or not)"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:445
+#, python-format
+msgid "Missing SMTP Server"
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,data:0
+#: field:base.language.import,data:0
+msgid "File"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_view_base_module_upgrade_install
+msgid "Module Upgrade Install"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_configuration_wizard
+msgid "ir.actions.configuration.wizard"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%b - Abbreviated month name."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:729
+#, python-format
+msgid "Sorry, you are not allowed to delete this document."
+msgstr ""
+
+#. module: base
+#: constraint:ir.rule:0
+msgid "Rules can not be applied on the Record Rules model."
+msgstr ""
+
+#. module: base
+#: field:res.partner,supplier:0
+#: model:res.partner.category,name:base.res_partner_category_1
+msgid "Supplier"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+#: selection:ir.actions.server,state:0
+msgid "Multi Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_mail
+msgid "Discussions, Mailing Lists, News"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_fleet
+msgid ""
+"\n"
+"Vehicle, leasing, insurances, cost\n"
+"==================================\n"
+"With this module, OpenERP helps you managing all your vehicles, the\n"
+"contracts associated to those vehicle as well as services, fuel log\n"
+"entries, costs and many other features necessary to the management \n"
+"of your fleet of vehicle(s)\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Add vehicles to your fleet\n"
+"* Manage contracts for vehicles\n"
+"* Reminder when a contract reach its expiration date\n"
+"* Add services, fuel log entry, odometer values for all vehicles\n"
+"* Show all costs associated to a vehicle or to a type of service\n"
+"* Analysis graph for costs\n"
+msgstr ""
+
+#. module: base
+#: field:multi_company.default,company_dest_id:0
+msgid "Default Company"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (EC) / Español (EC)"
+msgstr ""
+
+#. module: base
+#: help:ir.ui.view,xml_id:0
+msgid "ID of the view defined in xml file"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_module_import
+msgid "Import Module"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.as
+msgid "American Samoa"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,res_model:0
+msgid "Model name of the object to open in the view window"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,selectable:0
+msgid "Selectable"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:222
+#, python-format
+msgid "Everything seems properly set up!"
+msgstr ""
+
+#. module: base
+#: view:res.request.link:0
+msgid "Request Link"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: selection:ir.attachment,type:0
+#: field:ir.module.module,url:0
+msgid "URL"
+msgstr ""
+
+#. module: base
+#: help:res.country,name:0
+msgid "The full name of the country."
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+msgid "Iteration"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4246
+#: code:addons/orm.py:4347
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_project_issue
+msgid "Support, Bug Tracker, Helpdesk"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ae
+msgid "United Arab Emirates"
+msgstr ""
+
+#. module: base
+#: help:ir.ui.menu,needaction_enabled:0
+msgid ""
+"If the menu entry action is an act_window action, and if this action is "
+"related to a model that uses the need_action mechanism, this field is set to "
+"true. Otherwise, it is false."
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3961
+#, python-format
+msgid ""
+"Unable to delete this document because it is used as a default property"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_5
+msgid "Silver"
+msgstr ""
+
+#. module: base
+#: field:res.partner.title,shortcut:0
+msgid "Abbreviation"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_crm_case_job_req_main
+msgid "Recruitment"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_gr
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Greece.\n"
+"==================================================================\n"
+"\n"
+"Greek accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.values:0
+msgid "Action Reference"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_auth_ldap
+msgid ""
+"\n"
+"Adds support for authentication by LDAP server.\n"
+"===============================================\n"
+"This module allows users to login with their LDAP username and password, "
+"and\n"
+"will automatically create OpenERP users for them on the fly.\n"
+"\n"
+"**Note:** This module only work on servers who have Python's ``ldap`` module "
+"installed.\n"
+"\n"
+"Configuration:\n"
+"--------------\n"
+"After installing this module, you need to configure the LDAP parameters in "
+"the\n"
+"Configuration tab of the Company details. Different companies may have "
+"different\n"
+"LDAP servers, as long as they have unique usernames (usernames need to be "
+"unique\n"
+"in OpenERP, even across multiple companies).\n"
+"\n"
+"Anonymous LDAP binding is also supported (for LDAP servers that allow it), "
+"by\n"
+"simply keeping the LDAP user and password empty in the LDAP configuration.\n"
+"This does not allow anonymous authentication for users, it is only for the "
+"master\n"
+"LDAP account that is used to verify if a user exists before attempting to\n"
+"authenticate it.\n"
+"\n"
+"Securing the connection with STARTTLS is available for LDAP servers "
+"supporting\n"
+"it, by enabling the TLS option in the LDAP configuration.\n"
+"\n"
+"For further options configuring the LDAP settings, refer to the ldap.conf\n"
+"manpage: manpage:`ldap.conf(5)`.\n"
+"\n"
+"Security Considerations:\n"
+"------------------------\n"
+"Users' LDAP passwords are never stored in the OpenERP database, the LDAP "
+"server\n"
+"is queried whenever a user needs to be authenticated. No duplication of the\n"
+"password occurs, and passwords are managed in one place only.\n"
+"\n"
+"OpenERP does not manage password changes in the LDAP, so any change of "
+"password\n"
+"should be conducted by other means in the LDAP directory directly (for LDAP "
+"users).\n"
+"\n"
+"It is also possible to have local OpenERP users in the database along with\n"
+"LDAP-authenticated users (the Administrator account is one obvious "
+"example).\n"
+"\n"
+"Here is how it works:\n"
+"---------------------\n"
+"    * The system first attempts to authenticate users against the local "
+"OpenERP\n"
+"      database;\n"
+"    * if this authentication fails (for example because the user has no "
+"local\n"
+"      password), the system then attempts to authenticate against LDAP;\n"
+"\n"
+"As LDAP users have blank passwords by default in the local OpenERP database\n"
+"(which means no access), the first step always fails and the LDAP server is\n"
+"queried to do the authentication.\n"
+"\n"
+"Enabling STARTTLS ensures that the authentication query to the LDAP server "
+"is\n"
+"encrypted.\n"
+"\n"
+"User Template:\n"
+"--------------\n"
+"In the LDAP configuration on the Company form, it is possible to select a "
+"*User\n"
+"Template*. If set, this user will be used as template to create the local "
+"users\n"
+"whenever someone authenticates for the first time via LDAP authentication. "
+"This\n"
+"allows pre-setting the default groups and menus of the first-time users.\n"
+"\n"
+"**Warning:** if you set a password for the user template, this password will "
+"be\n"
+"         assigned as local password for each new LDAP user, effectively "
+"setting\n"
+"         a *master password* for these users (until manually changed). You\n"
+"         usually do not want this. One easy way to setup a template user is "
+"to\n"
+"         login once with a valid LDAP user, let OpenERP create a blank "
+"local\n"
+"         user with the same login (and a blank password), then rename this "
+"new\n"
+"         user to a username that does not exist in LDAP, and setup its "
+"groups\n"
+"         the way you want.\n"
+"\n"
+"Interaction with base_crypt:\n"
+"----------------------------\n"
+"The base_crypt module is not compatible with this module, and will disable "
+"LDAP\n"
+"authentication if installed at the same time.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.re
+msgid "Reunion (French)"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:422
+#, python-format
+msgid ""
+"New column name must still start with x_ , because it is a custom field!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_mrp_repair
+msgid "Repairs Management"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_asset
+msgid "Assets Management"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+#: view:ir.rule:0
+#: field:ir.rule,global:0
+msgid "Global"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cz
+msgid "Czech Republic"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_claim_from_delivery
+msgid "Claim on Deliveries"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sb
+msgid "Solomon Islands"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4152
+#: code:addons/orm.py:4685
+#, python-format
+msgid "AccessError"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_gantt
+msgid ""
+"\n"
+"OpenERP Web Gantt chart view.\n"
+"=============================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_status
+msgid "State/Stage Management"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_warehouse_management
+msgid "Warehouse"
+msgstr ""
+
+#. module: base
+#: field:ir.exports,resource:0
+#: model:ir.module.module,shortdesc:base.module_resource
+#: field:ir.property,res_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_process
+msgid ""
+"\n"
+"This module shows the basic processes involved in the selected modules and "
+"in the sequence they occur.\n"
+"============================================================================="
+"=========================\n"
+"\n"
+"**Note:** This applies to the modules containing modulename_process.xml.\n"
+"\n"
+"**e.g.** product/process/product_process.xml.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "8.  %I:%M:%S %p  ==> 06:25:20 PM"
+msgstr ""
+
+#. module: base
+#: view:ir.filters:0
+msgid "Filters shared with all users"
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+#: model:ir.ui.menu,name:base.menu_translation
+msgid "Translations"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "Report"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_prof
+msgid "Prof."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:241
+#, python-format
+msgid ""
+"Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
+"instead.If SSL is needed, an upgrade to Python 2.6 on the server-side should "
+"do the trick."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ua
+msgid "Ukraine"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:164
+#: field:ir.module.module,website:0
+#: field:res.company,website:0
+#: field:res.partner,website:0
+#, python-format
+msgid "Website"
+msgstr ""
+
+#. module: base
+#: selection:ir.mail_server,smtp_encryption:0
+msgid "None"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_holidays
+msgid "Leave Management"
+msgstr ""
+
+#. module: base
+#: model:res.company,overdue_msg:base.main_company
+msgid ""
+"Dear Sir/Madam,\n"
+"\n"
+"Our records indicate that some payments on your account are still due. "
+"Please find details below.\n"
+"If the amount has already been paid, please disregard this notice. "
+"Otherwise, please forward us the total amount stated below.\n"
+"If you have any queries regarding your account, Please contact us.\n"
+"\n"
+"Thank you in advance for your cooperation.\n"
+"Best Regards,"
+msgstr ""
+
+#. module: base
+#: view:ir.module.category:0
+msgid "Module Category"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.us
+msgid "United States"
+msgstr ""
+
+#. module: base
+#: view:ir.ui.view:0
+msgid "Architecture"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ml
+msgid "Mali"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_project_config_project
+msgid "Stages"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Flemish (BE) / Vlaams (BE)"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,interval_number:0
+msgid "Interval Number"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.dz
+msgid "Algeria"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_hr_employees
+msgid ""
+"\n"
+"This module adds a list of employees to your portal's contact page if hr and "
+"portal_crm (which creates the contact page) are installed.\n"
+"============================================================================="
+"==========================================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bn
+msgid "Brunei Darussalam"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: field:ir.actions.act_window,view_type:0
+#: field:ir.actions.act_window.view,view_mode:0
+#: field:ir.ui.view,type:0
+msgid "View Type"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_2
+msgid "User Interface"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_mrp_byproduct
+msgid "MRP Byproducts"
+msgstr ""
+
+#. module: base
+#: field:res.request,ref_partner_id:0
+msgid "Partner Ref."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_expense
+msgid "Expense Management"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,create_date:0
+msgid "Date Created"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,trigger_name:0
+msgid "The workflow signal to trigger"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,state:0
+#: selection:base.module.import,state:0
+#: selection:base.module.update,state:0
+msgid "done"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+msgid "General Settings"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_in
+msgid ""
+"\n"
+"Indian Accounting: Chart of Account.\n"
+"====================================\n"
+"\n"
+"Indian accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_uy
+msgid "Uruguay - Chart of Accounts"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_administration_shortcut
+msgid "Custom Shortcuts"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_cancel
+msgid ""
+"\n"
+"Allows canceling accounting entries.\n"
+"====================================\n"
+"\n"
+"This module adds 'Allow Canceling Entries' field on form view of account "
+"journal.\n"
+"If set to true it allows user to cancel entries & invoices.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_plugin
+msgid "CRM Plugins"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_model_model
+#: model:ir.model,name:base.model_ir_model
+#: model:ir.ui.menu,name:base.ir_model_model_menu
+msgid "Models"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:499
+#, python-format
+msgid "The `base` module cannot be uninstalled"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_cron.py:262
+#, python-format
+msgid "Record cannot be modified right now"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,type:0
+msgid "Launch Manually"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.be
+msgid "Belgium"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_osv_memory_autovacuum
+msgid "osv_memory.autovacuum"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:728
+#, python-format
+msgid "Sorry, you are not allowed to create this kind of document."
+msgstr ""
+
+#. module: base
+#: field:base.language.export,lang:0
+#: field:base.language.install,lang:0
+#: field:base.update.translations,lang:0
+#: field:ir.translation,lang:0
+#: view:res.lang:0
+#: field:res.partner,lang:0
+msgid "Language"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gm
+msgid "Gambia"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_company_form
+#: model:ir.actions.act_window,name:base.company_normal_action_tree
+#: model:ir.model,name:base.model_res_company
+#: model:ir.ui.menu,name:base.menu_action_res_company_form
+#: model:ir.ui.menu,name:base.menu_res_company_global
+#: view:res.company:0
+#: view:res.partner:0
+#: field:res.users,company_ids:0
+msgid "Companies"
+msgstr ""
+
+#. module: base
+#: help:res.currency,symbol:0
+msgid "Currency sign, to be used when printing amounts."
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%H - Hour (24-hour clock) [00,23]."
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,on_delete:0
+msgid "On Delete"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:347
+#, python-format
+msgid "Model %s does not exist!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_mrp_jit
+msgid "Just In Time Scheduling"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+#: field:ir.actions.server,code:0
+#: selection:ir.actions.server,state:0
+msgid "Python Code"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,state:0
+msgid "Type of the Action that is to be executed"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_crm
+msgid ""
+"\n"
+"This module adds a contact page (with a contact form creating a lead when "
+"submitted) to your portal if crm and portal are installed.\n"
+"============================================================================="
+"=======================================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_us
+msgid "United States - Chart of accounts"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+#: view:base.language.import:0
+#: view:base.language.install:0
+#: view:base.module.import:0
+#: view:base.module.update:0
+#: view:base.module.upgrade:0
+#: view:base.update.translations:0
+#: view:change.password.wizard:0
+#: view:ir.actions.configuration.wizard:0
+#: view:res.config:0
+#: view:res.users:0
+#: view:wizard.ir.model.menu.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:1507
+#, python-format
+msgid "Unknown database identifier '%s'"
+msgstr ""
+
+#. module: base
+#: selection:base.language.export,format:0
+msgid "PO File"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_diagram
+msgid ""
+"\n"
+"Openerp Web Diagram view.\n"
+"=========================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nt
+msgid "Neutral Zone"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_sale
+msgid ""
+"\n"
+"This module adds a Sales menu to your portal as soon as sale and portal are "
+"installed.\n"
+"============================================================================="
+"=========\n"
+"\n"
+"After installing this module, portal users will be able to access their own "
+"documents\n"
+"via the following menus:\n"
+"\n"
+"  - Quotations\n"
+"  - Sale Orders\n"
+"  - Delivery Orders\n"
+"  - Products (public ones)\n"
+"  - Invoices\n"
+"  - Payments/Refunds\n"
+"\n"
+"If online payment acquirers are configured, portal users will also be given "
+"the opportunity to\n"
+"pay online on their Sale Orders and Invoices that are not paid yet. Paypal "
+"is included\n"
+"by default, you simply need to configure a Paypal account in the "
+"Accounting/Invoicing settings.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:316
+#, python-format
+msgid "external id"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+msgid "Custom"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_margin
+msgid "Margins in Sales Orders"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_purchase
+msgid "Purchase Management"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,published_version:0
+msgid "Published Version"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.is
+msgid "Iceland"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_action_window
+#: model:ir.ui.menu,name:base.menu_ir_action_window
+msgid "Window Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_project_issue
+msgid ""
+"\n"
+"This module adds issue menu and features to your portal if project_issue and "
+"portal are installed.\n"
+"============================================================================="
+"=====================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%I - Hour (12-hour clock) [01,12]."
+msgstr ""
+
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.de
+msgid "Germany"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_oauth
+msgid "OAuth2 Authentication"
+msgstr ""
+
+#. module: base
+#: view:workflow:0
+msgid ""
+"When customizing a workflow, be sure you do not modify an existing node or "
+"arrow, but rather add new nodes or arrows. If you absolutly need to modify a "
+"node or arrow, you can only change fields that are empty or set to the "
+"default value. If you don't do that, your customization will be overwrited "
+"at the next update or upgrade to a future version of OpenERP."
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Reports :"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_multi_company
+msgid ""
+"\n"
+"This module is for managing a multicompany environment.\n"
+"=======================================================\n"
+"\n"
+"This module is the base module for other multi-company modules.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_export_language.py:39
+#, python-format
+msgid "New Language (Empty translation template)"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,email:0
+msgid ""
+"Expression that returns the email address to send to. Can be based on the "
+"same values as for the condition field.\n"
+"Example: object.invoice_address_id.email, or 'me@example.com'"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_issue_sheet
+msgid ""
+"\n"
+"This module adds the Timesheet support for the Issues/Bugs Management in "
+"Project.\n"
+"============================================================================="
+"====\n"
+"\n"
+"Worklogs can be maintained to signify number of hours spent by users to "
+"handle an issue.\n"
+"                "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gy
+msgid "Guyana"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_product_expiry
+msgid "Products Expiry Date"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_config.py:419
+#, python-format
+msgid "Click 'Continue' to configure the next addon..."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,record_id:0
+msgid "Create Id"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.hn
+msgid "Honduras"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.eg
+msgid "Egypt"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Creation"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,model_id:0
+msgid ""
+"Select the object on which the action will work (read, write, create)."
+msgstr ""
+
+#. module: base
+#: field:base.language.import,name:0
+msgid "Language Name"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Boolean"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_encryption:0
+msgid ""
+"Choose the connection encryption scheme:\n"
+"- None: SMTP sessions are done in cleartext.\n"
+"- TLS (STARTTLS): TLS encryption is requested at start of SMTP session "
+"(Recommended)\n"
+"- SSL/TLS: SMTP sessions are encrypted with SSL/TLS through a dedicated port "
+"(default: 465)"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+msgid "Fields Description"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_analytic_contract_hr_expense
+msgid "Contracts Management: hr_expense link"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: view:ir.cron:0
+#: view:ir.filters:0
+#: view:ir.model.access:0
+#: view:ir.model.data:0
+#: view:ir.model.fields:0
+#: view:ir.module.module:0
+#: view:ir.ui.view:0
+#: view:ir.values:0
+#: view:res.partner:0
+#: view:workflow.activity:0
+msgid "Group By..."
+msgstr ""
+
+#. module: base
+#: view:base.module.update:0
+msgid "Module Update Result"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_analytic_contract_hr_expense
+msgid ""
+"\n"
+"This module is for modifying account analytic view to show some data related "
+"to the hr_expense module.\n"
+"============================================================================="
+"=========================\n"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
+#. module: base
+#: field:res.partner,use_parent_address:0
+msgid "Use Company Address"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_hr_holidays
+msgid "Holidays, Allocation and Leave Requests"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_hello
+msgid ""
+"\n"
+"OpenERP Web example module.\n"
+"===========================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,state:0
+#: selection:ir.module.module.dependency,state:0
+msgid "To be installed"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+#: model:ir.module.module,shortdesc:base.module_base
+#: field:res.currency,base:0
+msgid "Base"
+msgstr ""
+
+#. module: base
+#: field:ir.model.data,model:0
+#: field:ir.values,model:0
+msgid "Model Name"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Telugu / తెలుగు"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_supplier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a supplier: discussions, history of purchases,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lr
+msgid "Liberia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_tests
+msgid ""
+"\n"
+"OpenERP Web test suite.\n"
+"=======================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+#: model:ir.module.module,shortdesc:base.module_note
+#: view:res.groups:0
+#: field:res.partner,comment:0
+msgid "Notes"
+msgstr ""
+
+#. module: base
+#: field:ir.config_parameter,value:0
+#: field:ir.property,value_binary:0
+#: field:ir.property,value_datetime:0
+#: field:ir.property,value_float:0
+#: field:ir.property,value_integer:0
+#: field:ir.property,value_reference:0
+#: field:ir.property,value_text:0
+#: selection:ir.server.object.lines,type:0
+#: field:ir.server.object.lines,value:0
+#: field:ir.values,value:0
+msgid "Value"
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+#: field:ir.sequence,code:0
+#: field:ir.sequence.type,code:0
+#: selection:ir.translation,type:0
+#: field:res.partner.bank.type,code:0
+msgid "Code"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_config_installer
+msgid "res.config.installer"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mc
+msgid "Monaco"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Minutes"
+msgstr ""
+
+#. module: base
+#: view:res.currency:0
+msgid "Display"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_multi_company
+msgid "Multi Companies"
+msgstr ""
+
+#. module: base
+#: help:res.users,menu_id:0
+msgid ""
+"If specified, the action will replace the standard menu for this user."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.report.xml,name:base.preview_report
+msgid "Preview Report"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_purchase_analytic_plans
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_sequence_type
+#: model:ir.ui.menu,name:base.menu_ir_sequence_type
+msgid "Sequence Codes"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (CO) / Español (CO)"
+msgstr ""
+
+#. module: base
+#: view:base.module.configuration:0
+msgid ""
+"All pending configuration wizards have been executed. You may restart "
+"individual wizards via the list of configuration wizards."
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Current Year with Century: %(year)s"
+msgstr ""
+
+#. module: base
+#: field:ir.exports,export_fields:0
+msgid "Export ID"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fr
+msgid "France"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: field:workflow.activity,flow_stop:0
+msgid "Flow Stop"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Weeks"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.af
+msgid "Afghanistan, Islamic State of"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_import.py:58
+#: code:addons/base/module/wizard/base_module_import.py:66
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_marketing_campaign_crm_demo
+msgid "Marketing Campaign - Demo"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:360
+#, python-format
+msgid ""
+"Can not create Many-To-One records indirectly, import the field separately"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,interval_type:0
+msgid "Interval Unit"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
+#. module: base
+#: field:workflow.activity,kind:0
+msgid "Kind"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4647
+#, python-format
+msgid "This method does not exist anymore"
+msgstr ""
+
+#. module: base
+#: view:base.update.translations:0
+#: model:ir.actions.act_window,name:base.action_wizard_update_translations
+#: model:ir.ui.menu,name:base.menu_wizard_update_translations
+msgid "Synchronize Terms"
+msgstr ""
+
+#. module: base
+#: field:res.lang,thousands_sep:0
+msgid "Thousands Separator"
+msgstr ""
+
+#. module: base
+#: field:res.request,create_date:0
+msgid "Created Date"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_cn
+msgid "中国会计科目表 - Accounting"
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.model.constraint:0
+msgid "Constraints with the same name are unique per module."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_report_intrastat
+msgid ""
+"\n"
+"A module that adds intrastat reports.\n"
+"=====================================\n"
+"\n"
+"This module gives the details of the goods traded between the countries of\n"
+"European Union."
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,loop_action:0
+msgid ""
+"Select the action that will be executed. Loop action will not be avaliable "
+"inside loop."
+msgstr ""
+
+#. module: base
+#: help:ir.model.data,res_id:0
+msgid "ID of the target record in the database"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_analytic_analysis
+msgid "Contracts Management"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Chinese (TW) / 正體字"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_request
+msgid "res.request"
+msgstr ""
+
+#. module: base
+#: field:res.partner,image_medium:0
+msgid "Medium-sized image"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+msgid "In Memory"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Todo"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_product_visible_discount
+msgid "Prices Visible Discounts"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,datas:0
+msgid "File Content"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_model_relation
+#: view:ir.model.relation:0
+#: model:ir.ui.menu,name:base.ir_model_relation_menu
+msgid "ManyToMany Relations"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pa
+msgid "Panama"
+msgstr ""
+
+#. module: base
+#: help:workflow.transition,group_id:0
+msgid ""
+"The group that a user must have to be authorized to validate this transition."
+msgstr ""
+
+#. module: base
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gi
+msgid "Gibraltar"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_name:0
+msgid "Service Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pn
+msgid "Pitcairn Island"
+msgstr ""
+
+#. module: base
+#: field:res.partner,category_id:0
+msgid "Tags"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid ""
+"We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_rule
+#: view:ir.rule:0
+#: model:ir.ui.menu,name:base.menu_action_rule
+msgid "Record Rules"
+msgstr ""
+
+#. module: base
+#: view:multi_company.default:0
+msgid "Multi Company"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_portal
+#: model:ir.module.module,shortdesc:base.module_portal
+msgid "Portal"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,state:0
+msgid "To Translate"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:294
+#, python-format
+msgid "See all possible values"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_claim_from_delivery
+msgid ""
+"\n"
+"Create a claim from a delivery order.\n"
+"=====================================\n"
+"\n"
+"Adds a Claim link to the delivery order.\n"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+#: view:workflow.activity:0
+msgid "Properties"
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+
+#. module: base
+#: help:ir.model.constraint,name:0
+msgid "PostgreSQL constraint or foreign key name."
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%A - Full weekday name."
+msgstr ""
+
+#. module: base
+#: help:ir.values,user_id:0
+msgid "If set, action binding only applies for this user."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gw
+msgid "Guinea Bissau"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,header:0
+msgid "Add RML Header"
+msgstr ""
+
+#. module: base
+#: help:res.company,rml_footer:0
+msgid "Footer text displayed at the bottom of all reports."
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_note_pad
+msgid "Memos pad"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_pad
+msgid ""
+"\n"
+"Adds enhanced support for (Ether)Pad attachments in the web client.\n"
+"===================================================================\n"
+"\n"
+"Lets the company customize which Pad installation should be used to link to "
+"new\n"
+"pads (by default, http://ietherpad.com/).\n"
+"    "
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.lang:0
+msgid "The code of the language must be unique !"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_attachment
+#: view:ir.actions.report.xml:0
+#: view:ir.attachment:0
+#: model:ir.ui.menu,name:base.menu_action_attachment
+msgid "Attachments"
+msgstr ""
+
+#. module: base
+#: help:res.company,bank_ids:0
+msgid "Bank accounts related to this company"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_sales_management
+#: model:ir.ui.menu,name:base.menu_base_partner
+#: model:ir.ui.menu,name:base.menu_sale_config
+#: model:ir.ui.menu,name:base.menu_sale_config_sales
+#: model:ir.ui.menu,name:base.menu_sales
+#: model:ir.ui.menu,name:base.next_id_64
+msgid "Sales"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,child_ids:0
+msgid "Other Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_coda
+msgid "Belgium - Import Bank CODA Statements"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,state:0
+msgid "Done"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,doall:0
+msgid ""
+"Specify if missed occurrences should be executed when the server restarts."
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_miss
+#: model:res.partner.title,shortcut:base.res_partner_title_miss
+msgid "Miss"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+#: field:ir.model.access,perm_write:0
+msgid "Write Access"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%m - Month number [01,12]."
+msgstr ""
+
+#. module: base
+#: view:res.bank:0
+#: field:res.bank,city:0
+#: view:res.company:0
+#: field:res.company,city:0
+#: view:res.partner:0
+#: field:res.partner,city:0
+#: view:res.partner.bank:0
+#: field:res.partner.bank,city:0
+#: view:res.users:0
+msgid "City"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.qa
+msgid "Qatar"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.it
+msgid "Italy"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_sale_salesman
+msgid "See Own Leads"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+#: selection:ir.actions.todo,state:0
+msgid "To Do"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_hr_employees
+msgid "Portal HR employees"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Estonian / Eesti keel"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "GPL-3 or later version"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2033
+#, python-format
+msgid ""
+"Insufficient fields to generate a Calendar View for %s, missing a date_stop "
+"or a date_delay"
+msgstr ""
+
+#. module: base
+#: field:workflow.activity,action:0
+msgid "Python Action"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "English (US)"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_title_partner
+msgid ""
+"Manage the partner titles you want to have available in your system. The "
+"partner titles is the legal status of the company: Private Limited, SA, etc."
+msgstr ""
+
+#. module: base
+#: view:res.bank:0
+#: view:res.company:0
+#: view:res.partner:0
+#: view:res.partner.bank:0
+#: view:res.users:0
+msgid "Address"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Mongolian / монгол"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mr
+msgid "Mauritania"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_resource
+msgid ""
+"\n"
+"Module for resource management.\n"
+"===============================\n"
+"\n"
+"A resource represent something that can be scheduled (a developer on a task "
+"or a\n"
+"work center on manufacturing orders). This module manages a resource "
+"calendar\n"
+"associated to every resource. It also manages the leaves of every resource.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:735
+#, python-format
+msgid ""
+"Please contact your system administrator if you think this is an error."
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:545
+#: view:base.module.upgrade:0
+#: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
+#, python-format
+msgid "Apply Schedule Upgrade"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: field:workflow.workitem,act_id:0
+msgid "Activity"
+msgstr ""
+
+#. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
+#: model:ir.actions.act_window,name:base.action_res_users
+#: field:ir.default,uid:0
+#: model:ir.model,name:base.model_res_users
+#: model:ir.ui.menu,name:base.menu_action_res_users
+#: model:ir.ui.menu,name:base.menu_users
+#: view:res.groups:0
+#: field:res.groups,users:0
+#: field:res.partner,user_ids:0
+#: view:res.users:0
+msgid "Users"
+msgstr ""
+
+#. module: base
+#: field:res.company,parent_id:0
+msgid "Parent Company"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3872
+#, python-format
+msgid ""
+"One of the documents you are trying to access has been deleted, please try "
+"again after refreshing."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_mail_server
+msgid "ir.mail_server"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (CR) / Español (CR)"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"Global rules (non group-specific) are restrictions, and cannot be bypassed. "
+"Group-local rules grant additional permissions, but are constrained within "
+"the bounds of global ones. The first group rules restrict further than "
+"global rules, but any additional group rule will add more permissions"
+msgstr ""
+
+#. module: base
+#: field:res.currency.rate,rate:0
+msgid "Rate"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cg
+msgid "Congo"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "Examples"
+msgstr ""
+
+#. module: base
+#: field:ir.default,value:0
+msgid "Default Value"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_country_state
+msgid "Country state"
+msgstr "Departamento"
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_5
+msgid "Sequences & Identifiers"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_th
+msgid ""
+"\n"
+"Chart of Accounts for Thailand.\n"
+"===============================\n"
+"\n"
+"Thai accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kn
+msgid "Saint Kitts & Nevis Anguilla"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_currency.py:194
+#, python-format
+msgid ""
+"No rate found \n"
+"for the currency: %s \n"
+"at the date: %s"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_ui_view_custom
+msgid ""
+"Customized views are used when users reorganize the content of their "
+"dashboard views (via web client)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_stock
+msgid "Sales and Warehouse Management"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,model:0
+msgid "Object Name"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,srcmodel_id:0
+msgid ""
+"Object in which you want to create / write the object. If it is empty then "
+"refer to the Object field."
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+#: selection:ir.module.module,state:0
+#: selection:ir.module.module.dependency,state:0
+msgid "Not Installed"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: field:workflow.activity,out_transitions:0
+msgid "Outgoing Transitions"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,icon_image:0
+#: field:ir.ui.menu,icon:0
+msgid "Icon"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_human_resources
+msgid ""
+"Helps you manage your human resources by encoding your employees structure, "
+"generating work sheets, tracking attendance and more."
+msgstr ""
+
+#. module: base
+#: help:res.partner,ean13:0
+msgid "BarCode"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,model_id:0
+msgid "The model this field belongs to"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,sms:0
+#: selection:ir.actions.server,state:0
+msgid "SMS"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mq
+msgid "Martinique (French)"
+msgstr ""
+
+#. module: base
+#: help:res.partner,is_company:0
+msgid "Check if the contact is a company, otherwise it is a person"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence.type:0
+msgid "Sequences Type"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_bank.py:195
+#, python-format
+msgid "Formating Error"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ye
+msgid "Yemen"
+msgstr ""
+
+#. module: base
+#: selection:workflow.activity,split_mode:0
+msgid "Or"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_br
+msgid "Brazilian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pk
+msgid "Pakistan"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_product_margin
+msgid ""
+"\n"
+"Adds a reporting menu in products that computes sales, purchases, margins "
+"and other interesting indicators based on invoices.\n"
+"============================================================================="
+"================================================\n"
+"\n"
+"The wizard to launch the report has several options to help you get the data "
+"you need.\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.al
+msgid "Albania"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ws
+msgid "Samoa"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:189
+#, python-format
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:509
+#: code:addons/base/ir/ir_model.py:570
+#: code:addons/base/ir/ir_model.py:1031
+#, python-format
+msgid "Permission Denied"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,child_id:0
+msgid "Child IDs"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_actions.py:702
+#: code:addons/base/ir/ir_actions.py:705
+#, python-format
+msgid "Problem in configuration `Record Id` in Server Action!"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2807
+#: code:addons/orm.py:2817
+#, python-format
+msgid "ValidateError"
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+#: view:base.module.update:0
+msgid "Open Modules"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_res_bank_form
+msgid "Manage bank records you want to be used in the system."
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+msgid "Import module"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,loop_action:0
+msgid "Loop Action"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,report_file:0
+msgid ""
+"The path to the main report file (depending on Report Type) or NULL if the "
+"content is in another field"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.la
+msgid "Laos"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:163
+#: selection:ir.actions.server,state:0
+#: model:ir.ui.menu,name:base.menu_email
+#: field:res.bank,email:0
+#: field:res.company,email:0
+#: field:res.partner,email:0
+#, python-format
+msgid "Email"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_12
+msgid "Office Supplies"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
+#, python-format
+msgid ""
+"The sum of the data (2nd field) is null.\n"
+"We can't draw a pie chart !"
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "Information About the Bank"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,condition:0
+msgid ""
+"Condition that is tested before the action is executed, and prevent "
+"execution if it is not verified.\n"
+"Example: object.list_price > 5000\n"
+"It is a Python expression that can use the following values:\n"
+" - self: ORM model of the record on which the action is triggered\n"
+" - object or obj: browse_record of the record on which the action is "
+"triggered\n"
+" - pool: ORM model pool (i.e. self.pool)\n"
+" - time: Python time module\n"
+" - cr: database cursor\n"
+" - uid: current user id\n"
+" - context: current context"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"2. Group-specific rules are combined together with a logical OR operator"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bl
+msgid "Saint Barthélémy"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "Other Proprietary"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ec
+msgid "Ecuador"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Read Access Right"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_analytic_user_function
+msgid "Jobs on Contracts"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:187
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: view:ir.model.data:0
+msgid "Updatable"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "3.  %x ,%X         ==> 12/05/08, 18:25:20"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,on_delete:0
+msgid "Cascade"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_knowledge_management
+msgid ""
+"Lets you install addons geared towards sharing knowledge with and between "
+"your employees."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Arabic / الْعَرَبيّة"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,state:0
+msgid "Translated"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_inventory_form
+#: model:ir.ui.menu,name:base.menu_action_inventory_form
+msgid "Default Company per Object"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_hello
+msgid "Hello"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.configuration.wizard:0
+msgid "Next Configuration Step"
+msgstr ""
+
+#. module: base
+#: field:res.groups,comment:0
+msgid "Comment"
+msgstr ""
+
+#. module: base
+#: field:ir.filters,domain:0
+#: field:ir.model.fields,domain:0
+#: field:ir.rule,domain:0
+#: field:ir.rule,domain_force:0
+#: field:res.partner.title,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:166
+#, python-format
+msgid "Use '1' for yes and '0' for no"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_marketing_campaign
+msgid "Marketing Campaigns"
+msgstr ""
+
+#. module: base
+#: field:res.country.state,name:0
+msgid "State Name"
+msgstr "Nombre Departamento"
+
+#. module: base
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:313
+#, python-format
+msgid "Invalid database id '%s' for the field '%%(field)s'"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "Update Languague Terms"
+msgstr ""
+
+#. module: base
+#: field:workflow.activity,join_mode:0
+msgid "Join Mode"
+msgstr ""
+
+#. module: base
+#: field:res.partner,tz:0
+msgid "Timezone"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_sequence_form
+#: view:ir.sequence:0
+#: model:ir.ui.menu,name:base.menu_ir_sequence_form
+msgid "Sequences"
+msgstr ""
+
+#. module: base
+#: help:res.lang,code:0
+msgid "This field is used to set/get locales for user"
+msgstr ""
+
+#. module: base
+#: view:ir.filters:0
+msgid "Shared"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:357
+#, python-format
+msgid ""
+"Unable to install module \"%s\" because an external dependency is not met: %s"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Search modules"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.by
+msgid "Belarus"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_url,name:0
+#: field:ir.actions.act_window,name:0
+#: field:ir.actions.client,name:0
+#: field:ir.actions.server,name:0
+msgid "Action Name"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_res_users
+msgid ""
+"Create and manage users that will connect to the system. Users can be "
+"deactivated should there be a period of time during which they will/should "
+"not connect to the system. You can assign them groups in order to give them "
+"specific access to the applications they need to use in the system."
+msgstr ""
+
+#. module: base
+#: selection:res.request,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_purchase_double_validation
+msgid "Double Validation on Purchases"
+msgstr ""
+
+#. module: base
+#: field:res.bank,street2:0
+#: field:res.company,street2:0
+#: field:res.partner,street2:0
+msgid "Street2"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_view_base_module_update
+msgid "Module Update"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_upgrade.py:85
+#, python-format
+msgid "Following modules are not installed or unknown: %s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_auth_oauth_signup
+msgid ""
+"\n"
+"Allow users to sign up through OAuth2 Provider.\n"
+"===============================================\n"
+msgstr ""
+
+#. module: base
+#: field:change.password.user,user_id:0
+#: view:ir.cron:0
+#: field:ir.cron,user_id:0
+#: view:ir.filters:0
+#: field:ir.filters,user_id:0
+#: field:ir.ui.view.custom,user_id:0
+#: field:ir.values,user_id:0
+#: model:res.groups,name:base.group_document_user
+#: model:res.groups,name:base.group_tool_user
+#: view:res.users:0
+msgid "User"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pr
+msgid "Puerto Rico"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_tests_demo
+msgid "Demonstration of web/javascript tests"
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,signal:0
+msgid "Signal (Button Name)"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+msgid "Open Window"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,auto_search:0
+msgid "Auto Search"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,filter:0
+msgid "Filter"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ch
+msgid "Switzerland"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gd
+msgid "Grenada"
+msgstr ""
+
+#. module: base
+#: help:res.partner,customer:0
+msgid "Check this box if this contact is a customer."
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Trigger Configuration"
+msgstr ""
+
+#. module: base
+#: view:base.language.install:0
+msgid "Load"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_warning
+msgid ""
+"\n"
+"Module to trigger warnings in OpenERP objects.\n"
+"==============================================\n"
+"\n"
+"Warning messages can be displayed for objects like sale order, purchase "
+"order,\n"
+"picking and invoice. The message is triggered by the form's onchange event.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.users,partner_id:0
+msgid "Related Partner"
+msgstr ""
+
+#. module: base
+#: code:addons/osv.py:172
+#: code:addons/osv.py:174
+#, python-format
+msgid "Integrity Error"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:296
+#, python-format
+msgid "Size of the field can never be less than 1 !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_mrp_operations
+msgid "Manufacturing Operations"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "Here is the exported translation file:"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_rml_content:0
+#: field:ir.actions.report.xml,report_rml_content_data:0
+msgid "RML Content"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "Update Terms"
+msgstr ""
+
+#. module: base
+#: field:res.request,act_to:0
+#: field:res.request.history,act_to:0
+msgid "To"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr
+msgid "Employee Directory"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,args:0
+msgid "Arguments"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "GPL Version 2"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "GPL Version 3"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_stock_location
+msgid ""
+"\n"
+"This module supplements the Warehouse application by effectively "
+"implementing Push and Pull inventory flows.\n"
+"============================================================================="
+"===============================\n"
+"\n"
+"Typically this could be used to:\n"
+"--------------------------------\n"
+"    * Manage product manufacturing chains\n"
+"    * Manage default locations per product\n"
+"    * Define routes within your warehouse according to business needs, such "
+"as:\n"
+"        - Quality Control\n"
+"        - After Sales Services\n"
+"        - Supplier Returns\n"
+"\n"
+"    * Help rental management, by generating automated return moves for "
+"rented products\n"
+"\n"
+"Once this module is installed, an additional tab appear on the product "
+"form,\n"
+"where you can add Push and Pull flow specifications. The demo data of CPU1\n"
+"product for that push/pull :\n"
+"\n"
+"Push flows:\n"
+"-----------\n"
+"Push flows are useful when the arrival of certain products in a given "
+"location\n"
+"should always be followed by a corresponding move to another location, "
+"optionally\n"
+"after a certain delay. The original Warehouse application already supports "
+"such\n"
+"Push flow specifications on the Locations themselves, but these cannot be\n"
+"refined per-product.\n"
+"\n"
+"A push flow specification indicates which location is chained with which "
+"location,\n"
+"and with what parameters. As soon as a given quantity of products is moved "
+"in the\n"
+"source location, a chained move is automatically foreseen according to the\n"
+"parameters set on the flow specification (destination location, delay, type "
+"of\n"
+"move, journal). The new move can be automatically processed, or require a "
+"manual\n"
+"confirmation, depending on the parameters.\n"
+"\n"
+"Pull flows:\n"
+"-----------\n"
+"Pull flows are a bit different from Push flows, in the sense that they are "
+"not\n"
+"related to the processing of product moves, but rather to the processing of\n"
+"procurement orders. What is being pulled is a need, not directly products. "
+"A\n"
+"classical example of Pull flow is when you have an Outlet company, with a "
+"parent\n"
+"Company that is responsible for the supplies of the Outlet.\n"
+"\n"
+"  [ Customer ] <- A - [ Outlet ]  <- B -  [ Holding ] <~ C ~ [ Supplier ]\n"
+"\n"
+"When a new procurement order (A, coming from the confirmation of a Sale "
+"Order\n"
+"for example) arrives in the Outlet, it is converted into another "
+"procurement\n"
+"(B, via a Pull flow of type 'move') requested from the Holding. When "
+"procurement\n"
+"order B is processed by the Holding company, and if the product is out of "
+"stock,\n"
+"it can be converted into a Purchase Order (C) from the Supplier (Pull flow "
+"of\n"
+"type Purchase). The result is that the procurement order, the need, is "
+"pushed\n"
+"all the way between the Customer and Supplier.\n"
+"\n"
+"Technically, Pull flows allow to process procurement orders differently, "
+"not\n"
+"only depending on the product being considered, but also depending on which\n"
+"location holds the 'need' for that product (i.e. the destination location "
+"of\n"
+"that procurement order).\n"
+"\n"
+"Use-Case:\n"
+"---------\n"
+"\n"
+"You can use the demo data as follow:\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+"  **CPU1:** Sell some CPU1 from Chicago Shop and run the scheduler\n"
+"     - Warehouse: delivery order, Chicago Shop: reception\n"
+"  **CPU3:**\n"
+"     - When receiving the product, it goes to Quality Control location then\n"
+"       stored to shelf 2.\n"
+"     - When delivering the customer: Pick List -> Packing -> Delivery Order "
+"from Gate A\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_decimal_precision
+msgid ""
+"\n"
+"Configure the price accuracy you need for different kinds of usage: "
+"accounting, sales, purchases.\n"
+"============================================================================="
+"====================\n"
+"\n"
+"The decimal precision is configured per company.\n"
+msgstr ""
+
+#. module: base
+#: selection:res.company,paper_format:0
+msgid "A4"
+msgstr ""
+
+#. module: base
+#: view:res.config.installer:0
+msgid "Configuration Installer"
+msgstr ""
+
+#. module: base
+#: field:res.partner,customer:0
+msgid "Customer"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (NI) / Español (NI)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_pad_project
+msgid ""
+"\n"
+"This module adds a PAD in all project kanban views.\n"
+"===================================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,context:0
+#: field:ir.actions.client,context:0
+msgid "Context Value"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Hour 00->24: %(h24)s"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,nextcall:0
+msgid "Next Execution Date"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,padding:0
+msgid "Number Padding"
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,field_id:0
+msgid "Select field property"
+msgstr ""
+
+#. module: base
+#: field:res.request.history,date_sent:0
+msgid "Date sent"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Month: %(month)s"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window.view,sequence:0
+#: field:ir.actions.server,sequence:0
+#: field:ir.actions.todo,sequence:0
+#: view:ir.cron:0
+#: field:ir.module.category,sequence:0
+#: field:ir.module.module,sequence:0
+#: view:ir.sequence:0
+#: field:ir.ui.menu,sequence:0
+#: view:ir.ui.view:0
+#: field:ir.ui.view,priority:0
+#: field:ir.ui.view_sc,sequence:0
+#: field:multi_company.default,sequence:0
+#: field:res.partner.bank,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tn
+msgid "Tunisia"
+msgstr ""
+
+#. module: base
+#: help:ir.model.access,active:0
+msgid ""
+"If you uncheck the active field, it will disable the ACL without deleting it "
+"(if you delete a native ACL, it will be re-created when you reload the "
+"module."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_fields_converter
+msgid "ir.fields.converter"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_partner.py:439
+#, python-format
+msgid "Couldn't create contact without email address !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_manufacturing
+#: model:ir.ui.menu,name:base.menu_mrp_config
+#: model:ir.ui.menu,name:base.menu_mrp_root
+msgid "Manufacturing"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.km
+msgid "Comoros"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Cancel Install"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_model_relation
+msgid "ir.model.relation"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_check_writing
+msgid "Check Writing"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_plugin_outlook
+msgid ""
+"\n"
+"This module provides the Outlook Plug-in.\n"
+"=========================================\n"
+"\n"
+"Outlook plug-in allows you to select an object that you would like to add "
+"to\n"
+"your email and its attachments from MS Outlook. You can select a partner, a "
+"task,\n"
+"a project, an analytical account, or any other object and archive selected "
+"mail\n"
+"into mail.message with attachments.\n"
+"      "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_plugin_thunderbird
+msgid ""
+"\n"
+"This module is required for the Thuderbird Plug-in to work properly.\n"
+"====================================================================\n"
+"\n"
+"The plugin allows you archive email and its attachments to the selected\n"
+"OpenERP objects. You can select a partner, a task, a project, an analytical\n"
+"account, or any other object and attach the selected mail as a .eml file in\n"
+"the attachment of a selected record. You can create documents for CRM Lead,\n"
+"HR Applicant and Project Issue from selected mails.\n"
+"      "
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "Legends for Date and Time Formats"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+msgid "Copy Object"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,trigger_name:0
+msgid "Trigger Signal"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_country_state
+#: model:ir.ui.menu,name:base.menu_country_state_partner
+msgid "Fed. States"
+msgstr "Departamentos"
+
+#. module: base
+#: view:ir.model:0
+#: view:res.groups:0
+msgid "Access Rules"
+msgstr ""
+
+#. module: base
+#: field:res.groups,trans_implied_ids:0
+msgid "Transitively inherits"
+msgstr ""
+
+#. module: base
+#: field:ir.default,ref_table:0
+msgid "Table Ref."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_journal
+msgid ""
+"\n"
+"The sales journal modules allows you to categorise your sales and deliveries "
+"(picking lists) between different journals.\n"
+"============================================================================="
+"===========================================\n"
+"\n"
+"This module is very helpful for bigger companies that works by departments.\n"
+"\n"
+"You can use journal for different purposes, some examples:\n"
+"----------------------------------------------------------\n"
+"    * isolate sales of different departments\n"
+"    * journals for deliveries by truck or by UPS\n"
+"\n"
+"Journals have a responsible and evolves between different status:\n"
+"-----------------------------------------------------------------\n"
+"    * draft, open, cancel, done.\n"
+"\n"
+"Batch operations can be processed on the different journals to confirm all "
+"sales\n"
+"at once, to validate or invoice packing.\n"
+"\n"
+"It also supports batch invoicing methods that can be configured by partners "
+"and sales orders, examples:\n"
+"-----------------------------------------------------------------------------"
+"--------------------------\n"
+"    * daily invoicing\n"
+"    * monthly invoicing\n"
+"\n"
+"Some statistics by journals are provided.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:474
+#, python-format
+msgid "Mail delivery failed"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: field:ir.actions.report.xml,model:0
+#: field:ir.actions.server,model_id:0
+#: field:ir.actions.wizard,model:0
+#: field:ir.cron,model:0
+#: field:ir.default,field_tbl:0
+#: view:ir.model.access:0
+#: field:ir.model.access,model_id:0
+#: view:ir.model.data:0
+#: view:ir.model.fields:0
+#: field:ir.rule,model_id:0
+#: selection:ir.translation,type:0
+#: view:ir.ui.view:0
+#: field:ir.ui.view,model:0
+#: field:multi_company.default,object_id:0
+#: field:res.request.link,object:0
+#: field:workflow.triggers,model:0
+msgid "Object"
+msgstr ""
+
+#. module: base
+#: code:addons/osv.py:169
+#, python-format
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_analytic_plans
+msgid "Multiple Analytic Plans"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_default
+msgid "ir.default"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Minute: %(min)s"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_ir_cron
+msgid "Scheduler"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_event_moodle
+msgid ""
+"\n"
+"Configure your moodle server.\n"
+"============================= \n"
+"\n"
+"With this module you are able to connect your OpenERP with a moodle "
+"platform.\n"
+"This module will create courses and students automatically in your moodle "
+"platform \n"
+"to avoid wasting time.\n"
+"Now you have a simple way to create training or courses with OpenERP and "
+"moodle.\n"
+"\n"
+"STEPS TO CONFIGURE:\n"
+"-------------------\n"
+"\n"
+"1. Activate web service in moodle.\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+">site administration >plugins >web services >manage protocols activate the "
+"xmlrpc web service \n"
+"\n"
+"\n"
+">site administration >plugins >web services >manage tokens create a token \n"
+"\n"
+"\n"
+">site administration >plugins >web services >overview activate webservice\n"
+"\n"
+"\n"
+"2. Create confirmation email with login and password.\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+"We strongly suggest you to add those following lines at the bottom of your "
+"event\n"
+"confirmation email to communicate the login/password of moodle to your "
+"subscribers.\n"
+"\n"
+"\n"
+"........your configuration text.......\n"
+"\n"
+"**URL:** your moodle link for exemple: http://openerp.moodle.com\n"
+"\n"
+"**LOGIN:** ${object.moodle_username}\n"
+"\n"
+"**PASSWORD:** ${object.moodle_user_password}\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_uk
+msgid "UK - Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_madam
+msgid "Mrs."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:432
+#, python-format
+msgid ""
+"Changing the type of a column is not yet supported. Please drop it and "
+"create it again!"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view_sc,user_id:0
+msgid "User Ref."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:226
+#, python-format
+msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
+msgstr ""
+
+#. module: base
+#: model:res.partner.bank.type.field,name:base.bank_normal_field_bic
+msgid "bank_bic"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,expression:0
+msgid "Loop Expression"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_16
+msgid "Retailer"
+msgstr ""
+
+#. module: base
+#: view:ir.model.fields:0
+#: field:ir.model.fields,readonly:0
+#: field:res.partner.bank.type.field,readonly:0
+msgid "Readonly"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_gt
+msgid "Guatemala - Accounting"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,args:0
+msgid "Arguments to be passed to the method, e.g. (uid,)."
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Reference Guide"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_partner
+#: field:res.company,partner_id:0
+#: model:res.partner.category,name:base.res_partner_category_0
+#: selection:res.partner.title,domain:0
+#: model:res.request.link,name:base.req_link_partner
+msgid "Partner"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:482
+#, python-format
+msgid ""
+"Your server does not seem to support SSL, you may want to try STARTTLS "
+"instead"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/workflow/workflow.py:100
+#, python-format
+msgid ""
+"Please make sure no workitems refer to an activity before deleting it!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tr
+msgid "Turkey"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fk
+msgid "Falkland Islands"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lb
+msgid "Lebanon"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+#: field:ir.actions.report.xml,report_type:0
+msgid "Report Type"
+msgstr ""
+
+#. module: base
+#: view:res.bank:0
+#: view:res.company:0
+#: view:res.country.state:0
+#: view:res.partner:0
+#: field:res.partner,state_id:0
+#: view:res.partner.bank:0
+#: view:res.users:0
+msgid "State"
+msgstr "Departamento"
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Galician / Galego"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.no
+msgid "Norway"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "4.  %b, %B         ==> Dec, December"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_cl
+msgid "Chile Localization Chart Account"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Sinhalese / සිංහල"
+msgstr ""
+
+#. module: base
+#: selection:res.request,state:0
+msgid "waiting"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow_triggers
+msgid "workflow.triggers"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "XSL"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:85
+#, python-format
+msgid "Invalid search criterions"
+msgstr ""
+
+#. module: base
+#: view:ir.mail_server:0
+msgid "Connection Information"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_prof
+msgid "Professor"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.hm
+msgid "Heard and McDonald Islands"
+msgstr ""
+
+#. module: base
+#: help:ir.model.data,name:0
+msgid ""
+"External Key/Identifier that can be used for data integration with third-"
+"party systems"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,view_id:0
+msgid "View Ref."
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_sales_management
+msgid "Helps you handle your quotations, sale orders and invoicing."
+msgstr ""
+
+#. module: base
+#: field:res.users,login_date:0
+msgid "Latest connection"
+msgstr ""
+
+#. module: base
+#: field:res.groups,implied_ids:0
+msgid "Inherits"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Selection"
+msgstr ""
+
+#. module: base
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_es
+msgid ""
+"\n"
+"Spanish Charts of Accounts (PGCE 2008).\n"
+"=======================================\n"
+"\n"
+"    * Defines the following chart of account templates:\n"
+"        * Spanish General Chart of Accounts 2008\n"
+"        * Spanish General Chart of Accounts 2008 for small and medium "
+"companies\n"
+"    * Defines templates for sale and purchase VAT\n"
+"    * Defines tax code templates\n"
+"\n"
+"**Note:** You should install the l10n_ES_account_balance_report module for "
+"yearly\n"
+"      account reporting (balance, profit & losses).\n"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_url,type:0
+#: field:ir.actions.act_window,type:0
+#: field:ir.actions.act_window_close,type:0
+#: field:ir.actions.actions,type:0
+#: field:ir.actions.client,type:0
+#: field:ir.actions.report.xml,type:0
+#: view:ir.actions.server:0
+#: field:ir.actions.server,state:0
+#: field:ir.actions.server,type:0
+#: field:ir.actions.wizard,type:0
+msgid "Action Type"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:372
+#, python-format
+msgid ""
+"You try to install module '%s' that depends on module '%s'.\n"
+"But the latter module is not available in your system."
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+#: model:ir.actions.act_window,name:base.action_view_base_import_language
+#: model:ir.ui.menu,name:base.menu_view_base_import_language
+msgid "Import Translation"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+#: field:ir.module.module,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: selection:ir.attachment,type:0
+#: selection:ir.property,type:0
+msgid "Binary"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_doctor
+msgid "Doctor"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mrp_repair
+msgid ""
+"\n"
+"The aim is to have a complete module to manage all products repairs.\n"
+"====================================================================\n"
+"\n"
+"The following topics should be covered by this module:\n"
+"------------------------------------------------------\n"
+"    * Add/remove products in the reparation\n"
+"    * Impact for stocks\n"
+"    * Invoicing (products and/or services)\n"
+"    * Warranty concept\n"
+"    * Repair quotation report\n"
+"    * Notes for the technician and for the final customer\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cd
+msgid "Congo, Democratic Republic of the"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cr
+msgid "Costa Rica"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_ldap
+msgid "Authentication via LDAP"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+msgid "Conditions"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_other_form
+msgid "Other Partners"
+msgstr ""
+
+#. module: base
+#: field:base.language.install,state:0
+#: field:base.module.import,state:0
+#: field:base.module.update,state:0
+#: field:ir.actions.todo,state:0
+#: field:ir.module.module,state:0
+#: field:ir.module.module.dependency,state:0
+#: field:ir.translation,state:0
+#: field:res.request,state:0
+#: field:workflow.instance,state:0
+#: view:workflow.workitem:0
+#: field:workflow.workitem,state:0
+msgid "Status"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_currency_form
+#: model:ir.ui.menu,name:base.menu_action_currency_form
+#: view:res.currency:0
+msgid "Currencies"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_8
+msgid "Consultancy Services"
+msgstr ""
+
+#. module: base
+#: help:ir.values,value:0
+msgid "Default value (pickled) or reference to an action"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,auto:0
+msgid "Custom Python Parser"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.groups:0
+msgid "The name of the group must be unique !"
+msgstr ""
+
+#. module: base
+#: help:ir.translation,module:0
+msgid "Module this term belongs to"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_view_editor
+msgid ""
+"\n"
+"OpenERP Web to edit views.\n"
+"==========================\n"
+"\n"
+"        "
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Hour 00->12: %(h12)s"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.dk
+msgid "Denmark"
+msgstr ""
+
+#. module: base
+#: field:res.country,code:0
+msgid "Country Code"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow_instance
+msgid "workflow.instance"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:479
+#, python-format
+msgid "Unknown attribute %s in %s "
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "10. %S              ==> 20"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ar
+msgid ""
+"\n"
+"Argentinian accounting chart and tax localization.\n"
+"==================================================\n"
+"\n"
+"Plan contable argentino e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/fields.py:130
+#, python-format
+msgid "undefined get method !"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Norwegian Bokmål / Norsk bokmål"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_madam
+msgid "Madam"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ee
+msgid "Estonia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_board
+#: model:ir.ui.menu,name:base.menu_reporting_dashboard
+msgid "Dashboards"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_procurement
+msgid "Procurements"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_6
+msgid "Bronze"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_payroll_account
+msgid "Payroll Accounting"
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Change password"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_order_dates
+msgid "Dates on Sales Order"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,demo:0
+msgid "Demo Data"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_mister
+msgid "Mr."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mv
+msgid "Maldives"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_crm
+msgid "Portal CRM"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_4
+msgid "Low Level Objects"
+msgstr ""
+
+#. module: base
+#: help:ir.values,model:0
+msgid "Model to which this entry applies"
+msgstr ""
+
+#. module: base
+#: field:res.country,address_format:0
+msgid "Address Format"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_no_one
+msgid "Technical Features"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Occitan (FR, post 1500) / Occitan"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:215
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_model_data
+#: view:ir.model.data:0
+#: model:ir.ui.menu,name:base.ir_model_data_menu
+msgid "External Identifiers"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Malayalam / മലയാളം"
+msgstr ""
+
+#. module: base
+#: field:res.request,body:0
+#: field:res.request.history,req_id:0
+msgid "Request"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.act_ir_actions_todo_form
+msgid ""
+"The configuration wizards are used to help you configure a new instance of "
+"OpenERP. They are launched during the installation of new modules, but you "
+"can choose to restart some wizards manually from this menu."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_sxw:0
+msgid "SXW Path"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_asset
+msgid ""
+"\n"
+"Financial and accounting asset management.\n"
+"==========================================\n"
+"\n"
+"This Module manages the assets owned by a company or an individual. It will "
+"keep \n"
+"track of depreciation's occurred on those assets. And it allows to create "
+"Move's \n"
+"of the depreciation lines.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.cron,numbercall:0
+msgid "Number of Calls"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_bank.py:192
+#, python-format
+msgid "BANK"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_point_of_sale
+#: model:ir.module.module,shortdesc:base.module_point_of_sale
+msgid "Point of Sale"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mail
+msgid ""
+"\n"
+"Business oriented Social Networking\n"
+"===================================\n"
+"The Social Networking module provides a unified social network abstraction "
+"layer allowing applications to display a complete\n"
+"communication history on documents with a fully-integrated email and message "
+"management system.\n"
+"\n"
+"It enables the users to read and send messages as well as emails. It also "
+"provides a feeds page combined to a subscription mechanism that allows to "
+"follow documents and to be constantly updated about recent news.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Clean and renewed communication history for any OpenERP document that can "
+"act as a discussion topic\n"
+"* Subscription mechanism to be updated about new messages on interesting "
+"documents\n"
+"* Unified feeds page to see recent messages and activity on followed "
+"documents\n"
+"* User communication through the feeds page\n"
+"* Threaded discussion design on documents\n"
+"* Relies on the global outgoing mail server - an integrated email management "
+"system - allowing to send emails with a configurable scheduler-based "
+"processing engine\n"
+"* Includes an extensible generic email composition assistant, that can turn "
+"into a mass-mailing assistant and is capable of interpreting simple "
+"*placeholder expressions* that will be replaced with dynamic data when each "
+"email is actually sent.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,sequence:0
+msgid ""
+"Important when you deal with multiple actions, the execution order will be "
+"decided based on this, low number is higher priority."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gr
+msgid "Greece"
+msgstr ""
+
+#. module: base
+#: view:res.config:0
+msgid "Apply"
+msgstr ""
+
+#. module: base
+#: field:res.request,trigger_date:0
+msgid "Trigger Date"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Croatian / hrvatski jezik"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_uy
+msgid ""
+"\n"
+"General Chart of Accounts.\n"
+"==========================\n"
+"\n"
+"Provide Templates for Chart of Accounts, Taxes for Uruguay.\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_gr
+msgid "Greece - Accounting"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.country:0
+msgid "The code of the country must be unique !"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module.dependency,state:0
+msgid "Uninstallable"
+msgstr ""
+
+#. module: base
+#: view:res.partner.category:0
+msgid "Partner Category"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+#: selection:ir.actions.server,state:0
+msgid "Trigger"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_warehouse_management
+msgid ""
+"Helps you manage your inventory and main stock operations: delivery orders, "
+"receptions, etc."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_module_update
+msgid "Update Module"
+msgstr ""
+
+#. module: base
+#: view:ir.model.fields:0
+msgid "Translate"
+msgstr ""
+
+#. module: base
+#: field:res.request.history,body:0
+msgid "Body"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:221
+#, python-format
+msgid "Connection test succeeded!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_gtd
+msgid ""
+"\n"
+"Implement concepts of the \"Getting Things Done\" methodology \n"
+"===========================================================\n"
+"\n"
+"This module implements a simple personal to-do list based on tasks. It adds "
+"an editable list of tasks simplified to the minimum required fields in the "
+"project application.\n"
+"\n"
+"The to-do list is based on the GTD methodology. This world-wide used "
+"methodology is used for personal time management improvement.\n"
+"\n"
+"Getting Things Done (commonly abbreviated as GTD) is an action management "
+"method created by David Allen, and described in a book of the same name.\n"
+"\n"
+"GTD rests on the principle that a person needs to move tasks out of the mind "
+"by recording them externally. That way, the mind is freed from the job of "
+"remembering everything that needs to be done, and can concentrate on "
+"actually performing those tasks.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.users,menu_id:0
+msgid "Menu Action"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,selection:0
+msgid ""
+"List of options for a selection field, specified as a Python expression "
+"defining a list of (key, label) pairs. For example: "
+"[('blue','Blue'),('yellow','Yellow')]"
+msgstr ""
+
+#. module: base
+#: selection:base.language.export,state:0
+msgid "choose"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:446
+#, python-format
+msgid ""
+"Please define at least one SMTP server, or provide the SMTP parameters "
+"explicitly."
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Filter on my documents"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_project_gtd
+msgid "Personal Tasks, Contexts, Timeboxes"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_cr
+msgid ""
+"\n"
+"Chart of accounts for Costa Rica.\n"
+"=================================\n"
+"\n"
+"Includes:\n"
+"---------\n"
+"    * account.type\n"
+"    * account.account.template\n"
+"    * account.tax.template\n"
+"    * account.tax.code.template\n"
+"    * account.chart.template\n"
+"\n"
+"Everything is in English with Spanish translation. Further translations are "
+"welcome,\n"
+"please go to http://translations.launchpad.net/openerp-costa-rica.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_supplier_form
+#: model:ir.ui.menu,name:base.menu_procurement_management_supplier_name
+#: view:res.partner:0
+msgid "Suppliers"
+msgstr ""
+
+#. module: base
+#: field:res.request,ref_doc2:0
+msgid "Document Ref 2"
+msgstr ""
+
+#. module: base
+#: field:res.request,ref_doc1:0
+msgid "Document Ref 1"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ga
+msgid "Gabon"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_stock
+msgid "Inventory, Logistic, Storage"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: selection:ir.translation,type:0
+msgid "Help"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+#: view:ir.rule:0
+#: view:res.groups:0
+#: model:res.groups,name:base.group_erp_manager
+#: view:res.users:0
+msgid "Access Rights"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gl
+msgid "Greenland"
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+#: field:res.partner.bank,acc_number:0
+msgid "Account Number"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"Example: GLOBAL_RULE_1 AND GLOBAL_RULE_2 AND ( (GROUP_A_RULE_1 OR "
+"GROUP_A_RULE_2) OR (GROUP_B_RULE_1 OR GROUP_B_RULE_2) )"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_th
+msgid "Thailand - Accounting"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "1.  %c              ==> Fri Dec  5 18:25:20 2008"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nc
+msgid "New Caledonia (French)"
+msgstr ""
+
+#. module: base
+#: field:ir.model,osv_memory:0
+msgid "Transient Model"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cy
+msgid "Cyprus"
+msgstr ""
+
+#. module: base
+#: field:res.users,new_password:0
+msgid "Set Password"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,subject:0
+#: field:res.request,name:0
+#: view:res.request.link:0
+msgid "Subject"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_membership
+msgid ""
+"\n"
+"This module allows you to manage all operations for managing memberships.\n"
+"=========================================================================\n"
+"\n"
+"It supports different kind of members:\n"
+"--------------------------------------\n"
+"    * Free member\n"
+"    * Associated member (e.g.: a group subscribes to a membership for all "
+"subsidiaries)\n"
+"    * Paid members\n"
+"    * Special member prices\n"
+"\n"
+"It is integrated with sales and accounting to allow you to automatically\n"
+"invoice and send propositions for membership renewal.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:res.currency,position:0
+msgid "Before Amount"
+msgstr ""
+
+#. module: base
+#: field:res.request,act_from:0
+#: field:res.request.history,act_from:0
+msgid "From"
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Preferences"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_9
+msgid "Components Buyer"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_tests_demo
+msgid ""
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.cron,function:0
+msgid "Name of the method to be called when this job is processed."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.client,tag:0
+msgid "Client action tag"
+msgstr ""
+
+#. module: base
+#: field:ir.values,model_id:0
+msgid "Model (change only)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_marketing_campaign_crm_demo
+msgid ""
+"\n"
+"Demo data for the module marketing_campaign.\n"
+"============================================\n"
+"\n"
+"Creates demo data like leads, campaigns and segments for the module "
+"marketing_campaign.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
+#: selection:ir.ui.view,type:0
+msgid "Kanban"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:291
+#, python-format
+msgid ""
+"The Selection Options expression is must be in the [('key','Label'), ...] "
+"format!"
+msgstr ""
+
+#. module: base
+#: field:res.company,company_registry:0
+msgid "Company Registry"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+#: view:res.currency:0
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_ir_mail_server_list
+#: view:ir.mail_server:0
+#: model:ir.ui.menu,name:base.menu_mail_servers
+msgid "Outgoing Mail Servers"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_custom
+msgid "Technical"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cn
+msgid "China"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,wkf_model_id:0
+msgid ""
+"The object that should receive the workflow signal (must have an associated "
+"workflow)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_account_voucher
+msgid ""
+"Allows you to create your invoices and track the payments. It is an easier "
+"version of the accounting module for managers who are not accountants."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.eh
+msgid "Western Sahara"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_account_voucher
+msgid "Invoicing & Payments"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_res_company_form
+msgid ""
+"Create and manage the companies that will be managed by OpenERP from here. "
+"Shops or subsidiaries can be created and maintained from here."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.id
+msgid "Indonesia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_stock_no_autopicking
+msgid ""
+"\n"
+"This module allows an intermediate picking process to provide raw materials "
+"to production orders.\n"
+"============================================================================="
+"====================\n"
+"\n"
+"One example of usage of this module is to manage production made by your\n"
+"suppliers (sub-contracting). To achieve this, set the assembled product "
+"which is\n"
+"sub-contracted to 'No Auto-Picking' and put the location of the supplier in "
+"the\n"
+"routing of the assembly operation.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,expression:0
+msgid ""
+"Expression, must be True to match\n"
+"use context.get or user (browse)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bg
+msgid "Bulgaria"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tf
+msgid "French Southern Territories"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_currency
+#: field:res.company,currency_id:0
+#: field:res.company,currency_ids:0
+#: field:res.country,currency_id:0
+#: view:res.currency:0
+#: field:res.currency,name:0
+#: field:res.currency.rate,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "5.  %y, %Y         ==> 08, 2008"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_ltd
+msgid "ltd"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_purchase_double_validation
+msgid ""
+"\n"
+"Double-validation for purchases exceeding minimum amount.\n"
+"=========================================================\n"
+"\n"
+"This module modifies the purchase workflow in order to validate purchases "
+"that\n"
+"exceeds minimum amount set by configuration wizard.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_administration
+msgid "Administration"
+msgstr ""
+
+#. module: base
+#: view:base.module.update:0
+msgid "Click on Update below to start the process..."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ir
+msgid "Iran"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Slovak / Slovenský jazyk"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,state:0
+#: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
+#: field:res.users,user_email:0
+msgid "unknown"
+msgstr ""
+
+#. module: base
+#: field:res.currency,symbol:0
+msgid "Symbol"
+msgstr ""
+
+#. module: base
+#: help:res.partner,image_medium:0
+msgid ""
+"Medium-sized image of this contact. It is automatically resized as a "
+"128x128px image, with aspect ratio preserved. Use this field in form views "
+"or some kanban views."
+msgstr ""
+
+#. module: base
+#: view:base.update.translations:0
+msgid "Synchronize Translation"
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+#: field:res.partner.bank,bank_name:0
+msgid "Bank Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ki
+msgid "Kiribati"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.iq
+msgid "Iraq"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_association
+#: model:ir.ui.menu,name:base.menu_association
+#: model:ir.ui.menu,name:base.menu_report_association
+msgid "Association"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Action to Launch"
+msgstr ""
+
+#. module: base
+#: field:ir.model,modules:0
+#: field:ir.model.fields,modules:0
+msgid "In Modules"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_contacts
+#: model:ir.ui.menu,name:base.menu_config_address_book
+msgid "Address Book"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_sequence_type
+msgid "ir.sequence.type"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
+#. module: base
+#: selection:base.language.export,format:0
+msgid "CSV File"
+msgstr ""
+
+#. module: base
+#: field:res.company,account_no:0
+msgid "Account No."
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:185
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_uk
+msgid ""
+"\n"
+"This is the latest UK OpenERP localisation necessary to run OpenERP "
+"accounting for UK SME's with:\n"
+"============================================================================="
+"====================\n"
+"    - a CT600-ready chart of accounts\n"
+"    - VAT100-ready tax structure\n"
+"    - InfoLogic UK counties listing\n"
+"    - a few other adaptations"
+msgstr ""
+
+#. module: base
+#: selection:ir.model,state:0
+msgid "Base Object"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,priority:0
+#: field:ir.mail_server,sequence:0
+#: field:res.request,priority:0
+#: field:res.request.link,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Dependencies :"
+msgstr ""
+
+#. module: base
+#: field:res.company,vat:0
+msgid "Tax ID"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_bank_statement_extensions
+msgid "Bank Statement Extensions to Support e-banking"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,field_description:0
+msgid "Field Label"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.dj
+msgid "Djibouti"
+msgstr ""
+
+#. module: base
+#: field:ir.translation,value:0
+msgid "Translation Value"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ag
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.zr
+msgid "Zaire"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_project
+msgid "Projects, Tasks"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,res_id:0
+#: field:workflow.instance,res_id:0
+#: field:workflow.triggers,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
+#: field:ir.model,info:0
+msgid "Information"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "false"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_analytic_analysis
+msgid ""
+"\n"
+"This module is for modifying account analytic view to show important data to "
+"project manager of services companies.\n"
+"============================================================================="
+"======================================\n"
+"\n"
+"Adds menu to show relevant information to each manager.You can also view the "
+"report of account analytic summary user-wise as well as month-wise.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_payroll_account
+msgid ""
+"\n"
+"Generic Payroll system Integrated with Accounting.\n"
+"==================================================\n"
+"\n"
+"    * Expense Encoding\n"
+"    * Payment Encoding\n"
+"    * Company Contribution Management\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
+#. module: base
+#: view:base.module.update:0
+msgid "Update Module List"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:685
+#: code:addons/base/res/res_users.py:825
+#: selection:res.partner,type:0
+#: view:res.users:0
+#, python-format
+msgid "Other"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Turkish / Türkçe"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_activity_form
+#: model:ir.ui.menu,name:base.menu_workflow_activity
+#: field:workflow,activities:0
+msgid "Activities"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_product
+msgid "Products & Pricelists"
+msgstr ""
+
+#. module: base
+#: help:ir.filters,user_id:0
+msgid ""
+"The user this filter is private to. When left empty the filter is public and "
+"available to all users."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,auto_refresh:0
+msgid "Auto-Refresh"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_product_expiry
+msgid ""
+"\n"
+"Track different dates on products and production lots.\n"
+"======================================================\n"
+"\n"
+"Following dates can be tracked:\n"
+"-------------------------------\n"
+"    - end of life\n"
+"    - best before date\n"
+"    - removal date\n"
+"    - alert date\n"
+"\n"
+"Used, for example, in food industries."
+msgstr ""
+
+#. module: base
+#: help:ir.translation,state:0
+msgid ""
+"Automatically set to let administators find new terms that might need to be "
+"translated"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:85
+#, python-format
+msgid "The osv_memory field can only be compared with = and != operator."
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
+#. module: base
+#: selection:ir.ui.view,type:0
+msgid "Diagram"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_es
+msgid "Spanish - Accounting (PGCE 2008)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_stock_no_autopicking
+msgid "Picking Before Manufacturing"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_note_pad
+msgid "Sticky memos, Collaborative"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.wf
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,name:0
+msgid "Name it to easily find a record"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr
+msgid ""
+"\n"
+"Human Resources Management\n"
+"==========================\n"
+"\n"
+"This application enables you to manage important aspects of your company's "
+"staff and other details such as their skills, contacts, working time...\n"
+"\n"
+"\n"
+"You can manage:\n"
+"---------------\n"
+"* Employees and hierarchies : You can define your employee with User and "
+"display hierarchies\n"
+"* HR Departments\n"
+"* HR Jobs\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_contract
+msgid ""
+"\n"
+"Add all information on the employee form to manage contracts.\n"
+"=============================================================\n"
+"\n"
+"    * Contract\n"
+"    * Place of Birth,\n"
+"    * Medical Examination Date\n"
+"    * Company Vehicle\n"
+"\n"
+"You can assign several contracts per employee.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.model.data:0
+#: field:ir.model.data,name:0
+msgid "External Identifier"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_audittrail
+msgid ""
+"\n"
+"This module lets administrator track every user operation on all the objects "
+"of the system.\n"
+"============================================================================="
+"==============\n"
+"\n"
+"The administrator can subscribe to rules for read, write and delete on "
+"objects \n"
+"and can check logs.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.grant_menu_access
+#: model:ir.ui.menu,name:base.menu_grant_menu_access
+msgid "Menu Items"
+msgstr ""
+
+#. module: base
+#: model:res.groups,comment:base.group_sale_salesman_all_leads
+msgid ""
+"the user will have access to all records of everyone in the sales "
+"application."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_event
+msgid "Events Organisation"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_sequence_actions
+#: model:ir.ui.menu,name:base.menu_ir_sequence_actions
+#: model:ir.ui.menu,name:base.next_id_6
+#: view:workflow.activity:0
+msgid "Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_delivery
+msgid "Delivery Costs"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_cron.py:263
+#, python-format
+msgid ""
+"This cron task is currently being executed and may not be modified, please "
+"try again in a few minutes"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+#: field:ir.exports.line,export_id:0
+msgid "Export"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ma
+msgid "Maroc - Accounting"
+msgstr ""
+
+#. module: base
+#: field:res.bank,bic:0
+#: field:res.partner.bank,bank_bic:0
+msgid "Bank Identifier Code"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid ""
+"CSV format: you may edit it directly with your favorite spreadsheet "
+"software,\n"
+"                                the rightmost column (value) contains the "
+"translations"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_chart
+msgid ""
+"\n"
+"Remove minimal account chart.\n"
+"=============================\n"
+"\n"
+"Deactivates minimal chart of accounts.\n"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr ""
+
+#. module: base
+#: help:workflow.transition,act_to:0
+msgid "The destination activity."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_issue
+msgid "Issue Tracker"
+msgstr ""
+
+#. module: base
+#: view:base.module.update:0
+#: view:base.module.upgrade:0
+#: view:base.update.translations:0
+msgid "Update"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_plugin
+msgid ""
+"\n"
+"The common interface for plug-in.\n"
+"=================================\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_crm
+msgid ""
+"\n"
+"This module adds a shortcut on one or several opportunity cases in the CRM.\n"
+"===========================================================================\n"
+"\n"
+"This shortcut allows you to generate a sales order based on the selected "
+"case.\n"
+"If different cases are open (a list), it generates one sale order by case.\n"
+"The case is then closed and linked to the generated sales order.\n"
+"\n"
+"We suggest you to install this module, if you installed both the sale and "
+"the crm\n"
+"modules.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bq
+msgid "Bonaire, Sint Eustatius and Saba"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.report.xml,name:base.ir_module_reference_print
+msgid "Technical guide"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tz
+msgid "Tanzania"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Danish / Dansk"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,select_level:0
+msgid "Advanced Search (deprecated)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cx
+msgid "Christmas Island"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_contacts
+msgid ""
+"\n"
+"This module gives you a quick view of your address book, accessible from "
+"your home page.\n"
+"You can track your suppliers, customers and other contacts.\n"
+msgstr ""
+
+#. module: base
+#: help:res.company,custom_footer:0
+msgid ""
+"Check this to define the report footer manually.  Otherwise it will be "
+"filled in automatically."
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Supplier Partners"
+msgstr ""
+
+#. module: base
+#: view:res.config.installer:0
+msgid "Install Modules"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_import_crm
+msgid "Import & Synchronize"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Customer Partners"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_request_history
+msgid "res.request.history"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_multi_company_default
+msgid "Default multi company"
+msgstr ""
+
+#. module: base
+#: field:ir.translation,src:0
+msgid "Source"
+msgstr ""
+
+#. module: base
+#: field:ir.model.constraint,date_init:0
+#: field:ir.model.relation,date_init:0
+msgid "Initialization Date"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.vu
+msgid "Vanuatu"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_product_visible_discount
+msgid ""
+"\n"
+"This module lets you calculate discounts on Sale Order lines and Invoice "
+"lines base on the partner's pricelist.\n"
+"============================================================================="
+"==================================\n"
+"\n"
+"To this end, a new check box named 'Visible Discount' is added to the "
+"pricelist form.\n"
+"\n"
+"**Example:**\n"
+"    For the product PC1 and the partner \"Asustek\": if listprice=450, and "
+"the price\n"
+"    calculated using Asustek's pricelist is 225. If the check box is "
+"checked, we\n"
+"    will have on the sale order line: Unit price=450, Discount=50,00, Net "
+"price=225.\n"
+"    If the check box is unchecked, we will have on Sale Order and Invoice "
+"lines:\n"
+"    Unit price=225, Discount=0,00, Net price=225.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm
+msgid "CRM"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_report_designer
+msgid ""
+"\n"
+"This module is used along with OpenERP OpenOffice Plugin.\n"
+"=========================================================\n"
+"\n"
+"This module adds wizards to Import/Export .sxw report that you can modify in "
+"OpenOffice. \n"
+"Once you have modified it you can upload the report using the same wizard.\n"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "Start configuration"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Catalan / Català"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.do
+msgid "Dominican Republic"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Serbian (Cyrillic) / српски"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2650
+#, python-format
+msgid ""
+"Invalid group_by specification: \"%s\".\n"
+"A group_by specification must be a list of valid fields."
+msgstr ""
+
+#. module: base
+#: selection:ir.mail_server,smtp_encryption:0
+msgid "TLS (STARTTLS)"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,usage:0
+msgid "Used to filter menu and home actions from the user form."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sa
+msgid "Saudi Arabia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_mrp
+msgid ""
+"\n"
+"This module provides facility to the user to install mrp and sales modulesat "
+"a time.\n"
+"============================================================================="
+"=======\n"
+"\n"
+"It is basically used when we want to keep track of production orders "
+"generated\n"
+"from sales order. It adds sales name and sales Reference on production "
+"order.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,trigger_obj_id:0
+#: field:ir.model.fields,relation_field:0
+msgid "Relation Field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_project
+msgid ""
+"\n"
+"This module adds project menu and features (tasks) to your portal if project "
+"and portal are installed.\n"
+"============================================================================="
+"=========================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_configuration.py:38
+#, python-format
+msgid "System Configuration done"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#. module: base
+#: field:workflow.triggers,instance_id:0
+msgid "Destination Instance"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,multi:0
+#: field:ir.actions.wizard,multi:0
+msgid "Action on Multiple Doc."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_title_partner
+#: model:ir.ui.menu,name:base.menu_partner_title_partner
+msgid "Titles"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_anonymization
+msgid ""
+"\n"
+"This module allows you to anonymize a database.\n"
+"===============================================\n"
+"\n"
+"This module allows you to keep your data confidential for a given database.\n"
+"This process is useful, if you want to use the migration process and "
+"protect\n"
+"your own or your customer’s confidential data. The principle is that you "
+"run\n"
+"an anonymization tool which will hide your confidential data(they are "
+"replaced\n"
+"by ‘XXX’ characters). Then you can send the anonymized database to the "
+"migration\n"
+"team. Once you get back your migrated database, you restore it and reverse "
+"the\n"
+"anonymization process to recover your previous data.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,implementation:0
+msgid ""
+"Two sequence object implementations are offered: Standard and 'No gap'. The "
+"later is slower than the former but forbids any gap in the sequence (while "
+"they are possible in the former)."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gn
+msgid "Guinea"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_diagram
+msgid "OpenERP Web Diagram"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lu
+msgid "Luxembourg"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_base_calendar
+msgid "Personal & Shared Calendar"
+msgstr ""
+
+#. module: base
+#: selection:res.request,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_ui_menu.py:379
+#, python-format
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+msgid "Web-only translations"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"3. If user belongs to several groups, the results from step 2 are combined "
+"with logical OR operator"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_be
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Belgium in "
+"OpenERP.\n"
+"============================================================================="
+"=\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+"Thus, the pure copy of Chart Template is generated.\n"
+"\n"
+"Wizards provided by this module:\n"
+"--------------------------------\n"
+"    * Partner VAT Intra: Enlist the partners with their related VAT and "
+"invoiced\n"
+"      amounts. Prepares an XML file format.\n"
+"      \n"
+"        **Path to access :** Invoicing/Reporting/Legal Reports/Belgium "
+"Statements/Partner VAT Intra\n"
+"    * Periodical VAT Declaration: Prepares an XML file for Vat Declaration "
+"of\n"
+"      the Main company of the User currently Logged in.\n"
+"      \n"
+"        **Path to access :** Invoicing/Reporting/Legal Reports/Belgium "
+"Statements/Periodical VAT Declaration\n"
+"    * Annual Listing Of VAT-Subjected Customers: Prepares an XML file for "
+"Vat\n"
+"      Declaration of the Main company of the User currently Logged in Based "
+"on\n"
+"      Fiscal year.\n"
+"      \n"
+"        **Path to access :** Invoicing/Reporting/Legal Reports/Belgium "
+"Statements/Annual Listing Of VAT-Subjected Customers\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_gengo
+msgid "Automated Translations through Gengo API"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_payment
+msgid "Suppliers Payment Management"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sv
+msgid "El Salvador"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:161
+#: field:res.bank,phone:0
+#: field:res.company,phone:0
+#: field:res.partner,phone:0
+#, python-format
+msgid "Phone"
+msgstr ""
+
+#. module: base
+#: field:res.groups,menu_access:0
+msgid "Access Menu"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.th
+msgid "Thailand"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_account_voucher
+msgid "Send Invoices and Track Payments"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_crm_config_lead
+msgid "Leads & Opportunities"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gg
+msgid "Guernsey"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Romanian / română"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_tr
+msgid ""
+"\n"
+"Türkiye için Tek düzen hesap planı şablonu OpenERP Modülü.\n"
+"==========================================================\n"
+"\n"
+"Bu modül kurulduktan sonra, Muhasebe yapılandırma sihirbazı çalışır\n"
+"    * Sihirbaz sizden hesap planı şablonu, planın kurulacağı şirket, banka "
+"hesap\n"
+"      bilgileriniz, ilgili para birimi gibi bilgiler isteyecek.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "And"
+msgstr ""
+
+#. module: base
+#: help:ir.values,res_id:0
+msgid ""
+"Database identifier of the record to which this applies. 0 = for all records"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,relation:0
+msgid "Object Relation"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_voucher
+msgid "eInvoicing & Payments"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "General"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.uz
+msgid "Uzbekistan"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_act_window
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.act_window"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.vi
+msgid "Virgin Islands (USA)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tw
+msgid "Taiwan"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_currency_rate
+msgid "Currency Rate"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+#: field:base.module.upgrade,module_info:0
+msgid "Modules to Update"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_custom_multicompany
+msgid "Multi-Companies"
+msgstr ""
+
+#. module: base
+#: field:workflow,osv:0
+#: view:workflow.instance:0
+#: field:workflow.instance,res_type:0
+msgid "Resource Object"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_helpdesk
+msgid "Helpdesk"
+msgstr ""
+
+#. module: base
+#: field:ir.rule,perm_write:0
+msgid "Apply for Write"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_document_page
+msgid ""
+"\n"
+"Pages\n"
+"=====\n"
+"Web pages\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,code:0
+msgid ""
+"Python code to be executed if condition is met.\n"
+"It is a Python block that can use the same values as for the condition field"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.grant_menu_access
+msgid ""
+"Manage and customize the items available and displayed in your OpenERP "
+"system menu. You can delete an item by clicking on the box at the beginning "
+"of each line and then delete it through the button that appeared. Items can "
+"be assigned to specific groups in order to make them accessible to some "
+"users within the system."
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view,field_parent:0
+msgid "Child Field"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Detailed algorithm:"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_url,usage:0
+#: field:ir.actions.act_window,usage:0
+#: field:ir.actions.act_window_close,usage:0
+#: field:ir.actions.actions,usage:0
+#: field:ir.actions.client,usage:0
+#: field:ir.actions.report.xml,usage:0
+#: field:ir.actions.server,usage:0
+#: field:ir.actions.wizard,usage:0
+msgid "Action Usage"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,name:0
+msgid "Technical Name"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow_workitem
+msgid "workflow.workitem"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_tools
+msgid ""
+"Lets you install various interesting but non-essential tools like Survey, "
+"Lunch and Ideas box."
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,state:0
+msgid "Not Installable"
+msgstr ""
+
+#. module: base
+#: help:res.lang,iso_code:0
+msgid "This ISO code is the name of po files to use for translations"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "View :"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,view_load:0
+msgid "View Auto-Load"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Allowed Companies"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_de
+msgid "Deutschland - Accounting"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Day of the Year: %(doy)s"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,web_icon:0
+msgid "Web Icon File"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_view_base_module_upgrade
+msgid "Apply Scheduled Upgrades"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_journal
+msgid "Invoicing Journals"
+msgstr ""
+
+#. module: base
+#: help:ir.ui.view,groups_id:0
+msgid ""
+"If this field is empty, the view applies to all users. Otherwise, the view "
+"applies to the users of those groups only."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Persian / فارس"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "Export Settings"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,src_model:0
+msgid "Source Model"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Day of the Week (0:Monday): %(weekday)s"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_upgrade.py:84
+#, python-format
+msgid "Unmet dependency !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:509
+#: code:addons/base/ir/ir_model.py:570
+#: code:addons/base/ir/ir_model.py:1031
+#, python-format
+msgid "Administrator access is required to uninstall a module"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_module_configuration
+msgid "base.module.configuration"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3568
+#: code:addons/orm.py:3861
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_idea
+msgid ""
+"\n"
+"This module allows user to easily and efficiently participate in enterprise "
+"innovation.\n"
+"============================================================================="
+"==========\n"
+"\n"
+"It allows everybody to express ideas about different subjects.\n"
+"Then, other users can comment on these ideas and vote for particular ideas.\n"
+"Each idea has a score based on the different votes.\n"
+"The managers can obtain an easy view of best ideas from all the users.\n"
+"Once installed, check the menu 'Ideas' in the 'Tools' main menu."
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:5322
+#: code:addons/orm.py:5337
+#, python-format
+msgid ""
+"%s This might be '%s' in the current model, or a field of the same name in "
+"an o2m."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_payment
+msgid ""
+"\n"
+"Module to manage the payment of your supplier invoices.\n"
+"=======================================================\n"
+"\n"
+"This module allows you to create and manage your payment orders, with "
+"purposes to\n"
+"-----------------------------------------------------------------------------"
+"---- \n"
+"    * serve as base for an easy plug-in of various automated payment "
+"mechanisms.\n"
+"    * provide a more efficient way to manage invoice payment.\n"
+"\n"
+"Warning:\n"
+"~~~~~~~~\n"
+"The confirmation of a payment order does _not_ create accounting entries, it "
+"just \n"
+"records the fact that you gave your payment order to your bank. The booking "
+"of \n"
+"your order must be encoded as usual through a bank statement. Indeed, it's "
+"only \n"
+"when you get the confirmation from your bank that your order has been "
+"accepted \n"
+"that you can book it in your accounting. To help you with that operation, "
+"you \n"
+"have a new option to import payment orders as bank statement lines.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.model,access_ids:0
+#: view:ir.model.access:0
+msgid "Access"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:165
+#: field:res.partner,vat:0
+#, python-format
+msgid "TIN"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.aw
+msgid "Aruba"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_import.py:58
+#, python-format
+msgid "File is not a zip file!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ar
+msgid "Argentina"
+msgstr ""
+
+#. module: base
+#: field:res.groups,full_name:0
+msgid "Group Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bh
+msgid "Bahrain"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:162
+#: field:res.bank,fax:0
+#: field:res.company,fax:0
+#: field:res.partner,fax:0
+#, python-format
+msgid "Fax"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: field:ir.attachment,company_id:0
+#: field:ir.default,company_id:0
+#: field:ir.property,company_id:0
+#: field:ir.sequence,company_id:0
+#: field:ir.values,company_id:0
+#: view:res.company:0
+#: field:res.currency,company_id:0
+#: view:res.partner:0
+#: field:res.partner,company_id:0
+#: field:res.partner.bank,company_id:0
+#: view:res.users:0
+#: field:res.users,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_report_designer
+msgid "Advanced Reporting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_purchase
+msgid "Purchase Orders, Receptions, Supplier Invoices"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_payroll
+msgid ""
+"\n"
+"Generic Payroll system.\n"
+"=======================\n"
+"\n"
+"    * Employee Details\n"
+"    * Employee Contracts\n"
+"    * Passport based Contract\n"
+"    * Allowances/Deductions\n"
+"    * Allow to configure Basic/Gross/Net Salary\n"
+"    * Employee Payslip\n"
+"    * Monthly Payroll Register\n"
+"    * Integrated with Holiday Management\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_model_data
+msgid "ir.model.data"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Bulgarian / български език"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_aftersale
+msgid "After-Sale Services"
+msgstr ""
+
+#. module: base
+#: field:base.language.import,code:0
+msgid "ISO Code"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_fr
+msgid "France - Accounting"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Launch"
+msgstr ""
+
+#. module: base
+#: selection:res.partner,type:0
+msgid "Shipping"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_mrp
+msgid ""
+"\n"
+"Automatically creates project tasks from procurement lines.\n"
+"===========================================================\n"
+"\n"
+"This module will automatically create a new task for each procurement order "
+"line\n"
+"(e.g. for sale order lines), if the corresponding product meets the "
+"following\n"
+"characteristics:\n"
+"\n"
+"    * Product Type = Service\n"
+"    * Procurement Method (Order fulfillment) = MTO (Make to Order)\n"
+"    * Supply/Procurement Method = Manufacture\n"
+"\n"
+"If on top of that a projet is specified on the product form (in the "
+"Procurement\n"
+"tab), then the new task will be created in that specific project. Otherwise, "
+"the\n"
+"new task will not belong to any project, and may be added to a project "
+"manually\n"
+"later.\n"
+"\n"
+"When the project task is completed or cancelled, the workflow of the "
+"corresponding\n"
+"procurement line is updated accordingly. For example, if this procurement "
+"corresponds\n"
+"to a sale order line, the sale order line will be considered delivered when "
+"the\n"
+"task is completed.\n"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,limit:0
+msgid "Limit"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_hr_user
+msgid "Officer"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:787
+#, python-format
+msgid "Serialization field `%s` not found for sparse field `%s`!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.jm
+msgid "Jamaica"
+msgstr ""
+
+#. module: base
+#: field:res.partner,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_category_form
+msgid ""
+"Manage the partner categories in order to better classify them for tracking "
+"and analysis purposes. A partner may belong to several categories and "
+"categories have a hierarchy structure: a partner belonging to a category "
+"also belong to his parent category."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_survey
+msgid ""
+"\n"
+"This module is used for surveying.\n"
+"==================================\n"
+"\n"
+"It depends on the answers or reviews of some questions by different users. "
+"A\n"
+"survey may have multiple pages. Each page may contain multiple questions and "
+"each\n"
+"question may have multiple answers. Different users may give different "
+"answers of\n"
+"question and according to that survey is done. Partners are also sent mails "
+"with\n"
+"user name and password for the invitation of the survey.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:165
+#, python-format
+msgid "Model '%s' contains module data and cannot be removed!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.az
+msgid "Azerbaijan"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:481
+#: code:addons/base/ir/ir_sequence.py:259
+#: code:addons/base/res/res_partner.py:360
+#: code:addons/base/res/res_partner.py:566
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_edi
+msgid "Electronic Data Interchange (EDI)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_anglo_saxon
+msgid "Anglo-Saxon Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.vg
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#. module: base
+#: view:ir.property:0
+#: model:ir.ui.menu,name:base.menu_ir_property
+msgid "Parameters"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Czech / Čeština"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_generic_modules
+msgid "Generic Modules"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mk
+msgid "Macedonia, the former Yugoslav Republic of"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.rw
+msgid "Rwanda"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_auth_openid
+msgid ""
+"\n"
+"Allow users to login through OpenID.\n"
+"====================================\n"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_port:0
+msgid "SMTP Port. Usually 465 for SSL, and 25 or 587 for other cases."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ck
+msgid "Cook Islands"
+msgstr ""
+
+#. module: base
+#: field:ir.model.data,noupdate:0
+msgid "Non Updatable"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Klingon"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sg
+msgid "Singapore"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window,target:0
+msgid "Current Window"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_hidden
+#: view:res.users:0
+msgid "Technical Settings"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_accounting_and_finance
+msgid ""
+"Helps you handle your accounting needs, if you are not an accountant, we "
+"suggest you to install only the Invoicing."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_plugin_thunderbird
+msgid "Thunderbird Plug-In"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_event
+msgid "Trainings, Conferences, Meetings, Exhibitions, Registrations"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_country
+#: view:res.bank:0
+#: field:res.bank,country:0
+#: view:res.company:0
+#: field:res.company,country_id:0
+#: view:res.country:0
+#: field:res.country.state,country_id:0
+#: view:res.partner:0
+#: field:res.partner,country:0
+#: field:res.partner,country_id:0
+#: view:res.partner.bank:0
+#: field:res.partner.bank,country_id:0
+#: view:res.users:0
+msgid "Country"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_15
+msgid "Wholesaler"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_vat
+msgid "VAT Number Validation"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,complete_name:0
+msgid "Complete Name"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.wizard,multi:0
+msgid ""
+"If set to true, the wizard will not be displayed on the right toolbar of a "
+"form view."
+msgstr ""
+
+#. module: base
+#: view:ir.values:0
+msgid "Action Bindings/Defaults"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid ""
+"file encoding, please be sure to view and edit\n"
+"                           using the same encoding."
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"1. Global rules are combined together with a logical AND operator, and with "
+"the result of the following steps"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_nl
+msgid "Netherlands - Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gs
+msgid "South Georgia and the South Sandwich Islands"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%X - Appropriate time representation."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (SV) / Español (SV)"
+msgstr ""
+
+#. module: base
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,auto_install:0
+msgid "Automatic Installation"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_hn
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Honduras.\n"
+"====================================================================\n"
+"    \n"
+"Agrega una nomenclatura contable para Honduras. También incluye impuestos y "
+"la\n"
+"moneda Lempira. -- Adds accounting chart for Honduras. It also includes "
+"taxes\n"
+"and the Lempira currency."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.jp
+msgid "Japan"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:418
+#, python-format
+msgid "Can only rename one column at a time!"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Report/Template"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_budget
+msgid ""
+"\n"
+"This module allows accountants to manage analytic and crossovered budgets.\n"
+"==========================================================================\n"
+"\n"
+"Once the Budgets are defined (in Invoicing/Budgets/Budgets), the Project "
+"Managers \n"
+"can set the planned amount on each Analytic Account.\n"
+"\n"
+"The accountant has the possibility to see the total of amount planned for "
+"each\n"
+"Budget in order to ensure the total planned is not greater/lower than what "
+"he \n"
+"planned for this Budget. Each list of record can also be switched to a "
+"graphical \n"
+"view of it.\n"
+"\n"
+"Three reports are available:\n"
+"----------------------------\n"
+"    1. The first is available from a list of Budgets. It gives the "
+"spreading, for \n"
+"       these Budgets, of the Analytic Accounts.\n"
+"\n"
+"    2. The second is a summary of the previous one, it only gives the "
+"spreading, \n"
+"       for the selected Budgets, of the Analytic Accounts.\n"
+"\n"
+"    3. The last one is available from the Analytic Chart of Accounts. It "
+"gives \n"
+"       the spreading, for the selected Analytic Accounts of Budgets.\n"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Graph"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_server
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.server"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ca
+msgid "Canada - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
+#: model:ir.model,name:base.model_ir_actions_todo
+#: model:ir.ui.menu,name:base.menu_ir_actions_todo
+#: model:ir.ui.menu,name:base.menu_ir_actions_todo_form
+msgid "Configuration Wizards"
+msgstr ""
+
+#. module: base
+#: field:res.lang,code:0
+msgid "Locale Code"
+msgstr ""
+
+#. module: base
+#: field:workflow.activity,split_mode:0
+msgid "Split Mode"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "Note that this operation might take a few minutes."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:363
+#, python-format
+msgid ""
+"Ambiguous specification for field '%(field)s', only provide one of name, "
+"external id or database id"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,implementation:0
+msgid "Implementation"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ve
+msgid "Venezuela - Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cl
+msgid "Chile"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_view_editor
+msgid "View Editor"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
+msgid "Execution"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,condition:0
+#: view:ir.values:0
+#: field:workflow.transition,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
+#. module: base
+#: help:res.currency,rate:0
+msgid "The rate of the currency to the currency of rate 1."
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view,name:0
+msgid "View Name"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_groups
+msgid "Access Groups"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Italian / Italiano"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid ""
+"Only one client action will be executed, last client action will be "
+"considered in case of multiple client actions."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mrp_jit
+msgid ""
+"\n"
+"This module allows Just In Time computation of procurement orders.\n"
+"==================================================================\n"
+"\n"
+"If you install this module, you will not have to run the regular "
+"procurement\n"
+"scheduler anymore (but you still need to run the minimum order point rule\n"
+"scheduler, or for example let it run daily).\n"
+"All procurement orders will be processed immediately, which could in some\n"
+"cases entail a small performance impact.\n"
+"\n"
+"It may also increase your stock size because products are reserved as soon\n"
+"as possible and the scheduler time range is not taken into account anymore.\n"
+"In that case, you can not use priorities any more on the different picking.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.hr
+msgid "Croatia"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,mobile:0
+msgid "Mobile No"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_by_category
+#: model:ir.actions.act_window,name:base.action_partner_category_form
+#: model:ir.model,name:base.model_res_partner_category
+#: view:res.partner.category:0
+msgid "Partner Categories"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "System Update"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_sxw_content:0
+#: field:ir.actions.report.xml,report_sxw_content_data:0
+msgid "SXW Content"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sc
+msgid "Seychelles"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_4
+msgid "Gold"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:173
+#: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
+#: model:ir.model,name:base.model_res_partner_bank
+#: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
+#: view:res.company:0
+#: field:res.company,bank_ids:0
+#: view:res.partner.bank:0
+#, python-format
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sl
+msgid "Sierra Leone"
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "General Information"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
+#. module: base
+#: field:ir.model.data,complete_name:0
+msgid "Complete ID"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:res.partner,vat:0
+msgid ""
+"Tax Identification Number. Check the box if this contact is subjected to "
+"taxes. Used by the some of the legal statements."
+msgstr ""
+"Número de identificación Tributaria. Marque la casilla si el contacto está "
+"sujeto a impuestos. Usado por algunos documentos legales."
+
+#. module: base
+#: field:res.partner.bank,partner_id:0
+msgid "Account Owner"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_procurement
+msgid ""
+"\n"
+"This is the module for computing Procurements.\n"
+"==============================================\n"
+"\n"
+"In the MRP process, procurements orders are created to launch manufacturing\n"
+"orders, purchase orders, stock allocations. Procurement orders are\n"
+"generated automatically by the system and unless there is a problem, the\n"
+"user will not be notified. In case of problems, the system will raise some\n"
+"procurement exceptions to inform the user about blocking problems that need\n"
+"to be resolved manually (like, missing BoM structure or missing supplier).\n"
+"\n"
+"The procurement order will schedule a proposal for automatic procurement\n"
+"for the product which needs replenishment. This procurement will start a\n"
+"task, either a purchase order form for the supplier, or a production order\n"
+"depending on the product's configuration.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.open_module_tree
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
+#, python-format
+msgid "Company Switch Warning"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_manufacturing
+msgid ""
+"Helps you manage your manufacturing processes and generate reports on those "
+"processes."
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr ""
+
+#. module: base
+#: selection:workflow.activity,kind:0
+msgid "Function"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_customer_relationship_management
+msgid ""
+"Manage relations with prospects and customers using leads, opportunities, "
+"requests or issues."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project
+msgid ""
+"\n"
+"Track multi-level projects, tasks, work done on tasks\n"
+"=====================================================\n"
+"\n"
+"This application allows an operational project management system to organize "
+"your activities into tasks and plan the work you need to get the tasks "
+"completed.\n"
+"\n"
+"Gantt diagrams will give you a graphical representation of your project "
+"plans, as well as resources availability and workload.\n"
+"\n"
+"Dashboard / Reports for Project Management will include:\n"
+"--------------------------------------------------------\n"
+"* My Tasks\n"
+"* Open Tasks\n"
+"* Tasks Analysis\n"
+"* Cumulative Flow\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Internal Notes"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_pvt_ltd
+#: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
+msgid "Corp."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_purchase_requisition
+msgid "Purchase Requisitions"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window,target:0
+msgid "Inline Edit"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Months"
+msgstr ""
+
+#. module: base
+#: view:workflow.instance:0
+msgid "Workflow Instances"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_partner.py:684
+#, python-format
+msgid "Partners: "
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Is a Company?"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:173
+#: field:res.partner.bank,name:0
+#, python-format
+msgid "Bank Account"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kp
+msgid "North Korea"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+msgid "Create Object"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ss
+msgid "South Sudan"
+msgstr ""
+
+#. module: base
+#: field:ir.filters,context:0
+msgid "Context"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_mrp
+msgid "Sales and MRP Management"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer; discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_2
+msgid "Prospect"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_stock_invoice_directly
+msgid "Invoice Picking Directly"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Polish / Język polski"
+msgstr ""
+
+#. module: base
+#: field:ir.exports,name:0
+msgid "Export Name"
+msgstr ""
+
+#. module: base
+#: help:res.partner,type:0
+msgid ""
+"Used to select automatically the right address according to the context in "
+"sales and purchases documents."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_purchase_analytic_plans
+msgid ""
+"\n"
+"The base module to manage analytic distribution and purchase orders.\n"
+"====================================================================\n"
+"\n"
+"Allows the user to maintain several analysis plans. These let you split a "
+"line\n"
+"on a supplier purchase order into several accounts and analytic plans.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lk
+msgid "Sri Lanka"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,search_view:0
+msgid "Search View"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Russian / русский язык"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_signup
+msgid "Signup"
+msgstr ""

From 0d7ea5d74e27da850221e778c23fd4a097a681cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Sep 2013 09:59:15 +0200
Subject: [PATCH 139/164] [REF] crm, sale_crm: updated modules due to move of
 gauge and sparkline modules into web modules

bzr revid: tde@openerp.com-20130913075915-bagnbdw6qsexcul0
---
 addons/crm/__openerp__.py                     |    4 +-
 addons/crm/crm_case_section_view.xml          |    4 +-
 .../static/lib/sparkline/jquery.sparkline.js  | 3047 -----------------
 addons/crm/static/src/js/crm_case_section.js  |   22 -
 addons/sale_crm/__openerp__.py                |    3 +-
 addons/sale_crm/sale_crm_view.xml             |    4 +-
 addons/sale_crm/static/lib/justgage.js        |  883 -----
 addons/sale_crm/static/src/js/sale_crm.js     |  108 -
 8 files changed, 7 insertions(+), 4068 deletions(-)
 delete mode 100644 addons/crm/static/lib/sparkline/jquery.sparkline.js
 delete mode 100644 addons/sale_crm/static/lib/justgage.js
 delete mode 100644 addons/sale_crm/static/src/js/sale_crm.js

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index b677e7ee10f..e3443d5200f 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -57,7 +57,8 @@ Dashboard for CRM will include:
         'base_calendar',
         'resource',
         'board',
-        'fetchmail'
+        'fetchmail',
+        'web_kanban_sparkline',
     ],
     'data': [
         'crm_data.xml',
@@ -122,7 +123,6 @@ Dashboard for CRM will include:
         'static/src/css/crm.css'
     ],
     'js': [
-        'static/lib/sparkline/jquery.sparkline.js',
         'static/src/js/crm_case_section.js',
     ],
     'installable': True,
diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index 24862a39e89..99b3296c3c1 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -99,11 +99,11 @@
                                     <div class="oe_items_list">
                                         <div class="oe_salesteams_leads" t-if="record.use_leads.raw_value">
                                             <a name="%(crm_case_form_view_salesteams_lead)d" type="action">Leads</a>
-                                            <a name="%(action_report_crm_lead)d" type="action" class="oe_sparkline_bar_link"><field name="monthly_open_leads" widget="sparkline_bar">Open Leads per Month<br/>Click to see a detailed analysis of leads.</field></a>
+                                            <a name="%(action_report_crm_lead)d" type="action" class="oe_sparkline_bar_link"><field name="monthly_open_leads" widget="sparkline_bar" options="{'height': '20px', 'barWidth': 4, 'barSpacing': 1}">Open Leads per Month<br/>Click to see a detailed analysis of leads.</field></a>
                                         </div>
                                         <div class="oe_salesteams_opportunities">
                                             <a name="%(crm_case_form_view_salesteams_opportunity)d" type="action">Opportunities</a>
-                                            <a name="%(action_report_crm_opportunity)d" type="action"><field name="monthly_planned_revenue" widget="sparkline_bar">Planned Revenue per Month<br/>Click to see a detailed analysis of opportunities.</field></a>
+                                            <a name="%(action_report_crm_opportunity)d" type="action"><field name="monthly_planned_revenue" widget="sparkline_bar" height="20px" barWidth="4" barSpacing="1">Planned Revenue per Month<br/>Click to see a detailed analysis of opportunities.</field></a>
                                         </div>
                                     </div>
                                 </div>
diff --git a/addons/crm/static/lib/sparkline/jquery.sparkline.js b/addons/crm/static/lib/sparkline/jquery.sparkline.js
deleted file mode 100644
index c003923e03b..00000000000
--- a/addons/crm/static/lib/sparkline/jquery.sparkline.js
+++ /dev/null
@@ -1,3047 +0,0 @@
-/**
-*
-* jquery.sparkline.js
-*
-* v2.1.1
-* (c) Splunk, Inc
-* Contact: Gareth Watts (gareth@splunk.com)
-* http://omnipotent.net/jquery.sparkline/
-*
-* Generates inline sparkline charts from data supplied either to the method
-* or inline in HTML
-*
-* Compatible with Internet Explorer 6.0+ and modern browsers equipped with the canvas tag
-* (Firefox 2.0+, Safari, Opera, etc)
-*
-* License: New BSD License
-*
-* Copyright (c) 2012, Splunk Inc.
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-*     * Redistributions of source code must retain the above copyright notice,
-*       this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright notice,
-*       this list of conditions and the following disclaimer in the documentation
-*       and/or other materials provided with the distribution.
-*     * Neither the name of Splunk Inc nor the names of its contributors may
-*       be used to endorse or promote products derived from this software without
-*       specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-* SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*
-* Usage:
-*  $(selector).sparkline(values, options)
-*
-* If values is undefined or set to 'html' then the data values are read from the specified tag:
-*   <p>Sparkline: <span class="sparkline">1,4,6,6,8,5,3,5</span></p>
-*   $('.sparkline').sparkline();
-* There must be no spaces in the enclosed data set
-*
-* Otherwise values must be an array of numbers or null values
-*    <p>Sparkline: <span id="sparkline1">This text replaced if the browser is compatible</span></p>
-*    $('#sparkline1').sparkline([1,4,6,6,8,5,3,5])
-*    $('#sparkline2').sparkline([1,4,6,null,null,5,3,5])
-*
-* Values can also be specified in an HTML comment, or as a values attribute:
-*    <p>Sparkline: <span class="sparkline"><!--1,4,6,6,8,5,3,5 --></span></p>
-*    <p>Sparkline: <span class="sparkline" values="1,4,6,6,8,5,3,5"></span></p>
-*    $('.sparkline').sparkline();
-*
-* For line charts, x values can also be specified:
-*   <p>Sparkline: <span class="sparkline">1:1,2.7:4,3.4:6,5:6,6:8,8.7:5,9:3,10:5</span></p>
-*    $('#sparkline1').sparkline([ [1,1], [2.7,4], [3.4,6], [5,6], [6,8], [8.7,5], [9,3], [10,5] ])
-*
-* By default, options should be passed in as teh second argument to the sparkline function:
-*   $('.sparkline').sparkline([1,2,3,4], {type: 'bar'})
-*
-* Options can also be set by passing them on the tag itself.  This feature is disabled by default though
-* as there's a slight performance overhead:
-*   $('.sparkline').sparkline([1,2,3,4], {enableTagOptions: true})
-*   <p>Sparkline: <span class="sparkline" sparkType="bar" sparkBarColor="red">loading</span></p>
-* Prefix all options supplied as tag attribute with "spark" (configurable by setting tagOptionPrefix)
-*
-* Supported options:
-*   lineColor - Color of the line used for the chart
-*   fillColor - Color used to fill in the chart - Set to '' or false for a transparent chart
-*   width - Width of the chart - Defaults to 3 times the number of values in pixels
-*   height - Height of the chart - Defaults to the height of the containing element
-*   chartRangeMin - Specify the minimum value to use for the Y range of the chart - Defaults to the minimum value supplied
-*   chartRangeMax - Specify the maximum value to use for the Y range of the chart - Defaults to the maximum value supplied
-*   chartRangeClip - Clip out of range values to the max/min specified by chartRangeMin and chartRangeMax
-*   chartRangeMinX - Specify the minimum value to use for the X range of the chart - Defaults to the minimum value supplied
-*   chartRangeMaxX - Specify the maximum value to use for the X range of the chart - Defaults to the maximum value supplied
-*   composite - If true then don't erase any existing chart attached to the tag, but draw
-*           another chart over the top - Note that width and height are ignored if an
-*           existing chart is detected.
-*   tagValuesAttribute - Name of tag attribute to check for data values - Defaults to 'values'
-*   enableTagOptions - Whether to check tags for sparkline options
-*   tagOptionPrefix - Prefix used for options supplied as tag attributes - Defaults to 'spark'
-*   disableHiddenCheck - If set to true, then the plugin will assume that charts will never be drawn into a
-*           hidden dom element, avoding a browser reflow
-*   disableInteraction - If set to true then all mouseover/click interaction behaviour will be disabled,
-*       making the plugin perform much like it did in 1.x
-*   disableTooltips - If set to true then tooltips will be disabled - Defaults to false (tooltips enabled)
-*   disableHighlight - If set to true then highlighting of selected chart elements on mouseover will be disabled
-*       defaults to false (highlights enabled)
-*   highlightLighten - Factor to lighten/darken highlighted chart values by - Defaults to 1.4 for a 40% increase
-*   tooltipContainer - Specify which DOM element the tooltip should be rendered into - defaults to document.body
-*   tooltipClassname - Optional CSS classname to apply to tooltips - If not specified then a default style will be applied
-*   tooltipOffsetX - How many pixels away from the mouse pointer to render the tooltip on the X axis
-*   tooltipOffsetY - How many pixels away from the mouse pointer to render the tooltip on the r axis
-*   tooltipFormatter  - Optional callback that allows you to override the HTML displayed in the tooltip
-*       callback is given arguments of (sparkline, options, fields)
-*   tooltipChartTitle - If specified then the tooltip uses the string specified by this setting as a title
-*   tooltipFormat - A format string or SPFormat object  (or an array thereof for multiple entries)
-*       to control the format of the tooltip
-*   tooltipPrefix - A string to prepend to each field displayed in a tooltip
-*   tooltipSuffix - A string to append to each field displayed in a tooltip
-*   tooltipSkipNull - If true then null values will not have a tooltip displayed (defaults to true)
-*   tooltipValueLookups - An object or range map to map field values to tooltip strings
-*       (eg. to map -1 to "Lost", 0 to "Draw", and 1 to "Win")
-*   numberFormatter - Optional callback for formatting numbers in tooltips
-*   numberDigitGroupSep - Character to use for group separator in numbers "1,234" - Defaults to ","
-*   numberDecimalMark - Character to use for the decimal point when formatting numbers - Defaults to "."
-*   numberDigitGroupCount - Number of digits between group separator - Defaults to 3
-*
-* There are 7 types of sparkline, selected by supplying a "type" option of 'line' (default),
-* 'bar', 'tristate', 'bullet', 'discrete', 'pie' or 'box'
-*    line - Line chart.  Options:
-*       spotColor - Set to '' to not end each line in a circular spot
-*       minSpotColor - If set, color of spot at minimum value
-*       maxSpotColor - If set, color of spot at maximum value
-*       spotRadius - Radius in pixels
-*       lineWidth - Width of line in pixels
-*       normalRangeMin
-*       normalRangeMax - If set draws a filled horizontal bar between these two values marking the "normal"
-*                      or expected range of values
-*       normalRangeColor - Color to use for the above bar
-*       drawNormalOnTop - Draw the normal range above the chart fill color if true
-*       defaultPixelsPerValue - Defaults to 3 pixels of width for each value in the chart
-*       highlightSpotColor - The color to use for drawing a highlight spot on mouseover - Set to null to disable
-*       highlightLineColor - The color to use for drawing a highlight line on mouseover - Set to null to disable
-*       valueSpots - Specify which points to draw spots on, and in which color.  Accepts a range map
-*
-*   bar - Bar chart.  Options:
-*       barColor - Color of bars for postive values
-*       negBarColor - Color of bars for negative values
-*       zeroColor - Color of bars with zero values
-*       nullColor - Color of bars with null values - Defaults to omitting the bar entirely
-*       barWidth - Width of bars in pixels
-*       colorMap - Optional mappnig of values to colors to override the *BarColor values above
-*                  can be an Array of values to control the color of individual bars or a range map
-*                  to specify colors for individual ranges of values
-*       barSpacing - Gap between bars in pixels
-*       zeroAxis - Centers the y-axis around zero if true
-*
-*   tristate - Charts values of win (>0), lose (<0) or draw (=0)
-*       posBarColor - Color of win values
-*       negBarColor - Color of lose values
-*       zeroBarColor - Color of draw values
-*       barWidth - Width of bars in pixels
-*       barSpacing - Gap between bars in pixels
-*       colorMap - Optional mappnig of values to colors to override the *BarColor values above
-*                  can be an Array of values to control the color of individual bars or a range map
-*                  to specify colors for individual ranges of values
-*
-*   discrete - Options:
-*       lineHeight - Height of each line in pixels - Defaults to 30% of the graph height
-*       thesholdValue - Values less than this value will be drawn using thresholdColor instead of lineColor
-*       thresholdColor
-*
-*   bullet - Values for bullet graphs msut be in the order: target, performance, range1, range2, range3, ...
-*       options:
-*       targetColor - The color of the vertical target marker
-*       targetWidth - The width of the target marker in pixels
-*       performanceColor - The color of the performance measure horizontal bar
-*       rangeColors - Colors to use for each qualitative range background color
-*
-*   pie - Pie chart. Options:
-*       sliceColors - An array of colors to use for pie slices
-*       offset - Angle in degrees to offset the first slice - Try -90 or +90
-*       borderWidth - Width of border to draw around the pie chart, in pixels - Defaults to 0 (no border)
-*       borderColor - Color to use for the pie chart border - Defaults to #000
-*
-*   box - Box plot. Options:
-*       raw - Set to true to supply pre-computed plot points as values
-*             values should be: low_outlier, low_whisker, q1, median, q3, high_whisker, high_outlier
-*             When set to false you can supply any number of values and the box plot will
-*             be computed for you.  Default is false.
-*       showOutliers - Set to true (default) to display outliers as circles
-*       outlierIQR - Interquartile range used to determine outliers.  Default 1.5
-*       boxLineColor - Outline color of the box
-*       boxFillColor - Fill color for the box
-*       whiskerColor - Line color used for whiskers
-*       outlierLineColor - Outline color of outlier circles
-*       outlierFillColor - Fill color of the outlier circles
-*       spotRadius - Radius of outlier circles
-*       medianColor - Line color of the median line
-*       target - Draw a target cross hair at the supplied value (default undefined)
-*
-*
-*
-*   Examples:
-*   $('#sparkline1').sparkline(myvalues, { lineColor: '#f00', fillColor: false });
-*   $('.barsparks').sparkline('html', { type:'bar', height:'40px', barWidth:5 });
-*   $('#tristate').sparkline([1,1,-1,1,0,0,-1], { type:'tristate' }):
-*   $('#discrete').sparkline([1,3,4,5,5,3,4,5], { type:'discrete' });
-*   $('#bullet').sparkline([10,12,12,9,7], { type:'bullet' });
-*   $('#pie').sparkline([1,1,2], { type:'pie' });
-*/
-
-/*jslint regexp: true, browser: true, jquery: true, white: true, nomen: false, plusplus: false, maxerr: 500, indent: 4 */
-
-(function(factory) {
-    if(typeof define === 'function' && define.amd) {
-		define(['jquery'], factory);
-	}
-	else {
-		factory(jQuery);
-	}
-}
-(function($) {
-    'use strict';
-
-    var UNSET_OPTION = {},
-        getDefaults, createClass, SPFormat, clipval, quartile, normalizeValue, normalizeValues,
-        remove, isNumber, all, sum, addCSS, ensureArray, formatNumber, RangeMap,
-        MouseHandler, Tooltip, barHighlightMixin,
-        line, bar, tristate, discrete, bullet, pie, box, defaultStyles, initStyles,
-        VShape, VCanvas_base, VCanvas_canvas, VCanvas_vml, pending, shapeCount = 0;
-
-    /**
-     * Default configuration settings
-     */
-    getDefaults = function () {
-        return {
-            // Settings common to most/all chart types
-            common: {
-                type: 'line',
-                lineColor: '#00f',
-                fillColor: '#cdf',
-                defaultPixelsPerValue: 3,
-                width: 'auto',
-                height: 'auto',
-                composite: false,
-                tagValuesAttribute: 'values',
-                tagOptionsPrefix: 'spark',
-                enableTagOptions: false,
-                enableHighlight: true,
-                highlightLighten: 1.4,
-                tooltipSkipNull: true,
-                tooltipPrefix: '',
-                tooltipSuffix: '',
-                disableHiddenCheck: false,
-                numberFormatter: false,
-                numberDigitGroupCount: 3,
-                numberDigitGroupSep: ',',
-                numberDecimalMark: '.',
-                disableTooltips: false,
-                disableInteraction: false
-            },
-            // Defaults for line charts
-            line: {
-                spotColor: '#f80',
-                highlightSpotColor: '#5f5',
-                highlightLineColor: '#f22',
-                spotRadius: 1.5,
-                minSpotColor: '#f80',
-                maxSpotColor: '#f80',
-                lineWidth: 1,
-                normalRangeMin: undefined,
-                normalRangeMax: undefined,
-                normalRangeColor: '#ccc',
-                drawNormalOnTop: false,
-                chartRangeMin: undefined,
-                chartRangeMax: undefined,
-                chartRangeMinX: undefined,
-                chartRangeMaxX: undefined,
-                tooltipFormat: new SPFormat('<span style="color: {{color}}">&#9679;</span> {{prefix}}{{y}}{{suffix}}')
-            },
-            // Defaults for bar charts
-            bar: {
-                barColor: '#3366cc',
-                negBarColor: '#f44',
-                stackedBarColor: ['#3366cc', '#dc3912', '#ff9900', '#109618', '#66aa00',
-                    '#dd4477', '#0099c6', '#990099'],
-                zeroColor: undefined,
-                nullColor: undefined,
-                zeroAxis: true,
-                barWidth: 4,
-                barSpacing: 1,
-                chartRangeMax: undefined,
-                chartRangeMin: undefined,
-                chartRangeClip: false,
-                colorMap: undefined,
-                tooltipFormat: new SPFormat('<span style="color: {{color}}">&#9679;</span> {{prefix}}{{value}}{{suffix}}')
-            },
-            // Defaults for tristate charts
-            tristate: {
-                barWidth: 4,
-                barSpacing: 1,
-                posBarColor: '#6f6',
-                negBarColor: '#f44',
-                zeroBarColor: '#999',
-                colorMap: {},
-                tooltipFormat: new SPFormat('<span style="color: {{color}}">&#9679;</span> {{value:map}}'),
-                tooltipValueLookups: { map: { '-1': 'Loss', '0': 'Draw', '1': 'Win' } }
-            },
-            // Defaults for discrete charts
-            discrete: {
-                lineHeight: 'auto',
-                thresholdColor: undefined,
-                thresholdValue: 0,
-                chartRangeMax: undefined,
-                chartRangeMin: undefined,
-                chartRangeClip: false,
-                tooltipFormat: new SPFormat('{{prefix}}{{value}}{{suffix}}')
-            },
-            // Defaults for bullet charts
-            bullet: {
-                targetColor: '#f33',
-                targetWidth: 3, // width of the target bar in pixels
-                performanceColor: '#33f',
-                rangeColors: ['#d3dafe', '#a8b6ff', '#7f94ff'],
-                base: undefined, // set this to a number to change the base start number
-                tooltipFormat: new SPFormat('{{fieldkey:fields}} - {{value}}'),
-                tooltipValueLookups: { fields: {r: 'Range', p: 'Performance', t: 'Target'} }
-            },
-            // Defaults for pie charts
-            pie: {
-                offset: 0,
-                sliceColors: ['#3366cc', '#dc3912', '#ff9900', '#109618', '#66aa00',
-                    '#dd4477', '#0099c6', '#990099'],
-                borderWidth: 0,
-                borderColor: '#000',
-                tooltipFormat: new SPFormat('<span style="color: {{color}}">&#9679;</span> {{value}} ({{percent.1}}%)')
-            },
-            // Defaults for box plots
-            box: {
-                raw: false,
-                boxLineColor: '#000',
-                boxFillColor: '#cdf',
-                whiskerColor: '#000',
-                outlierLineColor: '#333',
-                outlierFillColor: '#fff',
-                medianColor: '#f00',
-                showOutliers: true,
-                outlierIQR: 1.5,
-                spotRadius: 1.5,
-                target: undefined,
-                targetColor: '#4a2',
-                chartRangeMax: undefined,
-                chartRangeMin: undefined,
-                tooltipFormat: new SPFormat('{{field:fields}}: {{value}}'),
-                tooltipFormatFieldlistKey: 'field',
-                tooltipValueLookups: { fields: { lq: 'Lower Quartile', med: 'Median',
-                    uq: 'Upper Quartile', lo: 'Left Outlier', ro: 'Right Outlier',
-                    lw: 'Left Whisker', rw: 'Right Whisker'} }
-            }
-        };
-    };
-
-    // You can have tooltips use a css class other than jqstooltip by specifying tooltipClassname
-    defaultStyles = '.jqstooltip { ' +
-            'position: absolute;' +
-            'left: 0px;' +
-            'top: 0px;' +
-            'visibility: hidden;' +
-            'background: rgb(0, 0, 0) transparent;' +
-            'background-color: rgba(0,0,0,0.6);' +
-            'filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000);' +
-            '-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000)";' +
-            'color: white;' +
-            'font: 10px arial, san serif;' +
-            'text-align: left;' +
-            'white-space: nowrap;' +
-            'padding: 5px;' +
-            'border: 1px solid white;' +
-            'z-index: 10000;' +
-            '}' +
-            '.jqsfield { ' +
-            'color: white;' +
-            'font: 10px arial, san serif;' +
-            'text-align: left;' +
-            '}';
-
-    /**
-     * Utilities
-     */
-
-    createClass = function (/* [baseclass, [mixin, ...]], definition */) {
-        var Class, args;
-        Class = function () {
-            this.init.apply(this, arguments);
-        };
-        if (arguments.length > 1) {
-            if (arguments[0]) {
-                Class.prototype = $.extend(new arguments[0](), arguments[arguments.length - 1]);
-                Class._super = arguments[0].prototype;
-            } else {
-                Class.prototype = arguments[arguments.length - 1];
-            }
-            if (arguments.length > 2) {
-                args = Array.prototype.slice.call(arguments, 1, -1);
-                args.unshift(Class.prototype);
-                $.extend.apply($, args);
-            }
-        } else {
-            Class.prototype = arguments[0];
-        }
-        Class.prototype.cls = Class;
-        return Class;
-    };
-
-    /**
-     * Wraps a format string for tooltips
-     * {{x}}
-     * {{x.2}
-     * {{x:months}}
-     */
-    $.SPFormatClass = SPFormat = createClass({
-        fre: /\{\{([\w.]+?)(:(.+?))?\}\}/g,
-        precre: /(\w+)\.(\d+)/,
-
-        init: function (format, fclass) {
-            this.format = format;
-            this.fclass = fclass;
-        },
-
-        render: function (fieldset, lookups, options) {
-            var self = this,
-                fields = fieldset,
-                match, token, lookupkey, fieldvalue, prec;
-            return this.format.replace(this.fre, function () {
-                var lookup;
-                token = arguments[1];
-                lookupkey = arguments[3];
-                match = self.precre.exec(token);
-                if (match) {
-                    prec = match[2];
-                    token = match[1];
-                } else {
-                    prec = false;
-                }
-                fieldvalue = fields[token];
-                if (fieldvalue === undefined) {
-                    return '';
-                }
-                if (lookupkey && lookups && lookups[lookupkey]) {
-                    lookup = lookups[lookupkey];
-                    if (lookup.get) { // RangeMap
-                        return lookups[lookupkey].get(fieldvalue) || fieldvalue;
-                    } else {
-                        return lookups[lookupkey][fieldvalue] || fieldvalue;
-                    }
-                }
-                if (isNumber(fieldvalue)) {
-                    if (options.get('numberFormatter')) {
-                        fieldvalue = options.get('numberFormatter')(fieldvalue);
-                    } else {
-                        fieldvalue = formatNumber(fieldvalue, prec,
-                            options.get('numberDigitGroupCount'),
-                            options.get('numberDigitGroupSep'),
-                            options.get('numberDecimalMark'));
-                    }
-                }
-                return fieldvalue;
-            });
-        }
-    });
-
-    // convience method to avoid needing the new operator
-    $.spformat = function(format, fclass) {
-        return new SPFormat(format, fclass);
-    };
-
-    clipval = function (val, min, max) {
-        if (val < min) {
-            return min;
-        }
-        if (val > max) {
-            return max;
-        }
-        return val;
-    };
-
-    quartile = function (values, q) {
-        var vl;
-        if (q === 2) {
-            vl = Math.floor(values.length / 2);
-            return values.length % 2 ? values[vl] : (values[vl-1] + values[vl]) / 2;
-        } else {
-            if (values.length % 2 ) { // odd
-                vl = (values.length * q + q) / 4;
-                return vl % 1 ? (values[Math.floor(vl)] + values[Math.floor(vl) - 1]) / 2 : values[vl-1];
-            } else { //even
-                vl = (values.length * q + 2) / 4;
-                return vl % 1 ? (values[Math.floor(vl)] + values[Math.floor(vl) - 1]) / 2 :  values[vl-1];
-
-            }
-        }
-    };
-
-    normalizeValue = function (val) {
-        var nf;
-        switch (val) {
-            case 'undefined':
-                val = undefined;
-                break;
-            case 'null':
-                val = null;
-                break;
-            case 'true':
-                val = true;
-                break;
-            case 'false':
-                val = false;
-                break;
-            default:
-                nf = parseFloat(val);
-                if (val == nf) {
-                    val = nf;
-                }
-        }
-        return val;
-    };
-
-    normalizeValues = function (vals) {
-        var i, result = [];
-        for (i = vals.length; i--;) {
-            result[i] = normalizeValue(vals[i]);
-        }
-        return result;
-    };
-
-    remove = function (vals, filter) {
-        var i, vl, result = [];
-        for (i = 0, vl = vals.length; i < vl; i++) {
-            if (vals[i] !== filter) {
-                result.push(vals[i]);
-            }
-        }
-        return result;
-    };
-
-    isNumber = function (num) {
-        return !isNaN(parseFloat(num)) && isFinite(num);
-    };
-
-    formatNumber = function (num, prec, groupsize, groupsep, decsep) {
-        var p, i;
-        num = (prec === false ? parseFloat(num).toString() : num.toFixed(prec)).split('');
-        p = (p = $.inArray('.', num)) < 0 ? num.length : p;
-        if (p < num.length) {
-            num[p] = decsep;
-        }
-        for (i = p - groupsize; i > 0; i -= groupsize) {
-            num.splice(i, 0, groupsep);
-        }
-        return num.join('');
-    };
-
-    // determine if all values of an array match a value
-    // returns true if the array is empty
-    all = function (val, arr, ignoreNull) {
-        var i;
-        for (i = arr.length; i--; ) {
-            if (ignoreNull && arr[i] === null) continue;
-            if (arr[i] !== val) {
-                return false;
-            }
-        }
-        return true;
-    };
-
-    // sums the numeric values in an array, ignoring other values
-    sum = function (vals) {
-        var total = 0, i;
-        for (i = vals.length; i--;) {
-            total += typeof vals[i] === 'number' ? vals[i] : 0;
-        }
-        return total;
-    };
-
-    ensureArray = function (val) {
-        return $.isArray(val) ? val : [val];
-    };
-
-    // http://paulirish.com/2008/bookmarklet-inject-new-css-rules/
-    addCSS = function(css) {
-        var tag;
-        //if ('\v' == 'v') /* ie only */ {
-        if (document.createStyleSheet) {
-            document.createStyleSheet().cssText = css;
-        } else {
-            tag = document.createElement('style');
-            tag.type = 'text/css';
-            document.getElementsByTagName('head')[0].appendChild(tag);
-            tag[(typeof document.body.style.WebkitAppearance == 'string') /* webkit only */ ? 'innerText' : 'innerHTML'] = css;
-        }
-    };
-
-    // Provide a cross-browser interface to a few simple drawing primitives
-    $.fn.simpledraw = function (width, height, useExisting, interact) {
-        var target, mhandler;
-        if (useExisting && (target = this.data('_jqs_vcanvas'))) {
-            return target;
-        }
-        if (width === undefined) {
-            width = $(this).innerWidth();
-        }
-        if (height === undefined) {
-            height = $(this).innerHeight();
-        }
-        if ($.fn.sparkline.hasCanvas) {
-            target = new VCanvas_canvas(width, height, this, interact);
-        } else if ($.fn.sparkline.hasVML) {
-            target = new VCanvas_vml(width, height, this);
-        } else {
-            return false;
-        }
-        mhandler = $(this).data('_jqs_mhandler');
-        if (mhandler) {
-            mhandler.registerCanvas(target);
-        }
-        return target;
-    };
-
-    $.fn.cleardraw = function () {
-        var target = this.data('_jqs_vcanvas');
-        if (target) {
-            target.reset();
-        }
-    };
-
-    $.RangeMapClass = RangeMap = createClass({
-        init: function (map) {
-            var key, range, rangelist = [];
-            for (key in map) {
-                if (map.hasOwnProperty(key) && typeof key === 'string' && key.indexOf(':') > -1) {
-                    range = key.split(':');
-                    range[0] = range[0].length === 0 ? -Infinity : parseFloat(range[0]);
-                    range[1] = range[1].length === 0 ? Infinity : parseFloat(range[1]);
-                    range[2] = map[key];
-                    rangelist.push(range);
-                }
-            }
-            this.map = map;
-            this.rangelist = rangelist || false;
-        },
-
-        get: function (value) {
-            var rangelist = this.rangelist,
-                i, range, result;
-            if ((result = this.map[value]) !== undefined) {
-                return result;
-            }
-            if (rangelist) {
-                for (i = rangelist.length; i--;) {
-                    range = rangelist[i];
-                    if (range[0] <= value && range[1] >= value) {
-                        return range[2];
-                    }
-                }
-            }
-            return undefined;
-        }
-    });
-
-    // Convenience function
-    $.range_map = function(map) {
-        return new RangeMap(map);
-    };
-
-    MouseHandler = createClass({
-        init: function (el, options) {
-            var $el = $(el);
-            this.$el = $el;
-            this.options = options;
-            this.currentPageX = 0;
-            this.currentPageY = 0;
-            this.el = el;
-            this.splist = [];
-            this.tooltip = null;
-            this.over = false;
-            this.displayTooltips = !options.get('disableTooltips');
-            this.highlightEnabled = !options.get('disableHighlight');
-        },
-
-        registerSparkline: function (sp) {
-            this.splist.push(sp);
-            if (this.over) {
-                this.updateDisplay();
-            }
-        },
-
-        registerCanvas: function (canvas) {
-            var $canvas = $(canvas.canvas);
-            this.canvas = canvas;
-            this.$canvas = $canvas;
-            $canvas.mouseenter($.proxy(this.mouseenter, this));
-            $canvas.mouseleave($.proxy(this.mouseleave, this));
-            $canvas.click($.proxy(this.mouseclick, this));
-        },
-
-        reset: function (removeTooltip) {
-            this.splist = [];
-            if (this.tooltip && removeTooltip) {
-                this.tooltip.remove();
-                this.tooltip = undefined;
-            }
-        },
-
-        mouseclick: function (e) {
-            var clickEvent = $.Event('sparklineClick');
-            clickEvent.originalEvent = e;
-            clickEvent.sparklines = this.splist;
-            this.$el.trigger(clickEvent);
-        },
-
-        mouseenter: function (e) {
-            $(document.body).unbind('mousemove.jqs');
-            $(document.body).bind('mousemove.jqs', $.proxy(this.mousemove, this));
-            this.over = true;
-            this.currentPageX = e.pageX;
-            this.currentPageY = e.pageY;
-            this.currentEl = e.target;
-            if (!this.tooltip && this.displayTooltips) {
-                this.tooltip = new Tooltip(this.options);
-                this.tooltip.updatePosition(e.pageX, e.pageY);
-            }
-            this.updateDisplay();
-        },
-
-        mouseleave: function () {
-            $(document.body).unbind('mousemove.jqs');
-            var splist = this.splist,
-                 spcount = splist.length,
-                 needsRefresh = false,
-                 sp, i;
-            this.over = false;
-            this.currentEl = null;
-
-            if (this.tooltip) {
-                this.tooltip.remove();
-                this.tooltip = null;
-            }
-
-            for (i = 0; i < spcount; i++) {
-                sp = splist[i];
-                if (sp.clearRegionHighlight()) {
-                    needsRefresh = true;
-                }
-            }
-
-            if (needsRefresh) {
-                this.canvas.render();
-            }
-        },
-
-        mousemove: function (e) {
-            this.currentPageX = e.pageX;
-            this.currentPageY = e.pageY;
-            this.currentEl = e.target;
-            if (this.tooltip) {
-                this.tooltip.updatePosition(e.pageX, e.pageY);
-            }
-            this.updateDisplay();
-        },
-
-        updateDisplay: function () {
-            var splist = this.splist,
-                 spcount = splist.length,
-                 needsRefresh = false,
-                 offset = this.$canvas.offset(),
-                 localX = this.currentPageX - offset.left,
-                 localY = this.currentPageY - offset.top,
-                 tooltiphtml, sp, i, result, changeEvent;
-            if (!this.over) {
-                return;
-            }
-            for (i = 0; i < spcount; i++) {
-                sp = splist[i];
-                result = sp.setRegionHighlight(this.currentEl, localX, localY);
-                if (result) {
-                    needsRefresh = true;
-                }
-            }
-            if (needsRefresh) {
-                changeEvent = $.Event('sparklineRegionChange');
-                changeEvent.sparklines = this.splist;
-                this.$el.trigger(changeEvent);
-                if (this.tooltip) {
-                    tooltiphtml = '';
-                    for (i = 0; i < spcount; i++) {
-                        sp = splist[i];
-                        tooltiphtml += sp.getCurrentRegionTooltip();
-                    }
-                    this.tooltip.setContent(tooltiphtml);
-                }
-                if (!this.disableHighlight) {
-                    this.canvas.render();
-                }
-            }
-            if (result === null) {
-                this.mouseleave();
-            }
-        }
-    });
-
-
-    Tooltip = createClass({
-        sizeStyle: 'position: static !important;' +
-            'display: block !important;' +
-            'visibility: hidden !important;' +
-            'float: left !important;',
-
-        init: function (options) {
-            var tooltipClassname = options.get('tooltipClassname', 'jqstooltip'),
-                sizetipStyle = this.sizeStyle,
-                offset;
-            this.container = options.get('tooltipContainer') || document.body;
-            this.tooltipOffsetX = options.get('tooltipOffsetX', 10);
-            this.tooltipOffsetY = options.get('tooltipOffsetY', 12);
-            // remove any previous lingering tooltip
-            $('#jqssizetip').remove();
-            $('#jqstooltip').remove();
-            this.sizetip = $('<div/>', {
-                id: 'jqssizetip',
-                style: sizetipStyle,
-                'class': tooltipClassname
-            });
-            this.tooltip = $('<div/>', {
-                id: 'jqstooltip',
-                'class': tooltipClassname
-            }).appendTo(this.container);
-            // account for the container's location
-            offset = this.tooltip.offset();
-            this.offsetLeft = offset.left;
-            this.offsetTop = offset.top;
-            this.hidden = true;
-            $(window).unbind('resize.jqs scroll.jqs');
-            $(window).bind('resize.jqs scroll.jqs', $.proxy(this.updateWindowDims, this));
-            this.updateWindowDims();
-        },
-
-        updateWindowDims: function () {
-            this.scrollTop = $(window).scrollTop();
-            this.scrollLeft = $(window).scrollLeft();
-            this.scrollRight = this.scrollLeft + $(window).width();
-            this.updatePosition();
-        },
-
-        getSize: function (content) {
-            this.sizetip.html(content).appendTo(this.container);
-            this.width = this.sizetip.width() + 1;
-            this.height = this.sizetip.height();
-            this.sizetip.remove();
-        },
-
-        setContent: function (content) {
-            if (!content) {
-                this.tooltip.css('visibility', 'hidden');
-                this.hidden = true;
-                return;
-            }
-            this.getSize(content);
-            this.tooltip.html(content)
-                .css({
-                    'width': this.width,
-                    'height': this.height,
-                    'visibility': 'visible'
-                });
-            if (this.hidden) {
-                this.hidden = false;
-                this.updatePosition();
-            }
-        },
-
-        updatePosition: function (x, y) {
-            if (x === undefined) {
-                if (this.mousex === undefined) {
-                    return;
-                }
-                x = this.mousex - this.offsetLeft;
-                y = this.mousey - this.offsetTop;
-
-            } else {
-                this.mousex = x = x - this.offsetLeft;
-                this.mousey = y = y - this.offsetTop;
-            }
-            if (!this.height || !this.width || this.hidden) {
-                return;
-            }
-
-            y -= this.height + this.tooltipOffsetY;
-            x += this.tooltipOffsetX;
-
-            if (y < this.scrollTop) {
-                y = this.scrollTop;
-            }
-            if (x < this.scrollLeft) {
-                x = this.scrollLeft;
-            } else if (x + this.width > this.scrollRight) {
-                x = this.scrollRight - this.width;
-            }
-
-            this.tooltip.css({
-                'left': x,
-                'top': y
-            });
-        },
-
-        remove: function () {
-            this.tooltip.remove();
-            this.sizetip.remove();
-            this.sizetip = this.tooltip = undefined;
-            $(window).unbind('resize.jqs scroll.jqs');
-        }
-    });
-
-    initStyles = function() {
-        addCSS(defaultStyles);
-    };
-
-    $(initStyles);
-
-    pending = [];
-    $.fn.sparkline = function (userValues, userOptions) {
-        return this.each(function () {
-            var options = new $.fn.sparkline.options(this, userOptions),
-                 $this = $(this),
-                 render, i;
-            render = function () {
-                var values, width, height, tmp, mhandler, sp, vals;
-                if (userValues === 'html' || userValues === undefined) {
-                    vals = this.getAttribute(options.get('tagValuesAttribute'));
-                    if (vals === undefined || vals === null) {
-                        vals = $this.html();
-                    }
-                    values = vals.replace(/(^\s*<!--)|(-->\s*$)|\s+/g, '').split(',');
-                } else {
-                    values = userValues;
-                }
-
-                width = options.get('width') === 'auto' ? values.length * options.get('defaultPixelsPerValue') : options.get('width');
-                if (options.get('height') === 'auto') {
-                    if (!options.get('composite') || !$.data(this, '_jqs_vcanvas')) {
-                        // must be a better way to get the line height
-                        tmp = document.createElement('span');
-                        tmp.innerHTML = 'a';
-                        $this.html(tmp);
-                        height = $(tmp).innerHeight() || $(tmp).height();
-                        $(tmp).remove();
-                        tmp = null;
-                    }
-                } else {
-                    height = options.get('height');
-                }
-
-                if (!options.get('disableInteraction')) {
-                    mhandler = $.data(this, '_jqs_mhandler');
-                    if (!mhandler) {
-                        mhandler = new MouseHandler(this, options);
-                        $.data(this, '_jqs_mhandler', mhandler);
-                    } else if (!options.get('composite')) {
-                        mhandler.reset();
-                    }
-                } else {
-                    mhandler = false;
-                }
-
-                if (options.get('composite') && !$.data(this, '_jqs_vcanvas')) {
-                    if (!$.data(this, '_jqs_errnotify')) {
-                        alert('Attempted to attach a composite sparkline to an element with no existing sparkline');
-                        $.data(this, '_jqs_errnotify', true);
-                    }
-                    return;
-                }
-
-                sp = new $.fn.sparkline[options.get('type')](this, values, options, width, height);
-
-                sp.render();
-
-                if (mhandler) {
-                    mhandler.registerSparkline(sp);
-                }
-            };
-            // jQuery 1.3.0 completely changed the meaning of :hidden :-/
-            if (($(this).html() && !options.get('disableHiddenCheck') && $(this).is(':hidden')) || ($.fn.jquery < '1.3.0' && $(this).parents().is(':hidden')) || !$(this).parents('body').length) {
-                if (!options.get('composite') && $.data(this, '_jqs_pending')) {
-                    // remove any existing references to the element
-                    for (i = pending.length; i; i--) {
-                        if (pending[i - 1][0] == this) {
-                            pending.splice(i - 1, 1);
-                        }
-                    }
-                }
-                pending.push([this, render]);
-                $.data(this, '_jqs_pending', true);
-            } else {
-                render.call(this);
-            }
-        });
-    };
-
-    $.fn.sparkline.defaults = getDefaults();
-
-
-    $.sparkline_display_visible = function () {
-        var el, i, pl;
-        var done = [];
-        for (i = 0, pl = pending.length; i < pl; i++) {
-            el = pending[i][0];
-            if ($(el).is(':visible') && !$(el).parents().is(':hidden')) {
-                pending[i][1].call(el);
-                $.data(pending[i][0], '_jqs_pending', false);
-                done.push(i);
-            } else if (!$(el).closest('html').length && !$.data(el, '_jqs_pending')) {
-                // element has been inserted and removed from the DOM
-                // If it was not yet inserted into the dom then the .data request
-                // will return true.
-                // removing from the dom causes the data to be removed.
-                $.data(pending[i][0], '_jqs_pending', false);
-                done.push(i);
-            }
-        }
-        for (i = done.length; i; i--) {
-            pending.splice(done[i - 1], 1);
-        }
-    };
-
-
-    /**
-     * User option handler
-     */
-    $.fn.sparkline.options = createClass({
-        init: function (tag, userOptions) {
-            var extendedOptions, defaults, base, tagOptionType;
-            this.userOptions = userOptions = userOptions || {};
-            this.tag = tag;
-            this.tagValCache = {};
-            defaults = $.fn.sparkline.defaults;
-            base = defaults.common;
-            this.tagOptionsPrefix = userOptions.enableTagOptions && (userOptions.tagOptionsPrefix || base.tagOptionsPrefix);
-
-            tagOptionType = this.getTagSetting('type');
-            if (tagOptionType === UNSET_OPTION) {
-                extendedOptions = defaults[userOptions.type || base.type];
-            } else {
-                extendedOptions = defaults[tagOptionType];
-            }
-            this.mergedOptions = $.extend({}, base, extendedOptions, userOptions);
-        },
-
-
-        getTagSetting: function (key) {
-            var prefix = this.tagOptionsPrefix,
-                val, i, pairs, keyval;
-            if (prefix === false || prefix === undefined) {
-                return UNSET_OPTION;
-            }
-            if (this.tagValCache.hasOwnProperty(key)) {
-                val = this.tagValCache.key;
-            } else {
-                val = this.tag.getAttribute(prefix + key);
-                if (val === undefined || val === null) {
-                    val = UNSET_OPTION;
-                } else if (val.substr(0, 1) === '[') {
-                    val = val.substr(1, val.length - 2).split(',');
-                    for (i = val.length; i--;) {
-                        val[i] = normalizeValue(val[i].replace(/(^\s*)|(\s*$)/g, ''));
-                    }
-                } else if (val.substr(0, 1) === '{') {
-                    pairs = val.substr(1, val.length - 2).split(',');
-                    val = {};
-                    for (i = pairs.length; i--;) {
-                        keyval = pairs[i].split(':', 2);
-                        val[keyval[0].replace(/(^\s*)|(\s*$)/g, '')] = normalizeValue(keyval[1].replace(/(^\s*)|(\s*$)/g, ''));
-                    }
-                } else {
-                    val = normalizeValue(val);
-                }
-                this.tagValCache.key = val;
-            }
-            return val;
-        },
-
-        get: function (key, defaultval) {
-            var tagOption = this.getTagSetting(key),
-                result;
-            if (tagOption !== UNSET_OPTION) {
-                return tagOption;
-            }
-            return (result = this.mergedOptions[key]) === undefined ? defaultval : result;
-        }
-    });
-
-
-    $.fn.sparkline._base = createClass({
-        disabled: false,
-
-        init: function (el, values, options, width, height) {
-            this.el = el;
-            this.$el = $(el);
-            this.values = values;
-            this.options = options;
-            this.width = width;
-            this.height = height;
-            this.currentRegion = undefined;
-        },
-
-        /**
-         * Setup the canvas
-         */
-        initTarget: function () {
-            var interactive = !this.options.get('disableInteraction');
-            if (!(this.target = this.$el.simpledraw(this.width, this.height, this.options.get('composite'), interactive))) {
-                this.disabled = true;
-            } else {
-                this.canvasWidth = this.target.pixelWidth;
-                this.canvasHeight = this.target.pixelHeight;
-            }
-        },
-
-        /**
-         * Actually render the chart to the canvas
-         */
-        render: function () {
-            if (this.disabled) {
-                this.el.innerHTML = '';
-                return false;
-            }
-            return true;
-        },
-
-        /**
-         * Return a region id for a given x/y co-ordinate
-         */
-        getRegion: function (x, y) {
-        },
-
-        /**
-         * Highlight an item based on the moused-over x,y co-ordinate
-         */
-        setRegionHighlight: function (el, x, y) {
-            var currentRegion = this.currentRegion,
-                highlightEnabled = !this.options.get('disableHighlight'),
-                newRegion;
-            if (x > this.canvasWidth || y > this.canvasHeight || x < 0 || y < 0) {
-                return null;
-            }
-            newRegion = this.getRegion(el, x, y);
-            if (currentRegion !== newRegion) {
-                if (currentRegion !== undefined && highlightEnabled) {
-                    this.removeHighlight();
-                }
-                this.currentRegion = newRegion;
-                if (newRegion !== undefined && highlightEnabled) {
-                    this.renderHighlight();
-                }
-                return true;
-            }
-            return false;
-        },
-
-        /**
-         * Reset any currently highlighted item
-         */
-        clearRegionHighlight: function () {
-            if (this.currentRegion !== undefined) {
-                this.removeHighlight();
-                this.currentRegion = undefined;
-                return true;
-            }
-            return false;
-        },
-
-        renderHighlight: function () {
-            this.changeHighlight(true);
-        },
-
-        removeHighlight: function () {
-            this.changeHighlight(false);
-        },
-
-        changeHighlight: function (highlight)  {},
-
-        /**
-         * Fetch the HTML to display as a tooltip
-         */
-        getCurrentRegionTooltip: function () {
-            var options = this.options,
-                header = '',
-                entries = [],
-                fields, formats, formatlen, fclass, text, i,
-                showFields, showFieldsKey, newFields, fv,
-                formatter, format, fieldlen, j;
-            if (this.currentRegion === undefined) {
-                return '';
-            }
-            fields = this.getCurrentRegionFields();
-            formatter = options.get('tooltipFormatter');
-            if (formatter) {
-                return formatter(this, options, fields);
-            }
-            if (options.get('tooltipChartTitle')) {
-                header += '<div class="jqs jqstitle">' + options.get('tooltipChartTitle') + '</div>\n';
-            }
-            formats = this.options.get('tooltipFormat');
-            if (!formats) {
-                return '';
-            }
-            if (!$.isArray(formats)) {
-                formats = [formats];
-            }
-            if (!$.isArray(fields)) {
-                fields = [fields];
-            }
-            showFields = this.options.get('tooltipFormatFieldlist');
-            showFieldsKey = this.options.get('tooltipFormatFieldlistKey');
-            if (showFields && showFieldsKey) {
-                // user-selected ordering of fields
-                newFields = [];
-                for (i = fields.length; i--;) {
-                    fv = fields[i][showFieldsKey];
-                    if ((j = $.inArray(fv, showFields)) != -1) {
-                        newFields[j] = fields[i];
-                    }
-                }
-                fields = newFields;
-            }
-            formatlen = formats.length;
-            fieldlen = fields.length;
-            for (i = 0; i < formatlen; i++) {
-                format = formats[i];
-                if (typeof format === 'string') {
-                    format = new SPFormat(format);
-                }
-                fclass = format.fclass || 'jqsfield';
-                for (j = 0; j < fieldlen; j++) {
-                    if (!fields[j].isNull || !options.get('tooltipSkipNull')) {
-                        $.extend(fields[j], {
-                            prefix: options.get('tooltipPrefix'),
-                            suffix: options.get('tooltipSuffix')
-                        });
-                        text = format.render(fields[j], options.get('tooltipValueLookups'), options);
-                        entries.push('<div class="' + fclass + '">' + text + '</div>');
-                    }
-                }
-            }
-            if (entries.length) {
-                return header + entries.join('\n');
-            }
-            return '';
-        },
-
-        getCurrentRegionFields: function () {},
-
-        calcHighlightColor: function (color, options) {
-            var highlightColor = options.get('highlightColor'),
-                lighten = options.get('highlightLighten'),
-                parse, mult, rgbnew, i;
-            if (highlightColor) {
-                return highlightColor;
-            }
-            if (lighten) {
-                // extract RGB values
-                parse = /^#([0-9a-f])([0-9a-f])([0-9a-f])$/i.exec(color) || /^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/i.exec(color);
-                if (parse) {
-                    rgbnew = [];
-                    mult = color.length === 4 ? 16 : 1;
-                    for (i = 0; i < 3; i++) {
-                        rgbnew[i] = clipval(Math.round(parseInt(parse[i + 1], 16) * mult * lighten), 0, 255);
-                    }
-                    return 'rgb(' + rgbnew.join(',') + ')';
-                }
-
-            }
-            return color;
-        }
-
-    });
-
-    barHighlightMixin = {
-        changeHighlight: function (highlight) {
-            var currentRegion = this.currentRegion,
-                target = this.target,
-                shapeids = this.regionShapes[currentRegion],
-                newShapes;
-            // will be null if the region value was null
-            if (shapeids) {
-                newShapes = this.renderRegion(currentRegion, highlight);
-                if ($.isArray(newShapes) || $.isArray(shapeids)) {
-                    target.replaceWithShapes(shapeids, newShapes);
-                    this.regionShapes[currentRegion] = $.map(newShapes, function (newShape) {
-                        return newShape.id;
-                    });
-                } else {
-                    target.replaceWithShape(shapeids, newShapes);
-                    this.regionShapes[currentRegion] = newShapes.id;
-                }
-            }
-        },
-
-        render: function () {
-            var values = this.values,
-                target = this.target,
-                regionShapes = this.regionShapes,
-                shapes, ids, i, j;
-
-            if (!this.cls._super.render.call(this)) {
-                return;
-            }
-            for (i = values.length; i--;) {
-                shapes = this.renderRegion(i);
-                if (shapes) {
-                    if ($.isArray(shapes)) {
-                        ids = [];
-                        for (j = shapes.length; j--;) {
-                            shapes[j].append();
-                            ids.push(shapes[j].id);
-                        }
-                        regionShapes[i] = ids;
-                    } else {
-                        shapes.append();
-                        regionShapes[i] = shapes.id; // store just the shapeid
-                    }
-                } else {
-                    // null value
-                    regionShapes[i] = null;
-                }
-            }
-            target.render();
-        }
-    };
-
-    /**
-     * Line charts
-     */
-    $.fn.sparkline.line = line = createClass($.fn.sparkline._base, {
-        type: 'line',
-
-        init: function (el, values, options, width, height) {
-            line._super.init.call(this, el, values, options, width, height);
-            this.vertices = [];
-            this.regionMap = [];
-            this.xvalues = [];
-            this.yvalues = [];
-            this.yminmax = [];
-            this.hightlightSpotId = null;
-            this.lastShapeId = null;
-            this.initTarget();
-        },
-
-        getRegion: function (el, x, y) {
-            var i,
-                regionMap = this.regionMap; // maps regions to value positions
-            for (i = regionMap.length; i--;) {
-                if (regionMap[i] !== null && x >= regionMap[i][0] && x <= regionMap[i][1]) {
-                    return regionMap[i][2];
-                }
-            }
-            return undefined;
-        },
-
-        getCurrentRegionFields: function () {
-            var currentRegion = this.currentRegion;
-            return {
-                isNull: this.yvalues[currentRegion] === null,
-                x: this.xvalues[currentRegion],
-                y: this.yvalues[currentRegion],
-                color: this.options.get('lineColor'),
-                fillColor: this.options.get('fillColor'),
-                offset: currentRegion
-            };
-        },
-
-        renderHighlight: function () {
-            var currentRegion = this.currentRegion,
-                target = this.target,
-                vertex = this.vertices[currentRegion],
-                options = this.options,
-                spotRadius = options.get('spotRadius'),
-                highlightSpotColor = options.get('highlightSpotColor'),
-                highlightLineColor = options.get('highlightLineColor'),
-                highlightSpot, highlightLine;
-
-            if (!vertex) {
-                return;
-            }
-            if (spotRadius && highlightSpotColor) {
-                highlightSpot = target.drawCircle(vertex[0], vertex[1],
-                    spotRadius, undefined, highlightSpotColor);
-                this.highlightSpotId = highlightSpot.id;
-                target.insertAfterShape(this.lastShapeId, highlightSpot);
-            }
-            if (highlightLineColor) {
-                highlightLine = target.drawLine(vertex[0], this.canvasTop, vertex[0],
-                    this.canvasTop + this.canvasHeight, highlightLineColor);
-                this.highlightLineId = highlightLine.id;
-                target.insertAfterShape(this.lastShapeId, highlightLine);
-            }
-        },
-
-        removeHighlight: function () {
-            var target = this.target;
-            if (this.highlightSpotId) {
-                target.removeShapeId(this.highlightSpotId);
-                this.highlightSpotId = null;
-            }
-            if (this.highlightLineId) {
-                target.removeShapeId(this.highlightLineId);
-                this.highlightLineId = null;
-            }
-        },
-
-        scanValues: function () {
-            var values = this.values,
-                valcount = values.length,
-                xvalues = this.xvalues,
-                yvalues = this.yvalues,
-                yminmax = this.yminmax,
-                i, val, isStr, isArray, sp;
-            for (i = 0; i < valcount; i++) {
-                val = values[i];
-                isStr = typeof(values[i]) === 'string';
-                isArray = typeof(values[i]) === 'object' && values[i] instanceof Array;
-                sp = isStr && values[i].split(':');
-                if (isStr && sp.length === 2) { // x:y
-                    xvalues.push(Number(sp[0]));
-                    yvalues.push(Number(sp[1]));
-                    yminmax.push(Number(sp[1]));
-                } else if (isArray) {
-                    xvalues.push(val[0]);
-                    yvalues.push(val[1]);
-                    yminmax.push(val[1]);
-                } else {
-                    xvalues.push(i);
-                    if (values[i] === null || values[i] === 'null') {
-                        yvalues.push(null);
-                    } else {
-                        yvalues.push(Number(val));
-                        yminmax.push(Number(val));
-                    }
-                }
-            }
-            if (this.options.get('xvalues')) {
-                xvalues = this.options.get('xvalues');
-            }
-
-            this.maxy = this.maxyorg = Math.max.apply(Math, yminmax);
-            this.miny = this.minyorg = Math.min.apply(Math, yminmax);
-
-            this.maxx = Math.max.apply(Math, xvalues);
-            this.minx = Math.min.apply(Math, xvalues);
-
-            this.xvalues = xvalues;
-            this.yvalues = yvalues;
-            this.yminmax = yminmax;
-
-        },
-
-        processRangeOptions: function () {
-            var options = this.options,
-                normalRangeMin = options.get('normalRangeMin'),
-                normalRangeMax = options.get('normalRangeMax');
-
-            if (normalRangeMin !== undefined) {
-                if (normalRangeMin < this.miny) {
-                    this.miny = normalRangeMin;
-                }
-                if (normalRangeMax > this.maxy) {
-                    this.maxy = normalRangeMax;
-                }
-            }
-            if (options.get('chartRangeMin') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMin') < this.miny)) {
-                this.miny = options.get('chartRangeMin');
-            }
-            if (options.get('chartRangeMax') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMax') > this.maxy)) {
-                this.maxy = options.get('chartRangeMax');
-            }
-            if (options.get('chartRangeMinX') !== undefined && (options.get('chartRangeClipX') || options.get('chartRangeMinX') < this.minx)) {
-                this.minx = options.get('chartRangeMinX');
-            }
-            if (options.get('chartRangeMaxX') !== undefined && (options.get('chartRangeClipX') || options.get('chartRangeMaxX') > this.maxx)) {
-                this.maxx = options.get('chartRangeMaxX');
-            }
-
-        },
-
-        drawNormalRange: function (canvasLeft, canvasTop, canvasHeight, canvasWidth, rangey) {
-            var normalRangeMin = this.options.get('normalRangeMin'),
-                normalRangeMax = this.options.get('normalRangeMax'),
-                ytop = canvasTop + Math.round(canvasHeight - (canvasHeight * ((normalRangeMax - this.miny) / rangey))),
-                height = Math.round((canvasHeight * (normalRangeMax - normalRangeMin)) / rangey);
-            this.target.drawRect(canvasLeft, ytop, canvasWidth, height, undefined, this.options.get('normalRangeColor')).append();
-        },
-
-        render: function () {
-            var options = this.options,
-                target = this.target,
-                canvasWidth = this.canvasWidth,
-                canvasHeight = this.canvasHeight,
-                vertices = this.vertices,
-                spotRadius = options.get('spotRadius'),
-                regionMap = this.regionMap,
-                rangex, rangey, yvallast,
-                canvasTop, canvasLeft,
-                vertex, path, paths, x, y, xnext, xpos, xposnext,
-                last, next, yvalcount, lineShapes, fillShapes, plen,
-                valueSpots, hlSpotsEnabled, color, xvalues, yvalues, i;
-
-            if (!line._super.render.call(this)) {
-                return;
-            }
-
-            this.scanValues();
-            this.processRangeOptions();
-
-            xvalues = this.xvalues;
-            yvalues = this.yvalues;
-
-            if (!this.yminmax.length || this.yvalues.length < 2) {
-                // empty or all null valuess
-                return;
-            }
-
-            canvasTop = canvasLeft = 0;
-
-            rangex = this.maxx - this.minx === 0 ? 1 : this.maxx - this.minx;
-            rangey = this.maxy - this.miny === 0 ? 1 : this.maxy - this.miny;
-            yvallast = this.yvalues.length - 1;
-
-            if (spotRadius && (canvasWidth < (spotRadius * 4) || canvasHeight < (spotRadius * 4))) {
-                spotRadius = 0;
-            }
-            if (spotRadius) {
-                // adjust the canvas size as required so that spots will fit
-                hlSpotsEnabled = options.get('highlightSpotColor') &&  !options.get('disableInteraction');
-                if (hlSpotsEnabled || options.get('minSpotColor') || (options.get('spotColor') && yvalues[yvallast] === this.miny)) {
-                    canvasHeight -= Math.ceil(spotRadius);
-                }
-                if (hlSpotsEnabled || options.get('maxSpotColor') || (options.get('spotColor') && yvalues[yvallast] === this.maxy)) {
-                    canvasHeight -= Math.ceil(spotRadius);
-                    canvasTop += Math.ceil(spotRadius);
-                }
-                if (hlSpotsEnabled ||
-                     ((options.get('minSpotColor') || options.get('maxSpotColor')) && (yvalues[0] === this.miny || yvalues[0] === this.maxy))) {
-                    canvasLeft += Math.ceil(spotRadius);
-                    canvasWidth -= Math.ceil(spotRadius);
-                }
-                if (hlSpotsEnabled || options.get('spotColor') ||
-                    (options.get('minSpotColor') || options.get('maxSpotColor') &&
-                        (yvalues[yvallast] === this.miny || yvalues[yvallast] === this.maxy))) {
-                    canvasWidth -= Math.ceil(spotRadius);
-                }
-            }
-
-
-            canvasHeight--;
-
-            if (options.get('normalRangeMin') !== undefined && !options.get('drawNormalOnTop')) {
-                this.drawNormalRange(canvasLeft, canvasTop, canvasHeight, canvasWidth, rangey);
-            }
-
-            path = [];
-            paths = [path];
-            last = next = null;
-            yvalcount = yvalues.length;
-            for (i = 0; i < yvalcount; i++) {
-                x = xvalues[i];
-                xnext = xvalues[i + 1];
-                y = yvalues[i];
-                xpos = canvasLeft + Math.round((x - this.minx) * (canvasWidth / rangex));
-                xposnext = i < yvalcount - 1 ? canvasLeft + Math.round((xnext - this.minx) * (canvasWidth / rangex)) : canvasWidth;
-                next = xpos + ((xposnext - xpos) / 2);
-                regionMap[i] = [last || 0, next, i];
-                last = next;
-                if (y === null) {
-                    if (i) {
-                        if (yvalues[i - 1] !== null) {
-                            path = [];
-                            paths.push(path);
-                        }
-                        vertices.push(null);
-                    }
-                } else {
-                    if (y < this.miny) {
-                        y = this.miny;
-                    }
-                    if (y > this.maxy) {
-                        y = this.maxy;
-                    }
-                    if (!path.length) {
-                        // previous value was null
-                        path.push([xpos, canvasTop + canvasHeight]);
-                    }
-                    vertex = [xpos, canvasTop + Math.round(canvasHeight - (canvasHeight * ((y - this.miny) / rangey)))];
-                    path.push(vertex);
-                    vertices.push(vertex);
-                }
-            }
-
-            lineShapes = [];
-            fillShapes = [];
-            plen = paths.length;
-            for (i = 0; i < plen; i++) {
-                path = paths[i];
-                if (path.length) {
-                    if (options.get('fillColor')) {
-                        path.push([path[path.length - 1][0], (canvasTop + canvasHeight)]);
-                        fillShapes.push(path.slice(0));
-                        path.pop();
-                    }
-                    // if there's only a single point in this path, then we want to display it
-                    // as a vertical line which means we keep path[0]  as is
-                    if (path.length > 2) {
-                        // else we want the first value
-                        path[0] = [path[0][0], path[1][1]];
-                    }
-                    lineShapes.push(path);
-                }
-            }
-
-            // draw the fill first, then optionally the normal range, then the line on top of that
-            plen = fillShapes.length;
-            for (i = 0; i < plen; i++) {
-                target.drawShape(fillShapes[i],
-                    options.get('fillColor'), options.get('fillColor')).append();
-            }
-
-            if (options.get('normalRangeMin') !== undefined && options.get('drawNormalOnTop')) {
-                this.drawNormalRange(canvasLeft, canvasTop, canvasHeight, canvasWidth, rangey);
-            }
-
-            plen = lineShapes.length;
-            for (i = 0; i < plen; i++) {
-                target.drawShape(lineShapes[i], options.get('lineColor'), undefined,
-                    options.get('lineWidth')).append();
-            }
-
-            if (spotRadius && options.get('valueSpots')) {
-                valueSpots = options.get('valueSpots');
-                if (valueSpots.get === undefined) {
-                    valueSpots = new RangeMap(valueSpots);
-                }
-                for (i = 0; i < yvalcount; i++) {
-                    color = valueSpots.get(yvalues[i]);
-                    if (color) {
-                        target.drawCircle(canvasLeft + Math.round((xvalues[i] - this.minx) * (canvasWidth / rangex)),
-                            canvasTop + Math.round(canvasHeight - (canvasHeight * ((yvalues[i] - this.miny) / rangey))),
-                            spotRadius, undefined,
-                            color).append();
-                    }
-                }
-
-            }
-            if (spotRadius && options.get('spotColor') && yvalues[yvallast] !== null) {
-                target.drawCircle(canvasLeft + Math.round((xvalues[xvalues.length - 1] - this.minx) * (canvasWidth / rangex)),
-                    canvasTop + Math.round(canvasHeight - (canvasHeight * ((yvalues[yvallast] - this.miny) / rangey))),
-                    spotRadius, undefined,
-                    options.get('spotColor')).append();
-            }
-            if (this.maxy !== this.minyorg) {
-                if (spotRadius && options.get('minSpotColor')) {
-                    x = xvalues[$.inArray(this.minyorg, yvalues)];
-                    target.drawCircle(canvasLeft + Math.round((x - this.minx) * (canvasWidth / rangex)),
-                        canvasTop + Math.round(canvasHeight - (canvasHeight * ((this.minyorg - this.miny) / rangey))),
-                        spotRadius, undefined,
-                        options.get('minSpotColor')).append();
-                }
-                if (spotRadius && options.get('maxSpotColor')) {
-                    x = xvalues[$.inArray(this.maxyorg, yvalues)];
-                    target.drawCircle(canvasLeft + Math.round((x - this.minx) * (canvasWidth / rangex)),
-                        canvasTop + Math.round(canvasHeight - (canvasHeight * ((this.maxyorg - this.miny) / rangey))),
-                        spotRadius, undefined,
-                        options.get('maxSpotColor')).append();
-                }
-            }
-
-            this.lastShapeId = target.getLastShapeId();
-            this.canvasTop = canvasTop;
-            target.render();
-        }
-    });
-
-    /**
-     * Bar charts
-     */
-    $.fn.sparkline.bar = bar = createClass($.fn.sparkline._base, barHighlightMixin, {
-        type: 'bar',
-
-        init: function (el, values, options, width, height) {
-            var barWidth = parseInt(options.get('barWidth'), 10),
-                barSpacing = parseInt(options.get('barSpacing'), 10),
-                chartRangeMin = options.get('chartRangeMin'),
-                chartRangeMax = options.get('chartRangeMax'),
-                chartRangeClip = options.get('chartRangeClip'),
-                stackMin = Infinity,
-                stackMax = -Infinity,
-                isStackString, groupMin, groupMax, stackRanges,
-                numValues, i, vlen, range, zeroAxis, xaxisOffset, min, max, clipMin, clipMax,
-                stacked, vlist, j, slen, svals, val, yoffset, yMaxCalc, canvasHeightEf;
-            bar._super.init.call(this, el, values, options, width, height);
-
-            // scan values to determine whether to stack bars
-            for (i = 0, vlen = values.length; i < vlen; i++) {
-                val = values[i];
-                isStackString = typeof(val) === 'string' && val.indexOf(':') > -1;
-                if (isStackString || $.isArray(val)) {
-                    stacked = true;
-                    if (isStackString) {
-                        val = values[i] = normalizeValues(val.split(':'));
-                    }
-                    val = remove(val, null); // min/max will treat null as zero
-                    groupMin = Math.min.apply(Math, val);
-                    groupMax = Math.max.apply(Math, val);
-                    if (groupMin < stackMin) {
-                        stackMin = groupMin;
-                    }
-                    if (groupMax > stackMax) {
-                        stackMax = groupMax;
-                    }
-                }
-            }
-
-            this.stacked = stacked;
-            this.regionShapes = {};
-            this.barWidth = barWidth;
-            this.barSpacing = barSpacing;
-            this.totalBarWidth = barWidth + barSpacing;
-            this.width = width = (values.length * barWidth) + ((values.length - 1) * barSpacing);
-
-            this.initTarget();
-
-            if (chartRangeClip) {
-                clipMin = chartRangeMin === undefined ? -Infinity : chartRangeMin;
-                clipMax = chartRangeMax === undefined ? Infinity : chartRangeMax;
-            }
-
-            numValues = [];
-            stackRanges = stacked ? [] : numValues;
-            var stackTotals = [];
-            var stackRangesNeg = [];
-            for (i = 0, vlen = values.length; i < vlen; i++) {
-                if (stacked) {
-                    vlist = values[i];
-                    values[i] = svals = [];
-                    stackTotals[i] = 0;
-                    stackRanges[i] = stackRangesNeg[i] = 0;
-                    for (j = 0, slen = vlist.length; j < slen; j++) {
-                        val = svals[j] = chartRangeClip ? clipval(vlist[j], clipMin, clipMax) : vlist[j];
-                        if (val !== null) {
-                            if (val > 0) {
-                                stackTotals[i] += val;
-                            }
-                            if (stackMin < 0 && stackMax > 0) {
-                                if (val < 0) {
-                                    stackRangesNeg[i] += Math.abs(val);
-                                } else {
-                                    stackRanges[i] += val;
-                                }
-                            } else {
-                                stackRanges[i] += Math.abs(val - (val < 0 ? stackMax : stackMin));
-                            }
-                            numValues.push(val);
-                        }
-                    }
-                } else {
-                    val = chartRangeClip ? clipval(values[i], clipMin, clipMax) : values[i];
-                    val = values[i] = normalizeValue(val);
-                    if (val !== null) {
-                        numValues.push(val);
-                    }
-                }
-            }
-            this.max = max = Math.max.apply(Math, numValues);
-            this.min = min = Math.min.apply(Math, numValues);
-            this.stackMax = stackMax = stacked ? Math.max.apply(Math, stackTotals) : max;
-            this.stackMin = stackMin = stacked ? Math.min.apply(Math, numValues) : min;
-
-            if (options.get('chartRangeMin') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMin') < min)) {
-                min = options.get('chartRangeMin');
-            }
-            if (options.get('chartRangeMax') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMax') > max)) {
-                max = options.get('chartRangeMax');
-            }
-
-            this.zeroAxis = zeroAxis = options.get('zeroAxis', true);
-            if (min <= 0 && max >= 0 && zeroAxis) {
-                xaxisOffset = 0;
-            } else if (zeroAxis == false) {
-                xaxisOffset = min;
-            } else if (min > 0) {
-                xaxisOffset = min;
-            } else {
-                xaxisOffset = max;
-            }
-            this.xaxisOffset = xaxisOffset;
-
-            range = stacked ? (Math.max.apply(Math, stackRanges) + Math.max.apply(Math, stackRangesNeg)) : max - min;
-
-            // as we plot zero/min values a single pixel line, we add a pixel to all other
-            // values - Reduce the effective canvas size to suit
-            this.canvasHeightEf = (zeroAxis && min < 0) ? this.canvasHeight - 2 : this.canvasHeight - 1;
-
-            if (min < xaxisOffset) {
-                yMaxCalc = (stacked && max >= 0) ? stackMax : max;
-                yoffset = (yMaxCalc - xaxisOffset) / range * this.canvasHeight;
-                if (yoffset !== Math.ceil(yoffset)) {
-                    this.canvasHeightEf -= 2;
-                    yoffset = Math.ceil(yoffset);
-                }
-            } else {
-                yoffset = this.canvasHeight;
-            }
-            this.yoffset = yoffset;
-
-            if ($.isArray(options.get('colorMap'))) {
-                this.colorMapByIndex = options.get('colorMap');
-                this.colorMapByValue = null;
-            } else {
-                this.colorMapByIndex = null;
-                this.colorMapByValue = options.get('colorMap');
-                if (this.colorMapByValue && this.colorMapByValue.get === undefined) {
-                    this.colorMapByValue = new RangeMap(this.colorMapByValue);
-                }
-            }
-
-            this.range = range;
-        },
-
-        getRegion: function (el, x, y) {
-            var result = Math.floor(x / this.totalBarWidth);
-            return (result < 0 || result >= this.values.length) ? undefined : result;
-        },
-
-        getCurrentRegionFields: function () {
-            var currentRegion = this.currentRegion,
-                values = ensureArray(this.values[currentRegion]),
-                result = [],
-                value, i;
-            for (i = values.length; i--;) {
-                value = values[i];
-                result.push({
-                    isNull: value === null,
-                    value: value,
-                    color: this.calcColor(i, value, currentRegion),
-                    offset: currentRegion
-                });
-            }
-            return result;
-        },
-
-        calcColor: function (stacknum, value, valuenum) {
-            var colorMapByIndex = this.colorMapByIndex,
-                colorMapByValue = this.colorMapByValue,
-                options = this.options,
-                color, newColor;
-            if (this.stacked) {
-                color = options.get('stackedBarColor');
-            } else {
-                color = (value < 0) ? options.get('negBarColor') : options.get('barColor');
-            }
-            if (value === 0 && options.get('zeroColor') !== undefined) {
-                color = options.get('zeroColor');
-            }
-            if (colorMapByValue && (newColor = colorMapByValue.get(value))) {
-                color = newColor;
-            } else if (colorMapByIndex && colorMapByIndex.length > valuenum) {
-                color = colorMapByIndex[valuenum];
-            }
-            return $.isArray(color) ? color[stacknum % color.length] : color;
-        },
-
-        /**
-         * Render bar(s) for a region
-         */
-        renderRegion: function (valuenum, highlight) {
-            var vals = this.values[valuenum],
-                options = this.options,
-                xaxisOffset = this.xaxisOffset,
-                result = [],
-                range = this.range,
-                stacked = this.stacked,
-                target = this.target,
-                x = valuenum * this.totalBarWidth,
-                canvasHeightEf = this.canvasHeightEf,
-                yoffset = this.yoffset,
-                y, height, color, isNull, yoffsetNeg, i, valcount, val, minPlotted, allMin;
-
-            vals = $.isArray(vals) ? vals : [vals];
-            valcount = vals.length;
-            val = vals[0];
-            isNull = all(null, vals);
-            allMin = all(xaxisOffset, vals, true);
-
-            if (isNull) {
-                if (options.get('nullColor')) {
-                    color = highlight ? options.get('nullColor') : this.calcHighlightColor(options.get('nullColor'), options);
-                    y = (yoffset > 0) ? yoffset - 1 : yoffset;
-                    return target.drawRect(x, y, this.barWidth - 1, 0, color, color);
-                } else {
-                    return undefined;
-                }
-            }
-            yoffsetNeg = yoffset;
-            for (i = 0; i < valcount; i++) {
-                val = vals[i];
-
-                if (stacked && val === xaxisOffset) {
-                    if (!allMin || minPlotted) {
-                        continue;
-                    }
-                    minPlotted = true;
-                }
-
-                if (range > 0) {
-                    height = Math.floor(canvasHeightEf * ((Math.abs(val - xaxisOffset) / range))) + 1;
-                } else {
-                    height = 1;
-                }
-                if (val < xaxisOffset || (val === xaxisOffset && yoffset === 0)) {
-                    y = yoffsetNeg;
-                    yoffsetNeg += height;
-                } else {
-                    y = yoffset - height;
-                    yoffset -= height;
-                }
-                color = this.calcColor(i, val, valuenum);
-                if (highlight) {
-                    color = this.calcHighlightColor(color, options);
-                }
-                result.push(target.drawRect(x, y, this.barWidth - 1, height - 1, color, color));
-            }
-            if (result.length === 1) {
-                return result[0];
-            }
-            return result;
-        }
-    });
-
-    /**
-     * Tristate charts
-     */
-    $.fn.sparkline.tristate = tristate = createClass($.fn.sparkline._base, barHighlightMixin, {
-        type: 'tristate',
-
-        init: function (el, values, options, width, height) {
-            var barWidth = parseInt(options.get('barWidth'), 10),
-                barSpacing = parseInt(options.get('barSpacing'), 10);
-            tristate._super.init.call(this, el, values, options, width, height);
-
-            this.regionShapes = {};
-            this.barWidth = barWidth;
-            this.barSpacing = barSpacing;
-            this.totalBarWidth = barWidth + barSpacing;
-            this.values = $.map(values, Number);
-            this.width = width = (values.length * barWidth) + ((values.length - 1) * barSpacing);
-
-            if ($.isArray(options.get('colorMap'))) {
-                this.colorMapByIndex = options.get('colorMap');
-                this.colorMapByValue = null;
-            } else {
-                this.colorMapByIndex = null;
-                this.colorMapByValue = options.get('colorMap');
-                if (this.colorMapByValue && this.colorMapByValue.get === undefined) {
-                    this.colorMapByValue = new RangeMap(this.colorMapByValue);
-                }
-            }
-            this.initTarget();
-        },
-
-        getRegion: function (el, x, y) {
-            return Math.floor(x / this.totalBarWidth);
-        },
-
-        getCurrentRegionFields: function () {
-            var currentRegion = this.currentRegion;
-            return {
-                isNull: this.values[currentRegion] === undefined,
-                value: this.values[currentRegion],
-                color: this.calcColor(this.values[currentRegion], currentRegion),
-                offset: currentRegion
-            };
-        },
-
-        calcColor: function (value, valuenum) {
-            var values = this.values,
-                options = this.options,
-                colorMapByIndex = this.colorMapByIndex,
-                colorMapByValue = this.colorMapByValue,
-                color, newColor;
-
-            if (colorMapByValue && (newColor = colorMapByValue.get(value))) {
-                color = newColor;
-            } else if (colorMapByIndex && colorMapByIndex.length > valuenum) {
-                color = colorMapByIndex[valuenum];
-            } else if (values[valuenum] < 0) {
-                color = options.get('negBarColor');
-            } else if (values[valuenum] > 0) {
-                color = options.get('posBarColor');
-            } else {
-                color = options.get('zeroBarColor');
-            }
-            return color;
-        },
-
-        renderRegion: function (valuenum, highlight) {
-            var values = this.values,
-                options = this.options,
-                target = this.target,
-                canvasHeight, height, halfHeight,
-                x, y, color;
-
-            canvasHeight = target.pixelHeight;
-            halfHeight = Math.round(canvasHeight / 2);
-
-            x = valuenum * this.totalBarWidth;
-            if (values[valuenum] < 0) {
-                y = halfHeight;
-                height = halfHeight - 1;
-            } else if (values[valuenum] > 0) {
-                y = 0;
-                height = halfHeight - 1;
-            } else {
-                y = halfHeight - 1;
-                height = 2;
-            }
-            color = this.calcColor(values[valuenum], valuenum);
-            if (color === null) {
-                return;
-            }
-            if (highlight) {
-                color = this.calcHighlightColor(color, options);
-            }
-            return target.drawRect(x, y, this.barWidth - 1, height - 1, color, color);
-        }
-    });
-
-    /**
-     * Discrete charts
-     */
-    $.fn.sparkline.discrete = discrete = createClass($.fn.sparkline._base, barHighlightMixin, {
-        type: 'discrete',
-
-        init: function (el, values, options, width, height) {
-            discrete._super.init.call(this, el, values, options, width, height);
-
-            this.regionShapes = {};
-            this.values = values = $.map(values, Number);
-            this.min = Math.min.apply(Math, values);
-            this.max = Math.max.apply(Math, values);
-            this.range = this.max - this.min;
-            this.width = width = options.get('width') === 'auto' ? values.length * 2 : this.width;
-            this.interval = Math.floor(width / values.length);
-            this.itemWidth = width / values.length;
-            if (options.get('chartRangeMin') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMin') < this.min)) {
-                this.min = options.get('chartRangeMin');
-            }
-            if (options.get('chartRangeMax') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMax') > this.max)) {
-                this.max = options.get('chartRangeMax');
-            }
-            this.initTarget();
-            if (this.target) {
-                this.lineHeight = options.get('lineHeight') === 'auto' ? Math.round(this.canvasHeight * 0.3) : options.get('lineHeight');
-            }
-        },
-
-        getRegion: function (el, x, y) {
-            return Math.floor(x / this.itemWidth);
-        },
-
-        getCurrentRegionFields: function () {
-            var currentRegion = this.currentRegion;
-            return {
-                isNull: this.values[currentRegion] === undefined,
-                value: this.values[currentRegion],
-                offset: currentRegion
-            };
-        },
-
-        renderRegion: function (valuenum, highlight) {
-            var values = this.values,
-                options = this.options,
-                min = this.min,
-                max = this.max,
-                range = this.range,
-                interval = this.interval,
-                target = this.target,
-                canvasHeight = this.canvasHeight,
-                lineHeight = this.lineHeight,
-                pheight = canvasHeight - lineHeight,
-                ytop, val, color, x;
-
-            val = clipval(values[valuenum], min, max);
-            x = valuenum * interval;
-            ytop = Math.round(pheight - pheight * ((val - min) / range));
-            color = (options.get('thresholdColor') && val < options.get('thresholdValue')) ? options.get('thresholdColor') : options.get('lineColor');
-            if (highlight) {
-                color = this.calcHighlightColor(color, options);
-            }
-            return target.drawLine(x, ytop, x, ytop + lineHeight, color);
-        }
-    });
-
-    /**
-     * Bullet charts
-     */
-    $.fn.sparkline.bullet = bullet = createClass($.fn.sparkline._base, {
-        type: 'bullet',
-
-        init: function (el, values, options, width, height) {
-            var min, max, vals;
-            bullet._super.init.call(this, el, values, options, width, height);
-
-            // values: target, performance, range1, range2, range3
-            this.values = values = normalizeValues(values);
-            // target or performance could be null
-            vals = values.slice();
-            vals[0] = vals[0] === null ? vals[2] : vals[0];
-            vals[1] = values[1] === null ? vals[2] : vals[1];
-            min = Math.min.apply(Math, values);
-            max = Math.max.apply(Math, values);
-            if (options.get('base') === undefined) {
-                min = min < 0 ? min : 0;
-            } else {
-                min = options.get('base');
-            }
-            this.min = min;
-            this.max = max;
-            this.range = max - min;
-            this.shapes = {};
-            this.valueShapes = {};
-            this.regiondata = {};
-            this.width = width = options.get('width') === 'auto' ? '4.0em' : width;
-            this.target = this.$el.simpledraw(width, height, options.get('composite'));
-            if (!values.length) {
-                this.disabled = true;
-            }
-            this.initTarget();
-        },
-
-        getRegion: function (el, x, y) {
-            var shapeid = this.target.getShapeAt(el, x, y);
-            return (shapeid !== undefined && this.shapes[shapeid] !== undefined) ? this.shapes[shapeid] : undefined;
-        },
-
-        getCurrentRegionFields: function () {
-            var currentRegion = this.currentRegion;
-            return {
-                fieldkey: currentRegion.substr(0, 1),
-                value: this.values[currentRegion.substr(1)],
-                region: currentRegion
-            };
-        },
-
-        changeHighlight: function (highlight) {
-            var currentRegion = this.currentRegion,
-                shapeid = this.valueShapes[currentRegion],
-                shape;
-            delete this.shapes[shapeid];
-            switch (currentRegion.substr(0, 1)) {
-                case 'r':
-                    shape = this.renderRange(currentRegion.substr(1), highlight);
-                    break;
-                case 'p':
-                    shape = this.renderPerformance(highlight);
-                    break;
-                case 't':
-                    shape = this.renderTarget(highlight);
-                    break;
-            }
-            this.valueShapes[currentRegion] = shape.id;
-            this.shapes[shape.id] = currentRegion;
-            this.target.replaceWithShape(shapeid, shape);
-        },
-
-        renderRange: function (rn, highlight) {
-            var rangeval = this.values[rn],
-                rangewidth = Math.round(this.canvasWidth * ((rangeval - this.min) / this.range)),
-                color = this.options.get('rangeColors')[rn - 2];
-            if (highlight) {
-                color = this.calcHighlightColor(color, this.options);
-            }
-            return this.target.drawRect(0, 0, rangewidth - 1, this.canvasHeight - 1, color, color);
-        },
-
-        renderPerformance: function (highlight) {
-            var perfval = this.values[1],
-                perfwidth = Math.round(this.canvasWidth * ((perfval - this.min) / this.range)),
-                color = this.options.get('performanceColor');
-            if (highlight) {
-                color = this.calcHighlightColor(color, this.options);
-            }
-            return this.target.drawRect(0, Math.round(this.canvasHeight * 0.3), perfwidth - 1,
-                Math.round(this.canvasHeight * 0.4) - 1, color, color);
-        },
-
-        renderTarget: function (highlight) {
-            var targetval = this.values[0],
-                x = Math.round(this.canvasWidth * ((targetval - this.min) / this.range) - (this.options.get('targetWidth') / 2)),
-                targettop = Math.round(this.canvasHeight * 0.10),
-                targetheight = this.canvasHeight - (targettop * 2),
-                color = this.options.get('targetColor');
-            if (highlight) {
-                color = this.calcHighlightColor(color, this.options);
-            }
-            return this.target.drawRect(x, targettop, this.options.get('targetWidth') - 1, targetheight - 1, color, color);
-        },
-
-        render: function () {
-            var vlen = this.values.length,
-                target = this.target,
-                i, shape;
-            if (!bullet._super.render.call(this)) {
-                return;
-            }
-            for (i = 2; i < vlen; i++) {
-                shape = this.renderRange(i).append();
-                this.shapes[shape.id] = 'r' + i;
-                this.valueShapes['r' + i] = shape.id;
-            }
-            if (this.values[1] !== null) {
-                shape = this.renderPerformance().append();
-                this.shapes[shape.id] = 'p1';
-                this.valueShapes.p1 = shape.id;
-            }
-            if (this.values[0] !== null) {
-                shape = this.renderTarget().append();
-                this.shapes[shape.id] = 't0';
-                this.valueShapes.t0 = shape.id;
-            }
-            target.render();
-        }
-    });
-
-    /**
-     * Pie charts
-     */
-    $.fn.sparkline.pie = pie = createClass($.fn.sparkline._base, {
-        type: 'pie',
-
-        init: function (el, values, options, width, height) {
-            var total = 0, i;
-
-            pie._super.init.call(this, el, values, options, width, height);
-
-            this.shapes = {}; // map shape ids to value offsets
-            this.valueShapes = {}; // maps value offsets to shape ids
-            this.values = values = $.map(values, Number);
-
-            if (options.get('width') === 'auto') {
-                this.width = this.height;
-            }
-
-            if (values.length > 0) {
-                for (i = values.length; i--;) {
-                    total += values[i];
-                }
-            }
-            this.total = total;
-            this.initTarget();
-            this.radius = Math.floor(Math.min(this.canvasWidth, this.canvasHeight) / 2);
-        },
-
-        getRegion: function (el, x, y) {
-            var shapeid = this.target.getShapeAt(el, x, y);
-            return (shapeid !== undefined && this.shapes[shapeid] !== undefined) ? this.shapes[shapeid] : undefined;
-        },
-
-        getCurrentRegionFields: function () {
-            var currentRegion = this.currentRegion;
-            return {
-                isNull: this.values[currentRegion] === undefined,
-                value: this.values[currentRegion],
-                percent: this.values[currentRegion] / this.total * 100,
-                color: this.options.get('sliceColors')[currentRegion % this.options.get('sliceColors').length],
-                offset: currentRegion
-            };
-        },
-
-        changeHighlight: function (highlight) {
-            var currentRegion = this.currentRegion,
-                 newslice = this.renderSlice(currentRegion, highlight),
-                 shapeid = this.valueShapes[currentRegion];
-            delete this.shapes[shapeid];
-            this.target.replaceWithShape(shapeid, newslice);
-            this.valueShapes[currentRegion] = newslice.id;
-            this.shapes[newslice.id] = currentRegion;
-        },
-
-        renderSlice: function (valuenum, highlight) {
-            var target = this.target,
-                options = this.options,
-                radius = this.radius,
-                borderWidth = options.get('borderWidth'),
-                offset = options.get('offset'),
-                circle = 2 * Math.PI,
-                values = this.values,
-                total = this.total,
-                next = offset ? (2*Math.PI)*(offset/360) : 0,
-                start, end, i, vlen, color;
-
-            vlen = values.length;
-            for (i = 0; i < vlen; i++) {
-                start = next;
-                end = next;
-                if (total > 0) {  // avoid divide by zero
-                    end = next + (circle * (values[i] / total));
-                }
-                if (valuenum === i) {
-                    color = options.get('sliceColors')[i % options.get('sliceColors').length];
-                    if (highlight) {
-                        color = this.calcHighlightColor(color, options);
-                    }
-
-                    return target.drawPieSlice(radius, radius, radius - borderWidth, start, end, undefined, color);
-                }
-                next = end;
-            }
-        },
-
-        render: function () {
-            var target = this.target,
-                values = this.values,
-                options = this.options,
-                radius = this.radius,
-                borderWidth = options.get('borderWidth'),
-                shape, i;
-
-            if (!pie._super.render.call(this)) {
-                return;
-            }
-            if (borderWidth) {
-                target.drawCircle(radius, radius, Math.floor(radius - (borderWidth / 2)),
-                    options.get('borderColor'), undefined, borderWidth).append();
-            }
-            for (i = values.length; i--;) {
-                if (values[i]) { // don't render zero values
-                    shape = this.renderSlice(i).append();
-                    this.valueShapes[i] = shape.id; // store just the shapeid
-                    this.shapes[shape.id] = i;
-                }
-            }
-            target.render();
-        }
-    });
-
-    /**
-     * Box plots
-     */
-    $.fn.sparkline.box = box = createClass($.fn.sparkline._base, {
-        type: 'box',
-
-        init: function (el, values, options, width, height) {
-            box._super.init.call(this, el, values, options, width, height);
-            this.values = $.map(values, Number);
-            this.width = options.get('width') === 'auto' ? '4.0em' : width;
-            this.initTarget();
-            if (!this.values.length) {
-                this.disabled = 1;
-            }
-        },
-
-        /**
-         * Simulate a single region
-         */
-        getRegion: function () {
-            return 1;
-        },
-
-        getCurrentRegionFields: function () {
-            var result = [
-                { field: 'lq', value: this.quartiles[0] },
-                { field: 'med', value: this.quartiles[1] },
-                { field: 'uq', value: this.quartiles[2] }
-            ];
-            if (this.loutlier !== undefined) {
-                result.push({ field: 'lo', value: this.loutlier});
-            }
-            if (this.routlier !== undefined) {
-                result.push({ field: 'ro', value: this.routlier});
-            }
-            if (this.lwhisker !== undefined) {
-                result.push({ field: 'lw', value: this.lwhisker});
-            }
-            if (this.rwhisker !== undefined) {
-                result.push({ field: 'rw', value: this.rwhisker});
-            }
-            return result;
-        },
-
-        render: function () {
-            var target = this.target,
-                values = this.values,
-                vlen = values.length,
-                options = this.options,
-                canvasWidth = this.canvasWidth,
-                canvasHeight = this.canvasHeight,
-                minValue = options.get('chartRangeMin') === undefined ? Math.min.apply(Math, values) : options.get('chartRangeMin'),
-                maxValue = options.get('chartRangeMax') === undefined ? Math.max.apply(Math, values) : options.get('chartRangeMax'),
-                canvasLeft = 0,
-                lwhisker, loutlier, iqr, q1, q2, q3, rwhisker, routlier, i,
-                size, unitSize;
-
-            if (!box._super.render.call(this)) {
-                return;
-            }
-
-            if (options.get('raw')) {
-                if (options.get('showOutliers') && values.length > 5) {
-                    loutlier = values[0];
-                    lwhisker = values[1];
-                    q1 = values[2];
-                    q2 = values[3];
-                    q3 = values[4];
-                    rwhisker = values[5];
-                    routlier = values[6];
-                } else {
-                    lwhisker = values[0];
-                    q1 = values[1];
-                    q2 = values[2];
-                    q3 = values[3];
-                    rwhisker = values[4];
-                }
-            } else {
-                values.sort(function (a, b) { return a - b; });
-                q1 = quartile(values, 1);
-                q2 = quartile(values, 2);
-                q3 = quartile(values, 3);
-                iqr = q3 - q1;
-                if (options.get('showOutliers')) {
-                    lwhisker = rwhisker = undefined;
-                    for (i = 0; i < vlen; i++) {
-                        if (lwhisker === undefined && values[i] > q1 - (iqr * options.get('outlierIQR'))) {
-                            lwhisker = values[i];
-                        }
-                        if (values[i] < q3 + (iqr * options.get('outlierIQR'))) {
-                            rwhisker = values[i];
-                        }
-                    }
-                    loutlier = values[0];
-                    routlier = values[vlen - 1];
-                } else {
-                    lwhisker = values[0];
-                    rwhisker = values[vlen - 1];
-                }
-            }
-            this.quartiles = [q1, q2, q3];
-            this.lwhisker = lwhisker;
-            this.rwhisker = rwhisker;
-            this.loutlier = loutlier;
-            this.routlier = routlier;
-
-            unitSize = canvasWidth / (maxValue - minValue + 1);
-            if (options.get('showOutliers')) {
-                canvasLeft = Math.ceil(options.get('spotRadius'));
-                canvasWidth -= 2 * Math.ceil(options.get('spotRadius'));
-                unitSize = canvasWidth / (maxValue - minValue + 1);
-                if (loutlier < lwhisker) {
-                    target.drawCircle((loutlier - minValue) * unitSize + canvasLeft,
-                        canvasHeight / 2,
-                        options.get('spotRadius'),
-                        options.get('outlierLineColor'),
-                        options.get('outlierFillColor')).append();
-                }
-                if (routlier > rwhisker) {
-                    target.drawCircle((routlier - minValue) * unitSize + canvasLeft,
-                        canvasHeight / 2,
-                        options.get('spotRadius'),
-                        options.get('outlierLineColor'),
-                        options.get('outlierFillColor')).append();
-                }
-            }
-
-            // box
-            target.drawRect(
-                Math.round((q1 - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight * 0.1),
-                Math.round((q3 - q1) * unitSize),
-                Math.round(canvasHeight * 0.8),
-                options.get('boxLineColor'),
-                options.get('boxFillColor')).append();
-            // left whisker
-            target.drawLine(
-                Math.round((lwhisker - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight / 2),
-                Math.round((q1 - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight / 2),
-                options.get('lineColor')).append();
-            target.drawLine(
-                Math.round((lwhisker - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight / 4),
-                Math.round((lwhisker - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight - canvasHeight / 4),
-                options.get('whiskerColor')).append();
-            // right whisker
-            target.drawLine(Math.round((rwhisker - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight / 2),
-                Math.round((q3 - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight / 2),
-                options.get('lineColor')).append();
-            target.drawLine(
-                Math.round((rwhisker - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight / 4),
-                Math.round((rwhisker - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight - canvasHeight / 4),
-                options.get('whiskerColor')).append();
-            // median line
-            target.drawLine(
-                Math.round((q2 - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight * 0.1),
-                Math.round((q2 - minValue) * unitSize + canvasLeft),
-                Math.round(canvasHeight * 0.9),
-                options.get('medianColor')).append();
-            if (options.get('target')) {
-                size = Math.ceil(options.get('spotRadius'));
-                target.drawLine(
-                    Math.round((options.get('target') - minValue) * unitSize + canvasLeft),
-                    Math.round((canvasHeight / 2) - size),
-                    Math.round((options.get('target') - minValue) * unitSize + canvasLeft),
-                    Math.round((canvasHeight / 2) + size),
-                    options.get('targetColor')).append();
-                target.drawLine(
-                    Math.round((options.get('target') - minValue) * unitSize + canvasLeft - size),
-                    Math.round(canvasHeight / 2),
-                    Math.round((options.get('target') - minValue) * unitSize + canvasLeft + size),
-                    Math.round(canvasHeight / 2),
-                    options.get('targetColor')).append();
-            }
-            target.render();
-        }
-    });
-
-    // Setup a very simple "virtual canvas" to make drawing the few shapes we need easier
-    // This is accessible as $(foo).simpledraw()
-
-    // Detect browser renderer support
-    (function() {
-        if (document.namespaces && !document.namespaces.v) {
-            $.fn.sparkline.hasVML = true;
-            document.namespaces.add('v', 'urn:schemas-microsoft-com:vml', '#default#VML');
-        } else {
-            $.fn.sparkline.hasVML = false;
-        }
-
-        var el = document.createElement('canvas');
-        $.fn.sparkline.hasCanvas = !!(el.getContext && el.getContext('2d'));
-
-    })()
-
-    VShape = createClass({
-        init: function (target, id, type, args) {
-            this.target = target;
-            this.id = id;
-            this.type = type;
-            this.args = args;
-        },
-        append: function () {
-            this.target.appendShape(this);
-            return this;
-        }
-    });
-
-    VCanvas_base = createClass({
-        _pxregex: /(\d+)(px)?\s*$/i,
-
-        init: function (width, height, target) {
-            if (!width) {
-                return;
-            }
-            this.width = width;
-            this.height = height;
-            this.target = target;
-            this.lastShapeId = null;
-            if (target[0]) {
-                target = target[0];
-            }
-            $.data(target, '_jqs_vcanvas', this);
-        },
-
-        drawLine: function (x1, y1, x2, y2, lineColor, lineWidth) {
-            return this.drawShape([[x1, y1], [x2, y2]], lineColor, lineWidth);
-        },
-
-        drawShape: function (path, lineColor, fillColor, lineWidth) {
-            return this._genShape('Shape', [path, lineColor, fillColor, lineWidth]);
-        },
-
-        drawCircle: function (x, y, radius, lineColor, fillColor, lineWidth) {
-            return this._genShape('Circle', [x, y, radius, lineColor, fillColor, lineWidth]);
-        },
-
-        drawPieSlice: function (x, y, radius, startAngle, endAngle, lineColor, fillColor) {
-            return this._genShape('PieSlice', [x, y, radius, startAngle, endAngle, lineColor, fillColor]);
-        },
-
-        drawRect: function (x, y, width, height, lineColor, fillColor) {
-            return this._genShape('Rect', [x, y, width, height, lineColor, fillColor]);
-        },
-
-        getElement: function () {
-            return this.canvas;
-        },
-
-        /**
-         * Return the most recently inserted shape id
-         */
-        getLastShapeId: function () {
-            return this.lastShapeId;
-        },
-
-        /**
-         * Clear and reset the canvas
-         */
-        reset: function () {
-            alert('reset not implemented');
-        },
-
-        _insert: function (el, target) {
-            $(target).html(el);
-        },
-
-        /**
-         * Calculate the pixel dimensions of the canvas
-         */
-        _calculatePixelDims: function (width, height, canvas) {
-            // XXX This should probably be a configurable option
-            var match;
-            match = this._pxregex.exec(height);
-            if (match) {
-                this.pixelHeight = match[1];
-            } else {
-                this.pixelHeight = $(canvas).height();
-            }
-            match = this._pxregex.exec(width);
-            if (match) {
-                this.pixelWidth = match[1];
-            } else {
-                this.pixelWidth = $(canvas).width();
-            }
-        },
-
-        /**
-         * Generate a shape object and id for later rendering
-         */
-        _genShape: function (shapetype, shapeargs) {
-            var id = shapeCount++;
-            shapeargs.unshift(id);
-            return new VShape(this, id, shapetype, shapeargs);
-        },
-
-        /**
-         * Add a shape to the end of the render queue
-         */
-        appendShape: function (shape) {
-            alert('appendShape not implemented');
-        },
-
-        /**
-         * Replace one shape with another
-         */
-        replaceWithShape: function (shapeid, shape) {
-            alert('replaceWithShape not implemented');
-        },
-
-        /**
-         * Insert one shape after another in the render queue
-         */
-        insertAfterShape: function (shapeid, shape) {
-            alert('insertAfterShape not implemented');
-        },
-
-        /**
-         * Remove a shape from the queue
-         */
-        removeShapeId: function (shapeid) {
-            alert('removeShapeId not implemented');
-        },
-
-        /**
-         * Find a shape at the specified x/y co-ordinates
-         */
-        getShapeAt: function (el, x, y) {
-            alert('getShapeAt not implemented');
-        },
-
-        /**
-         * Render all queued shapes onto the canvas
-         */
-        render: function () {
-            alert('render not implemented');
-        }
-    });
-
-    VCanvas_canvas = createClass(VCanvas_base, {
-        init: function (width, height, target, interact) {
-            VCanvas_canvas._super.init.call(this, width, height, target);
-            this.canvas = document.createElement('canvas');
-            if (target[0]) {
-                target = target[0];
-            }
-            $.data(target, '_jqs_vcanvas', this);
-            $(this.canvas).css({ display: 'inline-block', width: width, height: height, verticalAlign: 'top' });
-            this._insert(this.canvas, target);
-            this._calculatePixelDims(width, height, this.canvas);
-            this.canvas.width = this.pixelWidth;
-            this.canvas.height = this.pixelHeight;
-            this.interact = interact;
-            this.shapes = {};
-            this.shapeseq = [];
-            this.currentTargetShapeId = undefined;
-            $(this.canvas).css({width: this.pixelWidth, height: this.pixelHeight});
-        },
-
-        _getContext: function (lineColor, fillColor, lineWidth) {
-            var context = this.canvas.getContext('2d');
-            if (lineColor !== undefined) {
-                context.strokeStyle = lineColor;
-            }
-            context.lineWidth = lineWidth === undefined ? 1 : lineWidth;
-            if (fillColor !== undefined) {
-                context.fillStyle = fillColor;
-            }
-            return context;
-        },
-
-        reset: function () {
-            var context = this._getContext();
-            context.clearRect(0, 0, this.pixelWidth, this.pixelHeight);
-            this.shapes = {};
-            this.shapeseq = [];
-            this.currentTargetShapeId = undefined;
-        },
-
-        _drawShape: function (shapeid, path, lineColor, fillColor, lineWidth) {
-            var context = this._getContext(lineColor, fillColor, lineWidth),
-                i, plen;
-            context.beginPath();
-            context.moveTo(path[0][0] + 0.5, path[0][1] + 0.5);
-            for (i = 1, plen = path.length; i < plen; i++) {
-                context.lineTo(path[i][0] + 0.5, path[i][1] + 0.5); // the 0.5 offset gives us crisp pixel-width lines
-            }
-            if (lineColor !== undefined) {
-                context.stroke();
-            }
-            if (fillColor !== undefined) {
-                context.fill();
-            }
-            if (this.targetX !== undefined && this.targetY !== undefined &&
-                context.isPointInPath(this.targetX, this.targetY)) {
-                this.currentTargetShapeId = shapeid;
-            }
-        },
-
-        _drawCircle: function (shapeid, x, y, radius, lineColor, fillColor, lineWidth) {
-            var context = this._getContext(lineColor, fillColor, lineWidth);
-            context.beginPath();
-            context.arc(x, y, radius, 0, 2 * Math.PI, false);
-            if (this.targetX !== undefined && this.targetY !== undefined &&
-                context.isPointInPath(this.targetX, this.targetY)) {
-                this.currentTargetShapeId = shapeid;
-            }
-            if (lineColor !== undefined) {
-                context.stroke();
-            }
-            if (fillColor !== undefined) {
-                context.fill();
-            }
-        },
-
-        _drawPieSlice: function (shapeid, x, y, radius, startAngle, endAngle, lineColor, fillColor) {
-            var context = this._getContext(lineColor, fillColor);
-            context.beginPath();
-            context.moveTo(x, y);
-            context.arc(x, y, radius, startAngle, endAngle, false);
-            context.lineTo(x, y);
-            context.closePath();
-            if (lineColor !== undefined) {
-                context.stroke();
-            }
-            if (fillColor) {
-                context.fill();
-            }
-            if (this.targetX !== undefined && this.targetY !== undefined &&
-                context.isPointInPath(this.targetX, this.targetY)) {
-                this.currentTargetShapeId = shapeid;
-            }
-        },
-
-        _drawRect: function (shapeid, x, y, width, height, lineColor, fillColor) {
-            return this._drawShape(shapeid, [[x, y], [x + width, y], [x + width, y + height], [x, y + height], [x, y]], lineColor, fillColor);
-        },
-
-        appendShape: function (shape) {
-            this.shapes[shape.id] = shape;
-            this.shapeseq.push(shape.id);
-            this.lastShapeId = shape.id;
-            return shape.id;
-        },
-
-        replaceWithShape: function (shapeid, shape) {
-            var shapeseq = this.shapeseq,
-                i;
-            this.shapes[shape.id] = shape;
-            for (i = shapeseq.length; i--;) {
-                if (shapeseq[i] == shapeid) {
-                    shapeseq[i] = shape.id;
-                }
-            }
-            delete this.shapes[shapeid];
-        },
-
-        replaceWithShapes: function (shapeids, shapes) {
-            var shapeseq = this.shapeseq,
-                shapemap = {},
-                sid, i, first;
-
-            for (i = shapeids.length; i--;) {
-                shapemap[shapeids[i]] = true;
-            }
-            for (i = shapeseq.length; i--;) {
-                sid = shapeseq[i];
-                if (shapemap[sid]) {
-                    shapeseq.splice(i, 1);
-                    delete this.shapes[sid];
-                    first = i;
-                }
-            }
-            for (i = shapes.length; i--;) {
-                shapeseq.splice(first, 0, shapes[i].id);
-                this.shapes[shapes[i].id] = shapes[i];
-            }
-
-        },
-
-        insertAfterShape: function (shapeid, shape) {
-            var shapeseq = this.shapeseq,
-                i;
-            for (i = shapeseq.length; i--;) {
-                if (shapeseq[i] === shapeid) {
-                    shapeseq.splice(i + 1, 0, shape.id);
-                    this.shapes[shape.id] = shape;
-                    return;
-                }
-            }
-        },
-
-        removeShapeId: function (shapeid) {
-            var shapeseq = this.shapeseq,
-                i;
-            for (i = shapeseq.length; i--;) {
-                if (shapeseq[i] === shapeid) {
-                    shapeseq.splice(i, 1);
-                    break;
-                }
-            }
-            delete this.shapes[shapeid];
-        },
-
-        getShapeAt: function (el, x, y) {
-            this.targetX = x;
-            this.targetY = y;
-            this.render();
-            return this.currentTargetShapeId;
-        },
-
-        render: function () {
-            var shapeseq = this.shapeseq,
-                shapes = this.shapes,
-                shapeCount = shapeseq.length,
-                context = this._getContext(),
-                shapeid, shape, i;
-            context.clearRect(0, 0, this.pixelWidth, this.pixelHeight);
-            for (i = 0; i < shapeCount; i++) {
-                shapeid = shapeseq[i];
-                shape = shapes[shapeid];
-                this['_draw' + shape.type].apply(this, shape.args);
-            }
-            if (!this.interact) {
-                // not interactive so no need to keep the shapes array
-                this.shapes = {};
-                this.shapeseq = [];
-            }
-        }
-
-    });
-
-    VCanvas_vml = createClass(VCanvas_base, {
-        init: function (width, height, target) {
-            var groupel;
-            VCanvas_vml._super.init.call(this, width, height, target);
-            if (target[0]) {
-                target = target[0];
-            }
-            $.data(target, '_jqs_vcanvas', this);
-            this.canvas = document.createElement('span');
-            $(this.canvas).css({ display: 'inline-block', position: 'relative', overflow: 'hidden', width: width, height: height, margin: '0px', padding: '0px', verticalAlign: 'top'});
-            this._insert(this.canvas, target);
-            this._calculatePixelDims(width, height, this.canvas);
-            this.canvas.width = this.pixelWidth;
-            this.canvas.height = this.pixelHeight;
-            groupel = '<v:group coordorigin="0 0" coordsize="' + this.pixelWidth + ' ' + this.pixelHeight + '"' +
-                    ' style="position:absolute;top:0;left:0;width:' + this.pixelWidth + 'px;height=' + this.pixelHeight + 'px;"></v:group>';
-            this.canvas.insertAdjacentHTML('beforeEnd', groupel);
-            this.group = $(this.canvas).children()[0];
-            this.rendered = false;
-            this.prerender = '';
-        },
-
-        _drawShape: function (shapeid, path, lineColor, fillColor, lineWidth) {
-            var vpath = [],
-                initial, stroke, fill, closed, vel, plen, i;
-            for (i = 0, plen = path.length; i < plen; i++) {
-                vpath[i] = '' + (path[i][0]) + ',' + (path[i][1]);
-            }
-            initial = vpath.splice(0, 1);
-            lineWidth = lineWidth === undefined ? 1 : lineWidth;
-            stroke = lineColor === undefined ? ' stroked="false" ' : ' strokeWeight="' + lineWidth + 'px" strokeColor="' + lineColor + '" ';
-            fill = fillColor === undefined ? ' filled="false"' : ' fillColor="' + fillColor + '" filled="true" ';
-            closed = vpath[0] === vpath[vpath.length - 1] ? 'x ' : '';
-            vel = '<v:shape coordorigin="0 0" coordsize="' + this.pixelWidth + ' ' + this.pixelHeight + '" ' +
-                 ' id="jqsshape' + shapeid + '" ' +
-                 stroke +
-                 fill +
-                ' style="position:absolute;left:0px;top:0px;height:' + this.pixelHeight + 'px;width:' + this.pixelWidth + 'px;padding:0px;margin:0px;" ' +
-                ' path="m ' + initial + ' l ' + vpath.join(', ') + ' ' + closed + 'e">' +
-                ' </v:shape>';
-            return vel;
-        },
-
-        _drawCircle: function (shapeid, x, y, radius, lineColor, fillColor, lineWidth) {
-            var stroke, fill, vel;
-            x -= radius;
-            y -= radius;
-            stroke = lineColor === undefined ? ' stroked="false" ' : ' strokeWeight="' + lineWidth + 'px" strokeColor="' + lineColor + '" ';
-            fill = fillColor === undefined ? ' filled="false"' : ' fillColor="' + fillColor + '" filled="true" ';
-            vel = '<v:oval ' +
-                 ' id="jqsshape' + shapeid + '" ' +
-                stroke +
-                fill +
-                ' style="position:absolute;top:' + y + 'px; left:' + x + 'px; width:' + (radius * 2) + 'px; height:' + (radius * 2) + 'px"></v:oval>';
-            return vel;
-
-        },
-
-        _drawPieSlice: function (shapeid, x, y, radius, startAngle, endAngle, lineColor, fillColor) {
-            var vpath, startx, starty, endx, endy, stroke, fill, vel;
-            if (startAngle === endAngle) {
-                return '';  // VML seems to have problem when start angle equals end angle.
-            }
-            if ((endAngle - startAngle) === (2 * Math.PI)) {
-                startAngle = 0.0;  // VML seems to have a problem when drawing a full circle that doesn't start 0
-                endAngle = (2 * Math.PI);
-            }
-
-            startx = x + Math.round(Math.cos(startAngle) * radius);
-            starty = y + Math.round(Math.sin(startAngle) * radius);
-            endx = x + Math.round(Math.cos(endAngle) * radius);
-            endy = y + Math.round(Math.sin(endAngle) * radius);
-
-            if (startx === endx && starty === endy) {
-                if ((endAngle - startAngle) < Math.PI) {
-                    // Prevent very small slices from being mistaken as a whole pie
-                    return '';
-                }
-                // essentially going to be the entire circle, so ignore startAngle
-                startx = endx = x + radius;
-                starty = endy = y;
-            }
-
-            if (startx === endx && starty === endy && (endAngle - startAngle) < Math.PI) {
-                return '';
-            }
-
-            vpath = [x - radius, y - radius, x + radius, y + radius, startx, starty, endx, endy];
-            stroke = lineColor === undefined ? ' stroked="false" ' : ' strokeWeight="1px" strokeColor="' + lineColor + '" ';
-            fill = fillColor === undefined ? ' filled="false"' : ' fillColor="' + fillColor + '" filled="true" ';
-            vel = '<v:shape coordorigin="0 0" coordsize="' + this.pixelWidth + ' ' + this.pixelHeight + '" ' +
-                 ' id="jqsshape' + shapeid + '" ' +
-                 stroke +
-                 fill +
-                ' style="position:absolute;left:0px;top:0px;height:' + this.pixelHeight + 'px;width:' + this.pixelWidth + 'px;padding:0px;margin:0px;" ' +
-                ' path="m ' + x + ',' + y + ' wa ' + vpath.join(', ') + ' x e">' +
-                ' </v:shape>';
-            return vel;
-        },
-
-        _drawRect: function (shapeid, x, y, width, height, lineColor, fillColor) {
-            return this._drawShape(shapeid, [[x, y], [x, y + height], [x + width, y + height], [x + width, y], [x, y]], lineColor, fillColor);
-        },
-
-        reset: function () {
-            this.group.innerHTML = '';
-        },
-
-        appendShape: function (shape) {
-            var vel = this['_draw' + shape.type].apply(this, shape.args);
-            if (this.rendered) {
-                this.group.insertAdjacentHTML('beforeEnd', vel);
-            } else {
-                this.prerender += vel;
-            }
-            this.lastShapeId = shape.id;
-            return shape.id;
-        },
-
-        replaceWithShape: function (shapeid, shape) {
-            var existing = $('#jqsshape' + shapeid),
-                vel = this['_draw' + shape.type].apply(this, shape.args);
-            existing[0].outerHTML = vel;
-        },
-
-        replaceWithShapes: function (shapeids, shapes) {
-            // replace the first shapeid with all the new shapes then toast the remaining old shapes
-            var existing = $('#jqsshape' + shapeids[0]),
-                replace = '',
-                slen = shapes.length,
-                i;
-            for (i = 0; i < slen; i++) {
-                replace += this['_draw' + shapes[i].type].apply(this, shapes[i].args);
-            }
-            existing[0].outerHTML = replace;
-            for (i = 1; i < shapeids.length; i++) {
-                $('#jqsshape' + shapeids[i]).remove();
-            }
-        },
-
-        insertAfterShape: function (shapeid, shape) {
-            var existing = $('#jqsshape' + shapeid),
-                 vel = this['_draw' + shape.type].apply(this, shape.args);
-            existing[0].insertAdjacentHTML('afterEnd', vel);
-        },
-
-        removeShapeId: function (shapeid) {
-            var existing = $('#jqsshape' + shapeid);
-            this.group.removeChild(existing[0]);
-        },
-
-        getShapeAt: function (el, x, y) {
-            var shapeid = el.id.substr(8);
-            return shapeid;
-        },
-
-        render: function () {
-            if (!this.rendered) {
-                // batch the intial render into a single repaint
-                this.group.innerHTML = this.prerender;
-                this.rendered = true;
-            }
-        }
-    });
-
-}));
diff --git a/addons/crm/static/src/js/crm_case_section.js b/addons/crm/static/src/js/crm_case_section.js
index 2b4ca741d75..deb21d38de2 100644
--- a/addons/crm/static/src/js/crm_case_section.js
+++ b/addons/crm/static/src/js/crm_case_section.js
@@ -9,26 +9,4 @@ openerp.crm = function(openerp) {
         },
     });
 
-    openerp.crm.SparklineBarWidget = openerp.web_kanban.AbstractField.extend({
-        className: "oe_sparkline_bar",
-        start: function() {
-            var self = this;
-            var title = this.$node.html();
-            setTimeout(function () {
-                var value = _.pluck(self.field.value, 'value');
-                var tooltips = _.pluck(self.field.value, 'tooltip');
-                self.$el.sparkline(value, {
-                    type: 'bar',
-                    barWidth: 5,
-                    tooltipFormat: '{{offset:offset}} {{value}}',
-                    tooltipValueLookups: {
-                        'offset': tooltips
-                    },
-                });
-                self.$el.tipsy({'delayIn': 0, 'html': true, 'title': function(){return title}, 'gravity': 'n'});
-            }, 0);
-        },
-    });
-    openerp.web_kanban.fields_registry.add("sparkline_bar", "openerp.crm.SparklineBarWidget");
-
 };
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 7db1aa1eff0..7a57484eab8 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -37,7 +37,7 @@ modules.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/crm_statistics_dashboard.jpeg', 'images/opportunity_to_quote.jpeg'],
-    'depends': ['sale', 'crm'],
+    'depends': ['sale', 'crm', 'web_kanban_gauge'],
     'data': [
         'wizard/crm_make_sale_view.xml',
         'sale_crm_view.xml',
@@ -48,7 +48,6 @@ modules.
         'report/sale_crm_account_invoice_report_view.xml',
     ],
     'js': [
-        'static/lib/justgage.js',
         'static/src/js/sale_crm.js',
     ],
     'demo': ['sale_crm_demo.xml'],
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 7812b8d2687..a1e201d9b7f 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -268,8 +268,8 @@
                 </xpath>
                 <xpath expr="//div[@class='oe_items_list']" position="after">
                     <div class="oe_center" t-if="record.invoiced_target.raw_value">
-                        <field name="monthly_invoiced" widget="gage" style="width:160px; height: 120px;" options="{'max_field': 'invoiced_target'}">Invoiced</field>
-                        <field name="invoiced_forecast" widget="gage" style="width:160px; height: 120px;" options="{'max_field': 'invoiced_target', 'action_change': 'action_forecast'}">Forecast</field>
+                        <field name="monthly_invoiced" widget="gauge" style="width:160px; height: 120px;" options="{'max_field': 'invoiced_target'}">Invoiced</field>
+                        <field name="invoiced_forecast" widget="gauge" style="width:160px; height: 120px;" options="{'max_field': 'invoiced_target', 'action_change': 'action_forecast'}">Forecast</field>
                     </div>
                     <div class="oe_center" style="color:#bbbbbb;" t-if="!record.invoiced_target.raw_value">
                         <br/>Define an invoicing target in the sales team settings to see the period's achievement and forecast at a glance.
diff --git a/addons/sale_crm/static/lib/justgage.js b/addons/sale_crm/static/lib/justgage.js
deleted file mode 100644
index 52b5c6ea0c3..00000000000
--- a/addons/sale_crm/static/lib/justgage.js
+++ /dev/null
@@ -1,883 +0,0 @@
-/**
- * JustGage - this is work-in-progress, unreleased, unofficial code, so it might not work top-notch :)
- * Check http://www.justgage.com for official releases
- * Licensed under MIT.
- * @author Bojan Djuricic  (@Toorshia)
- *
- * LATEST UPDATES
-
- * -----------------------------
- * April 01, 2013.
- * -----------------------------
-     * fix - https://github.com/toorshia/justgage/issues/46
-
- * -----------------------------
- * March 26, 2013.
- * -----------------------------
-     * customSectors - define specific color for value range (0-10 : red, 10-30 : blue etc.)
-
- * -----------------------------
- * March 23, 2013.
- * -----------------------------
-     * counter - option to animate value  in counting fashion
-     * fix - https://github.com/toorshia/justgage/issues/45
-
- * -----------------------------
- * March 13, 2013.
- * -----------------------------
-     * refresh method - added optional 'max' parameter to use when you need to update max value
-
- * -----------------------------
- * February 26, 2013.
- * -----------------------------
-     * decimals - option to define/limit number of decimals when not using humanFriendly or customRenderer to display value
-     * fixed a missing parameters bug when calling generateShadow()  for IE < 9
-
- * -----------------------------
- * December 31, 2012.
- * -----------------------------
-     * fixed text y-position for hidden divs - workaround for Raphael <tspan> 'dy' bug - https://github.com/DmitryBaranovskiy/raphael/issues/491
-     * 'show' parameters, like showMinMax are now 'hide' because I am lame developer - please update these in your setups
-     * Min and Max labels are now auto-off when in donut mode
-     * Start angle in donut mode is now 90
-     * donutStartAngle - option to define start angle for donut
-
- * -----------------------------
- * November 25, 2012.
- * -----------------------------
-     * Option to define custom rendering function for displayed value
-
- * -----------------------------
- * November 19, 2012.
- * -----------------------------
-     * Config.value is now updated after gauge refresh
-
- * -----------------------------
- * November 13, 2012.
- * -----------------------------
-     * Donut display mode added
-     * Option to hide value label
-     * Option to enable responsive gauge size
-     * Removed default title attribute
-     * Option to accept min and max defined as string values
-     * Option to configure value symbol
-     * Fixed bad aspect ratio calculations
-     * Option to configure minimum font size for all texts
-     * Option to show shorthand big numbers (human friendly)
-     */
-
- JustGage = function(config) {
-
-  if (!config.id) {alert("Missing id parameter for gauge!"); return false;}
-  if (!config.node) {
-    if (!document.getElementById(config.id)) {alert("No element with id: \""+config.id+"\" found!"); return false;}
-    config.node = document.getElementById(config.id);
-  }
-
-  var obj = this;
-
-  // configurable parameters
-  obj.config =
-  {
-    // id : string
-    // this is container element id
-    id : config.id,
-
-    // node : string
-    // the node to use instead of DOM
-    node : config.node,
-
-    // title : string
-    // gauge title
-    title : (config.title) ? config.title : "",
-
-    // titleFontColor : string
-    // color of gauge title
-    titleFontColor : (config.titleFontColor) ? config.titleFontColor : "#999999",
-
-    // value : int
-    // value gauge is showing
-    value : (config.value) ? config.value : 0,
-
-
-    // valueFontColor : string
-    // color of label showing current value
-    valueFontColor : (config.valueFontColor) ? config.valueFontColor : "#010101",
-
-    // symbol : string
-    // special symbol to show next to value
-    symbol : (config.symbol) ? config.symbol : "",
-
-    // min : int
-    // min value
-    min : (config.min) ? parseFloat(config.min) : 0,
-
-    // max : int
-    // max value
-    max : (config.max) ? parseFloat(config.max) : 100,
-
-    // humanFriendlyDecimal : int
-    // number of decimal places for our human friendly number to contain
-    humanFriendlyDecimal : (config.humanFriendlyDecimal) ? config.humanFriendlyDecimal : 0,
-
-    // textRenderer: func
-    // function applied before rendering text
-    textRenderer  : (config.textRenderer) ? config.textRenderer : null,
-
-    // gaugeWidthScale : float
-    // width of the gauge element
-    gaugeWidthScale : (config.gaugeWidthScale) ? config.gaugeWidthScale : 1.0,
-
-    // gaugeColor : string
-    // background color of gauge element
-    gaugeColor : (config.gaugeColor) ? config.gaugeColor : "#edebeb",
-
-    // label : string
-    // text to show below value
-    label : (config.label) ? config.label : "",
-
-    // labelFontColor : string
-    // color of label showing label under value
-    labelFontColor : (config.labelFontColor) ? config.labelFontColor : "#b3b3b3",
-
-    // shadowOpacity : int
-    // 0 ~ 1
-    shadowOpacity : (config.shadowOpacity) ? config.shadowOpacity : 0.2,
-
-    // shadowSize: int
-    // inner shadow size
-    shadowSize : (config.shadowSize) ? config.shadowSize : 5,
-
-    // shadowVerticalOffset : int
-    // how much shadow is offset from top
-    shadowVerticalOffset : (config.shadowVerticalOffset) ? config.shadowVerticalOffset : 3,
-
-    // levelColors : string[]
-    // colors of indicator, from lower to upper, in RGB format
-    levelColors : (config.levelColors) ? config.levelColors : [
-    "#a9d70b",
-    "#f9c802",
-    "#ff0000"
-    ],
-
-    // startAnimationTime : int
-    // length of initial animation
-    startAnimationTime : (config.startAnimationTime) ? config.startAnimationTime : 700,
-
-    // startAnimationType : string
-    // type of initial animation (linear, >, <,  <>, bounce)
-    startAnimationType : (config.startAnimationType) ? config.startAnimationType : ">",
-
-    // refreshAnimationTime : int
-    // length of refresh animation
-    refreshAnimationTime : (config.refreshAnimationTime) ? config.refreshAnimationTime : 700,
-
-    // refreshAnimationType : string
-    // type of refresh animation (linear, >, <,  <>, bounce)
-    refreshAnimationType : (config.refreshAnimationType) ? config.refreshAnimationType : ">",
-
-    // donutStartAngle : int
-    // angle to start from when in donut mode
-    donutStartAngle : (config.donutStartAngle) ? config.donutStartAngle : 90,
-
-    // valueMinFontSize : int
-    // absolute minimum font size for the value
-    valueMinFontSize : config.valueMinFontSize || 16,
-
-    // titleMinFontSize
-    // absolute minimum font size for the title
-    titleMinFontSize : config.titleMinFontSize || 10,
-
-    // labelMinFontSize
-    // absolute minimum font size for the label
-    labelMinFontSize : config.labelMinFontSize || 10,
-
-    // minLabelMinFontSize
-    // absolute minimum font size for the minimum label
-    minLabelMinFontSize : config.minLabelMinFontSize || 10,
-
-    // maxLabelMinFontSize
-    // absolute minimum font size for the maximum label
-    maxLabelMinFontSize : config.maxLabelMinFontSize || 10,
-
-    // hideValue : bool
-    // hide value text
-    hideValue : (config.hideValue) ? config.hideValue : false,
-
-    // hideMinMax : bool
-    // hide min and max values
-    hideMinMax : (config.hideMinMax) ? config.hideMinMax : false,
-
-    // hideInnerShadow : bool
-    // hide inner shadow
-    hideInnerShadow : (config.hideInnerShadow) ? config.hideInnerShadow : false,
-
-    // humanFriendly : bool
-    // convert large numbers for min, max, value to human friendly (e.g. 1234567 -> 1.23M)
-    humanFriendly : (config.humanFriendly) ? config.humanFriendly : false,
-
-    // noGradient : bool
-    // whether to use gradual color change for value, or sector-based
-    noGradient : (config.noGradient) ? config.noGradient : false,
-
-    // donut : bool
-    // show full donut gauge
-    donut : (config.donut) ? config.donut : false,
-
-    // relativeGaugeSize : bool
-    // whether gauge size should follow changes in container element size
-    relativeGaugeSize : (config.relativeGaugeSize) ? config.relativeGaugeSize : false,
-
-    // counter : bool
-    // animate level number change
-    counter : (config.counter) ? config.counter : false,
-
-    // decimals : int
-    // number of digits after floating point
-    decimals : (config.decimals) ? config.decimals : 0,
-
-    // customSectors : [] of objects
-    // number of digits after floating point
-    customSectors : (config.customSectors) ? config.customSectors : []
-  };
-
-  // variables
-  var
-  canvasW,
-  canvasH,
-  widgetW,
-  widgetH,
-  aspect,
-  dx,
-  dy,
-  titleFontSize,
-  titleX,
-  titleY,
-  valueFontSize,
-  valueX,
-  valueY,
-  labelFontSize,
-  labelX,
-  labelY,
-  minFontSize,
-  minX,
-  minY,
-  maxFontSize,
-  maxX,
-  maxY;
-
-  // overflow values
-  if (this.config.value > this.config.max) this.config.value = this.config.max;
-  if (this.config.value < this.config.min) this.config.value = this.config.min;
-  this.originalValue = config.value;
-
-  // canvas
-  this.canvas = Raphael(this.config.node, "100%", "100%");
-  if (this.config.relativeGaugeSize === true) {
-    this.canvas.setViewBox(0, 0, 200, 150, true);
-  }
-
-  // canvas dimensions
-  if (this.config.relativeGaugeSize === true) {
-    canvasW = 200;
-    canvasH = 150;
-  } else {
-    canvasW = getStyle(this.config.node, "width").slice(0, -2) * 1;
-    canvasH = getStyle(this.config.node, "height").slice(0, -2) * 1;
-  }
-
-  // widget dimensions
-  if (this.config.donut === true) {
-
-    // DONUT *******************************
-
-    // width more than height
-    if(canvasW > canvasH) {
-      widgetH = canvasH;
-      widgetW = widgetH;
-    // width less than height
-  } else if (canvasW < canvasH) {
-    widgetW = canvasW;
-    widgetH = widgetW;
-      // if height don't fit, rescale both
-      if(widgetH > canvasH) {
-        aspect = widgetH / canvasH;
-        widgetH = widgetH / aspect;
-        widgetW = widgetH / aspect;
-      }
-    // equal
-  } else {
-    widgetW = canvasW;
-    widgetH = widgetW;
-  }
-
-    // delta
-    dx = (canvasW - widgetW)/2;
-    dy = (canvasH - widgetH)/2;
-
-    // title
-    titleFontSize = ((widgetH / 8) > 10) ? (widgetH / 10) : 10;
-    titleX = dx + widgetW / 2;
-    titleY = dy + widgetH / 11;
-
-    // value
-    valueFontSize = ((widgetH / 6.4) > 16) ? (widgetH / 5.4) : 18;
-    valueX = dx + widgetW / 2;
-    if(this.config.label !== '') {
-      valueY = dy + widgetH / 1.85;
-    } else {
-      valueY = dy + widgetH / 1.7;
-    }
-
-    // label
-    labelFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
-    labelX = dx + widgetW / 2;
-    labelY = valueY + labelFontSize;
-
-    // min
-    minFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
-    minX = dx + (widgetW / 10) + (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
-    minY = labelY;
-
-    // max
-    maxFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
-    maxX = dx + widgetW - (widgetW / 10) - (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
-    maxY = labelY;
-
-  } else {
-    // HALF *******************************
-
-    // width more than height
-    if(canvasW > canvasH) {
-      widgetH = canvasH;
-      widgetW = widgetH * 1.25;
-      //if width doesn't fit, rescale both
-      if(widgetW > canvasW) {
-        aspect = widgetW / canvasW;
-        widgetW = widgetW / aspect;
-        widgetH = widgetH / aspect;
-      }
-    // width less than height
-  } else if (canvasW < canvasH) {
-    widgetW = canvasW;
-    widgetH = widgetW / 1.25;
-      // if height don't fit, rescale both
-      if(widgetH > canvasH) {
-        aspect = widgetH / canvasH;
-        widgetH = widgetH / aspect;
-        widgetW = widgetH / aspect;
-      }
-    // equal
-  } else {
-    widgetW = canvasW;
-    widgetH = widgetW * 0.75;
-  }
-
-    // delta
-    dx = (canvasW - widgetW)/2;
-    dy = (canvasH - widgetH)/2;
-
-    // title
-    titleFontSize = ((widgetH / 8) > this.config.titleMinFontSize) ? (widgetH / 10) : this.config.titleMinFontSize;
-    titleX = dx + widgetW / 2;
-    titleY = dy + widgetH / 6.4;
-
-    // value
-    valueFontSize = ((widgetH / 6.5) > this.config.valueMinFontSize) ? (widgetH / 6.5) : this.config.valueMinFontSize;
-    valueX = dx + widgetW / 2;
-    valueY = dy + widgetH / 1.275;
-
-    // label
-    labelFontSize = ((widgetH / 16) > this.config.labelMinFontSize) ? (widgetH / 16) : this.config.labelMinFontSize;
-    labelX = dx + widgetW / 2;
-    labelY = valueY + valueFontSize / 2 + 5;
-
-    // min
-    minFontSize = ((widgetH / 16) > this.config.minLabelMinFontSize) ? (widgetH / 16) : this.config.minLabelMinFontSize;
-    minX = dx + (widgetW / 10) + (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
-    minY = labelY;
-
-    // max
-    maxFontSize = ((widgetH / 16) > this.config.maxLabelMinFontSize) ? (widgetH / 16) : this.config.maxLabelMinFontSize;
-    maxX = dx + widgetW - (widgetW / 10) - (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
-    maxY = labelY;
-  }
-
-  // parameters
-  this.params  = {
-    canvasW : canvasW,
-    canvasH : canvasH,
-    widgetW : widgetW,
-    widgetH : widgetH,
-    dx : dx,
-    dy : dy,
-    titleFontSize : titleFontSize,
-    titleX : titleX,
-    titleY : titleY,
-    valueFontSize : valueFontSize,
-    valueX : valueX,
-    valueY : valueY,
-    labelFontSize : labelFontSize,
-    labelX : labelX,
-    labelY : labelY,
-    minFontSize : minFontSize,
-    minX : minX,
-    minY : minY,
-    maxFontSize : maxFontSize,
-    maxX : maxX,
-    maxY : maxY
-  };
-
-  // var clear
-  canvasW, canvasH, widgetW, widgetH, aspect, dx, dy, titleFontSize, titleX, titleY, valueFontSize, valueX, valueY, labelFontSize, labelX, labelY, minFontSize, minX, minY, maxFontSize, maxX, maxY = null
-
-  // pki - custom attribute for generating gauge paths
-  this.canvas.customAttributes.pki = function (value, min, max, w, h, dx, dy, gws, donut) {
-
-    var alpha, Ro, Ri, Cx, Cy, Xo, Yo, Xi, Yi, path;
-
-    if (donut) {
-      alpha = (1 - 2 * (value - min) / (max - min)) * Math.PI;
-      Ro = w / 2 - w / 7;
-      Ri = Ro - w / 6.666666666666667 * gws;
-
-      Cx = w / 2 + dx;
-      Cy = h / 1.95 + dy;
-
-      Xo = w / 2 + dx + Ro * Math.cos(alpha);
-      Yo = h - (h - Cy) + 0 - Ro * Math.sin(alpha);
-      Xi = w / 2 + dx + Ri * Math.cos(alpha);
-      Yi = h - (h - Cy) + 0 - Ri * Math.sin(alpha);
-
-      path += "M" + (Cx - Ri) + "," + Cy + " ";
-      path += "L" + (Cx - Ro) + "," + Cy + " ";
-      if (value > ((max - min) / 2)) {
-        path += "A" + Ro + "," + Ro + " 0 0 1 " + (Cx + Ro) + "," + Cy + " ";
-      }
-      path += "A" + Ro + "," + Ro + " 0 0 1 " + Xo + "," + Yo + " ";
-      path += "L" + Xi + "," + Yi + " ";
-      if (value > ((max - min) / 2)) {
-        path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx + Ri) + "," + Cy + " ";
-      }
-      path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx - Ri) + "," + Cy + " ";
-      path += "Z ";
-
-      return { path: path };
-
-    } else {
-      alpha = (1 - (value - min) / (max - min)) * Math.PI;
-      Ro = w / 2 - w / 10;
-      Ri = Ro - w / 6.666666666666667 * gws;
-
-      Cx = w / 2 + dx;
-      Cy = h / 1.25 + dy;
-
-      Xo = w / 2 + dx + Ro * Math.cos(alpha);
-      Yo = h - (h - Cy) + 0 - Ro * Math.sin(alpha);
-      Xi = w / 2 + dx + Ri * Math.cos(alpha);
-      Yi = h - (h - Cy) + 0 - Ri * Math.sin(alpha);
-
-      path += "M" + (Cx - Ri) + "," + Cy + " ";
-      path += "L" + (Cx - Ro) + "," + Cy + " ";
-      path += "A" + Ro + "," + Ro + " 0 0 1 " + Xo + "," + Yo + " ";
-      path += "L" + Xi + "," + Yi + " ";
-      path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx - Ri) + "," + Cy + " ";
-      path += "Z ";
-
-      return { path: path };
-    }
-
-    // var clear
-    alpha, Ro, Ri, Cx, Cy, Xo, Yo, Xi, Yi, path = null;
-  };
-
-  // gauge
-  this.gauge = this.canvas.path().attr({
-    "stroke": "none",
-    "fill": this.config.gaugeColor,
-    pki: [this.config.max, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut]
-  });
-  this.gauge.id = this.config.id+"-gauge";
-
-  // level
-  this.level = this.canvas.path().attr({
-    "stroke": "none",
-    "fill": getColor(this.config.value, (this.config.value - this.config.min) / (this.config.max - this.config.min), this.config.levelColors, this.config.noGradient, this.config.customSectors),
-    pki: [this.config.min, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut]
-  });
-  if(this.config.donut) {
-    this.level.transform("r" + this.config.donutStartAngle + ", " + (this.params.widgetW/2 + this.params.dx) + ", " + (this.params.widgetH/1.95 + this.params.dy));
-  }
-  this.level.id = this.config.id+"-level";
-
-  // title
-  this.txtTitle = this.canvas.text(this.params.titleX, this.params.titleY, this.config.title);
-  this.txtTitle.attr({
-    "font-size":this.params.titleFontSize,
-    "font-weight":"bold",
-    "font-family":"Arial",
-    "fill":this.config.titleFontColor,
-    "fill-opacity":"1"
-  });
-  setDy(this.txtTitle, this.params.titleFontSize, this.params.titleY);
-  this.txtTitle.id = this.config.id+"-txttitle";
-
-  // value
-  this.txtValue = this.canvas.text(this.params.valueX, this.params.valueY, 0);
-  this.txtValue.attr({
-    "font-size":this.params.valueFontSize,
-    "font-weight":"bold",
-    "font-family":"Arial",
-    "fill":this.config.valueFontColor,
-    "fill-opacity":"0"
-  });
-  setDy(this.txtValue, this.params.valueFontSize, this.params.valueY);
-  this.txtValue.id = this.config.id+"-txtvalue";
-
-  // label
-  this.txtLabel = this.canvas.text(this.params.labelX, this.params.labelY, this.config.label);
-  this.txtLabel.attr({
-    "font-size":this.params.labelFontSize,
-    "font-weight":"normal",
-    "font-family":"Arial",
-    "fill":this.config.labelFontColor,
-    "fill-opacity":"0"
-  });
-  setDy(this.txtLabel, this.params.labelFontSize, this.params.labelY);
-  this.txtLabel.id = this.config.id+"-txtlabel";
-
-  // min
-  this.txtMinimum = this.config.min;
-  if( this.config.humanFriendly ) this.txtMinimum = humanFriendlyNumber( this.config.min, this.config.humanFriendlyDecimal );
-  this.txtMin = this.canvas.text(this.params.minX, this.params.minY, this.txtMinimum);
-  this.txtMin.attr({
-    "font-size":this.params.minFontSize,
-    "font-weight":"normal",
-    "font-family":"Arial",
-    "fill":this.config.labelFontColor,
-    "fill-opacity": (this.config.hideMinMax || this.config.donut)? "0" : "1"
-  });
-  setDy(this.txtMin, this.params.minFontSize, this.params.minY);
-  this.txtMin.id = this.config.id+"-txtmin";
-
-  // max
-  this.txtMaximum = this.config.max;
-  if( this.config.humanFriendly ) this.txtMaximum = humanFriendlyNumber( this.config.max, this.config.humanFriendlyDecimal );
-  this.txtMax = this.canvas.text(this.params.maxX, this.params.maxY, this.txtMaximum);
-  this.txtMax.attr({
-    "font-size":this.params.maxFontSize,
-    "font-weight":"normal",
-    "font-family":"Arial",
-    "fill":this.config.labelFontColor,
-    "fill-opacity": (this.config.hideMinMax || this.config.donut)? "0" : "1"
-  });
-  setDy(this.txtMax, this.params.maxFontSize, this.params.maxY);
-  this.txtMax.id = this.config.id+"-txtmax";
-
-  var defs = this.canvas.canvas.childNodes[1];
-  var svg = "http://www.w3.org/2000/svg";
-
-  if (ie < 9) {
-    onCreateElementNsReady(function() {
-      this.generateShadow(svg, defs);
-    });
-  } else {
-    this.generateShadow(svg, defs);
-  }
-
-  // var clear
-  defs, svg = null;
-
-  // execute on each animation frame
-  function onAnimate() {
-    if (obj.config.counter) {
-      var currentValue = obj.level.attr("pki");
-
-      if(obj.config.textRenderer) {
-        // this.originalValue = this.config.textRenderer(this.originalValue);
-        obj.txtValue.attr("text", obj.config.textRenderer(Math.floor(currentValue[0])));
-      } else if(obj.config.humanFriendly) {
-        // this.originalValue = humanFriendlyNumber( this.originalValue, this.config.humanFriendlyDecimal ) + this.config.symbol;
-        obj.txtValue.attr("text", humanFriendlyNumber( Math.floor(currentValue[0]), obj.config.humanFriendlyDecimal ) + obj.config.symbol);
-      } else {
-        // this.originalValue += this.config.symbol;
-        obj.txtValue.attr("text", (currentValue[0] * 1).toFixed(obj.config.decimals) + obj.config.symbol);
-      }
-
-      setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
-      currentValue = null;
-    }
-  }
-
-  if(!obj.config.counter) {
-    if(obj.config.textRenderer) {
-      obj.originalValue = obj.config.textRenderer(obj.originalValue);
-    } else if(obj.config.humanFriendly) {
-      obj.originalValue = humanFriendlyNumber( obj.originalValue, obj.config.humanFriendlyDecimal ) + obj.config.symbol;
-    } else {
-      obj.originalValue = (obj.originalValue * 1).toFixed(obj.config.decimals) + obj.config.symbol;
-    }
-
-    obj.txtValue.attr("text", obj.originalValue);
-    setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
-  }
-
-  //event fired on each animation frame
-  eve.on("raphael.anim.frame.*", onAnimate);
-
-  // animate gauge level
-  this.level.animate({pki: [this.config.value, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut]},  this.config.startAnimationTime, this.config.startAnimationType);
-
-  // animate value
-  this.txtValue.animate({"fill-opacity":"1"}, this.config.startAnimationTime, this.config.startAnimationType);
-
-  // animate label
-  this.txtLabel.animate({"fill-opacity":"1"}, this.config.startAnimationTime, this.config.startAnimationType);
-};
-
-/** Refresh gauge level */
-JustGage.prototype.refresh = function(val, max) {
-
-  var originalVal, displayVal, color, max = max || null;
-
-  // set new max
-  if(max !== null) {
-    this.config.max = max;
-
-    this.txtMaximum = this.config.max;
-    if( this.config.humanFriendly ) this.txtMaximum = humanFriendlyNumber( this.config.max, this.config.humanFriendlyDecimal );
-    this.txtMax.attr({"text" : this.config.max});
-    setDy(this.txtMax, this.params.maxFontSize, this.params.maxY);
-  }
-
-  // overflow values
-  originalVal = val;
-  displayVal = val;
-  if ((val * 1) > (this.config.max * 1)) {val = (this.config.max * 1);}
-  if ((val * 1) < (this.config.min * 1)) {val = (this.config.min * 1);}
-
-  color = getColor(val, (val - this.config.min) / (this.config.max - this.config.min), this.config.levelColors, this.config.noGradient, this.config.customSectors);
-
-  if(this.config.textRenderer) {
-    displayVal = this.config.textRenderer(displayVal);
-  } else if( this.config.humanFriendly ) {
-    displayVal = humanFriendlyNumber( displayVal, this.config.humanFriendlyDecimal ) + this.config.symbol;
-  } else {
-    displayVal = (displayVal * 1).toFixed(this.config.decimals) + this.config.symbol;
-  }
-
-  if(!this.config.counter) {
-    this.canvas.getById(this.config.id+"-txtvalue").attr({"text":displayVal});
-    setDy(this.canvas.getById(this.config.id+"-txtvalue"), this.params.valueFontSize, this.params.valueY);
-  }
-
-  this.canvas.getById(this.config.id+"-level").animate({pki: [val, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut], "fill":color},  this.config.refreshAnimationTime, this.config.refreshAnimationType);
-  this.config.value = val * 1;
-
-  // var clear
-  originalVal, displayVal, color, max = null;
-};
-
-/** Generate shadow */
-JustGage.prototype.generateShadow = function(svg, defs) {
-
-  var gaussFilter, feOffset, feGaussianBlur, feComposite1, feFlood, feComposite2, feComposite3;
-
-  // FILTER
-  gaussFilter=document.createElementNS(svg,"filter");
-  gaussFilter.setAttribute("id", this.config.id + "-inner-shadow");
-  defs.appendChild(gaussFilter);
-
-  // offset
-  feOffset = document.createElementNS(svg,"feOffset");
-  feOffset.setAttribute("dx", 0);
-  feOffset.setAttribute("dy", this.config.shadowVerticalOffset);
-  gaussFilter.appendChild(feOffset);
-
-  // blur
-  feGaussianBlur = document.createElementNS(svg,"feGaussianBlur");
-  feGaussianBlur.setAttribute("result","offset-blur");
-  feGaussianBlur.setAttribute("stdDeviation", this.config.shadowSize);
-  gaussFilter.appendChild(feGaussianBlur);
-
-  // composite 1
-  feComposite1 = document.createElementNS(svg,"feComposite");
-  feComposite1.setAttribute("operator","out");
-  feComposite1.setAttribute("in", "SourceGraphic");
-  feComposite1.setAttribute("in2","offset-blur");
-  feComposite1.setAttribute("result","inverse");
-  gaussFilter.appendChild(feComposite1);
-
-  // flood
-  feFlood = document.createElementNS(svg,"feFlood");
-  feFlood.setAttribute("flood-color","black");
-  feFlood.setAttribute("flood-opacity", this.config.shadowOpacity);
-  feFlood.setAttribute("result","color");
-  gaussFilter.appendChild(feFlood);
-
-  // composite 2
-  feComposite2 = document.createElementNS(svg,"feComposite");
-  feComposite2.setAttribute("operator","in");
-  feComposite2.setAttribute("in", "color");
-  feComposite2.setAttribute("in2","inverse");
-  feComposite2.setAttribute("result","shadow");
-  gaussFilter.appendChild(feComposite2);
-
-  // composite 3
-  feComposite3 = document.createElementNS(svg,"feComposite");
-  feComposite3.setAttribute("operator","over");
-  feComposite3.setAttribute("in", "shadow");
-  feComposite3.setAttribute("in2","SourceGraphic");
-  gaussFilter.appendChild(feComposite3);
-
-  // set shadow
-  if (!this.config.hideInnerShadow) {
-    this.canvas.canvas.childNodes[2].setAttribute("filter", "url(#" + this.config.id + "-inner-shadow)");
-    this.canvas.canvas.childNodes[3].setAttribute("filter", "url(#" + this.config.id + "-inner-shadow)");
-  }
-
-  // var clear
-  gaussFilter, feOffset, feGaussianBlur, feComposite1, feFlood, feComposite2, feComposite3 = null;
-
-};
-
-/** Get color for value */
-function getColor(val, pct, col, noGradient, custSec) {
-
-  var no, inc, colors, percentage, rval, gval, bval, lower, upper, range, rangePct, pctLower, pctUpper, color;
-  var noGradient = noGradient || custSec.length > 0;
-
-  if(custSec.length > 0) {
-    for(var i = 0; i < custSec.length; i++) {
-      if(val > custSec[i].lo && val <= custSec[i].hi) {
-        return custSec[i].color;
-      }
-    }
-  }
-
-  no = col.length;
-  if (no === 1) return col[0];
-  inc = (noGradient) ? (1 / no) : (1 / (no - 1));
-  colors = [];
-  for (var i = 0; i < col.length; i++) {
-    percentage = (noGradient) ? (inc * (i + 1)) : (inc * i);
-    rval = parseInt((cutHex(col[i])).substring(0,2),16);
-    gval = parseInt((cutHex(col[i])).substring(2,4),16);
-    bval = parseInt((cutHex(col[i])).substring(4,6),16);
-    colors[i] = { pct: percentage, color: { r: rval, g: gval, b: bval  } };
-  }
-
-  if(pct === 0) {
-    return 'rgb(' + [colors[0].color.r, colors[0].color.g, colors[0].color.b].join(',') + ')';
-  }
-
-  for (var j = 0; j < colors.length; j++) {
-    if (pct <= colors[j].pct) {
-      if (noGradient) {
-        return 'rgb(' + [colors[j].color.r, colors[j].color.g, colors[j].color.b].join(',') + ')';
-      } else {
-        lower = colors[j - 1];
-        upper = colors[j];
-        range = upper.pct - lower.pct;
-        rangePct = (pct - lower.pct) / range;
-        pctLower = 1 - rangePct;
-        pctUpper = rangePct;
-        color = {
-          r: Math.floor(lower.color.r * pctLower + upper.color.r * pctUpper),
-          g: Math.floor(lower.color.g * pctLower + upper.color.g * pctUpper),
-          b: Math.floor(lower.color.b * pctLower + upper.color.b * pctUpper)
-        };
-        return 'rgb(' + [color.r, color.g, color.b].join(',') + ')';
-      }
-    }
-  }
-
-}
-
-/** Fix Raphael display:none tspan dy attribute bug */
-function setDy(elem, fontSize, txtYpos) {
-  if ((!ie || ie > 9) && (elem.node.firstChild.attributes.dy)) {
-    elem.node.firstChild.attributes.dy.value = 0;
-  }
-}
-
-/** Random integer  */
-function getRandomInt (min, max) {
-  return Math.floor(Math.random() * (max - min + 1)) + min;
-}
-
-/**  Cut hex  */
-function cutHex(str) {
-  return (str.charAt(0)=="#") ? str.substring(1,7):str;
-}
-
-/**  Human friendly number suffix - From: http://stackoverflow.com/questions/2692323/code-golf-friendly-number-abbreviator */
-function humanFriendlyNumber( n, d ) {
-  var p, d2, i, s;
-
-  p = Math.pow;
-  d2 = p(10, d);
-  i = 7;
-  while( i ) {
-    s = p(10,i--*3);
-    if( s <= n ) {
-     n = Math.round(n*d2/s)/d2+"KMGTPE"[i];
-   }
- }
- return n;
-}
-
-/**  Get style  */
-function getStyle(oElm, strCssRule){
-  var strValue = "";
-  if(document.defaultView && document.defaultView.getComputedStyle){
-    strValue = document.defaultView.getComputedStyle(oElm).getPropertyValue(strCssRule);
-  }
-  else if(oElm.currentStyle){
-    strCssRule = strCssRule.replace(/\-(\w)/g, function (strMatch, p1){
-      return p1.toUpperCase();
-    });
-    strValue = oElm.currentStyle[strCssRule];
-  }
-  return strValue;
-}
-
-/**  Create Element NS Ready  */
-function onCreateElementNsReady(func) {
-  if (document.createElementNS !== undefined) {
-    func();
-  } else {
-    setTimeout(function() { onCreateElementNsReady(func); }, 100);
-  }
-}
-
-/**  Get IE version  */
-// ----------------------------------------------------------
-// A short snippet for detecting versions of IE in JavaScript
-// without resorting to user-agent sniffing
-// ----------------------------------------------------------
-// If you're not in IE (or IE version is less than 5) then:
-// ie === undefined
-// If you're in IE (>=5) then you can determine which version:
-// ie === 7; // IE7
-// Thus, to detect IE:
-// if (ie) {}
-// And to detect the version:
-// ie === 6 // IE6
-// ie > 7 // IE8, IE9 ...
-// ie < 9 // Anything less than IE9
-// ----------------------------------------------------------
-// UPDATE: Now using Live NodeList idea from @jdalton
-var ie = (function(){
-
-  var undef,
-  v = 3,
-  div = document.createElement('div'),
-  all = div.getElementsByTagName('i');
-
-  while (
-    div.innerHTML = '<!--[if gt IE ' + (++v) + ']><i></i><![endif]-->',
-    all[0]
-    );
-    return v > 4 ? v : undef;
-}());
\ No newline at end of file
diff --git a/addons/sale_crm/static/src/js/sale_crm.js b/addons/sale_crm/static/src/js/sale_crm.js
deleted file mode 100644
index 207ac959af3..00000000000
--- a/addons/sale_crm/static/src/js/sale_crm.js
+++ /dev/null
@@ -1,108 +0,0 @@
-openerp.sale_crm = function(openerp) {
-var _t = openerp.web._t;
-
-openerp.sale_crm.GaugeWidget = openerp.web_kanban.AbstractField.extend({
-    className: "oe_gage",
-    start: function() {
-        var self = this;
-
-        var parent = this.getParent();
-        var max = this.options.max_field ? parent.record[this.options.max_field].raw_value : 100;
-        var label = this.options.label_field ? parent.record[this.options.label_field].raw_value : "";
-        var title = this.$node.html();
-        var val = this.field.value;
-        var value = _.isArray(val) && val.length ? val[val.length-1]['value'] : val;
-        var unique_id = _.uniqueId("JustGage");
-        
-        this.$el.empty()
-            .attr('style', this.$node.attr('style') + ';position:relative; display:inline-block;')
-            .attr('id', unique_id);
-        this.gage = new JustGage({
-            id: unique_id,
-            node: this.$el[0],
-            title: title,
-            value: value,
-            min: 0,
-            max: max,
-            relativeGaugeSize: true,
-            humanFriendly: true,
-            titleFontColor: '#333333',
-            valueFontColor: '#333333',
-            labelFontColor: '#000',
-            label: label,
-            levelColors: [
-                "#ff0000",
-                "#f9c802",
-                "#a9d70b"
-            ],
-        });
-
-        var flag_open = false;
-        if (self.options.action_change) {
-            var $svg = self.$el.find('svg');
-            var css = {
-                'text-align': 'center',
-                'position': 'absolute',
-                'width': self.$el.outerWidth() + 'px',
-                'top': (self.$el.outerHeight()/2-5) + 'px'
-            };
-
-            self.$el.click(function (event) {
-                event.stopPropagation();
-                flag_open = false;
-                if (!parent.view.is_action_enabled('edit')) {
-                    return;
-                }
-                if (!self.$el.find(".oe_justgage_edit").size()) {
-                    $div = $('<div class="oe_justgage_edit" style="z-index:1"/>');
-                    $div.css(css);
-                    $input = $('<input/>').val(value);
-                    $input.css({
-                        'text-align': 'center',
-                        'margin': 'auto',
-                        'width': ($svg.outerWidth()-40) + 'px'
-                    });
-                    $div.append($input);
-                    self.$el.prepend($div)
-                    $input.focus()
-                        .keydown(function (event) {
-                            event.stopPropagation();
-                            if (event.keyCode == 13 || event.keyCode == 9) {
-                                if ($input.val() != value) {
-                                    parent.view.dataset.call(self.options.action_change, [parent.id, $input.val()]).then(function () {
-                                        parent.do_reload();
-                                    });
-                                } else {
-                                    $div.remove();
-                                }
-                            }
-                        })
-                        .click(function (event) {
-                            event.stopPropagation();
-                            flag_open = false;
-                        })
-                        .blur(function (event) {
-                            if(!flag_open) {
-                                self.$el.find(".oe_justgage_edit").remove();
-                            } else {
-                                flag_open = false;
-                                setTimeout(function () {$input.focus();}, 0);
-                            }
-                        });
-                }
-            }).mousedown(function () {
-                flag_open = true;
-            });
-
-            if (!+value) {
-                $svg.fadeTo(0, 0.3);
-                $div = $('<div/>').text(_t("Click to change value"));
-                $div.css(css);
-                self.$el.append($div);
-            }
-        }
-    },
-});
-openerp.web_kanban.fields_registry.add("gage", "openerp.sale_crm.GaugeWidget");
-
-};

From 53b7baf1ce8a3143648e9d987899b03e0b36dfea Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 13 Sep 2013 12:24:44 +0200
Subject: [PATCH 140/164] [FIX] fixed some problems related to magic guess of
 db, now only tries to perform the magic guess when the --dbfilter argument is
 specified

bzr revid: nicolas.vanhoren@openerp.com-20130913102444-u30boym4nklatnf1
---
 addons/web/controllers/main.py | 34 +++++++++++++++++++++-------------
 addons/web/http.py             | 11 ++++-------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 29cbd8960bb..651e5c42a97 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -528,27 +528,35 @@ class Home(http.Controller):
     @http.route('/', type='http', auth="none")
     def index(self, s_action=None, db=None, debug=False, **kw):
         debug = debug != False
-        if db is not None:
-            lst = http.db_list(True)
-            if db in lst and db != request.session.db:
-                request.session.logout()
-                request.session.db = db
 
-        if db != request.session.db:
+        lst = http.db_list(True)
+        if db not in lst:
+            db = None
+        guessed_db = http.db_monodb(request.httprequest)
+        if guessed_db is None and len(lst) > 0:
+            guessed_db = lst[0]
+
+        def redirect(db):
             query = dict(urlparse.parse_qsl(request.httprequest.query_string, keep_blank_values=True))
-            query.update({'db': request.session.db})
+            query.update({'db': db})
             redirect = request.httprequest.path + '?' + urllib.urlencode(query)
             return redirect_with_hash(redirect)
-                
-        db = request.session.db
 
-        js = "\n        ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list('js', db=db, debug=debug))
-        css = "\n        ".join('<link rel="stylesheet" href="%s">' % i for i in manifest_list('css', db=db, debug=debug))
+        if db is None and guessed_db is not None:
+            return redirect(guessed_db)
+
+        if db is not None and db != guessed_db:
+            request.session.logout()
+            request.session.db = db
+            guessed_db = db
+
+        js = "\n        ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list('js', db=guessed_db, debug=debug))
+        css = "\n        ".join('<link rel="stylesheet" href="%s">' % i for i in manifest_list('css', db=guessed_db, debug=debug))
 
         r = html_template % {
             'js': js,
             'css': css,
-            'modules': simplejson.dumps(module_boot(db=db)),
+            'modules': simplejson.dumps(module_boot(db=guessed_db)),
             'init': 'var wc = new s.web.WebClient();wc.appendTo($(document.body));'
         }
         return request.make_response(r, {'Cache-Control': 'no-cache', 'Content-Type': 'text/html; charset=utf-8'})
@@ -729,7 +737,7 @@ class Database(http.Controller):
     def get_list(self):
         # TODO change js to avoid calling this method if in monodb mode
         try:
-            return db_list()
+            return http.db_list()
         except openerp.exceptions.AccessDenied:
             monodb = db_monodb()
             if monodb:
diff --git a/addons/web/http.py b/addons/web/http.py
index ccd1125fa22..c8fabafd594 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -1084,17 +1084,14 @@ def db_monodb(httprequest=None):
 
     dbs = db_list(True, httprequest)
 
-    # 1 try the db already in the session
+    # try the db already in the session
     db_session = httprequest.session.db
     if db_session in dbs:
         return db_session
 
-    # 2 if there is only one db in the db filters, take it
-    if len(dbs) == 1:
-        return dbs[0]
-
-    # 3 if there are multiple dbs, take the first one only if we can list them
-    if len(dbs) > 1 and config['list_db']:
+    # if dbfilters was specified when launching the server and there is
+    # only one possible db, we take that one
+    if openerp.tools.config['dbfilter'] != ".*" and len(dbs) == 1:
         return dbs[0]
     return None
 

From 56382a450a4c5572a17dca3054bf23654013910a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 13 Sep 2013 12:40:26 +0200
Subject: [PATCH 141/164] [FIX] problem with page reload after installing a
 module

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

bzr revid: nicolas.vanhoren@openerp.com-20130913104026-rxtl7h1u7vuixyvm
---
 addons/web/static/src/js/chrome.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 55ab5ec073d..793dbd43d76 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -808,7 +808,7 @@ instance.web.redirect = function(url, wait) {
         if (old === url) {
             window.location.reload();
         } else {
-            window.location = url;
+            window.location.href = url;
         }
     };
 

From ed62d1dac714398c58b5cc149f144ebc70b56438 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Sep 2013 13:54:08 +0200
Subject: [PATCH 142/164] [REF] mass_mailing: first refactor

Mail statistics are now stored onto a separated object (mail.mail.statistics), allowing to
handle emails separately from statistics (among other removing mail.mail entries while keeping
statistics).

Everything linnked to opened/replied/bounce is not managed by mass_mailing, removed added code
in mail module.

bzr revid: tde@openerp.com-20130913115408-322cyjipdg680as6
---
 addons/mail/controllers/main.py               |   8 -
 addons/mail/data/mail_data.xml                |   6 -
 addons/mail/mail_mail.py                      |  47 -----
 addons/mail/mail_mail_view.xml                |   5 -
 addons/mail/mail_thread.py                    | 101 ++++------
 addons/mail/res_config.py                     |  26 ---
 addons/mail/res_config_view.xml               |   8 -
 addons/mail/tests/__init__.py                 |   3 +-
 addons/mass_mailing/__init__.py               |   1 +
 addons/mass_mailing/__openerp__.py            |   4 +-
 addons/mass_mailing/controllers/__init__.py   |   3 +
 addons/mass_mailing/controllers/main.py       |  12 ++
 addons/mass_mailing/mail_data.xml             |  12 ++
 addons/mass_mailing/mail_mail.py              |  54 ++---
 addons/mass_mailing/mail_mail_view.xml        |  20 --
 addons/mass_mailing/mail_thread.py            |  82 ++++++++
 addons/mass_mailing/mass_mailing.py           | 184 ++++++++++++++----
 addons/mass_mailing/mass_mailing_demo.xml     |  45 +++--
 addons/mass_mailing/mass_mailing_view.xml     |  68 +++----
 .../mass_mailing/security/ir.model.access.csv |   5 +-
 .../wizard/mail_compose_message.py            |  18 +-
 .../wizard/mail_compose_message_view.xml      |   6 +-
 .../mail_mass_mailing_create_segment.py       |  34 ++--
 .../mail_mass_mailing_create_segment.xml      |  26 +--
 24 files changed, 431 insertions(+), 347 deletions(-)
 create mode 100644 addons/mass_mailing/controllers/__init__.py
 create mode 100644 addons/mass_mailing/controllers/main.py
 create mode 100644 addons/mass_mailing/mail_data.xml
 delete mode 100644 addons/mass_mailing/mail_mail_view.xml
 create mode 100644 addons/mass_mailing/mail_thread.py

diff --git a/addons/mail/controllers/main.py b/addons/mail/controllers/main.py
index 27373c34add..959877ad098 100644
--- a/addons/mail/controllers/main.py
+++ b/addons/mail/controllers/main.py
@@ -5,7 +5,6 @@ import openerp
 from openerp import SUPERUSER_ID
 import openerp.addons.web.http as http
 from openerp.addons.web.controllers.main import content_disposition
-from openerp.addons.web.http import request
 
 
 class MailController(http.Controller):
@@ -38,10 +37,3 @@ class MailController(http.Controller):
             except psycopg2.Error:
                 pass
         return True
-
-    @http.route('/mail/track/<int:mail_id>/blank.gif', type='http', auth='admin')
-    def track_read_email(self, mail_id):
-        """ Email tracking. """
-        mail_mail = request.registry.get('mail.mail')
-        mail_mail.set_opened(request.cr, request.uid, [mail_id])
-        return False
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index 79754f5f5a4..e1ca797670b 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -51,12 +51,6 @@
             <field name="value">catchall</field>
         </record>
 
-        <!-- Bounce Email Alias -->
-        <record id="icp_mail_bounce_alias" model="ir.config_parameter">
-            <field name="key">mail.bounce.alias</field>
-            <field name="value">bounce</field>
-        </record>
-
         <!-- Discussion subtype for messaging / Chatter -->
         <record id="mt_comment" model="mail.message.subtype">
             <field name="name">Discussions</field>
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 127d1502028..91799b0ac63 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -62,17 +62,6 @@ class mail_mail(osv.Model):
         # and during unlink() we will not cascade delete the parent and its attachments
         'notification': fields.boolean('Is Notification',
             help='Mail has been created to notify people of an existing mail.message'),
-        # Bounce and tracking
-        'opened': fields.datetime(
-            'Opened',
-            help='Date when this email has been opened for the first time.'),
-        'replied': fields.datetime(
-            'Replied',
-            help='Date when this email has been replied for the first time.'),
-        'bounced': fields.datetime(
-            'Bounced',
-            help='Date when this email has bounced.'
-        ),
     }
 
     _defaults = {
@@ -106,30 +95,6 @@ class mail_mail(osv.Model):
     def cancel(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
 
-    def set_opened(self, cr, uid, ids, context=None):
-        """ Set as opened """
-        existing_ids = self.exists(cr, uid, ids, context=context)
-        for mail in self.browse(cr, uid, existing_ids, context=context):
-            if not mail.opened:
-                self.write(cr, uid, [mail.id], {'opened': fields.datetime.now()}, context=context)
-        return True
-
-    def set_replied(self, cr, uid, ids, context=None):
-        """ Set as replied """
-        existing_ids = self.exists(cr, uid, ids, context=context)
-        for mail in self.browse(cr, uid, existing_ids, context=context):
-            if not mail.replied:
-                self.write(cr, uid, [mail.id], {'replied': fields.datetime.now()}, context=context)
-        return True
-
-    def set_bounced(self, cr, uid, ids, context=None):
-        """ Set as bounced """
-        existing_ids = self.exists(cr, uid, ids, context=context)
-        for mail in self.browse(cr, uid, existing_ids, context=context):
-            if not mail.bounced:
-                self.write(cr, uid, [mail.id], {'bounced': fields.datetime.now()}, context=context)
-        return True
-
     def process_email_queue(self, cr, uid, ids=None, context=None):
         """Send immediately queued messages, committing after each
            message is sent - this is not transactional and should
@@ -200,15 +165,6 @@ class mail_mail(osv.Model):
         else:
             return None
 
-    def _get_tracking_url(self, cr, uid, mail, partner=None, context=None):
-        if not mail.auto_delete:
-            base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
-            track_url = urljoin(base_url, 'mail/track/%d/blank.gif' % mail.id)
-            print base_url, track_url
-            return '<img src="%s" alt=""/>' % track_url
-        else:
-            return ''
-
     def send_get_mail_subject(self, cr, uid, mail, force=False, partner=None, context=None):
         """ If subject is void and record_name defined: '<Author> posted on <Resource>'
 
@@ -233,11 +189,8 @@ class mail_mail(osv.Model):
 
         # generate footer
         link = self._get_partner_access_link(cr, uid, mail, partner, context=context)
-        tracking_url = self._get_tracking_url(cr, uid, mail, partner, context=context)
         if link:
             body = tools.append_content_to_html(body, link, plaintext=False, container_tag='div')
-        if tracking_url:
-            body = tools.append_content_to_html(body, tracking_url, plaintext=False, container_tag='div')
         return body
 
     def send_get_email_dict(self, cr, uid, mail, partner=None, context=None):
diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index 9a2a178d61c..dd6a78fd8a4 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -41,11 +41,6 @@
                                             <field name="model"/>
                                             <field name="res_id"/>
                                         </group>
-                                        <group string="Tracking">
-                                            <field name="opened"/>
-                                            <field name="replied"/>
-                                            <field name="bounced"/>
-                                        </group>
                                     </div>
                                     <div>
                                         <group string="Headers">
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 8c51e99a94c..2bfd17fdb59 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -778,7 +778,6 @@ class mail_thread(osv.AbstractModel):
         """
         assert isinstance(message, Message), 'message must be an email.message.Message at this point'
         fallback_model = model
-        bounce_alias = self.pool['ir.config_parameter'].get_param(cr, uid, "mail.bounce.alias", context=context)
 
         # Get email.message.Message variables for future processing
         message_id = message.get('Message-Id')
@@ -787,25 +786,6 @@ class mail_thread(osv.AbstractModel):
         references = decode_header(message, 'References')
         in_reply_to = decode_header(message, 'In-Reply-To')
 
-        # 0. Verify whether this is a bounced email (wrong destination,...) -> use it to collect data, such as dead leads
-        if bounce_alias in email_to:
-            bounce_match = tools.bounce_re.search(email_to)
-            if bounce_match:
-                bounced_mail_id = bounce_match.group(1)
-                self.pool['mail.mail'].set_bounced(cr, uid, [bounced_mail_id], context=context)
-                if self.pool['mail.mail'].exists(cr, uid, bounced_mail_id):
-                    mail = self.pool['mail.mail'].browse(cr, uid, bounced_mail_id, context=context)
-                    bounced_model = mail.model
-                    bounced_thread_id = mail.res_id
-                else:
-                    bounced_model = bounce_match.group(2)
-                    bounced_thread_id = int(bounce_match.group(3)) if bounce_match.group(3) else 0
-                _logger.info('Routing mail from %s to %s with Message-Id %s: bounced mail from mail %s, model: %s, thread_id: %s',
-                             email_from, email_to, message_id, bounced_mail_id, bounced_model, bounced_thread_id)
-                if bounced_model and bounced_model in self.pool and hasattr(self.pool[bounced_model], 'message_receive_bounce'):
-                    self.pool[bounced_model].message_receive_bounce(cr, uid, [bounced_thread_id], mail_id=bounced_mail_id, context=context)
-                return []
-
         # 1. Verify if this is a reply to an existing thread
         thread_references = references or in_reply_to
         ref_match = thread_references and tools.reference_re.search(thread_references)
@@ -894,6 +874,40 @@ class mail_thread(osv.AbstractModel):
             "No possible route found for incoming message from %s to %s (Message-Id %s:)." \
             "Create an appropriate mail.alias or force the destination model." % (email_from, email_to, message_id)
 
+    def message_route_process(self, cr, uid, msg, routes, context=None):
+        # postpone setting msg.partner_ids after message_post, to avoid double notifications
+        partner_ids = msg.pop('partner_ids', [])
+        thread_id = False
+        for model, thread_id, custom_values, user_id, alias in routes:
+            if self._name == 'mail.thread':
+                context.update({'thread_model': model})
+            if model:
+                model_pool = self.pool[model]
+                assert thread_id and hasattr(model_pool, 'message_update') or hasattr(model_pool, 'message_new'), \
+                    "Undeliverable mail with Message-Id %s, model %s does not accept incoming emails" % \
+                    (msg['message_id'], model)
+
+                # disabled subscriptions during message_new/update to avoid having the system user running the
+                # email gateway become a follower of all inbound messages
+                nosub_ctx = dict(context, mail_create_nosubscribe=True, mail_create_nolog=True)
+                if thread_id and hasattr(model_pool, 'message_update'):
+                    model_pool.message_update(cr, user_id, [thread_id], msg, context=nosub_ctx)
+                else:
+                    thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=nosub_ctx)
+            else:
+                assert thread_id == 0, "Posting a message without model should be with a null res_id, to create a private message."
+                model_pool = self.pool.get('mail.thread')
+            if not hasattr(model_pool, 'message_post'):
+                context['thread_model'] = model
+                model_pool = self.pool['mail.thread']
+            new_msg_id = model_pool.message_post(cr, uid, [thread_id], context=context, subtype='mail.mt_comment', **msg)
+
+            if partner_ids:
+                # postponed after message_post, because this is an external message and we don't want to create
+                # duplicate emails due to notifications
+                self.pool.get('mail.message').write(cr, uid, [new_msg_id], {'partner_ids': partner_ids}, context=context)
+        return thread_id
+
     def message_process(self, cr, uid, model, message, custom_values=None,
                         save_original=False, strip_attachments=False,
                         thread_id=None, context=None):
@@ -946,8 +960,7 @@ class mail_thread(osv.AbstractModel):
         msg = self.message_parse(cr, uid, msg_txt, save_original=save_original, context=context)
         if strip_attachments:
             msg.pop('attachments', None)
-        # postpone setting msg.partner_ids after message_post, to avoid double notifications
-        partner_ids = msg.pop('partner_ids', [])
+
         if msg.get('message_id'):   # should always be True as message_parse generate one if missing
             existing_msg_ids = self.pool.get('mail.message').search(cr, SUPERUSER_ID, [
                                                                 ('message_id', '=', msg.get('message_id')),
@@ -959,36 +972,7 @@ class mail_thread(osv.AbstractModel):
 
         # find possible routes for the message
         routes = self.message_route(cr, uid, msg_txt, msg, model, thread_id, custom_values, context=context)
-        thread_id = False
-        for model, thread_id, custom_values, user_id, alias in routes:
-            if self._name == 'mail.thread':
-                context.update({'thread_model': model})
-            if model:
-                model_pool = self.pool[model]
-                assert thread_id and hasattr(model_pool, 'message_update') or hasattr(model_pool, 'message_new'), \
-                    "Undeliverable mail with Message-Id %s, model %s does not accept incoming emails" % \
-                        (msg['message_id'], model)
-
-                # disabled subscriptions during message_new/update to avoid having the system user running the
-                # email gateway become a follower of all inbound messages
-                nosub_ctx = dict(context, mail_create_nosubscribe=True, mail_create_nolog=True)
-                if thread_id and hasattr(model_pool, 'message_update'):
-                    model_pool.message_update(cr, user_id, [thread_id], msg, context=nosub_ctx)
-                else:
-                    thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=nosub_ctx)
-            else:
-                assert thread_id == 0, "Posting a message without model should be with a null res_id, to create a private message."
-                model_pool = self.pool.get('mail.thread')
-            if not hasattr(model_pool, 'message_post'):
-                context['thread_model'] = model
-                model_pool = self.pool['mail.thread']
-            new_msg_id = model_pool.message_post(cr, uid, [thread_id], context=context, subtype='mail.mt_comment', **msg)
-
-            if partner_ids:
-                # postponed after message_post, because this is an external message and we don't want to create
-                # duplicate emails due to notifications
-                self.pool.get('mail.message').write(cr, uid, [new_msg_id], {'partner_ids': partner_ids}, context=context)
-
+        thread_id = self.message_route_process(cr, uid, msg, routes, context=context)
         return thread_id
 
     def message_new(self, cr, uid, msg_dict, custom_values=None, context=None):
@@ -1044,15 +1028,6 @@ class mail_thread(osv.AbstractModel):
             self.write(cr, uid, ids, update_vals, context=context)
         return True
 
-    def message_receive_bounce(self, cr, uid, ids, mail_id=None, context=None):
-        """Called by ``message_process`` when a bounce email (such as Undelivered
-        Mail Returned to Sender) is received for an existing thread. The default
-        behavior is to check is an integer  ``message_bounce`` column exists.
-        If it is the case, its content is incremented. """
-        if self._all_columns.get('message_bounce'):
-            for obj in self.browse(cr, uid, ids, context=context):
-                self.write(cr, uid, [obj.id], {'message_bounce': obj.message_bounce + 1}, context=context)
-
     def _message_extract_payload(self, message, save_original=False):
         """Extract body as HTML and attachments from the mail message"""
         attachments = []
@@ -1303,8 +1278,8 @@ class mail_thread(osv.AbstractModel):
         return result
 
     def message_post(self, cr, uid, thread_id, body='', subject=None, type='notification',
-                        subtype=None, parent_id=False, attachments=None, context=None,
-                        content_subtype='html', **kwargs):
+                     subtype=None, parent_id=False, attachments=None, context=None,
+                     content_subtype='html', **kwargs):
         """ Post a new message in an existing thread, returning the new
             mail.message ID.
 
diff --git a/addons/mail/res_config.py b/addons/mail/res_config.py
index 750c82d54ba..a0cc7ef5c53 100644
--- a/addons/mail/res_config.py
+++ b/addons/mail/res_config.py
@@ -32,14 +32,6 @@ class project_configuration(osv.TransientModel):
             'Alias Domain',
             help="If you have setup a catch-all email domain redirected to the OpenERP server, enter the domain name here."
         ),
-        'alias_bounce': fields.char(
-            'Return-Path for Emails',
-            help="Return-Path of send Emails. Used to compute bounced emails.",
-        ),
-        'alias_catchall': fields.char(
-            'Default Alias',
-            help='Default email alias',
-        ),
     }
 
     def get_default_alias_domain(self, cr, uid, ids, context=None):
@@ -56,21 +48,3 @@ class project_configuration(osv.TransientModel):
         config_parameters = self.pool.get("ir.config_parameter")
         for record in self.browse(cr, uid, ids, context=context):
             config_parameters.set_param(cr, uid, "mail.catchall.domain", record.alias_domain or '', context=context)
-
-    def get_default_alias_bounce(self, cr, uid, ids, context=None):
-        alias_bounce = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.bounce.alias", context=context)
-        return {'alias_bounce': alias_bounce}
-
-    def set_alias_bounce(self, cr, uid, ids, context=None):
-        config_parameters = self.pool.get("ir.config_parameter")
-        for record in self.browse(cr, uid, ids, context=context):
-            config_parameters.set_param(cr, uid, "mail.bounce.alias", record.alias_bounce or '', context=context)
-
-    def get_default_alias_catchall(self, cr, uid, ids, context=None):
-        alias_catchall = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.alias", context=context)
-        return {'alias_catchall': alias_catchall}
-
-    def set_alias_catchall(self, cr, uid, ids, context=None):
-        config_parameters = self.pool.get("ir.config_parameter")
-        for record in self.browse(cr, uid, ids, context=context):
-            config_parameters.set_param(cr, uid, "mail.catchall.alias", record.alias_catchall or '', context=context)
diff --git a/addons/mail/res_config_view.xml b/addons/mail/res_config_view.xml
index 440cf358e47..d3797ba2dcc 100644
--- a/addons/mail/res_config_view.xml
+++ b/addons/mail/res_config_view.xml
@@ -11,14 +11,6 @@
                         <label for="alias_domain" class="oe_inline"/>
                         <field name="alias_domain" placeholder="mycompany.my.openerp.com" class="oe_inline"/>
                     </div>
-                    <div>
-                        <label for="alias_bounce" class="oe_inline"/>
-                        <field name="alias_bounce" placeholder="bounce" class="oe_inline"/>
-                    </div>
-                    <div>
-                        <label for="alias_catchall" class="oe_inline"/>
-                        <field name="alias_catchall" placeholder="catchall" class="oe_inline"/>
-                    </div>
                 </xpath>
             </field>
         </record>
diff --git a/addons/mail/tests/__init__.py b/addons/mail/tests/__init__.py
index ff075d73d73..242beb60bf1 100644
--- a/addons/mail/tests/__init__.py
+++ b/addons/mail/tests/__init__.py
@@ -19,10 +19,9 @@
 #
 ##############################################################################
 
-from . import test_mail_mail, test_mail_group, test_mail_message, test_mail_features, test_mail_gateway, test_message_read, test_invite
+from . import test_mail_group, test_mail_message, test_mail_features, test_mail_gateway, test_message_read, test_invite
 
 checks = [
-    # test_mail_mail,
     test_mail_group,
     test_mail_message,
     test_mail_features,
diff --git a/addons/mass_mailing/__init__.py b/addons/mass_mailing/__init__.py
index 37f3850306a..f7b250bd2ed 100644
--- a/addons/mass_mailing/__init__.py
+++ b/addons/mass_mailing/__init__.py
@@ -22,3 +22,4 @@
 import mass_mailing
 import mail_mail
 import wizard
+import controllers
diff --git a/addons/mass_mailing/__openerp__.py b/addons/mass_mailing/__openerp__.py
index 7f2c26e4a28..0301484afec 100644
--- a/addons/mass_mailing/__openerp__.py
+++ b/addons/mass_mailing/__openerp__.py
@@ -21,6 +21,7 @@
 
 {
     'name': 'Mass Mailing Campaigns',
+    'description': """TODO""",
     'version': '1.0',
     'author': 'OpenERP',
     'website': 'http://www.openerp.com',
@@ -31,11 +32,10 @@
         'web_kanban_gauge',
         'web_kanban_sparkline',
     ],
-    'description': """TODO""",
     'data': [
+        'mail_data.xml',
         'mass_mailing_view.xml',
         'mass_mailing_demo.xml',
-        'mail_mail_view.xml',
         'wizard/mail_compose_message_view.xml',
         'wizard/mail_mass_mailing_create_segment.xml',
         'security/ir.model.access.csv',
diff --git a/addons/mass_mailing/controllers/__init__.py b/addons/mass_mailing/controllers/__init__.py
new file mode 100644
index 00000000000..e11f9ba81bb
--- /dev/null
+++ b/addons/mass_mailing/controllers/__init__.py
@@ -0,0 +1,3 @@
+import main
+
+# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mass_mailing/controllers/main.py b/addons/mass_mailing/controllers/main.py
new file mode 100644
index 00000000000..9997d854cf3
--- /dev/null
+++ b/addons/mass_mailing/controllers/main.py
@@ -0,0 +1,12 @@
+
+import openerp.addons.web.http as http
+from openerp.addons.web.http import request
+
+
+class MassMailController(http.Controller):
+    @http.route('/mail/track/<int:mail_id>/blank.gif', type='http', auth='admin')
+    def track_mail_open(self, mail_id):
+        """ Email tracking. """
+        mail_mail_stats = request.registry.get('mail.mail.statistics')
+        mail_mail_stats.set_opened(request.cr, request.uid, mail_ids=[mail_id])
+        return False
diff --git a/addons/mass_mailing/mail_data.xml b/addons/mass_mailing/mail_data.xml
new file mode 100644
index 00000000000..a1a0e404fe3
--- /dev/null
+++ b/addons/mass_mailing/mail_data.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <!-- Bounce Email Alias -->
+        <record id="icp_mail_bounce_alias" model="ir.config_parameter">
+            <field name="key">mail.bounce.alias</field>
+            <field name="value">bounce</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/mass_mailing/mail_mail.py b/addons/mass_mailing/mail_mail.py
index 2ecf38fd31e..5d576c158a9 100644
--- a/addons/mass_mailing/mail_mail.py
+++ b/addons/mass_mailing/mail_mail.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2013-today OpenERP SA (<http://www.openerp.com>)
+#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,7 +19,11 @@
 #
 ##############################################################################
 
-from openerp.osv import osv, fields
+from urlparse import urljoin
+
+from openerp import tools
+from openerp import SUPERUSER_ID
+from openerp.osv import osv
 
 
 class MailMail(osv.Model):
@@ -27,23 +31,29 @@ class MailMail(osv.Model):
     _name = 'mail.mail'
     _inherit = ['mail.mail']
 
-    _columns = {
-        'mass_mailing_segment_id': fields.many2one(
-            'mail.mass_mailing.segment', 'Mass Mailing Segment',
-            ondelete='set null',
-        ),
-        'mass_mailing_campaign_id': fields.related(
-            'mass_mailing_segment_id', 'mass_mailing_campaign_id',
-            type='many2one', ondelete='set null',
-            relation='mail.mass_mailing.campaign',
-            string='Mass Mailing Campaign',
-            store=True, readonly=True,
-        ),
-        'template_id': fields.related(
-            'mass_mailing_segment_id', 'template_id',
-            type='many2one', ondelete='set null',
-            relation='email.template',
-            string='Email Template',
-            store=True, readonly=True,
-        ),
-    }
+    def create(self, cr, uid, values, context=None):
+        """ Override mail_mail creation to create an entry in mail.mail.statistics """
+        # TDE note: should be after 'all values computed', to have values (FIXME after merging other branch holding create refactoring)
+        mail_id = super(MailMail, self).create(cr, uid, values, context=context)
+        message_id = self.browse(cr, SUPERUSER_ID, mail_id).message_id
+        self.pool['mail.mail.statistics'].create(
+            cr, uid, {
+                'mail_mail_id': mail_id,
+                'message_id': message_id,
+            }, context=context)
+        return mail_id
+
+    def _get_tracking_url(self, cr, uid, mail, partner=None, context=None):
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+        track_url = urljoin(base_url, 'mail/track/%d/blank.gif' % mail.id)
+        return '<img src="%s" alt=""/>' % track_url
+
+    def send_get_mail_body(self, cr, uid, mail, partner=None, context=None):
+        """ Override to add the tracking URL to the body. """
+        body = super(MailMail, self).send_get_mail_body(cr, uid, mail, partner=partner, context=context)
+
+        # generate tracking URL
+        tracking_url = self._get_tracking_url(cr, uid, mail, partner, context=context)
+        if tracking_url:
+            body = tools.append_content_to_html(body, tracking_url, plaintext=False, container_tag='div')
+        return body
diff --git a/addons/mass_mailing/mail_mail_view.xml b/addons/mass_mailing/mail_mail_view.xml
deleted file mode 100644
index 11fa08776f7..00000000000
--- a/addons/mass_mailing/mail_mail_view.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-        <!--  FOLLOWERS !-->
-        <record model="ir.ui.view" id="mail_mail_form_mass_mailing">
-            <field name="name">mail.mail.form.mass_mailing</field>
-            <field name="model">mail.mail</field>
-            <field name="inherit_id" ref="mail.view_mail_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='opened']" position="before">
-                    <field name="mass_mailing_campaign_id"/>
-                    <field name="mass_mailing_segment_id"/>
-                    <field name="template_id"/>
-                </xpath>
-            </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/mass_mailing/mail_thread.py b/addons/mass_mailing/mail_thread.py
new file mode 100644
index 00000000000..292e13eab3a
--- /dev/null
+++ b/addons/mass_mailing/mail_thread.py
@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 logging
+
+from openerp import tools
+from openerp.addons.mail.mail_thread import decode_header
+from openerp.osv import osv
+
+_logger = logging.getLogger(__name__)
+
+
+class MailThread(osv.Model):
+    """ Update MailThread to add the feature of bounced emails and replied emails
+    in message_process. """
+    _name = 'mail.thread'
+    _inherit = ['mail.thread']
+
+    def message_route_check_bounce(self, cr, uid, message, context=None):
+        bounce_alias = self.pool['ir.config_parameter'].get_param(cr, uid, "mail.bounce.alias", context=context)
+        message_id = message.get('Message-Id')
+        email_from = decode_header(message, 'From')
+        email_to = decode_header(message, 'To')
+
+        # 0. Verify whether this is a bounced email (wrong destination,...) -> use it to collect data, such as dead leads
+        if bounce_alias in email_to:
+            bounce_match = tools.bounce_re.search(email_to)
+            if bounce_match:
+                bounced_mail_id = bounce_match.group(1)
+                self.pool['mail.mail'].set_bounced(cr, uid, [bounced_mail_id], context=context)
+                if self.pool['mail.mail'].exists(cr, uid, bounced_mail_id):
+                    mail = self.pool['mail.mail'].browse(cr, uid, bounced_mail_id, context=context)
+                    bounced_model = mail.model
+                    bounced_thread_id = mail.res_id
+                else:
+                    bounced_model = bounce_match.group(2)
+                    bounced_thread_id = int(bounce_match.group(3)) if bounce_match.group(3) else 0
+                _logger.info('Routing mail from %s to %s with Message-Id %s: bounced mail from mail %s, model: %s, thread_id: %s',
+                             email_from, email_to, message_id, bounced_mail_id, bounced_model, bounced_thread_id)
+                if bounced_model and bounced_model in self.pool and hasattr(self.pool[bounced_model], 'message_receive_bounce'):
+                    self.pool[bounced_model].message_receive_bounce(cr, uid, [bounced_thread_id], mail_id=bounced_mail_id, context=context)
+                return False
+
+        return True
+
+    def message_route(self, cr, uid, message, message_dict, model=None, thread_id=None,
+                      custom_values=None, context=None):
+        if not self.message_route_check_bounce(cr, uid, message, context=context):
+            return []
+        return super(MailThread, self).message_route(cr, uid, message, message_dict, model, thread_id, custom_values, context)
+
+    def message_receive_bounce(self, cr, uid, ids, mail_id=None, context=None):
+        """Called by ``message_process`` when a bounce email (such as Undelivered
+        Mail Returned to Sender) is received for an existing thread. The default
+        behavior is to check is an integer  ``message_bounce`` column exists.
+        If it is the case, its content is incremented. """
+        if self._all_columns.get('message_bounce'):
+            for obj in self.browse(cr, uid, ids, context=context):
+                self.write(cr, uid, [obj.id], {'message_bounce': obj.message_bounce + 1}, context=context)
+
+    def message_route_process(self, cr, uid, msg, routes, context=None):
+        if msg.get('message_id'):
+            self.pool['mail.mail.statistics'].set_replied(cr, uid, mail_message_ids=[msg.get('message_id')], context=context)
+        return super(MailThread, self).message_route_process(cr, uid, msg, routes, context=context)
diff --git a/addons/mass_mailing/mass_mailing.py b/addons/mass_mailing/mass_mailing.py
index b255f3163c9..61fea847486 100644
--- a/addons/mass_mailing/mass_mailing.py
+++ b/addons/mass_mailing/mass_mailing.py
@@ -38,42 +38,46 @@ class MassMailingCampaign(osv.Model):
         results = dict.fromkeys(ids, False)
         for campaign in self.browse(cr, uid, ids, context=context):
             results[campaign.id] = {
-                'sent': len(campaign.mail_ids),
-                'opened': len([mail for mail in campaign.mail_ids if mail.opened]),
-                'replied': len([mail for mail in campaign.mail_ids if mail.replied]),
-                'bounced': len([mail for mail in campaign.mail_ids if mail.bounced]),
+                'sent': len(campaign.statistics_ids),
                 # delivered: shouldn't be: all mails - (failed + bounced) ?
-                'delivered': len([mail for mail in campaign.mail_ids if mail.state == 'sent' and not mail.bounced]),
+                'delivered': len([stat for stat in campaign.statistics_ids if not stat.bounced]),  # stat.state == 'sent' and
+                'opened': len([stat for stat in campaign.statistics_ids if stat.opened]),
+                'replied': len([stat for stat in campaign.statistics_ids if stat.replied]),
+                'bounced': len([stat for stat in campaign.statistics_ids if stat.bounced]),
             }
         return results
 
-    def _get_segment_kanban_ids(self, cr, uid, ids, name, arg, context=None):
+    def _get_mass_mailing_kanban_ids(self, cr, uid, ids, name, arg, context=None):
         results = dict.fromkeys(ids, '')
         for campaign in self.browse(cr, uid, ids, context=context):
-            segment_results = []
-            for segment in campaign.segment_ids:
-                segment_object = {}
+            mass_mailing_results = []
+            for mass_mailing in campaign.mass_mailing_ids:
+                mass_mailing_object = {}
                 for attr in ['name', 'sent', 'delivered', 'opened', 'replied', 'bounced']:
-                    segment_object[attr] = getattr(segment, attr)
-                segment_results.append(segment_object)
-            results[campaign.id] = segment_results
+                    mass_mailing_object[attr] = getattr(mass_mailing, attr)
+                mass_mailing_results.append(mass_mailing_object)
+            results[campaign.id] = mass_mailing_results
         return results
 
     _columns = {
         'name': fields.char(
             'Campaign Name', required=True,
         ),
-        'segment_ids': fields.one2many(
-            'mail.mass_mailing.segment', 'mass_mailing_campaign_id',
-            'Segments',
+        'user_id': fields.many2one(
+            'res.users', 'Responsible',
+            required=True,
         ),
-        'segment_kanban_ids': fields.function(
-            _get_segment_kanban_ids,
-            type='text', string='Segments (kanban data)',
-            help='This field has for purpose to gather data about segment to display them in kanban view as nested kanban views is not possible currently',
+        'mass_mailing_ids': fields.one2many(
+            'mail.mass_mailing', 'mass_mailing_campaign_id',
+            'Mass Mailings',
         ),
-        'mail_ids': fields.one2many(
-            'mail.mail', 'mass_mailing_campaign_id',
+        'mass_mailing_kanban_ids': fields.function(
+            _get_mass_mailing_kanban_ids,
+            type='text', string='Mass Mailings (kanban data)',
+            help='This field has for purpose to gather data about mass mailings to display them in kanban view as nested kanban views is not possible currently',
+        ),
+        'statistics_ids': fields.one2many(
+            'mail.mail.statistics', 'mass_mailing_campaign_id',
             'Sent Emails',
         ),
         'color': fields.integer('Color Index'),
@@ -105,17 +109,21 @@ class MassMailingCampaign(osv.Model):
         ),
     }
 
-    def launch_segment_create_wizard(self, cr, uid, ids, context=None):
+    # _defaults = {
+        # 'user_id': lambda self, cr, uid, ctx=None: uid,
+    # },
+
+    def launch_mass_mailing_create_wizard(self, cr, uid, ids, context=None):
         ctx = dict(context)
         ctx.update({
             'default_mass_mailing_campaign_id': ids[0],
         })
         return {
-            'name': _('Create a Segment for the Campaign'),
+            'name': _('Create a Mass Mailing for the Campaign'),
             'type': 'ir.actions.act_window',
             'view_type': 'form',
             'view_mode': 'form',
-            'res_model': 'mail.mass_mailing.segment.create',
+            'res_model': 'mail.mass_mailing.create',
             'views': [(False, 'form')],
             'view_id': False,
             'target': 'new',
@@ -123,12 +131,12 @@ class MassMailingCampaign(osv.Model):
         }
 
 
-class MassMailingSegment(osv.Model):
-    """ MassMailingSegment models a segment for a mass mailign campaign. A segment
-    is an occurence of sending emails. """
+class MassMailing(osv.Model):
+    """ MassMailing models a wave of emails for a mass mailign campaign.
+    A mass mailing is an occurence of sending emails. """
 
-    _name = 'mail.mass_mailing.segment'
-    _description = 'Segment of a mass mailing campaign'
+    _name = 'mail.mass_mailing'
+    _description = 'Wave of sending emails'
     # number of periods for tracking mail_mail statistics
     _period_number = 6
 
@@ -162,7 +170,7 @@ class MassMailingSegment(osv.Model):
     def _get_monthly_statistics(self, cr, uid, ids, field_name, arg, context=None):
         """ TODO
         """
-        obj = self.pool['mail.mail']
+        obj = self.pool['mail.mail.statistics']
         res = {}
         context['datetime_format'] = {
             'opened': {
@@ -179,22 +187,22 @@ class MassMailingSegment(osv.Model):
         for id in ids:
             res[id] = {}
             date_begin = self.browse(cr, uid, id, context=context).date
-            domain = [('mass_mailing_segment_id', '=', id), ('opened', '>=', date_begin)]
+            domain = [('mass_mailing_id', '=', id), ('opened', '>=', date_begin)]
             res[id]['opened_monthly'] = self.__get_bar_values(cr, uid, id, obj, domain, ['opened'], 'opened_count', 'opened', context=context)
-            domain = [('mass_mailing_segment_id', '=', id), ('replied', '>=', date_begin)]
+            domain = [('mass_mailing_id', '=', id), ('replied', '>=', date_begin)]
             res[id]['replied_monthly'] = self.__get_bar_values(cr, uid, id, obj, domain, ['replied'], 'replied_count', 'replied', context=context)
         return res
 
     def _get_statistics(self, cr, uid, ids, name, arg, context=None):
         """ Compute statistics of the mass mailing campaign """
         results = dict.fromkeys(ids, False)
-        for segment in self.browse(cr, uid, ids, context=context):
-            results[segment.id] = {
-                'sent': len(segment.mail_ids),
-                'delivered': len([mail for mail in segment.mail_ids if mail.state == 'sent' and not mail.bounced]),
-                'opened': len([mail for mail in segment.mail_ids if mail.opened]),
-                'replied': len([mail for mail in segment.mail_ids if mail.replied]),
-                'bounced': len([mail for mail in segment.mail_ids if mail.bounced]),
+        for mass_mailing in self.browse(cr, uid, ids, context=context):
+            results[mass_mailing.id] = {
+                'sent': len(mass_mailing.statistics_ids),
+                'delivered': len([stat for stat in mass_mailing.statistics_ids if not stat.bounced]),  # mail.state == 'sent' and
+                'opened': len([stat for stat in mass_mailing.statistics_ids if stat.opened]),
+                'replied': len([stat for stat in mass_mailing.statistics_ids if stat.replied]),
+                'bounced': len([stat for stat in mass_mailing.statistics_ids if stat.bounced]),
             }
         return results
 
@@ -214,9 +222,9 @@ class MassMailingSegment(osv.Model):
             'mass_mailing_campaign_id', 'color',
             type='integer', string='Color Index',
         ),
-        # mail_mail data
-        'mail_ids': fields.one2many(
-            'mail.mail', 'mass_mailing_segment_id',
+        # statistics data
+        'statistics_ids': fields.one2many(
+            'mail.mail.statistics', 'mass_mailing_id',
             'Send Emails',
         ),
         'sent': fields.function(
@@ -260,3 +268,95 @@ class MassMailingSegment(osv.Model):
     _defaults = {
         'date': fields.datetime.now(),
     }
+
+
+class MailMailStats(osv.Model):
+    """ MailMailStats models the statistics collected about emails. Those statistics
+    are stored in a separated model and table to avoid bloating the mail_mail table
+    with statistics values. This also allows to delete emails send with mass mailing
+    without loosing the statistics about them. """
+
+    _name = 'mail.mail.statistics'
+    _description = 'Email Statistics'
+    _rec_name = 'message_id'
+    _order = 'message_id'
+
+    _columns = {
+        'mail_mail_id': fields.integer(
+            'Mail ID',
+            help='ID of the related mail_mail. This field is an integer field because'
+                 'the related mail_mail can be deleted separately from its statistics.'
+        ),
+        'message_id': fields.char(
+            'Message-ID', required=True,
+        ),
+        # campaign / wave data
+        'mass_mailing_id': fields.many2one(
+            'mail.mass_mailing', 'Mass Mailing',
+            ondelete='set null',
+        ),
+        'mass_mailing_campaign_id': fields.related(
+            'mass_mailing_id', 'mass_mailing_campaign_id',
+            type='many2one', ondelete='set null',
+            relation='mail.mass_mailing.campaign',
+            string='Mass Mailing Campaign',
+            store=True, readonly=True,
+        ),
+        'template_id': fields.related(
+            'mass_mailing_id', 'template_id',
+            type='many2one', ondelete='set null',
+            relation='email.template',
+            string='Email Template',
+            store=True, readonly=True,
+        ),
+        # Bounce and tracking
+        'opened': fields.datetime(
+            'Opened',
+            help='Date when this email has been opened for the first time.'),
+        'replied': fields.datetime(
+            'Replied',
+            help='Date when this email has been replied for the first time.'),
+        'bounced': fields.datetime(
+            'Bounced',
+            help='Date when this email has bounced.'
+        ),
+    }
+
+    def set_opened(self, cr, uid, ids=None, mail_mail_ids=None, mail_message_ids=None, context=None):
+        """ Set as opened """
+        if not ids and mail_mail_ids:
+            ids = self.search(cr, uid, [('mail_mail_id', 'in', mail_mail_ids)], context=context)
+        elif not ids and mail_message_ids:
+            ids = self.search(cr, uid, [('message_id', 'in', mail_message_ids)], context=context)
+        else:
+            ids = []
+        for stat in self.browse(cr, uid, ids, context=context):
+            if not stat.opened:
+                self.write(cr, uid, [stat.id], {'opened': fields.datetime.now()}, context=context)
+        return True
+
+    def set_replied(self, cr, uid, ids=None, mail_mail_ids=None, mail_message_ids=None, context=None):
+        """ Set as replied """
+        if not ids and mail_mail_ids:
+            ids = self.search(cr, uid, [('mail_mail_id', 'in', mail_mail_ids)], context=context)
+        elif not ids and mail_message_ids:
+            ids = self.search(cr, uid, [('message_id', 'in', mail_message_ids)], context=context)
+        else:
+            ids = []
+        for stat in self.browse(cr, uid, ids, context=context):
+            if not stat.replied:
+                self.write(cr, uid, [stat.id], {'replied': fields.datetime.now()}, context=context)
+        return True
+
+    def set_bounced(self, cr, uid, ids=None, mail_mail_ids=None, mail_message_ids=None, context=None):
+        """ Set as bounced """
+        if not ids and mail_mail_ids:
+            ids = self.search(cr, uid, [('mail_mail_id', 'in', mail_mail_ids)], context=context)
+        elif not ids and mail_message_ids:
+            ids = self.search(cr, uid, [('message_id', 'in', mail_message_ids)], context=context)
+        else:
+            ids = []
+        for stat in self.browse(cr, uid, ids, context=context):
+            if not stat.bounced:
+                self.write(cr, uid, [stat.id], {'bounced': fields.datetime.now()}, context=context)
+        return True
diff --git a/addons/mass_mailing/mass_mailing_demo.xml b/addons/mass_mailing/mass_mailing_demo.xml
index b2278064d36..d75351e1166 100644
--- a/addons/mass_mailing/mass_mailing_demo.xml
+++ b/addons/mass_mailing/mass_mailing_demo.xml
@@ -20,60 +20,69 @@
 
         <record id="mass_mail_campaign_1" model="mail.mass_mailing.campaign">
             <field name="name">Partners Newsletter</field>
+            <field name="user_id" eval="ref('base.user_root')"/>
         </record>
 
-        <record id="mass_mail_segment_1" model="mail.mass_mailing.segment">
+        <record id="mass_mail_1" model="mail.mass_mailing">
             <field name="name">First Newsletter</field>
             <field name="template_id" eval="ref('mass_mail_template_1')"/>
             <field name="date" eval="(DateTime.today() - relativedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="mass_mailing_campaign_id" eval="ref('mass_mail_campaign_1')"/>
         </record>
-        <record id="mass_mail_segment_2" model="mail.mass_mailing.segment">
+        <record id="mass_mail_2" model="mail.mass_mailing">
             <field name="name">Second Newsletter</field>
             <field name="template_id" eval="ref('mass_mail_template_2')"/>
             <field name="date" eval="(DateTime.today() - relativedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="mass_mailing_campaign_id" eval="ref('mass_mail_campaign_1')"/>
         </record>
 
-        <record id="mass_mail_email_1" model="mail.mail">
-            <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_1')"/>
+        <record id="mass_mail_email_1" model="mail.mail.statistics">
+            <field name="mass_mailing_id" eval="ref('mass_mail_1')"/>
+            <field name="message_id">1111000@OpenERP.com</field>
             <field name="opened" eval="(DateTime.today() - relativedelta(days=2)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="replied" eval="(DateTime.today() - relativedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="state">sent</field>
         </record>
-        <record id="mass_mail_email_2" model="mail.mail">
-            <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_1')"/>
+        <record id="mass_mail_email_2" model="mail.mail.statistics">
+            <field name="mass_mailing_id" eval="ref('mass_mail_1')"/>
+            <field name="message_id">1111001@OpenERP.com</field>
             <field name="opened" eval="(DateTime.today() - relativedelta(days=2)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="replied" eval="(DateTime.today() - relativedelta(days=0)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="state">sent</field>
         </record>
-        <record id="mass_mail_email_3" model="mail.mail">
-            <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_1')"/>
+        <record id="mass_mail_email_3" model="mail.mail.statistics">
+            <field name="mass_mailing_id" eval="ref('mass_mail_1')"/>
+            <field name="message_id">1111002@OpenERP.com</field>
             <field name="opened" eval="(DateTime.today() - relativedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="state">sent</field>
         </record>
-        <record id="mass_mail_email_4" model="mail.mail">
-            <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_1')"/>
+        <record id="mass_mail_email_4" model="mail.mail.statistics">
+            <field name="mass_mailing_id" eval="ref('mass_mail_1')"/>
+            <field name="message_id">1111003@OpenERP.com</field>
             <field name="state">sent</field>
         </record>
-        <record id="mass_mail_email_5" model="mail.mail">
-            <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_1')"/>
+        <record id="mass_mail_email_5" model="mail.mail.statistics">
+            <field name="mass_mailing_id" eval="ref('mass_mail_1')"/>
+            <field name="message_id">1111004@OpenERP.com</field>
             <field name="bounced" eval="(DateTime.today() - relativedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="state">sent</field>
         </record>
 
-        <record id="mass_mail_email_2_1" model="mail.mail">
-            <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_2')"/>
+        <record id="mass_mail_email_2_1" model="mail.mail.statistics">
+            <field name="mass_mailing_id" eval="ref('mass_mail_2')"/>
+            <field name="message_id">1111005@OpenERP.com</field>
             <field name="opened" eval="(DateTime.today() - relativedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="state">sent</field>
         </record>
-        <record id="mass_mail_email_2_2" model="mail.mail">
-            <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_2')"/>
+        <record id="mass_mail_email_2_2" model="mail.mail.statistics">
+            <field name="mass_mailing_id" eval="ref('mass_mail_2')"/>
+            <field name="message_id">1111006@OpenERP.com</field>
             <field name="opened" eval="(DateTime.today() - relativedelta(days=2)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="state">sent</field>
         </record>
-        <record id="mass_mail_email_2_3" model="mail.mail">
-            <field name="mass_mailing_segment_id" eval="ref('mass_mail_segment_2')"/>
+        <record id="mass_mail_email_2_3" model="mail.mail.statistics">
+            <field name="mass_mailing_id" eval="ref('mass_mail_2')"/>
+            <field name="message_id">1111007@OpenERP.com</field>
             <field name="state">sent</field>
         </record>
 
diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index cc2ffc9cb25..2dc95220f6f 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -20,8 +20,8 @@
             <field name="arch" type="xml">
                 <form string="Mass Mailing Campaign" version="7.0">
                     <header>
-                        <button name="launch_segment_create_wizard" type="object"
-                            class="oe_highlight" string="Create a New Segment"/>
+                        <button name="launch_mass_mailing_create_wizard" type="object"
+                            class="oe_highlight" string="Create a New Mailing"/>
                     </header>
                     <sheet>
                         <group>
@@ -32,8 +32,8 @@
                             <field name="replied"/>
                             <field name="bounced"/>
                         </group>
-                        <label for="segment_ids"/>
-                        <field name="segment_ids"/>
+                        <label for="mass_mailing_ids"/>
+                        <field name="mass_mailing_ids"/>
                     </sheet>
                 </form>
             </field>
@@ -46,29 +46,29 @@
             <field name="model">mail.mass_mailing.campaign</field>
             <field name="arch" type="xml">
                 <kanban>
-                    <field name="segment_kanban_ids"/>
+                    <field name="mass_mailing_kanban_ids"/>
                     <field name='sent'/>
                     <field name='color'/>
                     <templates>
-                        <t t-name="mass_mailing.segment">
+                        <t t-name="mass_mailing.mass_mailing">
                             <div>
-                                <h4><t t-raw="segment.name"/></h4>
+                                <h4><t t-raw="mass_mailing.name"/></h4>
                             </div>
                             <div>
                                 <p class="oe_mail_stats">
-                                    <span class="oe_mail_result"><t t-raw="segment.sent"/></span><br />
+                                    <span class="oe_mail_result"><t t-raw="mass_mailing.sent"/></span><br />
                                     Sent
                                 </p>
                                 <p class="oe_mail_stats">
-                                    <span class="oe_mail_result"><t t-raw="segment.delivered"/></span><br />
+                                    <span class="oe_mail_result"><t t-raw="mass_mailing.delivered"/></span><br />
                                     Delivered
                                 </p>
                                 <p class="oe_mail_stats">
-                                    <span class="oe_mail_result"><t t-raw="segment.opened"/></span><br />
+                                    <span class="oe_mail_result"><t t-raw="mass_mailing.opened"/></span><br />
                                     Opened
                                 </p>
                                 <p class="oe_mail_stats">
-                                    <span class="oe_mail_result"><t t-raw="segment.replied"/></span><br />
+                                    <span class="oe_mail_result"><t t-raw="mass_mailing.replied"/></span><br />
                                     Replied
                                 </p>
                             </div>
@@ -93,8 +93,8 @@
                                         <field name="replied" widget="gauge" style="width:160px; height: 120px;"
                                             options="{'max_field': 'sent'}"/>
                                     </div>
-                                    <t t-foreach='record.segment_kanban_ids.value' t-as='segment'>
-                                        <t t-call="mass_mailing.segment"/>
+                                    <t t-foreach='record.mass_mailing_kanban_ids.value' t-as='mass_mailing'>
+                                        <t t-call="mass_mailing.mass_mailing"/>
                                     </t>
                                 </div>
                                 <div class="oe_clear"></div>
@@ -112,13 +112,13 @@
             <field name="view_mode">kanban,tree,form</field>
         </record>
 
-        <!--  MASS MAILING SEGMENTS !-->
-        <record model="ir.ui.view" id="view_mail_mass_mailing_segment_tree">
-            <field name="name">mail.mass_mailing.segment.tree</field>
-            <field name="model">mail.mass_mailing.segment</field>
+        <!--  MASS MAILING !-->
+        <record model="ir.ui.view" id="view_mail_mass_mailing_tree">
+            <field name="name">mail.mass_mailing.tree</field>
+            <field name="model">mail.mass_mailing</field>
             <field name="priority">10</field>
             <field name="arch" type="xml">
-                <tree string="Mass Mailing Segments">
+                <tree string="Mass Mailings">
                     <field name="name"/>
                     <field name="sent"/>
                     <field name="delivered"/>
@@ -128,11 +128,11 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_mail_mass_mailing_segment_form">
-            <field name="name">mail.mass_mailing.segment.form</field>
-            <field name="model">mail.mass_mailing.segment</field>
+        <record model="ir.ui.view" id="view_mail_mass_mailing_form">
+            <field name="name">mail.mass_mailing.form</field>
+            <field name="model">mail.mass_mailing</field>
             <field name="arch" type="xml">
-                <form string="Mass Mailing Segment" version="7.0">
+                <form string="Mass Mailing" version="7.0">
                     <sheet>
                         <group>
                             <group>
@@ -150,12 +150,12 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_mail_mass_mailing_segment_form_readonly">
-            <field name="name">mail.mass_mailing.segment.form</field>
-            <field name="model">mail.mass_mailing.segment</field>
+        <record model="ir.ui.view" id="view_mail_mass_mailing_form_readonly">
+            <field name="name">mail.mass_mailing.form</field>
+            <field name="model">mail.mass_mailing</field>
             <field name="priority">18</field>
             <field name="arch" type="xml">
-                <form string="Mass Mailing Segment" version="7.0">
+                <form string="Mass Mailing" version="7.0">
                     <sheet>
                         <group>
                             <group>
@@ -173,9 +173,9 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_mail_mass_mailing_segment_kanban">
-            <field name="name">mail.mass_mailing.segment.kanban</field>
-            <field name="model">mail.mass_mailing.segment</field>
+        <record model="ir.ui.view" id="view_mail_mass_mailing_kanban">
+            <field name="name">mail.mass_mailing.kanban</field>
+            <field name="model">mail.mass_mailing</field>
             <field name="arch" type="xml">
                 <kanban>
                     <field name='color'/>
@@ -229,9 +229,9 @@
             </field>
         </record>
 
-        <record id="action_view_mass_mailing_segments" model="ir.actions.act_window">
-            <field name="name">Mass Mailing Segments</field>
-            <field name="res_model">mail.mass_mailing.segment</field>
+        <record id="action_view_mass_mailings" model="ir.actions.act_window">
+            <field name="name">Mass Mailings</field>
+            <field name="res_model">mail.mass_mailing</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
         </record>
@@ -245,9 +245,9 @@
         <menuitem name="Campaigns" id="menu_email_campaigns"
             parent="mass_mailing_campaign" sequence="1"
             action="action_view_mass_mailing_campaigns"/>
-        <menuitem name="Segments" id="menu_email_segments"
+        <menuitem name="Mass Mailings" id="menu_email_mass_mailings"
             parent="mass_mailing_campaign" sequence="2"
-            action="action_view_mass_mailing_segments"/>
+            action="action_view_mass_mailings"/>
 
     </data>
 </openerp>
diff --git a/addons/mass_mailing/security/ir.model.access.csv b/addons/mass_mailing/security/ir.model.access.csv
index 54f3413e9f1..6931ab0265b 100644
--- a/addons/mass_mailing/security/ir.model.access.csv
+++ b/addons/mass_mailing/security/ir.model.access.csv
@@ -1,5 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_mass_mailing_campaign,mail.mass_mailing.campaign,model_mail_mass_mailing_campaign,,1,1,1,0
 access_mass_mailing_campaign_system,mail.mass_mailing.campaign.system,model_mail_mass_mailing_campaign,base.group_system,1,1,1,1
-access_mass_mailing_segment,mail.mass_mailing.segment,model_mail_mass_mailing_segment,,1,1,1,0
-access_mass_mailing_segment_system,mail.mass_mailing.segment.system,model_mail_mass_mailing_segment,base.group_system,1,1,1,1
\ No newline at end of file
+access_mass_mailing,mail.mass_mailing,model_mail_mass_mailing,,1,1,1,0
+access_mass_mailing_system,mail.mass_mailing.system,model_mail_mass_mailing,base.group_system,1,1,1,1
+access_mail_mail_statistics,mail.mail.statistics,model_mail_mail_statistics,,1,1,1,1
\ No newline at end of file
diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py
index 4fe858734fe..7b22bc8f4aa 100644
--- a/addons/mass_mailing/wizard/mail_compose_message.py
+++ b/addons/mass_mailing/wizard/mail_compose_message.py
@@ -34,8 +34,8 @@ class MailComposeMessage(osv.TransientModel):
         'mass_mailing_campaign_id': fields.many2one(
             'mail.mass_mailing.campaign', 'Mass mailing campaign',
         ),
-        'mass_mailing_segment_id': fields.many2one(
-            'mail.mass_mailing.segment', 'Mass mailing segment',
+        'mass_mailing_id': fields.many2one(
+            'mail.mass_mailing', 'Mass mailing',
             domain="[('mass_mailing_campaign_id', '=', mass_mailing_campaign_id)]",
         ),
     }
@@ -44,18 +44,18 @@ class MailComposeMessage(osv.TransientModel):
         'use_mass_mailing_campaign': False,
     }
 
-    def onchange_mass_mail_campaign_id(self, cr, uid, ids, mass_mailing_campaign_id, mass_mail_segment_id, context=None):
-        if mass_mail_segment_id:
-            segment = self.pool['mail.mass_mailing.segment'].browse(cr, uid, mass_mail_segment_id, context=context)
-            if segment.mass_mailing_campaign_id.id == mass_mailing_campaign_id:
+    def onchange_mass_mail_campaign_id(self, cr, uid, ids, mass_mailing_campaign_id, mass_mailing_id, context=None):
+        if mass_mailing_id:
+            mass_mailing = self.pool['mail.mass_mailing'].browse(cr, uid, mass_mailing_id, context=context)
+            if mass_mailing.mass_mailing_campaign_id.id == mass_mailing_campaign_id:
                 return {}
-        return {'value': {'mass_mailing_segment_id': False}}
+        return {'value': {'mass_mailing_id': False}}
 
     def render_message_batch(self, cr, uid, wizard, res_ids, context=None):
         """ Override method that generated the mail content by adding the mass
         mailing campaign, when doing pure email mass mailing. """
         res = super(MailComposeMessage, self).render_message_batch(cr, uid, wizard, res_ids, context=context)
-        if wizard.composition_mode == 'mass_mail' and wizard.use_mass_mailing_campaign and wizard.mass_mailing_segment_id:  # TODO: which kind of mass mailing ?
+        if wizard.composition_mode == 'mass_mail' and wizard.use_mass_mailing_campaign and wizard.mass_mailing_id:  # TODO: which kind of mass mailing ?
             for res_id in res_ids:
-                res[res_id]['mass_mailing_segment_id'] = wizard.mass_mailing_segment_id.id
+                res[res_id]['mass_mailing_id'] = wizard.mass_mailing_id.id
         return res
diff --git a/addons/mass_mailing/wizard/mail_compose_message_view.xml b/addons/mass_mailing/wizard/mail_compose_message_view.xml
index 9dcf57682f6..bdd4431a71d 100644
--- a/addons/mass_mailing/wizard/mail_compose_message_view.xml
+++ b/addons/mass_mailing/wizard/mail_compose_message_view.xml
@@ -15,16 +15,16 @@
                     <div>
                         <group>
                             <field name="mass_mailing_campaign_id"
-                                on_change="onchange_mass_mail_campaign_id(mass_mailing_campaign_id, mass_mailing_segment_id, context)"
+                                on_change="onchange_mass_mail_campaign_id(mass_mailing_campaign_id, mass_mailing_id, context)"
                                 attrs="{'invisible': ['|', ('composition_mode', '!=', 'mass_mail'), ('use_mass_mailing_campaign', '=', False)],
                                         'required': [('composition_mode', '=', 'mass_mail'), ('use_mass_mailing_campaign', '=', True)]}"/>
-                            <field name="mass_mailing_segment_id"
+                            <field name="mass_mailing_id"
                                 attrs="{'invisible': ['|', ('composition_mode', '!=', 'mass_mail'), ('use_mass_mailing_campaign', '=', False)],
                                         'required': [('composition_mode', '=', 'mass_mail'), ('use_mass_mailing_campaign', '=', True)]}"
                                 context="{'default_mass_mailing_campaign_id': mass_mailing_campaign_id,
                                           'default_template_id': template_id,
                                           'default_domain': active_domain,
-                                          'form_view_ref': 'mass_mailing.view_mail_mass_mailing_segment_form_readonly'}"/>
+                                          'form_view_ref': 'mass_mailing.view_mail_mass_mailing_form_readonly'}"/>
                         </group>
                     </div>
                 </xpath>
diff --git a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py
index ffb7c004415..927c34ab5fd 100644
--- a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py
+++ b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py
@@ -24,11 +24,11 @@ from openerp.osv import osv, fields
 from openerp.tools.translate import _
 
 
-class MailMassMailingSegmentCreate(osv.TransientModel):
-    """Wizard to help creating mass mailing segments for a campaign. """
+class MailMassMailingCreate(osv.TransientModel):
+    """Wizard to help creating mass mailing waves for a campaign. """
 
-    _name = 'mail.mass_mailing.segment.create'
-    _description = 'Mass mailing segment creation'
+    _name = 'mail.mass_mailing.create'
+    _description = 'Mass mailing creation'
 
     _columns = {
         'mass_mailing_campaign_id': fields.many2one(
@@ -55,11 +55,11 @@ class MailMassMailingSegmentCreate(osv.TransientModel):
             'email.template', 'Template', required=True,
             domain="[('model_id', '=', model_id)]",
         ),
-        'segment_name': fields.char(
-            'Segment name', required=True,
+        'name': fields.char(
+            'Name', required=True,
         ),
-        'mass_mailing_segment_id': fields.many2one(
-            'mail.mass_mailing.segment', 'Mass Mailing Segment',
+        'mass_mailing_id': fields.many2one(
+            'mail.mass_mailing', 'Mass Mailing',
         ),
     }
 
@@ -80,23 +80,23 @@ class MailMassMailingSegmentCreate(osv.TransientModel):
             domain = False
         return {'value': {'domain': domain}}
 
-    def create_segment(self, cr, uid, ids, context=None):
-        """ Create a segment based on wizard data, and update the wizard """
+    def create_mass_mailing(self, cr, uid, ids, context=None):
+        """ Create a mass mailing based on wizard data, and update the wizard """
         for wizard in self.browse(cr, uid, ids, context=context):
-            segment_values = {
-                'name': wizard.segment_name,
+            mass_mailing_values = {
+                'name': wizard.name,
                 'mass_mailing_campaign_id': wizard.mass_mailing_campaign_id.id,
                 'domain': wizard.domain,
                 'template_id': wizard.template_id.id,
             }
-            segment_id = self.pool['mail.mass_mailing.segment'].create(cr, uid, segment_values, context=context)
-            self.write(cr, uid, [wizard.id], {'mass_mailing_segment_id': segment_id}, context=context)
+            mass_mailing_id = self.pool['mail.mass_mailing'].create(cr, uid, mass_mailing_values, context=context)
+            self.write(cr, uid, [wizard.id], {'mass_mailing_id': mass_mailing_id}, context=context)
         return True
 
     def launch_composer(self, cr, uid, ids, context=None):
-        """ Main wizard action: create a new segment and launch the mail.compose.message
+        """ Main wizard action: create a new mailing and launch the mail.compose.message
         email composer with wizard data. """
-        self.create_segment(cr, uid, ids, context=context)
+        self.create_mass_mailing(cr, uid, ids, context=context)
 
         wizard = self.browse(cr, uid, ids[0], context=context)
         ctx = dict(context)
@@ -107,7 +107,7 @@ class MailMassMailingSegmentCreate(osv.TransientModel):
             'default_use_active_domain': True,
             'default_active_domain': wizard.domain,
             'default_mass_mailing_campaign_id': wizard.mass_mailing_campaign_id.id,
-            'default_mass_mailing_segment_id': wizard.mass_mailing_segment_id.id,
+            'default_mass_mailing_id': wizard.mass_mailing_id.id,
         })
         return {
             'name': _('Compose Email for Mass Mailing'),
diff --git a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
index 5d211bb9eb4..a10101e9446 100644
--- a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
+++ b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
@@ -3,17 +3,17 @@
     <data>
 
         <!-- Wizard form view -->
-        <record model="ir.ui.view" id="view_mail_mass_mailing_segment_create_form">
-            <field name="name">mail.mass_mailing.segment.create.form</field>
-            <field name="model">mail.mass_mailing.segment.create</field>
+        <record model="ir.ui.view" id="view_mail_mass_mailing_create_form">
+            <field name="name">mail.mass_mailing.create.form</field>
+            <field name="model">mail.mass_mailing.create</field>
             <field name="arch" type="xml">
-                <form string="Create a Mass Mailing Segment" version="7.0">
+                <form string="Create a Mass Mailing" version="7.0">
                     <group>
                         <field name="model_model" invisible="1"/>
                         <field name="domain" invisible="1"/>
                         <p class="oe_grey" colspan="2"
                             attrs="{'invisible': [('mass_mailing_campaign_id', '!=', False)]}">
-                            Please choose a mass mailing campaign that will hold the new segment.
+                            Please choose a mass mailing campaign that will hold the new mailing.
                         </p>
                         <field name="mass_mailing_campaign_id"/>
 
@@ -43,23 +43,23 @@
                             attrs="{'invisible': [('filter_id', '=', False)]}"/>
 
                         <p class="oe_grey" colspan="2"
-                            attrs="{'invisible': ['|', ('segment_name', '!=', False), ('template_id', '=', False)]}">
-                            Please choose the name of the campaign segment.
+                            attrs="{'invisible': ['|', ('name', '!=', False), ('template_id', '=', False)]}">
+                            Please choose the name of the mailing.
                         </p>
-                        <field name="segment_name"
+                        <field name="name"
                             attrs="{'invisible': [('template_id', '=', False)]}"/>
 
                         <button name="launch_composer" type="object"
-                            string="Create segment and launch email composer"
-                            attrs="{'invisible': [('segment_name', '=', False)]}"/>
+                            string="Create mailing and launch email composer"
+                            attrs="{'invisible': [('name', '=', False)]}"/>
                     </group>
                 </form>
             </field>
         </record>
 
-        <record model="ir.actions.act_window" id="action_mail_mass_mailing_segment_create">
-            <field name="name">Create Mass Mailing Segment</field>
-            <field name="res_model">mail.mass_mailing.segment.create</field>
+        <record model="ir.actions.act_window" id="action_mail_mass_mailing_create">
+            <field name="name">Create Mass Mailing</field>
+            <field name="res_model">mail.mass_mailing.create</field>
             <field name="src_model">mail.mass_mailing.campaign</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>

From fbc64436920cf6e3bad4275c718a59747edcf34a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Sep 2013 14:29:56 +0200
Subject: [PATCH 143/164] [CLEAN] mail: cleaned some read -> browse + forgotten
 statement to remove

bzr revid: tde@openerp.com-20130913122956-6zkk9ucewbt6w407
---
 addons/crm/static/src/js/crm_case_section.js |  1 +
 addons/mail/mail_message.py                  | 12 +++++-------
 addons/mail/mail_thread.py                   |  6 ------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/addons/crm/static/src/js/crm_case_section.js b/addons/crm/static/src/js/crm_case_section.js
index e027313d6dc..deb21d38de2 100644
--- a/addons/crm/static/src/js/crm_case_section.js
+++ b/addons/crm/static/src/js/crm_case_section.js
@@ -8,4 +8,5 @@ openerp.crm = function(openerp) {
             }
         },
     });
+
 };
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 822cfcab438..3719dbc1c63 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -91,7 +91,6 @@ class mail_message(osv.Model):
             SUPERUSER_ID, to be sure to have the record name correctly stored. """
         # TDE note: regroup by model/ids, to have less queries to perform
         result = dict.fromkeys(ids, False)
-        # return result
         for message in self.read(cr, uid, ids, ['model', 'res_id'], context=context):
             if not message.get('model') or not message.get('res_id') or message['model'] not in self.pool:
                 continue
@@ -101,7 +100,7 @@ class mail_message(osv.Model):
     def _get_to_read(self, cr, uid, ids, name, arg, context=None):
         """ Compute if the message is unread by the current user. """
         res = dict((id, False) for id in ids)
-        partner_id = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+        partner_id = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id.id
         notif_obj = self.pool.get('mail.notification')
         notif_ids = notif_obj.search(cr, uid, [
             ('partner_id', 'in', [partner_id]),
@@ -120,7 +119,7 @@ class mail_message(osv.Model):
     def _get_starred(self, cr, uid, ids, name, arg, context=None):
         """ Compute if the message is unread by the current user. """
         res = dict((id, False) for id in ids)
-        partner_id = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+        partner_id = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id.id
         notif_obj = self.pool.get('mail.notification')
         notif_ids = notif_obj.search(cr, uid, [
             ('partner_id', 'in', [partner_id]),
@@ -267,7 +266,7 @@ class mail_message(osv.Model):
             :return number of message mark as read
         """
         notification_obj = self.pool.get('mail.notification')
-        user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+        user_pid = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id.id
         domain = [('partner_id', '=', user_pid), ('message_id', 'in', msg_ids)]
         if not create_missing:
             domain += [('read', '=', not read)]
@@ -295,7 +294,7 @@ class mail_message(osv.Model):
                 (i.e. when acting on displayed messages not notified)
         """
         notification_obj = self.pool.get('mail.notification')
-        user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+        user_pid = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id.id
         domain = [('partner_id', '=', user_pid), ('message_id', 'in', msg_ids)]
         if not create_missing:
             domain += [('starred', '=', not starred)]
@@ -333,7 +332,7 @@ class mail_message(osv.Model):
         """
         res_partner_obj = self.pool.get('res.partner')
         ir_attachment_obj = self.pool.get('ir.attachment')
-        pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=None)['partner_id'][0]
+        pid = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id.id
 
         # 1. Aggregate partners (author_id and partner_ids) and attachments
         partner_ids = set()
@@ -649,7 +648,6 @@ class mail_message(osv.Model):
         elif not ids:
             return ids
 
-        # pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'])['partner_id'][0]
         pid = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id.id
         author_ids, partner_ids, allowed_ids = set([]), set([]), set([])
         model_ids = {}
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 2bfd17fdb59..9c4d753bc1c 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -1399,12 +1399,6 @@ class mail_thread(osv.AbstractModel):
             parent_id = message_ids and message_ids[0] or False
         # we want to set a parent: force to set the parent_id to the oldest ancestor, to avoid having more than 1 level of thread
         elif parent_id:
-            # update original mail_mail if exists
-            if type == 'email':
-                mail_mail_ids = self.pool['mail.mail'].search(cr, SUPERUSER_ID, [('mail_message_id', '=', parent_id)], context=context)
-                if mail_mail_ids:
-                    self.pool['mail.mail'].set_replied(cr, SUPERUSER_ID, mail_mail_ids, context=context)
-
             message_ids = mail_message.search(cr, SUPERUSER_ID, [('id', '=', parent_id), ('parent_id', '!=', False)], context=context)
             # avoid loops when finding ancestors
             processed_list = []

From 6d411f706509316795ecb3eb362f0b42b2740ae6 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 13 Sep 2013 14:40:26 +0200
Subject: [PATCH 144/164] [FIX] really solve reload problem

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

bzr revid: nicolas.vanhoren@openerp.com-20130913124026-yhchgik5yznkme19
---
 addons/web/static/src/js/chrome.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 793dbd43d76..11a2e58ae5b 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -805,10 +805,11 @@ instance.web.redirect = function(url, wait) {
 
     var load = function() {
         var old = "" + window.location;
-        if (old === url) {
-            window.location.reload();
-        } else {
-            window.location.href = url;
+        var old_no_hash = old.split("#")[0];
+        var url_no_hash = url.split("#")[0];
+        location.assign(url);
+        if (old_no_hash === url_no_hash) {
+            location.reload(true);
         }
     };
 

From 7b75c481d637812e96587bc2e744d4a1c4454be7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Sep 2013 15:21:50 +0200
Subject: [PATCH 145/164] [IMP] base_setup: added option in sales to install
 mass mailing

bzr revid: tde@openerp.com-20130913132150-kq5bsantglfogizs
---
 addons/base_setup/res_config.py       | 3 +++
 addons/base_setup/res_config_view.xml | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 6b8578bbf47..b34c3571822 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -76,6 +76,9 @@ class sale_config_settings(osv.osv_memory):
                 or a lead object and archive a selected
                 email into an OpenERP mail message with attachments.
                 This installs the module plugin_outlook."""),
+        'module_mass_mailing': fields.boolean(
+            'Manage mass mailing campaigns',
+            help='Get access to statistics with your mass mailing, manage campaigns.'),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 73685be95df..b0d7c90c7a0 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -123,6 +123,10 @@
                                     <field name="module_web_linkedin"/>
                                     <label for="module_web_linkedin"/>
                                 </div>
+                                <div>
+                                    <field name="module_mass_mailing" class="oe_inline"/>
+                                    <label for="module_mass_mailing"/>
+                                </div>
                             </div>
                         </group>
                     </div>

From 71d2a97a507dbc87cc66c229b6e5ebaf5bf6bbd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Sep 2013 15:22:34 +0200
Subject: [PATCH 146/164] [IMP] mail.compose.message: simplified mass mailing
 use in composer

Only remaining field is mass_mailing_campaign_id; if set, a new segment is automatically created
and its id is given to the created mail.mail.statistics using default value in context

bzr revid: tde@openerp.com-20130913132234-66vl19w54znky2rc
---
 .../wizard/mail_compose_message.py            | 28 ++++++++-----------
 .../wizard/mail_compose_message_view.xml      | 20 ++-----------
 2 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py
index 7b22bc8f4aa..dd4aa632a9e 100644
--- a/addons/mass_mailing/wizard/mail_compose_message.py
+++ b/addons/mass_mailing/wizard/mail_compose_message.py
@@ -28,9 +28,6 @@ class MailComposeMessage(osv.TransientModel):
     _inherit = 'mail.compose.message'
 
     _columns = {
-        'use_mass_mailing_campaign': fields.boolean(
-            'Use mass mailing campaigns',
-        ),
         'mass_mailing_campaign_id': fields.many2one(
             'mail.mass_mailing.campaign', 'Mass mailing campaign',
         ),
@@ -40,22 +37,19 @@ class MailComposeMessage(osv.TransientModel):
         ),
     }
 
-    _defaults = {
-        'use_mass_mailing_campaign': False,
-    }
-
-    def onchange_mass_mail_campaign_id(self, cr, uid, ids, mass_mailing_campaign_id, mass_mailing_id, context=None):
-        if mass_mailing_id:
-            mass_mailing = self.pool['mail.mass_mailing'].browse(cr, uid, mass_mailing_id, context=context)
-            if mass_mailing.mass_mailing_campaign_id.id == mass_mailing_campaign_id:
-                return {}
-        return {'value': {'mass_mailing_id': False}}
-
     def render_message_batch(self, cr, uid, wizard, res_ids, context=None):
         """ Override method that generated the mail content by adding the mass
         mailing campaign, when doing pure email mass mailing. """
         res = super(MailComposeMessage, self).render_message_batch(cr, uid, wizard, res_ids, context=context)
-        if wizard.composition_mode == 'mass_mail' and wizard.use_mass_mailing_campaign and wizard.mass_mailing_id:  # TODO: which kind of mass mailing ?
-            for res_id in res_ids:
-                res[res_id]['mass_mailing_id'] = wizard.mass_mailing_id.id
+        if wizard.composition_mode == 'mass_mail' and wizard.mass_mailing_campaign_id:  # TODO: which kind of mass mailing ?
+            current_date = fields.datetime.now()
+            mass_mailing_id = self.pool['mail.mass_mailing'].create(
+                cr, uid, {
+                    'mass_mailing_campaign_id': wizard.mass_mailing_campaign_id.id,
+                    'name': '%s-%s' % (wizard.mass_mailing_campaign_id.name, current_date),
+                    'date': current_date,
+                    'domain': wizard.active_domain,
+                    'template_id': wizard.template_id and wizard.template_id.id or False,
+                }, context=context)
+            context['default_mass_mailing_id'] = mass_mailing_id
         return res
diff --git a/addons/mass_mailing/wizard/mail_compose_message_view.xml b/addons/mass_mailing/wizard/mail_compose_message_view.xml
index bdd4431a71d..f5dbf57a808 100644
--- a/addons/mass_mailing/wizard/mail_compose_message_view.xml
+++ b/addons/mass_mailing/wizard/mail_compose_message_view.xml
@@ -9,24 +9,8 @@
             <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='notify']" position="after">
-                    <field name="use_mass_mailing_campaign"
-                                attrs="{'invisible': [('composition_mode', '!=', 'mass_mail')]}"/>
-                    <label for="mass_mailing_campaign_id" string=" "/>
-                    <div>
-                        <group>
-                            <field name="mass_mailing_campaign_id"
-                                on_change="onchange_mass_mail_campaign_id(mass_mailing_campaign_id, mass_mailing_id, context)"
-                                attrs="{'invisible': ['|', ('composition_mode', '!=', 'mass_mail'), ('use_mass_mailing_campaign', '=', False)],
-                                        'required': [('composition_mode', '=', 'mass_mail'), ('use_mass_mailing_campaign', '=', True)]}"/>
-                            <field name="mass_mailing_id"
-                                attrs="{'invisible': ['|', ('composition_mode', '!=', 'mass_mail'), ('use_mass_mailing_campaign', '=', False)],
-                                        'required': [('composition_mode', '=', 'mass_mail'), ('use_mass_mailing_campaign', '=', True)]}"
-                                context="{'default_mass_mailing_campaign_id': mass_mailing_campaign_id,
-                                          'default_template_id': template_id,
-                                          'default_domain': active_domain,
-                                          'form_view_ref': 'mass_mailing.view_mail_mass_mailing_form_readonly'}"/>
-                        </group>
-                    </div>
+                    <field name="mass_mailing_campaign_id"
+                        attrs="{'invisible': [('composition_mode', '!=', 'mass_mail')]}"/>
                 </xpath>
             </field>
         </record>

From de43093621620c6e64fcd5f7528dd255e2bb705c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Sep 2013 15:38:41 +0200
Subject: [PATCH 147/164] [IMP] mass_mailing: removed duplicate view; added
 views for mail.mail;statistics

bzr revid: tde@openerp.com-20130913133841-gk6axalbo1dyayhe
---
 addons/mass_mailing/mass_mailing_view.xml | 67 ++++++++++++++---------
 1 file changed, 42 insertions(+), 25 deletions(-)

diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index 2dc95220f6f..31ddb004c2a 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -39,8 +39,6 @@
             </field>
         </record>
 
-
-        <!-- CRM Lead Kanban View  -->
         <record model="ir.ui.view" id="view_mail_mass_mailing_campaign_kanban">
             <field name="name">mail.mass_mailing.campaign.kanban</field>
             <field name="model">mail.mass_mailing.campaign</field>
@@ -150,29 +148,6 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_mail_mass_mailing_form_readonly">
-            <field name="name">mail.mass_mailing.form</field>
-            <field name="model">mail.mass_mailing</field>
-            <field name="priority">18</field>
-            <field name="arch" type="xml">
-                <form string="Mass Mailing" version="7.0">
-                    <sheet>
-                        <group>
-                            <group>
-                                <field name="name"/>
-                                <field name="date" readonly="True"/>
-                            </group>
-                            <group>
-                                <field name="mass_mailing_campaign_id" readonly="True"/>
-                                <field name="template_id" readonly="True"/>
-                                <field name="domain" readonly="True"/>
-                            </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
         <record model="ir.ui.view" id="view_mail_mass_mailing_kanban">
             <field name="name">mail.mass_mailing.kanban</field>
             <field name="model">mail.mass_mailing</field>
@@ -236,6 +211,43 @@
             <field name="view_mode">kanban,tree,form</field>
         </record>
 
+        <!--  MAIL MAIL STATISTICS !-->
+        <record model="ir.ui.view" id="view_mail_mail_statistics_tree">
+            <field name="name">mail.mail.statistics.tree</field>
+            <field name="model">mail.mail.statistics</field>
+            <field name="arch" type="xml">
+                <tree string="Mail Statistics">
+                    <field name="mail_mail_id"/>
+                    <field name="message_id"/>
+                    <field name="opened"/>
+                    <field name="replied"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_mail_mail_statistics_form">
+            <field name="name">mail.mail.statistics.form</field>
+            <field name="model">mail.mail.statistics</field>
+            <field name="arch" type="xml">
+                <form string="Mail Statistics" version="7.0">
+                    <group>
+                        <field name="mail_mail_id"/>
+                        <field name="message_id"/>
+                        <field name="opened"/>
+                        <field name="replied"/>
+                        <field name="bounced"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_view_mail_mail_statistics" model="ir.actions.act_window">
+            <field name="name">Mail Statistics</field>
+            <field name="res_model">mail.mail.statistics</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
         <!-- Top menu item -->
         <menuitem name="Marketing" id="base.marketing_menu" sequence="85"/>
 
@@ -249,5 +261,10 @@
             parent="mass_mailing_campaign" sequence="2"
             action="action_view_mass_mailings"/>
 
+        <!-- Add in Technical/Email -->
+        <menuitem name="Mail Statistics" id="menu_email_statistics"
+            parent="base.menu_email" sequence="50"
+            action="action_view_mail_mail_statistics"/>
+
     </data>
 </openerp>

From 426abbc65e5569c7b38147929dd8fc774f2ae663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Sep 2013 16:00:43 +0200
Subject: [PATCH 148/164] [IMP] mass_mailing: improved various views of new
 objects

bzr revid: tde@openerp.com-20130913140043-wfrk7yv3qx20e5on
---
 addons/mass_mailing/mass_mailing.py       |  8 ++---
 addons/mass_mailing/mass_mailing_view.xml | 42 +++++++++++++++++------
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/addons/mass_mailing/mass_mailing.py b/addons/mass_mailing/mass_mailing.py
index 61fea847486..f37208e4568 100644
--- a/addons/mass_mailing/mass_mailing.py
+++ b/addons/mass_mailing/mass_mailing.py
@@ -109,9 +109,9 @@ class MassMailingCampaign(osv.Model):
         ),
     }
 
-    # _defaults = {
-        # 'user_id': lambda self, cr, uid, ctx=None: uid,
-    # },
+    _defaults = {
+        'user_id': lambda self, cr, uid, ctx=None: uid,
+    }
 
     def launch_mass_mailing_create_wizard(self, cr, uid, ids, context=None):
         ctx = dict(context)
@@ -225,7 +225,7 @@ class MassMailing(osv.Model):
         # statistics data
         'statistics_ids': fields.one2many(
             'mail.mail.statistics', 'mass_mailing_id',
-            'Send Emails',
+            'Emails Statistics',
         ),
         'sent': fields.function(
             _get_statistics,
diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index 31ddb004c2a..bdb1c12e016 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -26,14 +26,22 @@
                     <sheet>
                         <group>
                             <field name="name"/>
-                            <field name="sent"/>
-                            <field name="delivered"/>
-                            <field name="opened"/>
-                            <field name="replied"/>
-                            <field name="bounced"/>
+                            <field name="user_id"/>
+                        </group>
+                        <group>
+                            <group>
+                                <field name="sent"/>
+                                <field name="opened"/>
+                                <field name="bounced"/>
+                            </group>
+                            <group>
+                                <field name="delivered"/>
+                                <field name="replied"/>
+                            </group>
+                        </group>
+                        <group>
+                            <field name="mass_mailing_ids"/>
                         </group>
-                        <label for="mass_mailing_ids"/>
-                        <field name="mass_mailing_ids"/>
                     </sheet>
                 </form>
             </field>
@@ -135,12 +143,26 @@
                         <group>
                             <group>
                                 <field name="name"/>
-                                <field name="date"/>
+                                <field name="mass_mailing_campaign_id"/>
                             </group>
                             <group>
-                                <field name="mass_mailing_campaign_id"/>
                                 <field name="template_id"/>
                                 <field name="domain"/>
+                                <field name="date"/>
+                            </group>
+                        </group>
+                        <group>
+                            <field name="statistics_ids"/>
+                        </group>
+                        <group>
+                            <group>
+                                <field name="sent"/>
+                                <field name="opened"/>
+                                <field name="bounced"/>
+                            </group>
+                            <group>
+                                <field name="delivered"/>
+                                <field name="replied"/>
                             </group>
                         </group>
                     </sheet>
@@ -252,7 +274,7 @@
         <menuitem name="Marketing" id="base.marketing_menu" sequence="85"/>
 
         <!-- Add in marketing -->
-        <menuitem name="Mass Mailing Campaign" id="mass_mailing_campaign"
+        <menuitem name="Mass Mailing" id="mass_mailing_campaign"
             parent="base.marketing_menu" sequence="1"/>
         <menuitem name="Campaigns" id="menu_email_campaigns"
             parent="mass_mailing_campaign" sequence="1"

From 20f9f42ea9527a8734b2caf73a34711056a5ad3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 16 Sep 2013 12:10:35 +0200
Subject: [PATCH 149/164] [IMP] mass_mailing: improved kanban view of campaign
 (clicking now reidrects to mass mailings, filtered by the campaign); added
 search views for the various models; re-ordered view file; put demo data into
 demo section; added JS file for click redirection

bzr revid: tde@openerp.com-20130916101035-qre7362jyxwl4xve
---
 addons/mass_mailing/__openerp__.py            |   9 +-
 addons/mass_mailing/mass_mailing_view.xml     | 295 +++++++++++-------
 .../static/src/js/mass_mailing.js             |  13 +
 3 files changed, 198 insertions(+), 119 deletions(-)
 create mode 100644 addons/mass_mailing/static/src/js/mass_mailing.js

diff --git a/addons/mass_mailing/__openerp__.py b/addons/mass_mailing/__openerp__.py
index 0301484afec..db7ac54263a 100644
--- a/addons/mass_mailing/__openerp__.py
+++ b/addons/mass_mailing/__openerp__.py
@@ -35,17 +35,20 @@
     'data': [
         'mail_data.xml',
         'mass_mailing_view.xml',
-        'mass_mailing_demo.xml',
         'wizard/mail_compose_message_view.xml',
         'wizard/mail_mass_mailing_create_segment.xml',
         'security/ir.model.access.csv',
     ],
-    'js': [],
+    'js': [
+        'static/src/js/mass_mailing.js',
+    ],
     'qweb': [],
     'css': [
         'static/src/css/mass_mailing.css'
     ],
-    'demo': [],
+    'demo': [
+        'mass_mailing_demo.xml',
+    ],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index bdb1c12e016..f7443c896e3 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -2,123 +2,25 @@
 <openerp>
     <data>
 
-        <!--  MASS MAILING CAMPAIGNS !-->
-        <record model="ir.ui.view" id="view_mail_mass_mailing_campaign_tree">
-            <field name="name">mail.mass_mailing.campaign.tree</field>
-            <field name="model">mail.mass_mailing.campaign</field>
-            <field name="priority">10</field>
-            <field name="arch" type="xml">
-                <tree string="Mass Mailing Campaigns">
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_mail_mass_mailing_campaign_form">
-            <field name="name">mail.mass_mailing.campaign.form</field>
-            <field name="model">mail.mass_mailing.campaign</field>
-            <field name="arch" type="xml">
-                <form string="Mass Mailing Campaign" version="7.0">
-                    <header>
-                        <button name="launch_mass_mailing_create_wizard" type="object"
-                            class="oe_highlight" string="Create a New Mailing"/>
-                    </header>
-                    <sheet>
-                        <group>
-                            <field name="name"/>
-                            <field name="user_id"/>
-                        </group>
-                        <group>
-                            <group>
-                                <field name="sent"/>
-                                <field name="opened"/>
-                                <field name="bounced"/>
-                            </group>
-                            <group>
-                                <field name="delivered"/>
-                                <field name="replied"/>
-                            </group>
-                        </group>
-                        <group>
-                            <field name="mass_mailing_ids"/>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_mail_mass_mailing_campaign_kanban">
-            <field name="name">mail.mass_mailing.campaign.kanban</field>
-            <field name="model">mail.mass_mailing.campaign</field>
-            <field name="arch" type="xml">
-                <kanban>
-                    <field name="mass_mailing_kanban_ids"/>
-                    <field name='sent'/>
-                    <field name='color'/>
-                    <templates>
-                        <t t-name="mass_mailing.mass_mailing">
-                            <div>
-                                <h4><t t-raw="mass_mailing.name"/></h4>
-                            </div>
-                            <div>
-                                <p class="oe_mail_stats">
-                                    <span class="oe_mail_result"><t t-raw="mass_mailing.sent"/></span><br />
-                                    Sent
-                                </p>
-                                <p class="oe_mail_stats">
-                                    <span class="oe_mail_result"><t t-raw="mass_mailing.delivered"/></span><br />
-                                    Delivered
-                                </p>
-                                <p class="oe_mail_stats">
-                                    <span class="oe_mail_result"><t t-raw="mass_mailing.opened"/></span><br />
-                                    Opened
-                                </p>
-                                <p class="oe_mail_stats">
-                                    <span class="oe_mail_result"><t t-raw="mass_mailing.replied"/></span><br />
-                                    Replied
-                                </p>
-                            </div>
-                        </t>
-                        <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_kanban_mass_mailing oe_kanban_mass_mailing_campaign">
-                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
-                                    <span class="oe_e">i</span>
-                                    <ul class="oe_dropdown_menu">
-                                        <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
-                                    </ul>
-                                </div>
-                                 <div class="oe_kanban_content">
-                                    <h3>
-                                        <field name="name"/>
-                                    </h3>
-                                    <div>
-                                        <field name="delivered" widget="gauge" style="width:160px; height: 120px;"
-                                            options="{'max_field': 'sent'}"/>
-                                        <field name="opened" widget="gauge" style="width:160px; height: 120px;"
-                                            options="{'max_field': 'sent'}"/>
-                                        <field name="replied" widget="gauge" style="width:160px; height: 120px;"
-                                            options="{'max_field': 'sent'}"/>
-                                    </div>
-                                    <t t-foreach='record.mass_mailing_kanban_ids.value' t-as='mass_mailing'>
-                                        <t t-call="mass_mailing.mass_mailing"/>
-                                    </t>
-                                </div>
-                                <div class="oe_clear"></div>
-                            </div>
-                        </t>
-                    </templates>
-                </kanban>
-            </field>
-        </record>
-
-        <record id="action_view_mass_mailing_campaigns" model="ir.actions.act_window">
-            <field name="name">Mass Mailing Campaigns</field>
-            <field name="res_model">mail.mass_mailing.campaign</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">kanban,tree,form</field>
-        </record>
-
         <!--  MASS MAILING !-->
+        <record model="ir.ui.view" id="view_mail_mass_mailing_search">
+            <field name="name">mail.mass_mailing.search</field>
+            <field name="model">mail.mass_mailing</field>
+            <field name="arch" type="xml">
+               <search string="Mass Mailings">
+                    <field name="name" string="Mailings"/>
+                    <field name="mass_mailing_campaign_id"/>
+                    <field name="template_id"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Campaign" name="group_mass_mailing_campaign_id"
+                            context="{'group_by': 'mass_mailing_campaign_id'}"/>
+                        <filter string="Template" name="group_template_id"
+                            context="{'group_by': 'template_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="view_mail_mass_mailing_tree">
             <field name="name">mail.mass_mailing.tree</field>
             <field name="model">mail.mass_mailing</field>
@@ -130,6 +32,8 @@
                     <field name="delivered"/>
                     <field name="opened"/>
                     <field name="replied"/>
+                    <field name="mass_mailing_campaign_id" invisible="1"/>
+                    <field name="template_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -233,7 +137,166 @@
             <field name="view_mode">kanban,tree,form</field>
         </record>
 
+        <record id="action_view_mass_mailings_from_campaign" model="ir.actions.act_window">
+            <field name="name">Mass Mailings</field>
+            <field name="res_model">mail.mass_mailing</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="context">{
+                'search_default_mass_mailing_campaign_id': [active_id], 
+                'default_mass_mailing_campaign_id': active_id,
+            }
+            </field>
+        </record>
+
+        <!--  MASS MAILING CAMPAIGNS !-->
+        <record model="ir.ui.view" id="view_mail_mass_mailing_campaign_search">
+            <field name="name">mail.mass_mailing.campaign.search</field>
+            <field name="model">mail.mass_mailing.campaign</field>
+            <field name="arch" type="xml">
+               <search string="Mass Mailing Campaigns">
+                    <field name="name" string="Campaigns"/>
+                    <field name="user_id"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Responsibles" name="group_user_id"
+                            context="{'group_by': 'user_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_mail_mass_mailing_campaign_tree">
+            <field name="name">mail.mass_mailing.campaign.tree</field>
+            <field name="model">mail.mass_mailing.campaign</field>
+            <field name="priority">10</field>
+            <field name="arch" type="xml">
+                <tree string="Mass Mailing Campaigns">
+                    <field name="name"/>
+                    <field name="user_id"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_mail_mass_mailing_campaign_form">
+            <field name="name">mail.mass_mailing.campaign.form</field>
+            <field name="model">mail.mass_mailing.campaign</field>
+            <field name="arch" type="xml">
+                <form string="Mass Mailing Campaign" version="7.0">
+                    <header>
+                        <button name="launch_mass_mailing_create_wizard" type="object"
+                            class="oe_highlight" string="Create a New Mailing"/>
+                    </header>
+                    <sheet>
+                        <group>
+                            <field name="name"/>
+                            <field name="user_id"/>
+                        </group>
+                        <group>
+                            <group>
+                                <field name="sent"/>
+                                <field name="opened"/>
+                                <field name="bounced"/>
+                            </group>
+                            <group>
+                                <field name="delivered"/>
+                                <field name="replied"/>
+                            </group>
+                        </group>
+                        <group>
+                            <field name="mass_mailing_ids"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_mail_mass_mailing_campaign_kanban">
+            <field name="name">mail.mass_mailing.campaign.kanban</field>
+            <field name="model">mail.mass_mailing.campaign</field>
+            <field name="arch" type="xml">
+                <kanban>
+                    <field name="mass_mailing_kanban_ids"/>
+                    <field name='sent'/>
+                    <field name='color'/>
+                    <templates>
+                        <t t-name="mass_mailing.mass_mailing">
+                            <div class="oe_mass_mailings">
+                                <div>
+                                    <a name="%(action_view_mass_mailings_from_campaign)d" type="action">
+                                        <h4><t t-raw="mass_mailing.name"/></h4>
+                                    </a>
+                                </div>
+                                <div>
+                                    <p class="oe_mail_stats">
+                                        <span class="oe_mail_result"><t t-raw="mass_mailing.sent"/></span><br />
+                                        Sent
+                                    </p>
+                                    <p class="oe_mail_stats">
+                                        <span class="oe_mail_result"><t t-raw="mass_mailing.delivered"/></span><br />
+                                        Delivered
+                                    </p>
+                                    <p class="oe_mail_stats">
+                                        <span class="oe_mail_result"><t t-raw="mass_mailing.opened"/></span><br />
+                                        Opened
+                                    </p>
+                                    <p class="oe_mail_stats">
+                                        <span class="oe_mail_result"><t t-raw="mass_mailing.replied"/></span><br />
+                                        Replied
+                                    </p>
+                                </div>
+                            </div>
+                        </t>
+                        <t t-name="kanban-box">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_kanban_mass_mailing oe_kanban_mass_mailing_campaign">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                    <span class="oe_e">i</span>
+                                    <ul class="oe_dropdown_menu">
+                                        <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                                    </ul>
+                                </div>
+                                 <div class="oe_kanban_content">
+                                    <h3>
+                                        <field name="name"/>
+                                    </h3>
+                                    <div>
+                                        <field name="delivered" widget="gauge" style="width:160px; height: 120px;"
+                                            options="{'max_field': 'sent'}"/>
+                                        <field name="opened" widget="gauge" style="width:160px; height: 120px;"
+                                            options="{'max_field': 'sent'}"/>
+                                        <field name="replied" widget="gauge" style="width:160px; height: 120px;"
+                                            options="{'max_field': 'sent'}"/>
+                                    </div>
+                                    <t t-foreach='record.mass_mailing_kanban_ids.value' t-as='mass_mailing'>
+                                        <t t-call="mass_mailing.mass_mailing"/>
+                                    </t>
+                                </div>
+                                <div class="oe_clear"></div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
+        <record id="action_view_mass_mailing_campaigns" model="ir.actions.act_window">
+            <field name="name">Mass Mailing Campaigns</field>
+            <field name="res_model">mail.mass_mailing.campaign</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban,tree,form</field>
+        </record>
+
         <!--  MAIL MAIL STATISTICS !-->
+        <record model="ir.ui.view" id="view_mail_mail_statistics_search">
+            <field name="name">mail.mail.statistics.search</field>
+            <field name="model">mail.mail.statistics</field>
+            <field name="arch" type="xml">
+               <search string="Mail Statistics">
+                    <field name="mail_mail_id"/>
+                    <field name="message_id"/>
+                </search>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="view_mail_mail_statistics_tree">
             <field name="name">mail.mail.statistics.tree</field>
             <field name="model">mail.mail.statistics</field>
diff --git a/addons/mass_mailing/static/src/js/mass_mailing.js b/addons/mass_mailing/static/src/js/mass_mailing.js
new file mode 100644
index 00000000000..93f63f01ad1
--- /dev/null
+++ b/addons/mass_mailing/static/src/js/mass_mailing.js
@@ -0,0 +1,13 @@
+openerp.mass_mailing = function(openerp) {
+
+    openerp.web_kanban.KanbanRecord.include({
+        on_card_clicked: function (event) {
+            if (this.view.dataset.model === 'mail.mass_mailing.campaign') {
+                this.$('.oe_mass_mailings a').first().click();
+            } else {
+                this._super.apply(this, arguments);
+            }
+        },
+    });
+
+};

From defa3adbe898bfb10f497ae5c6cae7981bfa63c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 16 Sep 2013 12:30:47 +0200
Subject: [PATCH 150/164] [DOC] read_group: added comments for the new
 formatting option

bzr revid: tde@openerp.com-20130916103047-lpbf7czflyvgtonu
---
 doc/changelog.rst  |  2 ++
 openerp/osv/orm.py | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/doc/changelog.rst b/doc/changelog.rst
index eadfe81b5e8..46f84364c76 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -6,6 +6,8 @@ Changelog
 `trunk`
 -------
 
+- Added support of custom group_by format and display format when using group_by
+  on a datetime field, using datetime_format context key
 - Improved ``html_email_clean`` in tools: better quote and signature finding,
   added shortening.
 - Cleaned and slightly refactored ``ir.actions.server``. The ``loop``, ``sms``
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index f081e11b9e2..25ed8bdf861 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -2601,7 +2601,18 @@ class BaseModel(object):
         :param list groupby: fields by which the records will be grouped
         :param int offset: optional number of records to skip
         :param int limit: optional max number of records to return
-        :param dict context: context arguments, like lang, time zone
+        :param dict context: context arguments, like lang, time zone. A special
+                             context key exist for datetime fields : ``datetime_format``.
+                             context[``datetime_format``] = {
+                                'field_name': {
+                                    groupby_format: format for to_char (default: yyyy-mm)
+                                    display_format: format for displaying the value
+                                                    in the result (default: MMM yyyy)
+                                    interval: day, month or year; used for begin
+                                              and end date of group_by intervals
+                                              computation (default: month)
+                                }
+                             }
         :param list orderby: optional ``order by`` specification, for
                              overriding the natural sort ordering of the
                              groups, see also :py:meth:`~osv.osv.osv.search`

From 1d76129a226040d394096b73da8d3ee4cad433d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 16 Sep 2013 13:47:06 +0200
Subject: [PATCH 151/164] [FIX] mass_mailing: - fixed forgottent import of
 mail_thread in mass_mailing, to enable bounce and replied tracking - fixed
 replied computation in message_route_process, adding the original email in
 parameters - fixed form view of campaign, to add edit and dlete now that
 clicking on it redirects to the waves - added track field on mail_mail, to
 avoid creating too mush entries in mail.mail.statistics - fixed mass_mailign
 controller

bzr revid: tde@openerp.com-20130916114706-b9zyhp0ha6mr9fzg
---
 addons/mail/mail_thread.py                    | 16 +++++-----
 addons/mass_mailing/__init__.py               |  1 +
 addons/mass_mailing/controllers/main.py       |  4 +--
 addons/mass_mailing/mail_mail.py              | 30 ++++++++++++-------
 addons/mass_mailing/mail_thread.py            | 10 ++++---
 addons/mass_mailing/mass_mailing_view.xml     |  6 ++++
 .../wizard/mail_compose_message.py            |  6 ++--
 7 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 9c4d753bc1c..d72c24f6a99 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -874,9 +874,9 @@ class mail_thread(osv.AbstractModel):
             "No possible route found for incoming message from %s to %s (Message-Id %s:)." \
             "Create an appropriate mail.alias or force the destination model." % (email_from, email_to, message_id)
 
-    def message_route_process(self, cr, uid, msg, routes, context=None):
-        # postpone setting msg.partner_ids after message_post, to avoid double notifications
-        partner_ids = msg.pop('partner_ids', [])
+    def message_route_process(self, cr, uid, message, message_dict, routes, context=None):
+        # postpone setting message_dict.partner_ids after message_post, to avoid double notifications
+        partner_ids = message_dict.pop('partner_ids', [])
         thread_id = False
         for model, thread_id, custom_values, user_id, alias in routes:
             if self._name == 'mail.thread':
@@ -885,22 +885,22 @@ class mail_thread(osv.AbstractModel):
                 model_pool = self.pool[model]
                 assert thread_id and hasattr(model_pool, 'message_update') or hasattr(model_pool, 'message_new'), \
                     "Undeliverable mail with Message-Id %s, model %s does not accept incoming emails" % \
-                    (msg['message_id'], model)
+                    (message_dict['message_id'], model)
 
                 # disabled subscriptions during message_new/update to avoid having the system user running the
                 # email gateway become a follower of all inbound messages
                 nosub_ctx = dict(context, mail_create_nosubscribe=True, mail_create_nolog=True)
                 if thread_id and hasattr(model_pool, 'message_update'):
-                    model_pool.message_update(cr, user_id, [thread_id], msg, context=nosub_ctx)
+                    model_pool.message_update(cr, user_id, [thread_id], message_dict, context=nosub_ctx)
                 else:
-                    thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=nosub_ctx)
+                    thread_id = model_pool.message_new(cr, user_id, message_dict, custom_values, context=nosub_ctx)
             else:
                 assert thread_id == 0, "Posting a message without model should be with a null res_id, to create a private message."
                 model_pool = self.pool.get('mail.thread')
             if not hasattr(model_pool, 'message_post'):
                 context['thread_model'] = model
                 model_pool = self.pool['mail.thread']
-            new_msg_id = model_pool.message_post(cr, uid, [thread_id], context=context, subtype='mail.mt_comment', **msg)
+            new_msg_id = model_pool.message_post(cr, uid, [thread_id], context=context, subtype='mail.mt_comment', **message_dict)
 
             if partner_ids:
                 # postponed after message_post, because this is an external message and we don't want to create
@@ -972,7 +972,7 @@ class mail_thread(osv.AbstractModel):
 
         # find possible routes for the message
         routes = self.message_route(cr, uid, msg_txt, msg, model, thread_id, custom_values, context=context)
-        thread_id = self.message_route_process(cr, uid, msg, routes, context=context)
+        thread_id = self.message_route_process(cr, uid, msg_txt, msg, routes, context=context)
         return thread_id
 
     def message_new(self, cr, uid, msg_dict, custom_values=None, context=None):
diff --git a/addons/mass_mailing/__init__.py b/addons/mass_mailing/__init__.py
index f7b250bd2ed..9dadc456842 100644
--- a/addons/mass_mailing/__init__.py
+++ b/addons/mass_mailing/__init__.py
@@ -21,5 +21,6 @@
 
 import mass_mailing
 import mail_mail
+import mail_thread
 import wizard
 import controllers
diff --git a/addons/mass_mailing/controllers/main.py b/addons/mass_mailing/controllers/main.py
index 9997d854cf3..3ca238256b1 100644
--- a/addons/mass_mailing/controllers/main.py
+++ b/addons/mass_mailing/controllers/main.py
@@ -8,5 +8,5 @@ class MassMailController(http.Controller):
     def track_mail_open(self, mail_id):
         """ Email tracking. """
         mail_mail_stats = request.registry.get('mail.mail.statistics')
-        mail_mail_stats.set_opened(request.cr, request.uid, mail_ids=[mail_id])
-        return False
+        mail_mail_stats.set_opened(request.cr, request.uid, mail_mail_ids=[mail_id])
+        return "data:image/gif;base64,R0lGODlhAQABAIAAANvf7wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=="
diff --git a/addons/mass_mailing/mail_mail.py b/addons/mass_mailing/mail_mail.py
index 5d576c158a9..e288e5cf1bb 100644
--- a/addons/mass_mailing/mail_mail.py
+++ b/addons/mass_mailing/mail_mail.py
@@ -23,7 +23,7 @@ from urlparse import urljoin
 
 from openerp import tools
 from openerp import SUPERUSER_ID
-from openerp.osv import osv
+from openerp.osv import osv, fields
 
 
 class MailMail(osv.Model):
@@ -31,16 +31,25 @@ class MailMail(osv.Model):
     _name = 'mail.mail'
     _inherit = ['mail.mail']
 
+    _columns = {
+        'track': fields.boolean('Use tracking'),
+    }
+
+    _defaults = {
+        'track': False,
+    }
+
     def create(self, cr, uid, values, context=None):
         """ Override mail_mail creation to create an entry in mail.mail.statistics """
         # TDE note: should be after 'all values computed', to have values (FIXME after merging other branch holding create refactoring)
         mail_id = super(MailMail, self).create(cr, uid, values, context=context)
-        message_id = self.browse(cr, SUPERUSER_ID, mail_id).message_id
-        self.pool['mail.mail.statistics'].create(
-            cr, uid, {
-                'mail_mail_id': mail_id,
-                'message_id': message_id,
-            }, context=context)
+        mail = self.browse(cr, SUPERUSER_ID, mail_id)
+        if mail.track:
+            self.pool['mail.mail.statistics'].create(
+                cr, uid, {
+                    'mail_mail_id': mail_id,
+                    'message_id': mail.message_id,
+                }, context=context)
         return mail_id
 
     def _get_tracking_url(self, cr, uid, mail, partner=None, context=None):
@@ -53,7 +62,8 @@ class MailMail(osv.Model):
         body = super(MailMail, self).send_get_mail_body(cr, uid, mail, partner=partner, context=context)
 
         # generate tracking URL
-        tracking_url = self._get_tracking_url(cr, uid, mail, partner, context=context)
-        if tracking_url:
-            body = tools.append_content_to_html(body, tracking_url, plaintext=False, container_tag='div')
+        if mail.track:
+            tracking_url = self._get_tracking_url(cr, uid, mail, partner, context=context)
+            if tracking_url:
+                body = tools.append_content_to_html(body, tracking_url, plaintext=False, container_tag='div')
         return body
diff --git a/addons/mass_mailing/mail_thread.py b/addons/mass_mailing/mail_thread.py
index 292e13eab3a..985d03ce2cc 100644
--- a/addons/mass_mailing/mail_thread.py
+++ b/addons/mass_mailing/mail_thread.py
@@ -22,6 +22,7 @@
 import logging
 
 from openerp import tools
+from openerp.addons.mail.mail_message import decode
 from openerp.addons.mail.mail_thread import decode_header
 from openerp.osv import osv
 
@@ -76,7 +77,8 @@ class MailThread(osv.Model):
             for obj in self.browse(cr, uid, ids, context=context):
                 self.write(cr, uid, [obj.id], {'message_bounce': obj.message_bounce + 1}, context=context)
 
-    def message_route_process(self, cr, uid, msg, routes, context=None):
-        if msg.get('message_id'):
-            self.pool['mail.mail.statistics'].set_replied(cr, uid, mail_message_ids=[msg.get('message_id')], context=context)
-        return super(MailThread, self).message_route_process(cr, uid, msg, routes, context=context)
+    def message_route_process(self, cr, uid, message, message_dict, routes, context=None):
+        if message.get('References'):
+            message_ids = [x.strip() for x in decode(message['References']).split()]
+            self.pool['mail.mail.statistics'].set_replied(cr, uid, mail_message_ids=message_ids, context=context)
+        return super(MailThread, self).message_route_process(cr, uid, message, message_dict, routes, context=context)
diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index f7443c896e3..b7128f8e7dd 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -251,6 +251,12 @@
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">
+                                        <t t-if="widget.view.is_action_enabled('edit')">
+                                            <li><a type="edit">Settings</a></li>
+                                        </t>
+                                        <t t-if="widget.view.is_action_enabled('delete')">
+                                            <li><a type="delete">Delete</a></li>
+                                        </t>
                                         <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                     </ul>
                                 </div>
diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py
index dd4aa632a9e..6c02357c1bf 100644
--- a/addons/mass_mailing/wizard/mail_compose_message.py
+++ b/addons/mass_mailing/wizard/mail_compose_message.py
@@ -37,10 +37,10 @@ class MailComposeMessage(osv.TransientModel):
         ),
     }
 
-    def render_message_batch(self, cr, uid, wizard, res_ids, context=None):
+    def get_mail_values(self, cr, uid, wizard, res_ids, context=None):
         """ Override method that generated the mail content by adding the mass
         mailing campaign, when doing pure email mass mailing. """
-        res = super(MailComposeMessage, self).render_message_batch(cr, uid, wizard, res_ids, context=context)
+        res = super(MailComposeMessage, self).get_mail_values(cr, uid, wizard, res_ids, context=context)
         if wizard.composition_mode == 'mass_mail' and wizard.mass_mailing_campaign_id:  # TODO: which kind of mass mailing ?
             current_date = fields.datetime.now()
             mass_mailing_id = self.pool['mail.mass_mailing'].create(
@@ -52,4 +52,6 @@ class MailComposeMessage(osv.TransientModel):
                     'template_id': wizard.template_id and wizard.template_id.id or False,
                 }, context=context)
             context['default_mass_mailing_id'] = mass_mailing_id
+            for res_id in res_ids:
+                res[res_id]['track'] = True
         return res

From 63988959a7750b03096e95a6cd36ce731fbdb445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 16 Sep 2013 13:47:22 +0200
Subject: [PATCH 152/164] [IMP] read_group: added forgottent year computation

bzr revid: tde@openerp.com-20130916114722-4742fhn4ilhf133e
---
 openerp/osv/orm.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 25ed8bdf861..764279bc45e 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -2739,13 +2739,16 @@ class BaseModel(object):
                     groupby_datetime = datetime.datetime.strptime(alldata[d['id']][groupby], '%Y-%m-%d')
                     d[groupby] = babel.dates.format_date(
                         groupby_datetime, format=group_by_params.get('display_format', 'MMMM yyyy'), locale=context.get('lang', 'en_US'))
-                    if group_by_params.get('interval') == 'day':
-                        domain_dt_begin = groupby_datetime.replace(hour=0, minute=0)
-                        domain_dt_end = groupby_datetime.replace(hour=23, minute=59, second=59)
-                    else:
+                    if group_by_params.get('interval') == 'month':
                         days = calendar.monthrange(groupby_datetime.year, groupby_datetime.month)[1]
                         domain_dt_begin = groupby_datetime.replace(day=1)
                         domain_dt_end = groupby_datetime.replace(day=days)
+                    elif group_by_params.get('interval') == 'day':
+                        domain_dt_begin = groupby_datetime.replace(hour=0, minute=0)
+                        domain_dt_end = groupby_datetime.replace(hour=23, minute=59, second=59)
+                    else:
+                        domain_dt_begin = groupby_datetime.replace(month=1, day=1)
+                        domain_dt_end = groupby_datetime.replace(month=12, day=31)
                     d['__domain'] = [(group_by, '>=', domain_dt_begin.strftime('%Y-%m-%d')), (group_by, '<=', domain_dt_end.strftime('%Y-%m-%d'))] + domain
                 del alldata[d['id']][groupby]
             d.update(alldata[d['id']])

From 03ff00b63c0d08915ea4035e86f9b7fe372c0d5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 16 Sep 2013 13:50:55 +0200
Subject: [PATCH 153/164] [DOC] mail: updated changelog of mail to match the
 new implementation

bzr revid: tde@openerp.com-20130916115055-k08sdeiomriskbx9
---
 addons/mail/doc/changelog.rst | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/addons/mail/doc/changelog.rst b/addons/mail/doc/changelog.rst
index 852c548aa0f..5eee5f136a6 100644
--- a/addons/mail/doc/changelog.rst
+++ b/addons/mail/doc/changelog.rst
@@ -8,17 +8,12 @@ Changelog
 
  - ``mass_mailing_campaign`` update
 
-  - ``mail_mail``: added ``opened``, ``replied`` and ``bounced`` datetime fields
-    holding the first time the mail has been respectively opened, replied or has
-    bounced.
-  - controllers: added a web controller to track opened mail
   - ``mail_mail`: moved ``reply_to`` computation from ``mail_mail`` to ``mail_message``
     where it belongs, as the field is located onto the ``mail_message`` model.
   - ``mail_compose_message``: template rendering is now done in batch. Each template
     is rendered for all res_ids, instead of all templates one id at a time.
-  - ``mail_thread``: added support for bounce alias. Using an alias on Return-Path
-    the mail gateway now flags emails and models having a ``message_bounce`` field
-    as bounced.
+  - ``mail_thread``: to ease inheritance, processing of routes is now done in
+    message_route_process, called in message_route
 
  - added support of ``active_domain`` form context, coming from the list view.
    When checking the header hook, the mass mailing will be done on all records

From bc0d066505a054389525cdf7601b35751ea3efbb Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 17 Sep 2013 04:37:59 +0000
Subject: [PATCH 154/164] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130914054213-dq0kt273ooy6fozn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915055539-hzmy1ws1il6z8fji
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915054954-zisp7huxai3ew84l
bzr revid: launchpad_translations_on_behalf_of_openerp-20130916054225-m0j262vooofcavqz
bzr revid: launchpad_translations_on_behalf_of_openerp-20130917043759-tke0eln0ca01hsm7
---
 addons/auth_crypt/i18n/da.po           |  23 +-
 addons/auth_oauth_signup/i18n/da.po    |  23 +
 addons/contacts/i18n/da.po             |  45 ++
 addons/email_template/i18n/en_GB.po    | 490 +++++++++++++++++++++
 addons/portal_anonymous/i18n/da.po     |  25 ++
 addons/portal_sale/i18n/ru.po          | 554 ++++++++++++++++++++++++
 addons/purchase_requisition/i18n/ko.po | 473 ++++++++++++++++++++
 addons/web/i18n/ar.po                  |   4 +-
 addons/web/i18n/bg.po                  |   4 +-
 addons/web/i18n/bn.po                  |   4 +-
 addons/web/i18n/bs.po                  | 577 +++++++++++++------------
 addons/web/i18n/ca.po                  |   4 +-
 addons/web/i18n/cs.po                  |   4 +-
 addons/web/i18n/da.po                  |   4 +-
 addons/web/i18n/de.po                  |   4 +-
 addons/web/i18n/en_AU.po               |   4 +-
 addons/web/i18n/en_GB.po               |   4 +-
 addons/web/i18n/es.po                  |   4 +-
 addons/web/i18n/es_CL.po               |   4 +-
 addons/web/i18n/es_CR.po               |   4 +-
 addons/web/i18n/es_DO.po               |   4 +-
 addons/web/i18n/es_EC.po               |   4 +-
 addons/web/i18n/es_MX.po               |   4 +-
 addons/web/i18n/et.po                  |   4 +-
 addons/web/i18n/eu.po                  |   4 +-
 addons/web/i18n/fa.po                  |   4 +-
 addons/web/i18n/fi.po                  |   4 +-
 addons/web/i18n/fr.po                  |   4 +-
 addons/web/i18n/fr_CA.po               |   4 +-
 addons/web/i18n/gl.po                  |   4 +-
 addons/web/i18n/gu.po                  |   4 +-
 addons/web/i18n/hi.po                  |   4 +-
 addons/web/i18n/hr.po                  |   4 +-
 addons/web/i18n/hu.po                  |   4 +-
 addons/web/i18n/id.po                  |   4 +-
 addons/web/i18n/it.po                  |   4 +-
 addons/web/i18n/ja.po                  |   4 +-
 addons/web/i18n/ka.po                  |   4 +-
 addons/web/i18n/ko.po                  |   4 +-
 addons/web/i18n/lo.po                  |   4 +-
 addons/web/i18n/lt.po                  |   4 +-
 addons/web/i18n/lv.po                  |   4 +-
 addons/web/i18n/mk.po                  |   4 +-
 addons/web/i18n/mn.po                  |   4 +-
 addons/web/i18n/nb.po                  |   4 +-
 addons/web/i18n/nl.po                  |   6 +-
 addons/web/i18n/nl_BE.po               |   4 +-
 addons/web/i18n/pl.po                  |   4 +-
 addons/web/i18n/pt.po                  |   4 +-
 addons/web/i18n/pt_BR.po               |   4 +-
 addons/web/i18n/ro.po                  |   4 +-
 addons/web/i18n/ru.po                  |   4 +-
 addons/web/i18n/sk.po                  |   4 +-
 addons/web/i18n/sl.po                  |   4 +-
 addons/web/i18n/sq.po                  |   4 +-
 addons/web/i18n/sr@latin.po            |   4 +-
 addons/web/i18n/sv.po                  |   4 +-
 addons/web/i18n/th.po                  |  12 +-
 addons/web/i18n/tr.po                  |   4 +-
 addons/web/i18n/uk.po                  |   4 +-
 addons/web/i18n/vi.po                  |   4 +-
 addons/web/i18n/zh_CN.po               |   6 +-
 addons/web/i18n/zh_TW.po               |   4 +-
 addons/web_calendar/i18n/ar.po         |   4 +-
 addons/web_calendar/i18n/bg.po         |   4 +-
 addons/web_calendar/i18n/bn.po         |   4 +-
 addons/web_calendar/i18n/bs.po         |  52 +--
 addons/web_calendar/i18n/ca.po         |   4 +-
 addons/web_calendar/i18n/cs.po         |   4 +-
 addons/web_calendar/i18n/da.po         |   4 +-
 addons/web_calendar/i18n/de.po         |   4 +-
 addons/web_calendar/i18n/en_AU.po      |   4 +-
 addons/web_calendar/i18n/en_GB.po      |   4 +-
 addons/web_calendar/i18n/es.po         |   4 +-
 addons/web_calendar/i18n/es_CL.po      |   4 +-
 addons/web_calendar/i18n/es_CR.po      |   4 +-
 addons/web_calendar/i18n/es_DO.po      |   4 +-
 addons/web_calendar/i18n/es_EC.po      |   4 +-
 addons/web_calendar/i18n/es_MX.po      |   4 +-
 addons/web_calendar/i18n/et.po         |   4 +-
 addons/web_calendar/i18n/eu.po         |   4 +-
 addons/web_calendar/i18n/fa.po         |   4 +-
 addons/web_calendar/i18n/fi.po         |   4 +-
 addons/web_calendar/i18n/fr.po         |   4 +-
 addons/web_calendar/i18n/fr_CA.po      |   4 +-
 addons/web_calendar/i18n/gl.po         |   4 +-
 addons/web_calendar/i18n/gu.po         |   4 +-
 addons/web_calendar/i18n/hr.po         |   4 +-
 addons/web_calendar/i18n/hu.po         |   4 +-
 addons/web_calendar/i18n/id.po         |   4 +-
 addons/web_calendar/i18n/it.po         |   4 +-
 addons/web_calendar/i18n/ja.po         |   4 +-
 addons/web_calendar/i18n/ka.po         |   4 +-
 addons/web_calendar/i18n/ko.po         |   4 +-
 addons/web_calendar/i18n/lt.po         |   4 +-
 addons/web_calendar/i18n/mk.po         |   4 +-
 addons/web_calendar/i18n/mn.po         |   4 +-
 addons/web_calendar/i18n/nb.po         |   4 +-
 addons/web_calendar/i18n/nl.po         |   6 +-
 addons/web_calendar/i18n/nl_BE.po      |   4 +-
 addons/web_calendar/i18n/pl.po         |   4 +-
 addons/web_calendar/i18n/pt.po         |   4 +-
 addons/web_calendar/i18n/pt_BR.po      |   4 +-
 addons/web_calendar/i18n/ro.po         |   4 +-
 addons/web_calendar/i18n/ru.po         |   4 +-
 addons/web_calendar/i18n/sk.po         |   4 +-
 addons/web_calendar/i18n/sl.po         |   4 +-
 addons/web_calendar/i18n/sq.po         |   4 +-
 addons/web_calendar/i18n/sr@latin.po   |   4 +-
 addons/web_calendar/i18n/sv.po         |   4 +-
 addons/web_calendar/i18n/th.po         |   4 +-
 addons/web_calendar/i18n/tr.po         |   4 +-
 addons/web_calendar/i18n/uk.po         |   4 +-
 addons/web_calendar/i18n/zh_CN.po      |   6 +-
 addons/web_diagram/i18n/ar.po          |   4 +-
 addons/web_diagram/i18n/bg.po          |   4 +-
 addons/web_diagram/i18n/bn.po          |   4 +-
 addons/web_diagram/i18n/bs.po          |  19 +-
 addons/web_diagram/i18n/ca.po          |   4 +-
 addons/web_diagram/i18n/cs.po          |   4 +-
 addons/web_diagram/i18n/da.po          |   4 +-
 addons/web_diagram/i18n/de.po          |   4 +-
 addons/web_diagram/i18n/en_AU.po       |   4 +-
 addons/web_diagram/i18n/en_GB.po       |   4 +-
 addons/web_diagram/i18n/es.po          |   4 +-
 addons/web_diagram/i18n/es_CL.po       |   4 +-
 addons/web_diagram/i18n/es_CR.po       |   4 +-
 addons/web_diagram/i18n/es_DO.po       |   4 +-
 addons/web_diagram/i18n/es_EC.po       |   4 +-
 addons/web_diagram/i18n/es_MX.po       |   4 +-
 addons/web_diagram/i18n/et.po          |   4 +-
 addons/web_diagram/i18n/fa.po          |   4 +-
 addons/web_diagram/i18n/fi.po          |   4 +-
 addons/web_diagram/i18n/fr.po          |   4 +-
 addons/web_diagram/i18n/gl.po          |   4 +-
 addons/web_diagram/i18n/gu.po          |   4 +-
 addons/web_diagram/i18n/hr.po          |   4 +-
 addons/web_diagram/i18n/hu.po          |   4 +-
 addons/web_diagram/i18n/id.po          |   4 +-
 addons/web_diagram/i18n/it.po          |   4 +-
 addons/web_diagram/i18n/ja.po          |   4 +-
 addons/web_diagram/i18n/ka.po          |   4 +-
 addons/web_diagram/i18n/ko.po          |   4 +-
 addons/web_diagram/i18n/lt.po          |   4 +-
 addons/web_diagram/i18n/mk.po          |   4 +-
 addons/web_diagram/i18n/mn.po          |   4 +-
 addons/web_diagram/i18n/nb.po          |   4 +-
 addons/web_diagram/i18n/nl.po          |   6 +-
 addons/web_diagram/i18n/nl_BE.po       |   4 +-
 addons/web_diagram/i18n/pl.po          |   4 +-
 addons/web_diagram/i18n/pt.po          |   4 +-
 addons/web_diagram/i18n/pt_BR.po       |   4 +-
 addons/web_diagram/i18n/ro.po          |   4 +-
 addons/web_diagram/i18n/ru.po          |   4 +-
 addons/web_diagram/i18n/sl.po          |   4 +-
 addons/web_diagram/i18n/sq.po          |   4 +-
 addons/web_diagram/i18n/sr@latin.po    |   4 +-
 addons/web_diagram/i18n/sv.po          |   4 +-
 addons/web_diagram/i18n/th.po          |   4 +-
 addons/web_diagram/i18n/tr.po          |   4 +-
 addons/web_diagram/i18n/zh_CN.po       |   6 +-
 addons/web_diagram/i18n/zh_TW.po       |   4 +-
 addons/web_gantt/i18n/ar.po            |   4 +-
 addons/web_gantt/i18n/bg.po            |   4 +-
 addons/web_gantt/i18n/bn.po            |   4 +-
 addons/web_gantt/i18n/bs.po            |   4 +-
 addons/web_gantt/i18n/ca.po            |   4 +-
 addons/web_gantt/i18n/cs.po            |   4 +-
 addons/web_gantt/i18n/da.po            |   4 +-
 addons/web_gantt/i18n/de.po            |   4 +-
 addons/web_gantt/i18n/en_AU.po         |   4 +-
 addons/web_gantt/i18n/en_GB.po         |   4 +-
 addons/web_gantt/i18n/es.po            |   4 +-
 addons/web_gantt/i18n/es_CL.po         |   4 +-
 addons/web_gantt/i18n/es_CR.po         |   4 +-
 addons/web_gantt/i18n/es_DO.po         |   4 +-
 addons/web_gantt/i18n/es_EC.po         |   4 +-
 addons/web_gantt/i18n/es_MX.po         |   4 +-
 addons/web_gantt/i18n/et.po            |   4 +-
 addons/web_gantt/i18n/fa.po            |   4 +-
 addons/web_gantt/i18n/fi.po            |   4 +-
 addons/web_gantt/i18n/fr.po            |   4 +-
 addons/web_gantt/i18n/gl.po            |   4 +-
 addons/web_gantt/i18n/gu.po            |   4 +-
 addons/web_gantt/i18n/hr.po            |   4 +-
 addons/web_gantt/i18n/hu.po            |   4 +-
 addons/web_gantt/i18n/it.po            |   4 +-
 addons/web_gantt/i18n/ja.po            |   4 +-
 addons/web_gantt/i18n/ka.po            |   4 +-
 addons/web_gantt/i18n/ko.po            |   4 +-
 addons/web_gantt/i18n/lo.po            |   4 +-
 addons/web_gantt/i18n/lt.po            |   4 +-
 addons/web_gantt/i18n/mk.po            |   4 +-
 addons/web_gantt/i18n/mn.po            |   4 +-
 addons/web_gantt/i18n/nb.po            |   4 +-
 addons/web_gantt/i18n/nl.po            |   6 +-
 addons/web_gantt/i18n/nl_BE.po         |   4 +-
 addons/web_gantt/i18n/pl.po            |   4 +-
 addons/web_gantt/i18n/pt.po            |   4 +-
 addons/web_gantt/i18n/pt_BR.po         |   4 +-
 addons/web_gantt/i18n/ro.po            |   4 +-
 addons/web_gantt/i18n/ru.po            |   4 +-
 addons/web_gantt/i18n/sl.po            |   4 +-
 addons/web_gantt/i18n/sq.po            |   4 +-
 addons/web_gantt/i18n/sr@latin.po      |   4 +-
 addons/web_gantt/i18n/sv.po            |   4 +-
 addons/web_gantt/i18n/th.po            |   4 +-
 addons/web_gantt/i18n/tr.po            |   4 +-
 addons/web_gantt/i18n/zh_CN.po         |   4 +-
 addons/web_graph/i18n/ar.po            |   4 +-
 addons/web_graph/i18n/bg.po            |   4 +-
 addons/web_graph/i18n/bn.po            |   4 +-
 addons/web_graph/i18n/bs.po            |  36 +-
 addons/web_graph/i18n/ca.po            |   4 +-
 addons/web_graph/i18n/cs.po            |   4 +-
 addons/web_graph/i18n/da.po            |   4 +-
 addons/web_graph/i18n/de.po            |   4 +-
 addons/web_graph/i18n/en_AU.po         |   4 +-
 addons/web_graph/i18n/en_GB.po         |   4 +-
 addons/web_graph/i18n/es.po            |   4 +-
 addons/web_graph/i18n/es_CL.po         |   4 +-
 addons/web_graph/i18n/es_CR.po         |   4 +-
 addons/web_graph/i18n/es_DO.po         |   4 +-
 addons/web_graph/i18n/es_EC.po         |   4 +-
 addons/web_graph/i18n/es_MX.po         |   4 +-
 addons/web_graph/i18n/et.po            |   4 +-
 addons/web_graph/i18n/fa.po            |   4 +-
 addons/web_graph/i18n/fi.po            |   4 +-
 addons/web_graph/i18n/fr.po            |   4 +-
 addons/web_graph/i18n/fr_CA.po         |   4 +-
 addons/web_graph/i18n/gl.po            |   4 +-
 addons/web_graph/i18n/gu.po            |   4 +-
 addons/web_graph/i18n/hr.po            |   4 +-
 addons/web_graph/i18n/hu.po            |   4 +-
 addons/web_graph/i18n/it.po            |   4 +-
 addons/web_graph/i18n/ja.po            |   4 +-
 addons/web_graph/i18n/ka.po            |   4 +-
 addons/web_graph/i18n/ko.po            |   4 +-
 addons/web_graph/i18n/lt.po            |   4 +-
 addons/web_graph/i18n/mk.po            |   4 +-
 addons/web_graph/i18n/mn.po            |   4 +-
 addons/web_graph/i18n/nb.po            |   4 +-
 addons/web_graph/i18n/nl.po            |   6 +-
 addons/web_graph/i18n/nl_BE.po         |   4 +-
 addons/web_graph/i18n/pl.po            |   4 +-
 addons/web_graph/i18n/pt.po            |   4 +-
 addons/web_graph/i18n/pt_BR.po         |   4 +-
 addons/web_graph/i18n/ro.po            |   4 +-
 addons/web_graph/i18n/ru.po            |   4 +-
 addons/web_graph/i18n/sl.po            |   4 +-
 addons/web_graph/i18n/sq.po            |   4 +-
 addons/web_graph/i18n/sr@latin.po      |   4 +-
 addons/web_graph/i18n/sv.po            |   4 +-
 addons/web_graph/i18n/th.po            |   4 +-
 addons/web_graph/i18n/tr.po            |   4 +-
 addons/web_graph/i18n/zh_CN.po         |   4 +-
 addons/web_kanban/i18n/ar.po           |   4 +-
 addons/web_kanban/i18n/bg.po           |   4 +-
 addons/web_kanban/i18n/bn.po           |   4 +-
 addons/web_kanban/i18n/bs.po           |  34 +-
 addons/web_kanban/i18n/ca.po           |   4 +-
 addons/web_kanban/i18n/cs.po           |   4 +-
 addons/web_kanban/i18n/da.po           |   4 +-
 addons/web_kanban/i18n/de.po           |   4 +-
 addons/web_kanban/i18n/en_AU.po        |   4 +-
 addons/web_kanban/i18n/en_GB.po        |   4 +-
 addons/web_kanban/i18n/es.po           |   4 +-
 addons/web_kanban/i18n/es_CL.po        |   4 +-
 addons/web_kanban/i18n/es_CR.po        |   4 +-
 addons/web_kanban/i18n/es_DO.po        |   4 +-
 addons/web_kanban/i18n/es_EC.po        |   4 +-
 addons/web_kanban/i18n/es_MX.po        |   4 +-
 addons/web_kanban/i18n/et.po           |   4 +-
 addons/web_kanban/i18n/fa.po           |   4 +-
 addons/web_kanban/i18n/fi.po           |   4 +-
 addons/web_kanban/i18n/fr.po           |   4 +-
 addons/web_kanban/i18n/fr_CA.po        |   4 +-
 addons/web_kanban/i18n/gl.po           |   4 +-
 addons/web_kanban/i18n/gu.po           |   4 +-
 addons/web_kanban/i18n/hr.po           |   4 +-
 addons/web_kanban/i18n/hu.po           |   4 +-
 addons/web_kanban/i18n/it.po           |   4 +-
 addons/web_kanban/i18n/ja.po           |   4 +-
 addons/web_kanban/i18n/ka.po           |   4 +-
 addons/web_kanban/i18n/ko.po           |   4 +-
 addons/web_kanban/i18n/lt.po           |   4 +-
 addons/web_kanban/i18n/mk.po           |   4 +-
 addons/web_kanban/i18n/mn.po           |   4 +-
 addons/web_kanban/i18n/nb.po           |   4 +-
 addons/web_kanban/i18n/nl.po           |   6 +-
 addons/web_kanban/i18n/nl_BE.po        |   4 +-
 addons/web_kanban/i18n/pl.po           |   4 +-
 addons/web_kanban/i18n/pt.po           |   4 +-
 addons/web_kanban/i18n/pt_BR.po        |   4 +-
 addons/web_kanban/i18n/ro.po           |   4 +-
 addons/web_kanban/i18n/ru.po           |   4 +-
 addons/web_kanban/i18n/sl.po           |   4 +-
 addons/web_kanban/i18n/sr@latin.po     |   4 +-
 addons/web_kanban/i18n/sv.po           |   4 +-
 addons/web_kanban/i18n/th.po           |   4 +-
 addons/web_kanban/i18n/tr.po           |   4 +-
 addons/web_kanban/i18n/zh_CN.po        |   6 +-
 addons/web_kanban/i18n/zh_TW.po        |   4 +-
 addons/web_shortcuts/i18n/da.po        |  25 ++
 addons/web_view_editor/i18n/ar.po      |   4 +-
 addons/web_view_editor/i18n/bs.po      |   4 +-
 addons/web_view_editor/i18n/cs.po      |   4 +-
 addons/web_view_editor/i18n/da.po      |   4 +-
 addons/web_view_editor/i18n/de.po      |   4 +-
 addons/web_view_editor/i18n/en_AU.po   |   4 +-
 addons/web_view_editor/i18n/en_GB.po   | 184 ++++++++
 addons/web_view_editor/i18n/es.po      |   4 +-
 addons/web_view_editor/i18n/es_DO.po   |   4 +-
 addons/web_view_editor/i18n/es_EC.po   |   4 +-
 addons/web_view_editor/i18n/es_MX.po   |   4 +-
 addons/web_view_editor/i18n/et.po      |   4 +-
 addons/web_view_editor/i18n/fa.po      |   4 +-
 addons/web_view_editor/i18n/fi.po      |   4 +-
 addons/web_view_editor/i18n/fr.po      |   4 +-
 addons/web_view_editor/i18n/hr.po      |   4 +-
 addons/web_view_editor/i18n/hu.po      |   4 +-
 addons/web_view_editor/i18n/it.po      |   4 +-
 addons/web_view_editor/i18n/ko.po      |   4 +-
 addons/web_view_editor/i18n/lt.po      |   4 +-
 addons/web_view_editor/i18n/lv.po      |   4 +-
 addons/web_view_editor/i18n/mk.po      |   4 +-
 addons/web_view_editor/i18n/mn.po      |   4 +-
 addons/web_view_editor/i18n/nb.po      |   4 +-
 addons/web_view_editor/i18n/nl.po      |   6 +-
 addons/web_view_editor/i18n/nl_BE.po   |   4 +-
 addons/web_view_editor/i18n/pl.po      |   4 +-
 addons/web_view_editor/i18n/pt.po      |   4 +-
 addons/web_view_editor/i18n/pt_BR.po   |   4 +-
 addons/web_view_editor/i18n/ro.po      |   4 +-
 addons/web_view_editor/i18n/ru.po      |   4 +-
 addons/web_view_editor/i18n/sl.po      |   4 +-
 addons/web_view_editor/i18n/th.po      |   4 +-
 addons/web_view_editor/i18n/tr.po      |   4 +-
 addons/web_view_editor/i18n/zh_CN.po   |   6 +-
 339 files changed, 2875 insertions(+), 1017 deletions(-)
 create mode 100644 addons/auth_oauth_signup/i18n/da.po
 create mode 100644 addons/contacts/i18n/da.po
 create mode 100644 addons/email_template/i18n/en_GB.po
 create mode 100644 addons/portal_anonymous/i18n/da.po
 create mode 100644 addons/portal_sale/i18n/ru.po
 create mode 100644 addons/purchase_requisition/i18n/ko.po
 create mode 100644 addons/web_shortcuts/i18n/da.po
 create mode 100644 addons/web_view_editor/i18n/en_GB.po

diff --git a/addons/auth_crypt/i18n/da.po b/addons/auth_crypt/i18n/da.po
index 4710a5ffaa5..d1e0d789d87 100644
--- a/addons/auth_crypt/i18n/da.po
+++ b/addons/auth_crypt/i18n/da.po
@@ -1,23 +1,28 @@
 # Danish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-01-27 08:38+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-09-15 20:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@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-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2013-09-16 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. module: base_crypt
-#: model:ir.model,name:base_crypt.model_res_users
+#. module: auth_crypt
+#: field:res.users,password_crypt:0
+msgid "Encrypted Password"
+msgstr "Krypteret kodeord"
+
+#. module: auth_crypt
+#: model:ir.model,name:auth_crypt.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Brugere"
diff --git a/addons/auth_oauth_signup/i18n/da.po b/addons/auth_oauth_signup/i18n/da.po
new file mode 100644
index 00000000000..b6a7a5605b6
--- /dev/null
+++ b/addons/auth_oauth_signup/i18n/da.po
@@ -0,0 +1,23 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-09-15 20:08+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish <da@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: 2013-09-16 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. module: auth_oauth_signup
+#: model:ir.model,name:auth_oauth_signup.model_res_users
+msgid "Users"
+msgstr "Bruger"
diff --git a/addons/contacts/i18n/da.po b/addons/contacts/i18n/da.po
new file mode 100644
index 00000000000..3a04b0556ad
--- /dev/null
+++ b/addons/contacts/i18n/da.po
@@ -0,0 +1,45 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-09-15 20:14+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish <da@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: 2013-09-16 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a contact in your address book.\n"
+"          </p><p>\n"
+"            OpenERP helps you easily track all activities related to\n"
+"            a customer; discussions, history of business opportunities,\n"
+"            documents, etc.\n"
+"          </p>\n"
+"        "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Klik for at tilføje kontakt i din adressebog.\n"
+"          </p><p>\n"
+"            OpenERP hjælper med at spore alle aktiviteter i forbindelse med\n"
+"            kunde korrespondance, historik på forretnings muligheder,\n"
+"            dokumenter, o.s.v.\n"
+"          </p>\n"
+"        "
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr "Adressebog"
diff --git a/addons/email_template/i18n/en_GB.po b/addons/email_template/i18n/en_GB.po
new file mode 100644
index 00000000000..5734ecbd334
--- /dev/null
+++ b/addons/email_template/i18n/en_GB.po
@@ -0,0 +1,490 @@
+# English (United Kingdom) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-09-14 06:46+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-09-15 05:49+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. module: email_template
+#: field:email.template,email_from:0
+#: field:email_template.preview,email_from:0
+msgid "From"
+msgstr "From"
+
+#. module: email_template
+#: field:mail.compose.message,template_id:0
+msgid "Template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+#: help:email_template.preview,ref_ir_value:0
+msgid "Sidebar button to open the sidebar action"
+msgstr "Sidebar button to open the sidebar action"
+
+#. module: email_template
+#: field:res.partner,opt_out:0
+msgid "Opt-Out"
+msgstr "Opt-Out"
+
+#. module: email_template
+#: field:email.template,email_to:0
+#: field:email_template.preview,email_to:0
+msgid "To (Emails)"
+msgstr "To (E-mails)"
+
+#. module: email_template
+#: field:email.template,mail_server_id:0
+#: field:email_template.preview,mail_server_id:0
+msgid "Outgoing Mail Server"
+msgstr "Outgoing Mail Server"
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+#: help:email_template.preview,ref_ir_act_window:0
+msgid ""
+"Sidebar action to make this template available on records of the related "
+"document model"
+msgstr ""
+"Sidebar action to make this template available on records of the related "
+"document model"
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+#: field:email_template.preview,model_object_field:0
+msgid "Field"
+msgstr "Field"
+
+#. module: email_template
+#: help:email.template,email_from:0
+#: help:email_template.preview,email_from:0
+msgid "Sender address (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Remove context action"
+msgstr "Remove context action"
+
+#. module: email_template
+#: help:email.template,mail_server_id:0
+#: help:email_template.preview,mail_server_id:0
+msgid ""
+"Optional preferred server for outgoing mails. If not set, the highest "
+"priority one will be used."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,report_name:0
+#: field:email_template.preview,report_name:0
+msgid "Report Filename"
+msgstr "Report Filename"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.preview,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Use template"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,body_html:0
+#: field:email_template.preview,body_html:0
+msgid "Body"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:247
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,user_signature:0
+#: help:email_template.preview,user_signature:0
+msgid ""
+"If checked, the user's signature will be appended to the text version of the "
+"message"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "SMTP Server"
+msgstr ""
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Save as new template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_object:0
+#: help:email_template.preview,sub_object:0
+msgid ""
+"When a relationship field is selected as first field, this field shows the "
+"document model the relationship goes to."
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,report_name:0
+#: help:email_template.preview,report_name:0
+msgid ""
+"Name to use for the generated report file (may contain placeholders)\n"
+"The extension can be omitted and will then come from the report type."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+#: field:email_template.preview,ref_ir_act_window:0
+msgid "Sidebar action"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,lang:0
+#: help:email_template.preview,lang:0
+msgid ""
+"Optional translation language (ISO code) to select when sending out an "
+"email. If not set, the english version will be used. This should usually be "
+"a placeholder expression that provides the appropriate language code, e.g. "
+"${object.partner_id.lang.code}."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,res_id:0
+msgid "Sample Document"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+#: help:email_template.preview,model_object_field:0
+msgid ""
+"Select target field from the related document model.\n"
+"If it is a relationship field you will be able to select a target field at "
+"the destination of the relationship."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Dynamic Value Builder"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr ""
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Save as a new template"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid ""
+"Display an option on related documents to open a composition wizard with "
+"this template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,email_cc:0
+#: help:email_template.preview,email_cc:0
+msgid "Carbon copy recipients (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,email_to:0
+#: help:email_template.preview,email_to:0
+msgid "Comma-separated recipient addresses (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Preview of"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Using sample document"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+#: model:ir.ui.menu,name:email_template.menu_email_templates
+msgid "Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,name:0
+#: field:email_template.preview,name:0
+msgid "Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,lang:0
+#: field:email_template.preview,lang:0
+msgid "Language"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid ""
+"Remove the contextual action to use this template on related documents"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+#: field:email_template.preview,copyvalue:0
+msgid "Placeholder Expression"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_object:0
+#: field:email_template.preview,sub_object:0
+msgid "Sub-model"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,subject:0
+#: help:email_template.preview,subject:0
+msgid "Subject (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,reply_to:0
+#: help:email_template.preview,reply_to:0
+msgid "Preferred response address (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_value:0
+#: field:email_template.preview,ref_ir_value:0
+msgid "Sidebar Button"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,report_template:0
+#: field:email_template.preview,report_template:0
+msgid "Optional report to print and attach"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,null_value:0
+#: help:email_template.preview,null_value:0
+msgid "Optional value to use if the target field is empty"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Model"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Add context action"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,model_id:0
+#: help:email_template.preview,model_id:0
+msgid "The kind of document with with this template can be used"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,email_recipients:0
+#: field:email_template.preview,email_recipients:0
+msgid "To (Partners)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,auto_delete:0
+#: field:email_template.preview,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+#: help:email_template.preview,copyvalue:0
+msgid ""
+"Final placeholder expression, to be copy-pasted in the desired template "
+"field."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model:0
+#: field:email_template.preview,model:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addressing"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,email_recipients:0
+#: help:email_template.preview,email_recipients:0
+msgid ""
+"Comma-separated ids of recipient partners (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+#: field:email_template.preview,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:234
+#, python-format
+msgid "Deletion of the action record failed."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,email_cc:0
+#: field:email_template.preview,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_id:0
+#: field:email_template.preview,model_id:0
+msgid "Applies to"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+#: field:email_template.preview,sub_model_object_field:0
+msgid "Sub-field"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Details"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:199
+#, python-format
+msgid "Send Mail (%s)"
+msgstr ""
+
+#. module: email_template
+#: help:res.partner,opt_out:0
+msgid ""
+"If checked, this partner will not receive any automated email notifications, "
+"such as the availability of invoices."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,auto_delete:0
+#: help:email_template.preview,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+#: help:email_template.preview,sub_model_object_field:0
+msgid ""
+"When a relationship field is selected as first field, this field lets you "
+"select the target field within the destination document model (sub-model)."
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:234
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,user_signature:0
+#: field:email_template.preview,user_signature:0
+msgid "Add Signature"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,null_value:0
+#: field:email_template.preview,null_value:0
+msgid "Default Value"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+#: help:email_template.preview,attachment_ids:0
+msgid ""
+"You may attach files to this template, to be added to all emails created "
+"from this template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,body_html:0
+#: help:email_template.preview,body_html:0
+msgid "Rich-text/HTML version of the message (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Contents"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,subject:0
+#: field:email_template.preview,subject:0
+msgid "Subject"
+msgstr ""
diff --git a/addons/portal_anonymous/i18n/da.po b/addons/portal_anonymous/i18n/da.po
new file mode 100644
index 00000000000..e12356263b9
--- /dev/null
+++ b/addons/portal_anonymous/i18n/da.po
@@ -0,0 +1,25 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-09-15 20:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish <da@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: 2013-09-16 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. module: portal_anonymous
+#. openerp-web
+#: code:addons/portal_anonymous/static/src/xml/portal_anonymous.xml:8
+#, python-format
+msgid "Login"
+msgstr "Login"
diff --git a/addons/portal_sale/i18n/ru.po b/addons/portal_sale/i18n/ru.po
new file mode 100644
index 00000000000..da12b485f4f
--- /dev/null
+++ b/addons/portal_sale/i18n/ru.po
@@ -0,0 +1,554 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-09-16 07:59+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian <ru@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-09-17 04:37+0000\n"
+"X-Generator: Launchpad (build 16765)\n"
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.portal_action_invoices
+msgid "We haven't sent you any invoice."
+msgstr "У Вас нет никаких счетов."
+
+#. module: portal_sale
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'проект' or ''}"
+
+#. module: portal_sale
+#: model:res.groups,name:portal_sale.group_payment_options
+msgid "View Online Payment Options"
+msgstr "Посмотреть варианты оплаты онлайн"
+
+#. module: portal_sale
+#: field:account.config.settings,group_payment_options:0
+msgid "Show payment buttons to employees too"
+msgstr "Показывать кнопки оплаты сотрудникам"
+
+#. module: portal_sale
+#: model:email.template,subject:portal_sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Предложение' or 'Заказ'} № ${object.name or 'б/н' }"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_quotations_portal
+msgid "We haven't sent you any quotation."
+msgstr "У Вас нет никаких предложений цен"
+
+#. module: portal_sale
+#: model:ir.ui.menu,name:portal_sale.portal_sales_orders
+msgid "Sales Orders"
+msgstr "Заказы продаж"
+
+#. module: portal_sale
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid ""
+"Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers "
+"who are accessing\n"
+"their documents through the portal."
+msgstr ""
+"Члены этой группы видят варианты оплаты счетов онлайн\n"
+"по заказам продаж и счетам заказчиков. Эти варианты предназначены для "
+"заказчиков, имеющих доступ\n"
+"к своим документам через портал."
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    You can access this document and pay online via our Customer Portal:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
+"    % endif\n"
+"\n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        % endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Здравствуйте, ${object.partner_id.name}!</p>\n"
+"    \n"
+"    <p>Направляем Вам ${object.state in ('draft', 'sent') and 'предложение' "
+"or 'подтверждение заказа'} от ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>СВОДКА</strong><br />\n"
+"       &nbsp;&nbsp;Заказ: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Итог: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Дата: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Основание заказа: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Ваша ссылка: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Ваш контакт: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    Вы можете ознакомиться с этим документом онлайн и узнать о вариантах "
+"оплаты через наш Портал:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">Посмотреть ${object.state in ('draft', "
+"'sent') and 'Предложение' or 'Заказ'}</a>\n"
+"    % endif\n"
+"\n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>Также возможно произвести оплату непосредственно через Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>Если у Вас есть вопросы - пожалуйста, свяжитесь с нами.</p>\n"
+"    <p>Спасибо, что выбрали ${object.company_id.name or 'нас'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Сайт :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        % endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+
+#. module: portal_sale
+#: model:email.template,report_name:portal_sale.email_template_edi_invoice
+msgid ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
+msgstr ""
+"Счёт_${(object.number or '').replace('/','_')}_${object.state == 'draft' and "
+"'проект' or ''}"
+
+#. module: portal_sale
+#: model:email.template,subject:portal_sale.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+msgstr "${object.company_id.name} Счёт № ${object.number or 'n/a' }"
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_mail_mail
+msgid "Outgoing Mails"
+msgstr "Исходящая почта"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_quotations_portal
+#: model:ir.ui.menu,name:portal_sale.portal_quotations
+msgid "Quotations"
+msgstr "Предложения цен"
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_sale_order
+msgid "Sales Order"
+msgstr "Заказ продаж"
+
+#. module: portal_sale
+#: field:account.invoice,portal_payment_options:0
+#: field:sale.order,portal_payment_options:0
+msgid "Portal Payment Options"
+msgstr "Варианты оплаты через портал"
+
+#. module: portal_sale
+#: help:account.config.settings,group_payment_options:0
+msgid ""
+"Show online payment options on Sale Orders and Customer Invoices to "
+"employees. If not checked, these options are only visible to portal users."
+msgstr ""
+"Показывать варианты оплаты по заказам продаж и счетам заказчиков "
+"сотрудникам. Если не отмечено, то эти варианты видны только пользователям "
+"портала."
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.portal_action_invoices
+#: model:ir.ui.menu,name:portal_sale.portal_invoices
+msgid "Invoices"
+msgstr "Счета"
+
+#. module: portal_sale
+#: view:account.config.settings:0
+msgid "Configure payment acquiring methods"
+msgstr "Настроить методы получения платежей"
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    You can access the invoice document and pay online via our Customer "
+"Portal:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
+"    % endif\n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        % endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Здравствуйте, ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>Вам выставлен счёт: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>СВОДКА</strong><br />\n"
+"       &nbsp;&nbsp;Счёт: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Итог: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Дата: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Основание: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Ваш контакт: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Счёт%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    Вы можете ознакомиться с документом онлайн и узнать о вариантах оплаты "
+"через наш Портал:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">Посмотреть счёт</a>\n"
+"    % endif\n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>Также возможно произвести оплату через Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>Если у Вас есть вопросы - пожалуйста, свяжитесь с нами.</p>\n"
+"    <p>Спасибо, что выбрали ${object.company_id.name or 'нас'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Сайт:&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        % endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "We haven't sent you any sales order."
+msgstr "У Вас нет никаких заказов."
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_account_invoice
+msgid "Invoice"
+msgstr "Счёт"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_orders_portal
+msgid "Sale Orders"
+msgstr "Заказы продаж"
diff --git a/addons/purchase_requisition/i18n/ko.po b/addons/purchase_requisition/i18n/ko.po
new file mode 100644
index 00000000000..445ea25c3c0
--- /dev/null
+++ b/addons/purchase_requisition/i18n/ko.po
@@ -0,0 +1,473 @@
+# Korean translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-09-15 08:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean <ko@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-09-16 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Request a Quotation"
+msgstr "견적 요청"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Multiple Requisitions"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to start a new purchase requisition process. \n"
+"          </p><p>\n"
+"            A purchase requisition is the step before a request for "
+"quotation.\n"
+"            In a purchase requisition (or purchase tender), you can record "
+"the\n"
+"            products you need to buy and trigger the creation of RfQs to\n"
+"            suppliers. After the negotiation, once you have reviewed all "
+"the\n"
+"            supplier's offers, you can validate some and cancel others.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "Status"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Purchase Done"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "New"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Type"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_partner
+#: model:ir.actions.report.xml,name:purchase_requisition.report_purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition
+#: model:ir.module.category,name:purchase_requisition.module_category_purchase_requisition
+#: field:product.product,purchase_requisition:0
+#: field:purchase.order,requisition_id:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition.line,requisition_id:0
+#: view:purchase.requisition.partner:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Purchase Orders with requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "or"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Current Purchase Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_user
+msgid "User"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr ""
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Search Purchase Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "No Product in Tender."
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel Purchase Order"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "New Purchase Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Products"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+msgid "Source"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:procurement.order,requisition_id:0
+msgid "Latest Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr ""
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Cancel"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:product.product,purchase_requisition:0
+msgid ""
+"Check this box to generates purchase requisition instead of generating "
+"requests for quotation from procurement."
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,purchase_ids:0
+msgid "Purchase Orders"
+msgstr ""
diff --git a/addons/web/i18n/ar.po b/addons/web/i18n/ar.po
index eb9041c585e..65bbcd33781 100644
--- a/addons/web/i18n/ar.po
+++ b/addons/web/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:44+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/bg.po b/addons/web/i18n/bg.po
index 988b4e3a659..f291d6adfe4 100644
--- a/addons/web/i18n/bg.po
+++ b/addons/web/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:44+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/bn.po b/addons/web/i18n/bn.po
index bcfc65395af..00d840da9f5 100644
--- a/addons/web/i18n/bn.po
+++ b/addons/web/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:44+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/bs.po b/addons/web/i18n/bs.po
index 8576e8affac..649a3838e96 100644
--- a/addons/web/i18n/bs.po
+++ b/addons/web/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:44+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
@@ -36,14 +36,14 @@ msgstr "prije %d minuta"
 #: code:addons/web/static/src/js/coresetup.js:620
 #, python-format
 msgid "Still loading...<br />Please be patient."
-msgstr "Još se učitava..."
+msgstr "Još se učitava...<br />Molimo budite strpljivi."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/search.js:1999
 #, python-format
 msgid "%(field)s %(operator)s \"%(value)s\""
-msgstr ""
+msgstr "%(field)s %(operator)s \"%(value)s\""
 
 #. module: web
 #. openerp-web
@@ -59,7 +59,7 @@ msgstr "manje ili jednako od"
 #: code:addons/web/static/src/js/chrome.js:410
 #, python-format
 msgid "Please enter your previous password"
-msgstr ""
+msgstr "Molimo Vas da unesete prijašnju šifru"
 
 #. module: web
 #. openerp-web
@@ -148,7 +148,7 @@ msgstr "Ovo je pregled fajla koji nismo mogli importovati:"
 #: code:addons/web/static/src/js/coresetup.js:591
 #, python-format
 msgid "about a minute ago"
-msgstr ""
+msgstr "prije oko minut"
 
 #. module: web
 #. openerp-web
@@ -161,14 +161,14 @@ msgstr ""
 #: code:addons/web/controllers/main.py:869
 #, python-format
 msgid "You cannot leave any password empty."
-msgstr ""
+msgstr "Ne možete ostaviti šifru praznu."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:732
 #, python-format
 msgid "Invalid username or password"
-msgstr ""
+msgstr "Ne pravilno korisničko ime ili šifra"
 
 #. module: web
 #. openerp-web
@@ -177,7 +177,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:278
 #, python-format
 msgid "Master Password:"
-msgstr ""
+msgstr "Glavna šifra:"
 
 #. module: web
 #. openerp-web
@@ -185,7 +185,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1402
 #, python-format
 msgid "Select"
-msgstr ""
+msgstr "Odaberi"
 
 #. module: web
 #. openerp-web
@@ -199,14 +199,14 @@ msgstr "Baza podataka uspješno obnovljena"
 #: code:addons/web/static/src/xml/base.xml:437
 #, python-format
 msgid "Version"
-msgstr ""
+msgstr "Verzija"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:592
 #, python-format
 msgid "Latest Modification Date:"
-msgstr ""
+msgstr "Zadnji datum modifikacije:"
 
 #. module: web
 #. openerp-web
@@ -214,20 +214,22 @@ msgstr ""
 #, python-format
 msgid "M2O search fields do not currently handle multiple default values"
 msgstr ""
+"M2O polja pretraživanja trenutno ne mogu upravljati sa više zadanih "
+"vrijednosti"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:1241
 #, python-format
 msgid "Widget type '%s' is not implemented"
-msgstr ""
+msgstr "Widget tipa '%s' nije implementiran"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1626
 #, python-format
 msgid "Share with all users"
-msgstr ""
+msgstr "Djeli sa svim korisnicima"
 
 #. module: web
 #. openerp-web
@@ -235,21 +237,21 @@ msgstr ""
 #: code:addons/web/static/src/js/view_form.js:320
 #, python-format
 msgid "Form"
-msgstr ""
+msgstr "Forma"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1352
 #, python-format
 msgid "(no string)"
-msgstr ""
+msgstr "(nema stringa)"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/formats.js:286
 #, python-format
 msgid "'%s' is not a correct time"
-msgstr ""
+msgstr "'%s' je ne pravilno vrijeme"
 
 #. module: web
 #. openerp-web
@@ -263,77 +265,77 @@ msgstr "Ne važeći broj"
 #: code:addons/web/static/src/xml/base.xml:343
 #, python-format
 msgid "New Password:"
-msgstr ""
+msgstr "Nova šifra:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:632
 #, python-format
 msgid "Attachment :"
-msgstr ""
+msgstr "Zakačka:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1712
 #, python-format
 msgid "Fields to export"
-msgstr ""
+msgstr "Polja za izvoz"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_list.js:1350
 #, python-format
 msgid "Undefined"
-msgstr ""
+msgstr "Nedefinisano"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:5002
 #, python-format
 msgid "File Upload"
-msgstr ""
+msgstr "Učitavanje fajla"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/coresetup.js:597
 #, python-format
 msgid "about a month ago"
-msgstr ""
+msgstr "prije mjesec dana"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1618
 #, python-format
 msgid "Custom Filters"
-msgstr ""
+msgstr "Prilagođeni filteri"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1364
 #, python-format
 msgid "Button Type:"
-msgstr ""
+msgstr "Tip dugmeta:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:441
 #, python-format
 msgid "OpenERP SA Company"
-msgstr ""
+msgstr "OpenERP SA Kompanija"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/search.js:1663
 #, python-format
 msgid "Custom Filter"
-msgstr ""
+msgstr "Prilagođeni filter"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:177
 #, python-format
 msgid "Duplicate Database"
-msgstr ""
+msgstr "Dupliciraj bazu"
 
 #. module: web
 #. openerp-web
@@ -355,7 +357,7 @@ msgstr "Promijeni šifru"
 #: code:addons/web/static/src/js/view_form.js:3528
 #, python-format
 msgid "View type '%s' is not supported in One2Many."
-msgstr ""
+msgstr "Tip pogleda '%s' nije podržan u One2Many."
 
 #. module: web
 #. openerp-web
@@ -370,48 +372,48 @@ msgstr "Preuzimanje"
 #: code:addons/web/static/src/js/formats.js:270
 #, python-format
 msgid "'%s' is not a correct datetime"
-msgstr ""
+msgstr "'%s' nije pravilno datum-vrijeme"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_list.js:432
 #, python-format
 msgid "Group"
-msgstr ""
+msgstr "Grupa"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:949
 #, python-format
 msgid "Unhandled widget"
-msgstr ""
+msgstr "Ne upravljan widget"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1004
 #, python-format
 msgid "Selection:"
-msgstr ""
+msgstr "Izbor:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:881
 #, python-format
 msgid "The following fields are invalid:"
-msgstr ""
+msgstr "Sljedeća polja nisu pravilna:"
 
 #. module: web
 #: code:addons/web/controllers/main.py:890
 #, python-format
 msgid "Languages"
-msgstr ""
+msgstr "Jezici"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1298
 #, python-format
 msgid "...Upload in progress..."
-msgstr ""
+msgstr "...Učitavanje u toku..."
 
 #. module: web
 #. openerp-web
@@ -425,21 +427,21 @@ msgstr "Uvezi"
 #: code:addons/web/static/src/js/chrome.js:565
 #, python-format
 msgid "Could not restore the database"
-msgstr ""
+msgstr "Ne može se vratiti baza podataka"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:4982
 #, python-format
 msgid "File upload"
-msgstr ""
+msgstr "Učitavanje fajla"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:3925
 #, python-format
 msgid "Action Button"
-msgstr ""
+msgstr "Dugme akcije"
 
 #. module: web
 #. openerp-web
@@ -447,7 +449,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1493
 #, python-format
 msgid "Manage Filters"
-msgstr ""
+msgstr "Uredi filtere"
 
 #. module: web
 #. openerp-web
@@ -461,14 +463,14 @@ msgstr "sadrži"
 #: code:addons/web/static/src/js/coresetup.js:623
 #, python-format
 msgid "Take a minute to get a coffee,<br />because it's loading..."
-msgstr ""
+msgstr "Uzmite minutu da odete po kafu,<br />jer se učitava..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:435
 #, python-format
 msgid "Activate the developer mode"
-msgstr ""
+msgstr "Aktiviraj razvojni mod"
 
 #. module: web
 #. openerp-web
@@ -482,63 +484,63 @@ msgstr "Punim (%d)"
 #: code:addons/web/static/src/js/search.js:1216
 #, python-format
 msgid "GroupBy"
-msgstr ""
+msgstr "Grupiši po"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_list.js:699
 #, python-format
 msgid "You must select at least one record."
-msgstr ""
+msgstr "Morate izabrati makar jedan zapis."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:557
 #, python-format
 msgid "View Log (perm_read)"
-msgstr ""
+msgstr "Pregledaj Log (perm_read)"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:1071
 #, python-format
 msgid "Set Default"
-msgstr ""
+msgstr "Postavi zadano"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1000
 #, python-format
 msgid "Relation:"
-msgstr ""
+msgstr "Relacija:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/coresetup.js:590
 #, python-format
 msgid "less than a minute ago"
-msgstr ""
+msgstr "manje od minutu prije"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:873
 #, python-format
 msgid "Condition:"
-msgstr ""
+msgstr "Uslov:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:1709
 #, python-format
 msgid "Unsupported operator %s in domain %s"
-msgstr ""
+msgstr "Ne podržana operacija %s u domenu %s"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/formats.js:246
 #, python-format
 msgid "'%s' is not a correct float"
-msgstr ""
+msgstr "'%s' nije pravilan decimalni broj"
 
 #. module: web
 #. openerp-web
@@ -552,21 +554,21 @@ msgstr "Obnovljeno"
 #: code:addons/web/static/src/js/view_list.js:409
 #, python-format
 msgid "%d-%d of %d"
-msgstr ""
+msgstr "%d-%d od %d"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:2955
 #, python-format
 msgid "Create and Edit..."
-msgstr ""
+msgstr "Kreiraj i Uredi..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/pyeval.js:736
 #, python-format
 msgid "Unknown nonliteral type "
-msgstr ""
+msgstr "Ne poznat ne literalni tip "
 
 #. module: web
 #. openerp-web
@@ -587,63 +589,63 @@ msgstr "nije"
 #: code:addons/web/static/src/xml/base.xml:572
 #, python-format
 msgid "Print Workflow"
-msgstr ""
+msgstr "Štampaj radni tok"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:413
 #, python-format
 msgid "Please confirm your new password"
-msgstr ""
+msgstr "Molimo potvrdite novu šifru"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1825
 #, python-format
 msgid "UTF-8"
-msgstr ""
+msgstr "UTF‑8"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:443
 #, python-format
 msgid "For more information visit"
-msgstr ""
+msgstr "Za više informacija posjetite"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1880
 #, python-format
 msgid "Add All Info..."
-msgstr ""
+msgstr "Dodaj sve podatke..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1701
 #, python-format
 msgid "Export Formats"
-msgstr ""
+msgstr "Formati izvoza"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:996
 #, python-format
 msgid "On change:"
-msgstr ""
+msgstr "Prilikom promjene:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views.js:939
 #, python-format
 msgid "Model %s fields"
-msgstr ""
+msgstr "Polja %s modela"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_list.js:906
 #, python-format
 msgid "Setting 'id' attribute on existing record %s"
-msgstr ""
+msgstr "Postavljanje 'id' atributa na postojećem zapisu %s"
 
 #. module: web
 #. openerp-web
@@ -667,21 +669,21 @@ msgstr "veće od"
 #: code:addons/web/static/src/xml/base.xml:568
 #, python-format
 msgid "View"
-msgstr ""
+msgstr "Pogled"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1492
 #, python-format
 msgid "Save Filter"
-msgstr ""
+msgstr "Sačuvaj filter"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1372
 #, python-format
 msgid "Action ID:"
-msgstr ""
+msgstr "ID Akcije:"
 
 #. module: web
 #. openerp-web
@@ -689,55 +691,57 @@ msgstr ""
 #, python-format
 msgid "Your user's preference timezone does not match your browser timezone:"
 msgstr ""
+"Vaša vremenska zona korisnika se ne slaže sa vremenskom zonom internet "
+"pretraživača:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:1237
 #, python-format
 msgid "Field '%s' specified in view could not be found."
-msgstr ""
+msgstr "Polje '%s' specifirano u pogledu nije moglo biti pronađeno."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1777
 #, python-format
 msgid "Saved exports:"
-msgstr ""
+msgstr "Sačuvani izvozi:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:338
 #, python-format
 msgid "Old Password:"
-msgstr ""
+msgstr "Stara šifra:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/formats.js:113
 #, python-format
 msgid "Bytes,Kb,Mb,Gb,Tb,Pb,Eb,Zb,Yb"
-msgstr ""
+msgstr "Bajtovi,Kb,Mb,Gb,Tb,Pb,Eb,Zb,Yb"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:503
 #, python-format
 msgid "The database has been duplicated."
-msgstr ""
+msgstr "Baza podataka je bila duplicirana."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1643
 #, python-format
 msgid "Apply"
-msgstr ""
+msgstr "Primjeni"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1414
 #, python-format
 msgid "Save & New"
-msgstr ""
+msgstr "Sačuvaj i Novi"
 
 #. module: web
 #. openerp-web
@@ -745,14 +749,14 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1253
 #, python-format
 msgid "Save As"
-msgstr ""
+msgstr "Sačuvaj kao"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/doc/module/static/src/xml/web_example.xml:3
 #, python-format
 msgid "00:00:00"
-msgstr ""
+msgstr "00:00:00"
 
 #. module: web
 #. openerp-web
@@ -766,21 +770,21 @@ msgstr ""
 #: code:addons/web/static/src/js/coresetup.js:595
 #, python-format
 msgid "a day ago"
-msgstr ""
+msgstr "dan prije"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1810
 #, python-format
 msgid "Does your file have titles?"
-msgstr ""
+msgstr "Da li Vaš fajl sadrži naslove?"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_list.js:327
 #, python-format
 msgid "Unlimited"
-msgstr ""
+msgstr "Neograničeno"
 
 #. module: web
 #. openerp-web
@@ -791,13 +795,16 @@ msgid ""
 "\n"
 "Are you sure you want to leave this page ?"
 msgstr ""
+"Upozorenje, zapis je bio izmjenjen, Vaše promjene će biti odbačene.\n"
+"\n"
+"Da li ste sigurni da želite napustiti ovu stranicu?"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:2991
 #, python-format
 msgid "Search: "
-msgstr ""
+msgstr "Pretraži: "
 
 #. module: web
 #. openerp-web
@@ -811,28 +818,28 @@ msgstr "Tehnički prevod"
 #: code:addons/web/static/src/xml/base.xml:1818
 #, python-format
 msgid "Delimiter:"
-msgstr ""
+msgstr "Razdvajač:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:484
 #, python-format
 msgid "Browser's timezone"
-msgstr ""
+msgstr "Vremenska zona internet pretraživača"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1623
 #, python-format
 msgid "Filter name"
-msgstr ""
+msgstr "Ime filtera"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1490
 #, python-format
 msgid "-- Actions --"
-msgstr ""
+msgstr "-- Akcije --"
 
 #. module: web
 #. openerp-web
@@ -842,49 +849,49 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1726
 #, python-format
 msgid "Add"
-msgstr ""
+msgstr "Dodaj"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:558
 #, python-format
 msgid "Toggle Form Layout Outline"
-msgstr ""
+msgstr "Uključi/Isključi raspored linija forme"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:443
 #, python-format
 msgid "OpenERP.com"
-msgstr ""
+msgstr "OpenERP.com"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:2349
 #, python-format
 msgid "Can't send email to invalid e-mail address"
-msgstr ""
+msgstr "Ne može se poslati email na ne pravilnu email adresu"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:658
 #, python-format
 msgid "Add..."
-msgstr ""
+msgstr "Dodaj..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:424
 #, python-format
 msgid "Preferences"
-msgstr ""
+msgstr "Postavke"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:435
 #, python-format
 msgid "Wrong on change format: %s"
-msgstr ""
+msgstr "Pogrešan format pri izmjeni: %s"
 
 #. module: web
 #. openerp-web
@@ -892,28 +899,28 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:203
 #, python-format
 msgid "Drop Database"
-msgstr ""
+msgstr "Odbaci bazu podataka"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:488
 #, python-format
 msgid "Click here to change your user's timezone."
-msgstr ""
+msgstr "Kliknite ovdje da izmjenite postavke korisničke vremenske zone."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:988
 #, python-format
 msgid "Modifiers:"
-msgstr ""
+msgstr "Modifikatori:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:649
 #, python-format
 msgid "Delete this attachment"
-msgstr ""
+msgstr "Obriši ovu zakačku"
 
 #. module: web
 #. openerp-web
@@ -931,49 +938,49 @@ msgstr "Sačuvaj"
 #: code:addons/web/static/src/xml/base.xml:370
 #, python-format
 msgid "More"
-msgstr ""
+msgstr "Više"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:73
 #, python-format
 msgid "Username"
-msgstr ""
+msgstr "Korisničko ime"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:503
 #, python-format
 msgid "Duplicating database"
-msgstr ""
+msgstr "Baza se duplicira"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:585
 #, python-format
 msgid "Password has been changed successfully"
-msgstr ""
+msgstr "Šifra je bila uspješno promjenjena"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_list_editable.js:793
 #, python-format
 msgid "The form's data can not be discarded"
-msgstr ""
+msgstr "Podatci forme ne mogu biti odbačeni"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:555
 #, python-format
 msgid "Debug View#"
-msgstr ""
+msgstr "Debug pogled#"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:77
 #, python-format
 msgid "Log in"
-msgstr ""
+msgstr "Prijavi se"
 
 #. module: web
 #. openerp-web
@@ -982,7 +989,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1785
 #, python-format
 msgid "Delete"
-msgstr ""
+msgstr "Obriši"
 
 #. module: web
 #. openerp-web
@@ -994,6 +1001,10 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Greška lokalne procjene\n"
+"%s\n"
+"\n"
+"%s"
 
 #. module: web
 #. openerp-web
@@ -1007,14 +1018,14 @@ msgstr "Nevažeće ime baze podataka"
 #: code:addons/web/static/src/xml/base.xml:1714
 #, python-format
 msgid "Save fields list"
-msgstr ""
+msgstr "Sačuvaj listu polja"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/doc/module/static/src/xml/web_example.xml:5
 #, python-format
 msgid "Start"
-msgstr ""
+msgstr "Počni"
 
 #. module: web
 #. openerp-web
@@ -1028,21 +1039,21 @@ msgstr "Pogledaj Log (%s)"
 #: code:addons/web/static/src/xml/base.xml:586
 #, python-format
 msgid "Creation Date:"
-msgstr ""
+msgstr "Datum kreiranja:"
 
 #. module: web
 #: code:addons/web/controllers/main.py:833
 #: code:addons/web/controllers/main.py:878
 #, python-format
 msgid "Error, password not changed !"
-msgstr ""
+msgstr "Greška, šifra nije promjenjena !"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:4981
 #, python-format
 msgid "The selected file exceed the maximum file size of %s."
-msgstr ""
+msgstr "Odabrani fajl je prešao maksimalnu veličinu od %s."
 
 #. module: web
 #. openerp-web
@@ -1056,14 +1067,14 @@ msgstr ""
 #: code:addons/web/static/src/js/chrome.js:585
 #, python-format
 msgid "Changed Password"
-msgstr ""
+msgstr "Šifra je promijenjena"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1457
 #, python-format
 msgid "Search"
-msgstr ""
+msgstr "Pretraži"
 
 #. module: web
 #. openerp-web
@@ -1082,7 +1093,7 @@ msgstr "Otvori: "
 #: code:addons/web/static/src/xml/base.xml:327
 #, python-format
 msgid "Backup"
-msgstr ""
+msgstr "Napravi rezervnu kopiju"
 
 #. module: web
 #. openerp-web
@@ -1090,35 +1101,35 @@ msgstr ""
 #: code:addons/web/static/src/js/dates.js:80
 #, python-format
 msgid "'%s' is not a valid time"
-msgstr ""
+msgstr "'%s' nije pravilno vrijeme"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/formats.js:278
 #, python-format
 msgid "'%s' is not a correct date"
-msgstr ""
+msgstr "'%s' nije pravilan datum"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:955
 #, python-format
 msgid "(nolabel)"
-msgstr ""
+msgstr "(nema naziva)"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/coresetup.js:596
 #, python-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d dan(a) prije"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1500
 #, python-format
 msgid "(Any existing filter with the same name will be replaced)"
-msgstr ""
+msgstr "(Svaki postojeći filter sa istim imenom će biti zamjenjen)"
 
 #. module: web
 #. openerp-web
@@ -1128,7 +1139,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1881
 #, python-format
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
 #. module: web
 #. openerp-web
@@ -1144,14 +1155,14 @@ msgstr "Učitavam..."
 #: code:addons/web/static/src/xml/base.xml:589
 #, python-format
 msgid "Latest Modification by:"
-msgstr ""
+msgstr "Zadnji modificirao:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:492
 #, python-format
 msgid "Timezone mismatch"
-msgstr ""
+msgstr "Ne slaganje vremenske zone"
 
 #. module: web
 #. openerp-web
@@ -1165,21 +1176,21 @@ msgstr "Nepoznat operator %s na domeni %s"
 #: code:addons/web/static/src/js/view_form.js:427
 #, python-format
 msgid "%d / %d"
-msgstr ""
+msgstr "%d / %d"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1803
 #, python-format
 msgid "2. Check your file format"
-msgstr ""
+msgstr "Provjerite format fajla"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1739
 #, python-format
 msgid "Name"
-msgstr ""
+msgstr "Ime"
 
 #. module: web
 #. openerp-web
@@ -1189,13 +1200,15 @@ msgid ""
 "Select a .CSV file to import. If you need a sample of file to import,\n"
 "       you should use the export tool with the \"Import Compatible\" option."
 msgstr ""
+"Odaberite .CSV fajl za uvoz. Ako trebate prijedlog fajla za uvoz,\n"
+"       možete koristiti alat za izvoz sa opcijom \"Kompatibilno sa uvozom\"."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/coresetup.js:598
 #, python-format
 msgid "%d months ago"
-msgstr ""
+msgstr "%d mjeseci prije"
 
 #. module: web
 #. openerp-web
@@ -1203,20 +1216,20 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:326
 #, python-format
 msgid "Drop"
-msgstr ""
+msgstr "Odbaci"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1491
 #, python-format
 msgid "Add Advanced Filter"
-msgstr ""
+msgstr "Dodaj napredni filter"
 
 #. module: web
 #: code:addons/web/controllers/main.py:871
 #, python-format
 msgid "The new password and its confirmation must be identical."
-msgstr ""
+msgstr "Nova šifra i njena potvrda moraju biti identične."
 
 #. module: web
 #. openerp-web
@@ -1224,21 +1237,21 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:266
 #, python-format
 msgid "Restore Database"
-msgstr ""
+msgstr "Vrati bazu podataka"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:702
 #, python-format
 msgid "Login"
-msgstr ""
+msgstr "Prijava"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:442
 #, python-format
 msgid "Licenced under the terms of"
-msgstr ""
+msgstr "Licencirano pod uslovima"
 
 #. module: web
 #. openerp-web
@@ -1253,28 +1266,28 @@ msgstr "Vrati"
 #: code:addons/web/static/src/xml/base.xml:1695
 #, python-format
 msgid "Export Type:"
-msgstr ""
+msgstr "Tip izvoza:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:428
 #, python-format
 msgid "Log out"
-msgstr ""
+msgstr "Odjavi se"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/search.js:1192
 #, python-format
 msgid "Group by: %s"
-msgstr ""
+msgstr "Grupiši po: %s"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:154
 #, python-format
 msgid "No data provided."
-msgstr ""
+msgstr "Nisu dati podatci."
 
 #. module: web
 #. openerp-web
@@ -1303,70 +1316,70 @@ msgstr "Morate izabrati barem jedan zapis"
 #: code:addons/web/static/src/js/coresetup.js:621
 #, python-format
 msgid "Don't leave yet,<br />it's still loading..."
-msgstr ""
+msgstr "Ne odlazite još,<br />učitava se..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/search.js:841
 #, python-format
 msgid "Invalid Search"
-msgstr ""
+msgstr "Pogrešna pretraga"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_list.js:990
 #, python-format
 msgid "Could not find id in dataset"
-msgstr ""
+msgstr "Nije moglo biti pronađeno u dataset-u"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1728
 #, python-format
 msgid "Remove All"
-msgstr ""
+msgstr "Ukloni sve"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1368
 #, python-format
 msgid "Method:"
-msgstr ""
+msgstr "Metoda:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_list.js:1449
 #, python-format
 msgid "%(page)d/%(page_count)d"
-msgstr ""
+msgstr "%(page)d/%(page_count)d"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:414
 #, python-format
 msgid "The confirmation does not match the password"
-msgstr ""
+msgstr "Potvrda ne odgovara šifri"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:463
 #, python-format
 msgid "Edit Company data"
-msgstr ""
+msgstr "Uredi podatke kompanije"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:5017
 #, python-format
 msgid "Save As..."
-msgstr ""
+msgstr "Sačuvaj kao..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:5138
 #, python-format
 msgid "Could not display the selected image."
-msgstr ""
+msgstr "Nije se mogla prikazati izabrana slika."
 
 #. module: web
 #. openerp-web
@@ -1383,48 +1396,50 @@ msgid ""
 "For use if CSV files have titles on multiple lines, skips more than a single "
 "line during import"
 msgstr ""
+"Za korištenje kada CSV fajl ima naslove na više linija, preskače se više od "
+"jedne linije prilikom uvoza"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:414
 #, python-format
 msgid "99+"
-msgstr ""
+msgstr "99+"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1795
 #, python-format
 msgid "1. Import a .CSV file"
-msgstr ""
+msgstr "Uvezi .CSV fajl"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:702
 #, python-format
 msgid "No database selected !"
-msgstr ""
+msgstr "Nije odabrana baza podataka !"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/formats.js:184
 #, python-format
 msgid "(%d records)"
-msgstr ""
+msgstr "(%d zapis(a))"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:992
 #, python-format
 msgid "Change default:"
-msgstr ""
+msgstr "Promjeni zadano:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:189
 #, python-format
 msgid "Original database name:"
-msgstr ""
+msgstr "Originalno ime baze"
 
 #. module: web
 #. openerp-web
@@ -1441,14 +1456,14 @@ msgstr "je jednako"
 #: code:addons/web/static/src/js/views.js:1581
 #, python-format
 msgid "Could not serialize XML"
-msgstr ""
+msgstr "Nije se mogao serijalizovati XML"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1637
 #, python-format
 msgid "Advanced Search"
-msgstr ""
+msgstr "Napredna pretraga"
 
 #. module: web
 #. openerp-web
@@ -1463,6 +1478,8 @@ msgstr "Potvrdi glavni password"
 #, python-format
 msgid "Maybe you should consider reloading the application by pressing F5..."
 msgstr ""
+"Možda bi ste trebali razmotriti da ponovno učitate aplikaciju pritiskom na "
+"F5..."
 
 #. module: web
 #. openerp-web
@@ -1473,7 +1490,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1404
 #, python-format
 msgid "Create"
-msgstr ""
+msgstr "Kreiraj"
 
 #. module: web
 #. openerp-web
@@ -1487,14 +1504,14 @@ msgstr "Ne sarži"
 #: code:addons/web/static/src/xml/base.xml:1806
 #, python-format
 msgid "Import Options"
-msgstr ""
+msgstr "Opcije uvoza"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:3023
 #, python-format
 msgid "Add %s"
-msgstr ""
+msgstr "Dodaj %s"
 
 #. module: web
 #. openerp-web
@@ -1518,21 +1535,21 @@ msgstr "Zatvori"
 #, python-format
 msgid ""
 "You may not believe it,<br />but the application is actually loading..."
-msgstr ""
+msgstr "Možda nećete vjerovati,<br />ali aplikacija se zapravo učitava..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1800
 #, python-format
 msgid "CSV File:"
-msgstr ""
+msgstr "CSV Fajl:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/search.js:1879
 #, python-format
 msgid "Advanced"
-msgstr ""
+msgstr "Napredno"
 
 #. module: web
 #. openerp-web
@@ -1545,49 +1562,49 @@ msgstr "Stablo"
 #: code:addons/web/controllers/main.py:793
 #, python-format
 msgid "Could not drop database !"
-msgstr ""
+msgstr "Baza nije mogla biti odbačena !"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/formats.js:231
 #, python-format
 msgid "'%s' is not a correct integer"
-msgstr ""
+msgstr "'%s' nije pravilan cijeli broj"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:899
 #, python-format
 msgid "All users"
-msgstr ""
+msgstr "Svi korisnici"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:1671
 #, python-format
 msgid "Unknown field %s in domain %s"
-msgstr ""
+msgstr "Ne poznato polje %s u domenu %s"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views.js:1546
 #, python-format
 msgid "Node [%s] is not a JSONified XML node"
-msgstr ""
+msgstr "Čvor [%s] nije JSONificiran XML čvor"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1454
 #, python-format
 msgid "Advanced Search..."
-msgstr ""
+msgstr "Napredna pretraga..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:521
 #, python-format
 msgid "Dropping database"
-msgstr ""
+msgstr "Baza se odbacuje"
 
 #. module: web
 #. openerp-web
@@ -1595,7 +1612,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:467
 #, python-format
 msgid "Powered by"
-msgstr ""
+msgstr "Podržano od strane"
 
 #. module: web
 #. openerp-web
@@ -1603,56 +1620,56 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:992
 #, python-format
 msgid "Yes"
-msgstr ""
+msgstr "Da"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:5002
 #, python-format
 msgid "There was a problem while uploading your file"
-msgstr ""
+msgstr "Pojavio se problem prilikom učitavanja vašeg fajla"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:580
 #, python-format
 msgid "XML ID:"
-msgstr ""
+msgstr "XML ID:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:976
 #, python-format
 msgid "Size:"
-msgstr ""
+msgstr "Veličina:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1845
 #, python-format
 msgid "--- Don't Import ---"
-msgstr ""
+msgstr "--- Ne uvozi ---"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1697
 #, python-format
 msgid "Import-Compatible Export"
-msgstr ""
+msgstr "Izvoz kompatibilan sa uvozom"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/coresetup.js:600
 #, python-format
 msgid "%d years ago"
-msgstr ""
+msgstr "%d godina prije"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_list.js:1050
 #, python-format
 msgid "Unknown m2m command %s"
-msgstr ""
+msgstr "Ne poznata m2m komanda %s"
 
 #. module: web
 #. openerp-web
@@ -1674,77 +1691,77 @@ msgstr "Naziv nove baze podataka:"
 #: code:addons/web/static/src/js/chrome.js:411
 #, python-format
 msgid "Please enter your new password"
-msgstr ""
+msgstr "Molimo Vas da unesete vašu novu lozinku"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:5017
 #, python-format
 msgid "The field is empty, there's nothing to save !"
-msgstr ""
+msgstr "Polje je prazno, nema se šta sačuvati !"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:567
 #, python-format
 msgid "Manage Views"
-msgstr ""
+msgstr "Upravljaj pogledima"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1822
 #, python-format
 msgid "Encoding:"
-msgstr ""
+msgstr "Šifriranje:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1829
 #, python-format
 msgid "Lines to skip"
-msgstr ""
+msgstr "Stavke za preskočiti"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:2945
 #, python-format
 msgid "Create \"<strong>%s</strong>\""
-msgstr ""
+msgstr "Kreiraj \"<strong>%s</strong>\""
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/data_export.js:362
 #, python-format
 msgid "Please select fields to save export list..."
-msgstr ""
+msgstr "Molimo da odaberete polja za čuvanje liste izvoza..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:440
 #, python-format
 msgid "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved."
-msgstr ""
+msgstr "Autorsko pravo © 2004-TODAY OpenERP SA. Sva prava zadržana."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:2379
 #, python-format
 msgid "This resource is empty"
-msgstr ""
+msgstr "Ovaj resurs je prazan"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1710
 #, python-format
 msgid "Available fields"
-msgstr ""
+msgstr "Dostupna polja"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1856
 #, python-format
 msgid "The import failed due to:"
-msgstr ""
+msgstr "Uvoz nije uspio zbog:"
 
 #. module: web
 #. openerp-web
@@ -1752,21 +1769,21 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:561
 #, python-format
 msgid "JS Tests"
-msgstr ""
+msgstr "JS Testovi"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1771
 #, python-format
 msgid "Save as:"
-msgstr ""
+msgstr "Sačuvaj kao:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/search.js:1024
 #, python-format
 msgid "Filter on: %s"
-msgstr ""
+msgstr "Filtriraj po: %s"
 
 #. module: web
 #. openerp-web
@@ -1774,35 +1791,35 @@ msgstr ""
 #: code:addons/web/static/src/js/view_form.js:3878
 #, python-format
 msgid "Create: "
-msgstr ""
+msgstr "Kreiraj: "
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:562
 #, python-format
 msgid "View Fields"
-msgstr ""
+msgstr "Pogledaj polja"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:348
 #, python-format
 msgid "Confirm New Password:"
-msgstr ""
+msgstr "Potvrdite novu šifru:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_list.js:587
 #, python-format
 msgid "Do you really want to remove these records?"
-msgstr ""
+msgstr "Da li stvarno želite ukloniti ove zapise?"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:980
 #, python-format
 msgid "Context:"
-msgstr ""
+msgstr "Kontekst:"
 
 #. module: web
 #. openerp-web
@@ -1810,28 +1827,28 @@ msgstr ""
 #: code:addons/web/static/src/js/search.js:2143
 #, python-format
 msgid "is"
-msgstr ""
+msgstr "je"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/data_export.js:6
 #, python-format
 msgid "Export Data"
-msgstr ""
+msgstr "Izvezi podatke"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:984
 #, python-format
 msgid "Domain:"
-msgstr ""
+msgstr "Domen:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:856
 #, python-format
 msgid "Default:"
-msgstr ""
+msgstr "Zadano:"
 
 #. module: web
 #. openerp-web
@@ -1846,7 +1863,7 @@ msgstr "OpenERP"
 #: code:addons/web/doc/module/static/src/xml/web_example.xml:8
 #, python-format
 msgid "Stop"
-msgstr ""
+msgstr "Zaustavi"
 
 #. module: web
 #. openerp-web
@@ -1863,14 +1880,14 @@ msgstr "Baza podataka:"
 #: code:addons/web/static/src/xml/base.xml:1268
 #, python-format
 msgid "Uploading ..."
-msgstr ""
+msgstr "Učitavanje ..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1874
 #, python-format
 msgid "Name:"
-msgstr ""
+msgstr "Ime:"
 
 #. module: web
 #. openerp-web
@@ -1884,14 +1901,14 @@ msgstr "O programu"
 #: code:addons/web/static/src/xml/base.xml:1457
 #, python-format
 msgid "Search Again"
-msgstr ""
+msgstr "Pretraži ponovno"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1481
 #, python-format
 msgid "-- Filters --"
-msgstr ""
+msgstr "-- Filteri --"
 
 #. module: web
 #. openerp-web
@@ -1900,14 +1917,14 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1260
 #, python-format
 msgid "Clear"
-msgstr ""
+msgstr "Očisti"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1698
 #, python-format
 msgid "Export all Data"
-msgstr ""
+msgstr "Izvezi sve podatke"
 
 #. module: web
 #. openerp-web
@@ -1917,13 +1934,15 @@ msgid ""
 "Grouping on field '%s' is not possible because that field does not appear in "
 "the list view."
 msgstr ""
+"Grupiranje po polju '%s' nije moguće jer se to polje ne pojavljuje na "
+"pogledu liste."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:559
 #, python-format
 msgid "Set Defaults"
-msgstr ""
+msgstr "Postavi zadane vrijednosti"
 
 #. module: web
 #. openerp-web
@@ -1935,41 +1954,45 @@ msgid ""
 "            You can export all data or only the fields that can be "
 "reimported after modification."
 msgstr ""
+"Ovaj čarobnjak će izvesti podatke koji odgovaraju trenutnim uslovima "
+"pretrage u CSV fajl.\n"
+"            Možete izvesti sve podatke ili samo ona polja koja mogu biti "
+"ponovno uvezena nakon modifikacije."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:320
 #, python-format
 msgid "The record could not be found in the database."
-msgstr ""
+msgstr "Zapis nije mogao biti pronađen u bazi podataka."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1498
 #, python-format
 msgid "Filter Name:"
-msgstr ""
+msgstr "Ime filtera:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:968
 #, python-format
 msgid "Type:"
-msgstr ""
+msgstr "Tip:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:560
 #, python-format
 msgid "Incorrect super-administrator password"
-msgstr ""
+msgstr "Ne pravilna šifra super-administratora"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:964
 #, python-format
 msgid "Object:"
-msgstr ""
+msgstr "Objekt:"
 
 #. module: web
 #. openerp-web
@@ -1977,14 +2000,14 @@ msgstr ""
 #: code:addons/web/static/src/js/chrome.js:343
 #, python-format
 msgid "Loading"
-msgstr ""
+msgstr "Učitavanje"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/coresetup.js:599
 #, python-format
 msgid "about a year ago"
-msgstr ""
+msgstr "prije oko godinu dana"
 
 #. module: web
 #. openerp-web
@@ -1994,7 +2017,7 @@ msgstr ""
 #: code:addons/web/static/src/js/search.js:2120
 #, python-format
 msgid "is not equal to"
-msgstr ""
+msgstr "nije jednako"
 
 #. module: web
 #. openerp-web
@@ -2004,13 +2027,15 @@ msgid ""
 "The type of the field '%s' must be a many2many field with a relation to "
 "'ir.attachment' model."
 msgstr ""
+"Tip polja '%s' mora biti many2many polje sa relacijom na 'ir.attachment' "
+"model."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/coresetup.js:594
 #, python-format
 msgid "%d hours ago"
-msgstr ""
+msgstr "%d sati prije"
 
 #. module: web
 #. openerp-web
@@ -2018,21 +2043,21 @@ msgstr ""
 #: code:addons/web/static/src/js/view_form.js:4464
 #, python-format
 msgid "Add: "
-msgstr ""
+msgstr "Dodaj: "
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1879
 #, python-format
 msgid "Quick Add"
-msgstr ""
+msgstr "Brzo dodaj"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1826
 #, python-format
 msgid "Latin 1"
-msgstr ""
+msgstr "Latin 1"
 
 #. module: web
 #. openerp-web
@@ -2052,7 +2077,7 @@ msgstr "Uredu"
 #: code:addons/web/static/src/js/views.js:1237
 #, python-format
 msgid "Uploading..."
-msgstr ""
+msgstr "Učitavanje..."
 
 #. module: web
 #. openerp-web
@@ -2066,7 +2091,7 @@ msgstr "Učitavam Demonstrativne podatke"
 #: code:addons/web/static/src/xml/base.xml:637
 #, python-format
 msgid "Created by :"
-msgstr ""
+msgstr "Kreirao:"
 
 #. module: web
 #. openerp-web
@@ -2074,7 +2099,7 @@ msgstr ""
 #: code:addons/web/static/src/js/dates.js:26
 #, python-format
 msgid "'%s' is not a valid datetime"
-msgstr ""
+msgstr "'%s' nije pravilno datum-vrijeme"
 
 #. module: web
 #. openerp-web
@@ -2090,7 +2115,7 @@ msgstr "Datoteka:"
 #: code:addons/web/static/src/js/search.js:2122
 #, python-format
 msgid "less than"
-msgstr ""
+msgstr "manje od"
 
 #. module: web
 #. openerp-web
@@ -2105,7 +2130,7 @@ msgstr "Upozorenje"
 #: code:addons/web/static/src/xml/base.xml:569
 #, python-format
 msgid "Edit SearchView"
-msgstr ""
+msgstr "Uredi pogled pretrage"
 
 #. module: web
 #. openerp-web
@@ -2119,14 +2144,14 @@ msgstr "je istinito"
 #: code:addons/web/static/src/js/view_form.js:4030
 #, python-format
 msgid "Add an item"
-msgstr ""
+msgstr "Dodaj stavku"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1621
 #, python-format
 msgid "Save current filter"
-msgstr ""
+msgstr "Sačuvaj trenutni filter"
 
 #. module: web
 #. openerp-web
@@ -2140,7 +2165,7 @@ msgstr "Portvrdi"
 #: code:addons/web/static/src/js/data_export.js:127
 #, python-format
 msgid "Please enter save field list name"
-msgstr ""
+msgstr "Molimo unesite ime čuvanja liste polja"
 
 #. module: web
 #. openerp-web
@@ -2154,14 +2179,14 @@ msgstr "Preuzimanje \"%s\""
 #: code:addons/web/static/src/js/view_form.js:325
 #, python-format
 msgid "New"
-msgstr ""
+msgstr "Novi"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_list.js:1777
 #, python-format
 msgid "Can't convert value %s to context"
-msgstr ""
+msgstr "Ne može se konvertovati vrijednost %s u kontekst"
 
 #. module: web
 #. openerp-web
@@ -2169,7 +2194,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:563
 #, python-format
 msgid "Fields View Get"
-msgstr ""
+msgstr "Dohvati polja pogleda"
 
 #. module: web
 #. openerp-web
@@ -2185,21 +2210,21 @@ msgstr "Potvrdi password:"
 #: code:addons/web/static/src/js/search.js:2123
 #, python-format
 msgid "greater or equal than"
-msgstr ""
+msgstr "veće ili jednako od"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1349
 #, python-format
 msgid "Button"
-msgstr ""
+msgstr "Dugme"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:440
 #, python-format
 msgid "OpenERP is a trademark of the"
-msgstr ""
+msgstr "OpenERP je prodajna marka"
 
 #. module: web
 #. openerp-web
@@ -2227,48 +2252,48 @@ msgstr "je pogrešno"
 #: code:addons/web/static/src/xml/base.xml:426
 #, python-format
 msgid "About OpenERP"
-msgstr ""
+msgstr "O OpenERP-u"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/formats.js:301
 #, python-format
 msgid "'%s' is not a correct date, datetime nor time"
-msgstr ""
+msgstr "'%s' nije pravilan datum, datum-vrijeme ili vrijeme"
 
 #. module: web
 #: code:addons/web/controllers/main.py:1307
 #, python-format
 msgid "No content found for field '%s' on '%s:%s'"
-msgstr ""
+msgstr "Nije pronađen sadržaj polja '%s' na '%s:%s'"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:322
 #, python-format
 msgid "Database Management"
-msgstr ""
+msgstr "Upravljanje bazama podataka"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:5138
 #, python-format
 msgid "Image"
-msgstr ""
+msgstr "Slika"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:81
 #, python-format
 msgid "Manage Databases"
-msgstr ""
+msgstr "Upravljaj bazama"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/pyeval.js:770
 #, python-format
 msgid "Evaluation Error"
-msgstr ""
+msgstr "Greška procjene"
 
 #. module: web
 #. openerp-web
@@ -2287,21 +2312,21 @@ msgstr "ne važeći integer"
 #: code:addons/web/static/src/xml/base.xml:1648
 #, python-format
 msgid "or"
-msgstr ""
+msgstr "ili"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/search.js:1485
 #, python-format
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/formats.js:313
 #, python-format
 msgid "'%s' is not convertible to date, datetime nor time"
-msgstr ""
+msgstr "'%s' nije konvertibilno u datum, datum-vrijeme ili vrijeme"
 
 #. module: web
 #. openerp-web
@@ -2310,7 +2335,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:325
 #, python-format
 msgid "Duplicate"
-msgstr ""
+msgstr "Dupliciraj"
 
 #. module: web
 #. openerp-web
@@ -2319,21 +2344,21 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1419
 #, python-format
 msgid "Discard"
-msgstr ""
+msgstr "Odbaci"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1642
 #, python-format
 msgid "Add a condition"
-msgstr ""
+msgstr "Dodaj uslov"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/coresetup.js:619
 #, python-format
 msgid "Still loading..."
-msgstr ""
+msgstr "Još se učitava..."
 
 #. module: web
 #. openerp-web
@@ -2341,13 +2366,14 @@ msgstr ""
 #, python-format
 msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"
 msgstr ""
+"Ne pravilna vrijednost za polje %(fieldname)s: [%(value)s] je %(message)s"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:3926
 #, python-format
 msgid "The o2m record must be saved before an action can be used"
-msgstr ""
+msgstr "o2m zapis mora biti sačuvan prije upotrebe neke akcije"
 
 #. module: web
 #. openerp-web
@@ -2361,105 +2387,105 @@ msgstr "Spašeno"
 #: code:addons/web/static/src/xml/base.xml:1628
 #, python-format
 msgid "Use by default"
-msgstr ""
+msgstr "Koristi kao zadano"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_list.js:1358
 #, python-format
 msgid "%s (%d)"
-msgstr ""
+msgstr "%s (%d)"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/search.js:841
 #, python-format
 msgid "triggered from search view"
-msgstr ""
+msgstr "aktivirano iz pogleda pretrage"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/search.js:1079
 #, python-format
 msgid "Filter"
-msgstr ""
+msgstr "Filter"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:972
 #, python-format
 msgid "Widget:"
-msgstr ""
+msgstr "Widget:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:570
 #, python-format
 msgid "Edit Action"
-msgstr ""
+msgstr "Uredi akciju"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:577
 #, python-format
 msgid "ID:"
-msgstr ""
+msgstr "ID:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:892
 #, python-format
 msgid "Only you"
-msgstr ""
+msgstr "Samo vi"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:571
 #, python-format
 msgid "Edit Workflow"
-msgstr ""
+msgstr "Uredi radni tok"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views.js:1246
 #, python-format
 msgid "Do you really want to delete this attachment ?"
-msgstr ""
+msgstr "Da li stvarno želite obrisati ovu zakačku ?"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views.js:914
 #, python-format
 msgid "Technical Translation"
-msgstr ""
+msgstr "Tehnički prevod"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:960
 #, python-format
 msgid "Field:"
-msgstr ""
+msgstr "Polje:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:642
 #, python-format
 msgid "Modified by :"
-msgstr ""
+msgstr "Modificirao:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:521
 #, python-format
 msgid "The database %s has been dropped"
-msgstr ""
+msgstr "Baza podataka %s je bila odbačena"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:482
 #, python-format
 msgid "User's timezone"
-msgstr ""
+msgstr "Vremenska zona korisnika"
 
 #. module: web
 #. openerp-web
@@ -2467,21 +2493,21 @@ msgstr ""
 #: code:addons/web/static/src/js/chrome.js:1276
 #, python-format
 msgid "Client Error"
-msgstr ""
+msgstr "Greška klijenta"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views.js:1073
 #, python-format
 msgid "Print"
-msgstr ""
+msgstr "Štampaj"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1359
 #, python-format
 msgid "Special:"
-msgstr ""
+msgstr "Specijalno:"
 
 #. module: web
 #: code:addons/web/controllers/main.py:877
@@ -2489,13 +2515,14 @@ msgstr ""
 msgid ""
 "The old password you provided is incorrect, your password was not changed."
 msgstr ""
+"Stara šifra koju ste dali nije tačna, Vaša šifra neće biti promjenjena."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:583
 #, python-format
 msgid "Creation User:"
-msgstr ""
+msgstr "Korisnik kreiranja:"
 
 #. module: web
 #. openerp-web
@@ -2509,14 +2536,14 @@ msgstr "Jeste li sigurni da želite izbrisati ovaj zapis?"
 #: code:addons/web/static/src/xml/base.xml:1413
 #, python-format
 msgid "Save & Close"
-msgstr ""
+msgstr "Sačuvaj i Zatvori"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:2932
 #, python-format
 msgid "Search More..."
-msgstr ""
+msgstr "Pretraži više..."
 
 #. module: web
 #. openerp-web
@@ -2524,7 +2551,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:329
 #, python-format
 msgid "Password"
-msgstr ""
+msgstr "Šifra"
 
 #. module: web
 #. openerp-web
@@ -2540,14 +2567,14 @@ msgstr "Uređivanje"
 #: code:addons/web/static/src/xml/base.xml:1727
 #, python-format
 msgid "Remove"
-msgstr ""
+msgstr "Ukloni"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1090
 #, python-format
 msgid "Select date"
-msgstr ""
+msgstr "Odaberi datum"
 
 #. module: web
 #. openerp-web
@@ -2555,42 +2582,42 @@ msgstr ""
 #: code:addons/web/static/src/js/search.js:1369
 #, python-format
 msgid "Search %(field)s for: %(value)s"
-msgstr ""
+msgstr "Pretraži %(field)s za: %(value)s"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1305
 #, python-format
 msgid "Delete this file"
-msgstr ""
+msgstr "Obriši ovaj fajl"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:168
 #, python-format
 msgid "Create Database"
-msgstr ""
+msgstr "Kreiraj bazu podataka"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:442
 #, python-format
 msgid "GNU Affero General Public License"
-msgstr ""
+msgstr "GNU Affero General Public License"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1816
 #, python-format
 msgid "Separator:"
-msgstr ""
+msgstr "Separator:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:318
 #, python-format
 msgid "Back to Login"
-msgstr ""
+msgstr "Vrati se na prijavu"
 
 #. module: web
 #. openerp-web
@@ -2598,7 +2625,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1480
 #, python-format
 msgid "Filters"
-msgstr ""
+msgstr "Filteri"
 
 #~ msgid "Send OpenERP Enterprise Report"
 #~ msgstr "Pošalji OpenERP Enterprise Izvještaj"
diff --git a/addons/web/i18n/ca.po b/addons/web/i18n/ca.po
index 5f01d27dc72..e8e7d947372 100644
--- a/addons/web/i18n/ca.po
+++ b/addons/web/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:44+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/cs.po b/addons/web/i18n/cs.po
index d7c1dc997e2..734ffdabcd7 100644
--- a/addons/web/i18n/cs.po
+++ b/addons/web/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:44+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web
diff --git a/addons/web/i18n/da.po b/addons/web/i18n/da.po
index 3efc108c60c..53bbeca1ac5 100644
--- a/addons/web/i18n/da.po
+++ b/addons/web/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-05 04:44+0000\n"
-"X-Generator: Launchpad (build 16758)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/de.po b/addons/web/i18n/de.po
index a2281ab4b1a..80849a062f5 100644
--- a/addons/web/i18n/de.po
+++ b/addons/web/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/en_AU.po b/addons/web/i18n/en_AU.po
index 1e3a37162db..228c6ddce90 100644
--- a/addons/web/i18n/en_AU.po
+++ b/addons/web/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/en_GB.po b/addons/web/i18n/en_GB.po
index 7dfa6515d4e..e927fddba18 100644
--- a/addons/web/i18n/en_GB.po
+++ b/addons/web/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:40+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es.po b/addons/web/i18n/es.po
index 34f60912f93..aa9a5efc7cd 100644
--- a/addons/web/i18n/es.po
+++ b/addons/web/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:40+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_CL.po b/addons/web/i18n/es_CL.po
index fc481f3d3f3..5feb88437f9 100644
--- a/addons/web/i18n/es_CL.po
+++ b/addons/web/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:40+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_CR.po b/addons/web/i18n/es_CR.po
index fef6986e35d..2fb37c8fd6b 100644
--- a/addons/web/i18n/es_CR.po
+++ b/addons/web/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 "Language: es\n"
 
 #. module: web
diff --git a/addons/web/i18n/es_DO.po b/addons/web/i18n/es_DO.po
index 86bb3862f19..f6b97acb10d 100644
--- a/addons/web/i18n/es_DO.po
+++ b/addons/web/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:40+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_EC.po b/addons/web/i18n/es_EC.po
index 2689e3b0572..d14d816b4c6 100644
--- a/addons/web/i18n/es_EC.po
+++ b/addons/web/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_MX.po b/addons/web/i18n/es_MX.po
index 211d645ac6b..66a41b0bbf2 100644
--- a/addons/web/i18n/es_MX.po
+++ b/addons/web/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/et.po b/addons/web/i18n/et.po
index c8ada6f9e52..614f8a89760 100644
--- a/addons/web/i18n/et.po
+++ b/addons/web/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/eu.po b/addons/web/i18n/eu.po
index ad981b78047..faf89c4f547 100644
--- a/addons/web/i18n/eu.po
+++ b/addons/web/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:44+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fa.po b/addons/web/i18n/fa.po
index e2f8024867f..98c0a3ebda1 100644
--- a/addons/web/i18n/fa.po
+++ b/addons/web/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:40+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fi.po b/addons/web/i18n/fi.po
index ef20351be73..b840446b5f1 100644
--- a/addons/web/i18n/fi.po
+++ b/addons/web/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fr.po b/addons/web/i18n/fr.po
index 661ac102fe3..575f142faf1 100644
--- a/addons/web/i18n/fr.po
+++ b/addons/web/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fr_CA.po b/addons/web/i18n/fr_CA.po
index 086b1885aec..81a3636fa0f 100644
--- a/addons/web/i18n/fr_CA.po
+++ b/addons/web/i18n/fr_CA.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/gl.po b/addons/web/i18n/gl.po
index 3a8b37f7db7..aa4c8da7b4f 100644
--- a/addons/web/i18n/gl.po
+++ b/addons/web/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/gu.po b/addons/web/i18n/gu.po
index 7fab254c9d5..5eab79d4048 100644
--- a/addons/web/i18n/gu.po
+++ b/addons/web/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/hi.po b/addons/web/i18n/hi.po
index d10150e471b..21ac7d61967 100644
--- a/addons/web/i18n/hi.po
+++ b/addons/web/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/hr.po b/addons/web/i18n/hr.po
index 08710210cde..cfc545c15bb 100644
--- a/addons/web/i18n/hr.po
+++ b/addons/web/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:40+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/hu.po b/addons/web/i18n/hu.po
index 4a1fd98dac1..1218445a11f 100644
--- a/addons/web/i18n/hu.po
+++ b/addons/web/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/id.po b/addons/web/i18n/id.po
index 49e8cc77468..354b41f8d6c 100644
--- a/addons/web/i18n/id.po
+++ b/addons/web/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/it.po b/addons/web/i18n/it.po
index eb04e78d915..dd8a9d6b7ab 100644
--- a/addons/web/i18n/it.po
+++ b/addons/web/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ja.po b/addons/web/i18n/ja.po
index 8b0f350a322..2110c81e7b6 100644
--- a/addons/web/i18n/ja.po
+++ b/addons/web/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ka.po b/addons/web/i18n/ka.po
index 65084778ade..83f877b3dec 100644
--- a/addons/web/i18n/ka.po
+++ b/addons/web/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ko.po b/addons/web/i18n/ko.po
index 8fefc62c832..c9f4bfc90c2 100644
--- a/addons/web/i18n/ko.po
+++ b/addons/web/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/lo.po b/addons/web/i18n/lo.po
index cfb3098e4cd..f5e5076c49c 100644
--- a/addons/web/i18n/lo.po
+++ b/addons/web/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/lt.po b/addons/web/i18n/lt.po
index 20e4e0f1e8e..0bb44ab1311 100644
--- a/addons/web/i18n/lt.po
+++ b/addons/web/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/lv.po b/addons/web/i18n/lv.po
index 038e54572ad..19e07517ef3 100644
--- a/addons/web/i18n/lv.po
+++ b/addons/web/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/mk.po b/addons/web/i18n/mk.po
index ddaa0502bf7..1a4b2f87bbe 100644
--- a/addons/web/i18n/mk.po
+++ b/addons/web/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/mn.po b/addons/web/i18n/mn.po
index 1a441ce0db5..45f41087030 100644
--- a/addons/web/i18n/mn.po
+++ b/addons/web/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:40+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/nb.po b/addons/web/i18n/nb.po
index f091a4110d3..4accf6de92b 100644
--- a/addons/web/i18n/nb.po
+++ b/addons/web/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:40+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/nl.po b/addons/web/i18n/nl.po
index 4a8d2c99643..dc1e2c65f1e 100644
--- a/addons/web/i18n/nl.po
+++ b/addons/web/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-21 19:38+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:39+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/nl_BE.po b/addons/web/i18n/nl_BE.po
index efc1059a186..bbd40e6668d 100644
--- a/addons/web/i18n/nl_BE.po
+++ b/addons/web/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pl.po b/addons/web/i18n/pl.po
index fb435909899..60d37d8b42a 100644
--- a/addons/web/i18n/pl.po
+++ b/addons/web/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:40+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pt.po b/addons/web/i18n/pt.po
index 43af9b3df1a..a79ef048c3b 100644
--- a/addons/web/i18n/pt.po
+++ b/addons/web/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:40+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pt_BR.po b/addons/web/i18n/pt_BR.po
index eba73e98386..8c235d0e77c 100644
--- a/addons/web/i18n/pt_BR.po
+++ b/addons/web/i18n/pt_BR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:40+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ro.po b/addons/web/i18n/ro.po
index f128136055b..3f2cffc6ac3 100644
--- a/addons/web/i18n/ro.po
+++ b/addons/web/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:40+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ru.po b/addons/web/i18n/ru.po
index 0ece8fa7647..13c91a530ee 100644
--- a/addons/web/i18n/ru.po
+++ b/addons/web/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:40+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sk.po b/addons/web/i18n/sk.po
index 20189da93fa..83cbc765b9d 100644
--- a/addons/web/i18n/sk.po
+++ b/addons/web/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:40+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sl.po b/addons/web/i18n/sl.po
index 993c9844123..22277901d2d 100644
--- a/addons/web/i18n/sl.po
+++ b/addons/web/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:40+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sq.po b/addons/web/i18n/sq.po
index fe83bfb2472..4d0c8368035 100644
--- a/addons/web/i18n/sq.po
+++ b/addons/web/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:44+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:38+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sr@latin.po b/addons/web/i18n/sr@latin.po
index 0318dfa0307..bb1820e5e8e 100644
--- a/addons/web/i18n/sr@latin.po
+++ b/addons/web/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sv.po b/addons/web/i18n/sv.po
index cd7c635f50c..47469fce2cc 100644
--- a/addons/web/i18n/sv.po
+++ b/addons/web/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:40+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/th.po b/addons/web/i18n/th.po
index 57ea48c34b1..f56c84526f1 100644
--- a/addons/web/i18n/th.po
+++ b/addons/web/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:40+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
@@ -82,7 +82,7 @@ msgstr "เปลี่ยนรหัสผ่านหลัก"
 #: code:addons/web/static/src/js/chrome.js:513
 #, python-format
 msgid "Do you really want to delete the database: %s ?"
-msgstr "ต้องการลบ ฐานข้อมูล: %s ?"
+msgstr "คุณต้องการลบ ฐานข้อมูล: %s ?"
 
 #. module: web
 #. openerp-web
@@ -141,7 +141,7 @@ msgstr "'%s' ไม่ถูกต้อง"
 #: code:addons/web/static/src/xml/base.xml:1858
 #, python-format
 msgid "Here is a preview of the file we could not import:"
-msgstr ""
+msgstr "นี้คือตัวอย่างของแฟ้มที่เราไม่สามารถนำเข้าได้"
 
 #. module: web
 #. openerp-web
@@ -291,7 +291,7 @@ msgstr "ไม่ได้กำหนด"
 #: code:addons/web/static/src/js/view_form.js:5002
 #, python-format
 msgid "File Upload"
-msgstr "อัพโหลดข้อมูล"
+msgstr "อัพโหลดไฟล์"
 
 #. module: web
 #. openerp-web
@@ -391,7 +391,7 @@ msgstr "วิดเจ็ต Unhandled"
 #: code:addons/web/static/src/xml/base.xml:1004
 #, python-format
 msgid "Selection:"
-msgstr "เลือก"
+msgstr "การเลือก:"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/tr.po b/addons/web/i18n/tr.po
index 64a2fb91f36..2ca387292be 100644
--- a/addons/web/i18n/tr.po
+++ b/addons/web/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:45+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:40+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/uk.po b/addons/web/i18n/uk.po
index 18f17f66786..8fd40ec6581 100644
--- a/addons/web/i18n/uk.po
+++ b/addons/web/i18n/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:40+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/vi.po b/addons/web/i18n/vi.po
index 51831ce098b..09e1c688cd4 100644
--- a/addons/web/i18n/vi.po
+++ b/addons/web/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:40+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/zh_CN.po b/addons/web/i18n/zh_CN.po
index 1829371b6d4..2448925ae85 100644
--- a/addons/web/i18n/zh_CN.po
+++ b/addons/web/i18n/zh_CN.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-04 01:53+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
+"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/zh_TW.po b/addons/web/i18n/zh_TW.po
index c947aa2ac8a..651fd1bd0e0 100644
--- a/addons/web/i18n/zh_TW.po
+++ b/addons/web/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ar.po b/addons/web_calendar/i18n/ar.po
index 7c162d8147c..94eaf9253b1 100644
--- a/addons/web_calendar/i18n/ar.po
+++ b/addons/web_calendar/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/bg.po b/addons/web_calendar/i18n/bg.po
index a4246b38560..94d48c0e1b0 100644
--- a/addons/web_calendar/i18n/bg.po
+++ b/addons/web_calendar/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/bn.po b/addons/web_calendar/i18n/bn.po
index 03a9ec80bad..6e3f8bdbec5 100644
--- a/addons/web_calendar/i18n/bn.po
+++ b/addons/web_calendar/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/bs.po b/addons/web_calendar/i18n/bs.po
index b235bd87eba..3c1a77bcfeb 100644
--- a/addons/web_calendar/i18n/bs.po
+++ b/addons/web_calendar/i18n/bs.po
@@ -14,57 +14,57 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:161
 #, python-format
 msgid "New event"
-msgstr ""
+msgstr "Novi događaj"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:164
 #, python-format
 msgid "Details"
-msgstr ""
+msgstr "Detalji"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:162
 #, python-format
 msgid "Save"
-msgstr ""
+msgstr "Sačuvaj"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:109
 #, python-format
 msgid "Calendar view has a 'date_delay' type != float"
-msgstr ""
+msgstr "Kalendarski pogled ima 'date_delay' tip != float"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:157
 #, python-format
 msgid "Today"
-msgstr ""
+msgstr "Danas"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:159
 #, python-format
 msgid "Week"
-msgstr ""
+msgstr "Sedmica"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:171
 #, python-format
 msgid "Full day"
-msgstr ""
+msgstr "Cijeli dan"
 
 #. module: web_calendar
 #. openerp-web
@@ -72,14 +72,14 @@ msgstr ""
 #: code:addons/web_calendar/static/src/js/calendar.js:182
 #, python-format
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:168
 #, python-format
 msgid "Event will be deleted permanently, are you sure?"
-msgstr ""
+msgstr "Događaj će trajno biti obrisan, dali ste sigurni?"
 
 #. module: web_calendar
 #. openerp-web
@@ -94,7 +94,7 @@ msgstr "&nbsp;"
 #: code:addons/web_calendar/static/src/js/calendar.js:181
 #, python-format
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: web_calendar
 #. openerp-web
@@ -108,42 +108,42 @@ msgstr ""
 #: code:addons/web_calendar/static/src/js/calendar.js:158
 #, python-format
 msgid "Day"
-msgstr ""
+msgstr "Dan"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:165
 #, python-format
 msgid "Edit"
-msgstr ""
+msgstr "Uredi"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:177
 #, python-format
 msgid "Enabled"
-msgstr ""
+msgstr "Omogućeno"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:174
 #, python-format
 msgid "Do you want to edit the whole set of repeated events?"
-msgstr ""
+msgstr "Dali želite urediti cijeli set ponavljajućih događaja?"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:90
 #, python-format
 msgid "Filter"
-msgstr ""
+msgstr "Filter"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:175
 #, python-format
 msgid "Repeat event"
-msgstr ""
+msgstr "Ponovi događaj"
 
 #. module: web_calendar
 #. openerp-web
@@ -151,35 +151,35 @@ msgstr ""
 #: code:addons/web_calendar/static/src/js/calendar.js:188
 #, python-format
 msgid "Agenda"
-msgstr ""
+msgstr "Dnevni red"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:170
 #, python-format
 msgid "Time period"
-msgstr ""
+msgstr "Vremenski period"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:166
 #, python-format
 msgid "Delete"
-msgstr ""
+msgstr "Obriši"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:160
 #, python-format
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:176
 #, python-format
 msgid "Disabled"
-msgstr ""
+msgstr "Onemogućeno"
 
 #. module: web_calendar
 #. openerp-web
@@ -193,14 +193,14 @@ msgstr ""
 #: code:addons/web_calendar/static/src/js/calendar.js:185
 #, python-format
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:163
 #, python-format
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
 #. module: web_calendar
 #. openerp-web
@@ -214,7 +214,7 @@ msgstr "Kalendar"
 #: code:addons/web_calendar/static/src/js/calendar.js:101
 #, python-format
 msgid "Calendar view has not defined 'date_start' attribute."
-msgstr ""
+msgstr "Pogled kalendara nema definisan atribut 'date_start'."
 
 #~ msgid "Navigator"
 #~ msgstr "Navigator"
diff --git a/addons/web_calendar/i18n/ca.po b/addons/web_calendar/i18n/ca.po
index 2cb0a121182..2d95dba45fa 100644
--- a/addons/web_calendar/i18n/ca.po
+++ b/addons/web_calendar/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/cs.po b/addons/web_calendar/i18n/cs.po
index 089e5096edc..117061a091f 100644
--- a/addons/web_calendar/i18n/cs.po
+++ b/addons/web_calendar/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/da.po b/addons/web_calendar/i18n/da.po
index c2facb750fe..9298e39e58e 100644
--- a/addons/web_calendar/i18n/da.po
+++ b/addons/web_calendar/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-05 04:44+0000\n"
-"X-Generator: Launchpad (build 16758)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/de.po b/addons/web_calendar/i18n/de.po
index 4b4c557fc50..41a85445ec4 100644
--- a/addons/web_calendar/i18n/de.po
+++ b/addons/web_calendar/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/en_AU.po b/addons/web_calendar/i18n/en_AU.po
index 95636638a1b..7a6e36c8537 100644
--- a/addons/web_calendar/i18n/en_AU.po
+++ b/addons/web_calendar/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/en_GB.po b/addons/web_calendar/i18n/en_GB.po
index 038b0268282..15be4e50de8 100644
--- a/addons/web_calendar/i18n/en_GB.po
+++ b/addons/web_calendar/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es.po b/addons/web_calendar/i18n/es.po
index 592bb7354fa..0eb6916d0e5 100644
--- a/addons/web_calendar/i18n/es.po
+++ b/addons/web_calendar/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_CL.po b/addons/web_calendar/i18n/es_CL.po
index 8b102a8f82c..6c4e9022c45 100644
--- a/addons/web_calendar/i18n/es_CL.po
+++ b/addons/web_calendar/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_CR.po b/addons/web_calendar/i18n/es_CR.po
index f29d1ceeb99..e9c745cb5b2 100644
--- a/addons/web_calendar/i18n/es_CR.po
+++ b/addons/web_calendar/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 "Language: es\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/es_DO.po b/addons/web_calendar/i18n/es_DO.po
index cc995222d36..0a294870a86 100644
--- a/addons/web_calendar/i18n/es_DO.po
+++ b/addons/web_calendar/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_EC.po b/addons/web_calendar/i18n/es_EC.po
index fedb02e0e8f..48cdaade20b 100644
--- a/addons/web_calendar/i18n/es_EC.po
+++ b/addons/web_calendar/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_MX.po b/addons/web_calendar/i18n/es_MX.po
index f0996ec3285..d710945271a 100644
--- a/addons/web_calendar/i18n/es_MX.po
+++ b/addons/web_calendar/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/et.po b/addons/web_calendar/i18n/et.po
index 0cc4bbac830..feeea2937ea 100644
--- a/addons/web_calendar/i18n/et.po
+++ b/addons/web_calendar/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/eu.po b/addons/web_calendar/i18n/eu.po
index 04ebeb6c74f..7e21e7b0abd 100644
--- a/addons/web_calendar/i18n/eu.po
+++ b/addons/web_calendar/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fa.po b/addons/web_calendar/i18n/fa.po
index 59ecd768fee..bdafef24418 100644
--- a/addons/web_calendar/i18n/fa.po
+++ b/addons/web_calendar/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fi.po b/addons/web_calendar/i18n/fi.po
index 241ab72e8b7..86646e3de15 100644
--- a/addons/web_calendar/i18n/fi.po
+++ b/addons/web_calendar/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fr.po b/addons/web_calendar/i18n/fr.po
index e759925e441..d9f26f29da4 100644
--- a/addons/web_calendar/i18n/fr.po
+++ b/addons/web_calendar/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fr_CA.po b/addons/web_calendar/i18n/fr_CA.po
index 352fa771fde..4be2db1e489 100644
--- a/addons/web_calendar/i18n/fr_CA.po
+++ b/addons/web_calendar/i18n/fr_CA.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/gl.po b/addons/web_calendar/i18n/gl.po
index 882ac6b46d4..13efddee575 100644
--- a/addons/web_calendar/i18n/gl.po
+++ b/addons/web_calendar/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/gu.po b/addons/web_calendar/i18n/gu.po
index 76e7f30d02d..030eab8ee76 100644
--- a/addons/web_calendar/i18n/gu.po
+++ b/addons/web_calendar/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/hr.po b/addons/web_calendar/i18n/hr.po
index 69d20f57bae..ab7b43e8d27 100644
--- a/addons/web_calendar/i18n/hr.po
+++ b/addons/web_calendar/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/hu.po b/addons/web_calendar/i18n/hu.po
index 3b00c0c666b..8ce28f3b202 100644
--- a/addons/web_calendar/i18n/hu.po
+++ b/addons/web_calendar/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/id.po b/addons/web_calendar/i18n/id.po
index 32d6d6f8471..e5fd48a6a21 100644
--- a/addons/web_calendar/i18n/id.po
+++ b/addons/web_calendar/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/it.po b/addons/web_calendar/i18n/it.po
index 37ec0cd4cfe..bc0f1685e6d 100644
--- a/addons/web_calendar/i18n/it.po
+++ b/addons/web_calendar/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ja.po b/addons/web_calendar/i18n/ja.po
index 267b239d3d5..70e4daba708 100644
--- a/addons/web_calendar/i18n/ja.po
+++ b/addons/web_calendar/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ka.po b/addons/web_calendar/i18n/ka.po
index c3cddb3b2f3..5c214fa84d2 100644
--- a/addons/web_calendar/i18n/ka.po
+++ b/addons/web_calendar/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ko.po b/addons/web_calendar/i18n/ko.po
index 281e3ef955c..fdad97672bb 100644
--- a/addons/web_calendar/i18n/ko.po
+++ b/addons/web_calendar/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/lt.po b/addons/web_calendar/i18n/lt.po
index df0817a8789..25094c76d42 100644
--- a/addons/web_calendar/i18n/lt.po
+++ b/addons/web_calendar/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/mk.po b/addons/web_calendar/i18n/mk.po
index 6f112a647bd..187f2d17f37 100644
--- a/addons/web_calendar/i18n/mk.po
+++ b/addons/web_calendar/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/mn.po b/addons/web_calendar/i18n/mn.po
index d10d791c857..e860b4c73ad 100644
--- a/addons/web_calendar/i18n/mn.po
+++ b/addons/web_calendar/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/nb.po b/addons/web_calendar/i18n/nb.po
index d1371cd5220..1a908e245a1 100644
--- a/addons/web_calendar/i18n/nb.po
+++ b/addons/web_calendar/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/nl.po b/addons/web_calendar/i18n/nl.po
index 23cf975b43b..609c7ad43ae 100644
--- a/addons/web_calendar/i18n/nl.po
+++ b/addons/web_calendar/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-05 07:55+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/nl_BE.po b/addons/web_calendar/i18n/nl_BE.po
index e99d29c08b4..ddcd96b4411 100644
--- a/addons/web_calendar/i18n/nl_BE.po
+++ b/addons/web_calendar/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/pl.po b/addons/web_calendar/i18n/pl.po
index 9b18046fd00..d524c3058bb 100644
--- a/addons/web_calendar/i18n/pl.po
+++ b/addons/web_calendar/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/pt.po b/addons/web_calendar/i18n/pt.po
index f4a524d1d67..9ea979ca93d 100644
--- a/addons/web_calendar/i18n/pt.po
+++ b/addons/web_calendar/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/pt_BR.po b/addons/web_calendar/i18n/pt_BR.po
index e0d415cfce3..c40ecc3b114 100644
--- a/addons/web_calendar/i18n/pt_BR.po
+++ b/addons/web_calendar/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ro.po b/addons/web_calendar/i18n/ro.po
index beb9caee54c..1818080cb30 100644
--- a/addons/web_calendar/i18n/ro.po
+++ b/addons/web_calendar/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ru.po b/addons/web_calendar/i18n/ru.po
index 5cec06bdff3..2099b1ccc87 100644
--- a/addons/web_calendar/i18n/ru.po
+++ b/addons/web_calendar/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sk.po b/addons/web_calendar/i18n/sk.po
index 28a1d8b9c5c..4d4f8b0432b 100644
--- a/addons/web_calendar/i18n/sk.po
+++ b/addons/web_calendar/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sl.po b/addons/web_calendar/i18n/sl.po
index 26c774b18d8..012a22ae3ad 100644
--- a/addons/web_calendar/i18n/sl.po
+++ b/addons/web_calendar/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sq.po b/addons/web_calendar/i18n/sq.po
index 10fcac53e84..922a1bb0049 100644
--- a/addons/web_calendar/i18n/sq.po
+++ b/addons/web_calendar/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sr@latin.po b/addons/web_calendar/i18n/sr@latin.po
index 738969ff95f..4747563e71c 100644
--- a/addons/web_calendar/i18n/sr@latin.po
+++ b/addons/web_calendar/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sv.po b/addons/web_calendar/i18n/sv.po
index deeb0621629..d2120a6ea33 100644
--- a/addons/web_calendar/i18n/sv.po
+++ b/addons/web_calendar/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/th.po b/addons/web_calendar/i18n/th.po
index 2f06d1360e4..576da4b3c57 100644
--- a/addons/web_calendar/i18n/th.po
+++ b/addons/web_calendar/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/tr.po b/addons/web_calendar/i18n/tr.po
index 60bad30663f..c118d0d409c 100644
--- a/addons/web_calendar/i18n/tr.po
+++ b/addons/web_calendar/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/uk.po b/addons/web_calendar/i18n/uk.po
index 4ad02609517..a3bede62a70 100644
--- a/addons/web_calendar/i18n/uk.po
+++ b/addons/web_calendar/i18n/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/zh_CN.po b/addons/web_calendar/i18n/zh_CN.po
index 019b652a7a4..057fe334a88 100644
--- a/addons/web_calendar/i18n/zh_CN.po
+++ b/addons/web_calendar/i18n/zh_CN.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-01 14:56+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
+"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ar.po b/addons/web_diagram/i18n/ar.po
index eb24bf7ea1d..ffea43f5c45 100644
--- a/addons/web_diagram/i18n/ar.po
+++ b/addons/web_diagram/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/bg.po b/addons/web_diagram/i18n/bg.po
index 3da657741eb..ecbe27a1631 100644
--- a/addons/web_diagram/i18n/bg.po
+++ b/addons/web_diagram/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/bn.po b/addons/web_diagram/i18n/bn.po
index 0a7d5a1a75f..2e99a4109cc 100644
--- a/addons/web_diagram/i18n/bn.po
+++ b/addons/web_diagram/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/bs.po b/addons/web_diagram/i18n/bs.po
index 9ef09ab05bf..5fac1a69ea7 100644
--- a/addons/web_diagram/i18n/bs.po
+++ b/addons/web_diagram/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
@@ -34,7 +34,11 @@ msgid ""
 "It will also delete all connected transitions.\n"
 "\n"
 "Are you sure ?"
-msgstr "Brisanje ovog čvora je nepovratno"
+msgstr ""
+"Brisanje ovog čvora je nepovratno.\n"
+"Također će obrisati sve povezane prelaze.\n"
+"\n"
+"Dali ste sigurni?"
 
 #. module: web_diagram
 #. openerp-web
@@ -71,7 +75,7 @@ msgstr "Aktivnost"
 #: code:addons/web_diagram/static/src/js/diagram.js:420
 #, python-format
 msgid "%d / %d"
-msgstr ""
+msgstr "%d / %d"
 
 #. module: web_diagram
 #. openerp-web
@@ -79,7 +83,7 @@ msgstr ""
 #: code:addons/web_diagram/static/src/js/diagram.js:335
 #, python-format
 msgid "Create:"
-msgstr "Kreiraj"
+msgstr "Kreiraj:"
 
 #. module: web_diagram
 #. openerp-web
@@ -96,4 +100,7 @@ msgid ""
 "Deleting this transition cannot be undone.\n"
 "\n"
 "Are you sure ?"
-msgstr "Brisanje ove tranzicije je nepovratno"
+msgstr ""
+"Brisanje ove tranzicije je nepovratno.\n"
+"\n"
+"Dali ste sigurni?"
diff --git a/addons/web_diagram/i18n/ca.po b/addons/web_diagram/i18n/ca.po
index 7e05849ed80..134c8af30b4 100644
--- a/addons/web_diagram/i18n/ca.po
+++ b/addons/web_diagram/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/cs.po b/addons/web_diagram/i18n/cs.po
index 48eab24092b..db202de7007 100644
--- a/addons/web_diagram/i18n/cs.po
+++ b/addons/web_diagram/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/da.po b/addons/web_diagram/i18n/da.po
index 7844a2a289e..cfe0fec5faf 100644
--- a/addons/web_diagram/i18n/da.po
+++ b/addons/web_diagram/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-05 04:44+0000\n"
-"X-Generator: Launchpad (build 16758)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/de.po b/addons/web_diagram/i18n/de.po
index 9e230dbe96f..630dd44cade 100644
--- a/addons/web_diagram/i18n/de.po
+++ b/addons/web_diagram/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/en_AU.po b/addons/web_diagram/i18n/en_AU.po
index f4f359e0636..2649f289d63 100644
--- a/addons/web_diagram/i18n/en_AU.po
+++ b/addons/web_diagram/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/en_GB.po b/addons/web_diagram/i18n/en_GB.po
index 56ceef846b1..0f02d46feec 100644
--- a/addons/web_diagram/i18n/en_GB.po
+++ b/addons/web_diagram/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es.po b/addons/web_diagram/i18n/es.po
index 8ffd7f50dcc..567aad63205 100644
--- a/addons/web_diagram/i18n/es.po
+++ b/addons/web_diagram/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_CL.po b/addons/web_diagram/i18n/es_CL.po
index 00393ad1fe8..230c6d325b5 100644
--- a/addons/web_diagram/i18n/es_CL.po
+++ b/addons/web_diagram/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_CR.po b/addons/web_diagram/i18n/es_CR.po
index 087edd0296d..c76c346eea6 100644
--- a/addons/web_diagram/i18n/es_CR.po
+++ b/addons/web_diagram/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 "Language: es\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/es_DO.po b/addons/web_diagram/i18n/es_DO.po
index f02c4a2886f..7a8f0de9fe1 100644
--- a/addons/web_diagram/i18n/es_DO.po
+++ b/addons/web_diagram/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_EC.po b/addons/web_diagram/i18n/es_EC.po
index 594a320ed8d..ee3ca53cb2a 100644
--- a/addons/web_diagram/i18n/es_EC.po
+++ b/addons/web_diagram/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_MX.po b/addons/web_diagram/i18n/es_MX.po
index 904ff6793d4..abd279bcedf 100644
--- a/addons/web_diagram/i18n/es_MX.po
+++ b/addons/web_diagram/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/et.po b/addons/web_diagram/i18n/et.po
index eb618b79dd7..706c1a55bb0 100644
--- a/addons/web_diagram/i18n/et.po
+++ b/addons/web_diagram/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/fa.po b/addons/web_diagram/i18n/fa.po
index 5be6bb13982..76b68fb3d70 100644
--- a/addons/web_diagram/i18n/fa.po
+++ b/addons/web_diagram/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/fi.po b/addons/web_diagram/i18n/fi.po
index c9ea4bc90c6..0413559aa30 100644
--- a/addons/web_diagram/i18n/fi.po
+++ b/addons/web_diagram/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/fr.po b/addons/web_diagram/i18n/fr.po
index ffc0423518e..da5bfe28769 100644
--- a/addons/web_diagram/i18n/fr.po
+++ b/addons/web_diagram/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/gl.po b/addons/web_diagram/i18n/gl.po
index 3cab0a4c976..37482a70593 100644
--- a/addons/web_diagram/i18n/gl.po
+++ b/addons/web_diagram/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/gu.po b/addons/web_diagram/i18n/gu.po
index 00ac0b3abb3..19683f5b8e7 100644
--- a/addons/web_diagram/i18n/gu.po
+++ b/addons/web_diagram/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/hr.po b/addons/web_diagram/i18n/hr.po
index 912987942d3..3f68b2a428d 100644
--- a/addons/web_diagram/i18n/hr.po
+++ b/addons/web_diagram/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/hu.po b/addons/web_diagram/i18n/hu.po
index 30332a5a3b5..e4f178a27f4 100644
--- a/addons/web_diagram/i18n/hu.po
+++ b/addons/web_diagram/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/id.po b/addons/web_diagram/i18n/id.po
index 06f639f2883..a5f1292852f 100644
--- a/addons/web_diagram/i18n/id.po
+++ b/addons/web_diagram/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/it.po b/addons/web_diagram/i18n/it.po
index 4c85daa23a3..3b21e70273e 100644
--- a/addons/web_diagram/i18n/it.po
+++ b/addons/web_diagram/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ja.po b/addons/web_diagram/i18n/ja.po
index f3bdb5f27db..c84f2ef5fdb 100644
--- a/addons/web_diagram/i18n/ja.po
+++ b/addons/web_diagram/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ka.po b/addons/web_diagram/i18n/ka.po
index d8883ed4f7c..9a98d94a164 100644
--- a/addons/web_diagram/i18n/ka.po
+++ b/addons/web_diagram/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ko.po b/addons/web_diagram/i18n/ko.po
index b7391be6a35..891bd6c825d 100644
--- a/addons/web_diagram/i18n/ko.po
+++ b/addons/web_diagram/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/lt.po b/addons/web_diagram/i18n/lt.po
index 8564d592351..8c30cb6cf28 100644
--- a/addons/web_diagram/i18n/lt.po
+++ b/addons/web_diagram/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/mk.po b/addons/web_diagram/i18n/mk.po
index 9799a83f7d7..48ca7b8610a 100644
--- a/addons/web_diagram/i18n/mk.po
+++ b/addons/web_diagram/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/mn.po b/addons/web_diagram/i18n/mn.po
index aa4e4fee8af..5f5fadb2eea 100644
--- a/addons/web_diagram/i18n/mn.po
+++ b/addons/web_diagram/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/nb.po b/addons/web_diagram/i18n/nb.po
index a0d0174b18f..d009df5d7a5 100644
--- a/addons/web_diagram/i18n/nb.po
+++ b/addons/web_diagram/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/nl.po b/addons/web_diagram/i18n/nl.po
index 418b7d414e1..5b3ce6ea931 100644
--- a/addons/web_diagram/i18n/nl.po
+++ b/addons/web_diagram/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-25 07:04+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/nl_BE.po b/addons/web_diagram/i18n/nl_BE.po
index dd6c2af4fdf..5e7ce4fee6c 100644
--- a/addons/web_diagram/i18n/nl_BE.po
+++ b/addons/web_diagram/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/pl.po b/addons/web_diagram/i18n/pl.po
index 226004019fc..6a5dfa788b4 100644
--- a/addons/web_diagram/i18n/pl.po
+++ b/addons/web_diagram/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/pt.po b/addons/web_diagram/i18n/pt.po
index db02c95feb5..2a6b7b1ca55 100644
--- a/addons/web_diagram/i18n/pt.po
+++ b/addons/web_diagram/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/pt_BR.po b/addons/web_diagram/i18n/pt_BR.po
index 103880c16e5..cf264e0604b 100644
--- a/addons/web_diagram/i18n/pt_BR.po
+++ b/addons/web_diagram/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ro.po b/addons/web_diagram/i18n/ro.po
index a2d6efe6804..8a588e93f15 100644
--- a/addons/web_diagram/i18n/ro.po
+++ b/addons/web_diagram/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ru.po b/addons/web_diagram/i18n/ru.po
index ba07bfd67ca..a53324c9964 100644
--- a/addons/web_diagram/i18n/ru.po
+++ b/addons/web_diagram/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sl.po b/addons/web_diagram/i18n/sl.po
index 1dba3d48358..1e2e6218003 100644
--- a/addons/web_diagram/i18n/sl.po
+++ b/addons/web_diagram/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sq.po b/addons/web_diagram/i18n/sq.po
index 4fa76fccc24..3b412906404 100644
--- a/addons/web_diagram/i18n/sq.po
+++ b/addons/web_diagram/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sr@latin.po b/addons/web_diagram/i18n/sr@latin.po
index 0e50be0f3dd..7efecaaacc4 100644
--- a/addons/web_diagram/i18n/sr@latin.po
+++ b/addons/web_diagram/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sv.po b/addons/web_diagram/i18n/sv.po
index 14072652093..adad923400d 100644
--- a/addons/web_diagram/i18n/sv.po
+++ b/addons/web_diagram/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/th.po b/addons/web_diagram/i18n/th.po
index 4be3da8d991..197594436fc 100644
--- a/addons/web_diagram/i18n/th.po
+++ b/addons/web_diagram/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/tr.po b/addons/web_diagram/i18n/tr.po
index 7ac9d802b3e..84decda1008 100644
--- a/addons/web_diagram/i18n/tr.po
+++ b/addons/web_diagram/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/zh_CN.po b/addons/web_diagram/i18n/zh_CN.po
index 8c2a33946f3..ef7c0e4284e 100644
--- a/addons/web_diagram/i18n/zh_CN.po
+++ b/addons/web_diagram/i18n/zh_CN.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-29 15:16+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
+"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/zh_TW.po b/addons/web_diagram/i18n/zh_TW.po
index b575de75737..306a5c89acb 100644
--- a/addons/web_diagram/i18n/zh_TW.po
+++ b/addons/web_diagram/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ar.po b/addons/web_gantt/i18n/ar.po
index 87f7d2f4e61..9b82db4aae1 100644
--- a/addons/web_gantt/i18n/ar.po
+++ b/addons/web_gantt/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/bg.po b/addons/web_gantt/i18n/bg.po
index 1edc358f9ce..631ede530d8 100644
--- a/addons/web_gantt/i18n/bg.po
+++ b/addons/web_gantt/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/bn.po b/addons/web_gantt/i18n/bn.po
index ccfd295084d..acf0517500b 100644
--- a/addons/web_gantt/i18n/bn.po
+++ b/addons/web_gantt/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/bs.po b/addons/web_gantt/i18n/bs.po
index 270e56f546c..34644cc5c0b 100644
--- a/addons/web_gantt/i18n/bs.po
+++ b/addons/web_gantt/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ca.po b/addons/web_gantt/i18n/ca.po
index cdfb55ea105..8c98abe4b99 100644
--- a/addons/web_gantt/i18n/ca.po
+++ b/addons/web_gantt/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/cs.po b/addons/web_gantt/i18n/cs.po
index 831a5fa7892..c097169403b 100644
--- a/addons/web_gantt/i18n/cs.po
+++ b/addons/web_gantt/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/da.po b/addons/web_gantt/i18n/da.po
index 7725a9d1aa9..eb4d25b67c8 100644
--- a/addons/web_gantt/i18n/da.po
+++ b/addons/web_gantt/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/de.po b/addons/web_gantt/i18n/de.po
index e8b648b9ce9..ef15e30d6b6 100644
--- a/addons/web_gantt/i18n/de.po
+++ b/addons/web_gantt/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/en_AU.po b/addons/web_gantt/i18n/en_AU.po
index 32b748b34a0..8b79cacb60c 100644
--- a/addons/web_gantt/i18n/en_AU.po
+++ b/addons/web_gantt/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/en_GB.po b/addons/web_gantt/i18n/en_GB.po
index fdddde01403..bbb69ffd47e 100644
--- a/addons/web_gantt/i18n/en_GB.po
+++ b/addons/web_gantt/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es.po b/addons/web_gantt/i18n/es.po
index 3962c1bbb4e..44005c00cdc 100644
--- a/addons/web_gantt/i18n/es.po
+++ b/addons/web_gantt/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_CL.po b/addons/web_gantt/i18n/es_CL.po
index 618934fdfd3..5ebab5d2a13 100644
--- a/addons/web_gantt/i18n/es_CL.po
+++ b/addons/web_gantt/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_CR.po b/addons/web_gantt/i18n/es_CR.po
index 2ecd1ccfce0..552e50de73b 100644
--- a/addons/web_gantt/i18n/es_CR.po
+++ b/addons/web_gantt/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_DO.po b/addons/web_gantt/i18n/es_DO.po
index 71452a90422..cca01987616 100644
--- a/addons/web_gantt/i18n/es_DO.po
+++ b/addons/web_gantt/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_EC.po b/addons/web_gantt/i18n/es_EC.po
index 670e5e3e9e4..1fd53ace455 100644
--- a/addons/web_gantt/i18n/es_EC.po
+++ b/addons/web_gantt/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_MX.po b/addons/web_gantt/i18n/es_MX.po
index df85159ec8a..ed33d5b9b96 100644
--- a/addons/web_gantt/i18n/es_MX.po
+++ b/addons/web_gantt/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/et.po b/addons/web_gantt/i18n/et.po
index 732a236660e..1978a283114 100644
--- a/addons/web_gantt/i18n/et.po
+++ b/addons/web_gantt/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/fa.po b/addons/web_gantt/i18n/fa.po
index 7f8c540b3af..74071de0215 100644
--- a/addons/web_gantt/i18n/fa.po
+++ b/addons/web_gantt/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/fi.po b/addons/web_gantt/i18n/fi.po
index 7f0438d2fb3..bc072b249a4 100644
--- a/addons/web_gantt/i18n/fi.po
+++ b/addons/web_gantt/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/fr.po b/addons/web_gantt/i18n/fr.po
index 1fdd9bd9cd4..319f93433e6 100644
--- a/addons/web_gantt/i18n/fr.po
+++ b/addons/web_gantt/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/gl.po b/addons/web_gantt/i18n/gl.po
index 8c482ee3196..abf0cd2c9ba 100644
--- a/addons/web_gantt/i18n/gl.po
+++ b/addons/web_gantt/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/gu.po b/addons/web_gantt/i18n/gu.po
index 1081fe344de..149ada980e7 100644
--- a/addons/web_gantt/i18n/gu.po
+++ b/addons/web_gantt/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/hr.po b/addons/web_gantt/i18n/hr.po
index 265757767d3..adc5976ee5d 100644
--- a/addons/web_gantt/i18n/hr.po
+++ b/addons/web_gantt/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/hu.po b/addons/web_gantt/i18n/hu.po
index 6073535d31f..d31a63542c8 100644
--- a/addons/web_gantt/i18n/hu.po
+++ b/addons/web_gantt/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/it.po b/addons/web_gantt/i18n/it.po
index 4a249625fb1..b493efc56aa 100644
--- a/addons/web_gantt/i18n/it.po
+++ b/addons/web_gantt/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ja.po b/addons/web_gantt/i18n/ja.po
index d42e227c930..3c9a12ca63b 100644
--- a/addons/web_gantt/i18n/ja.po
+++ b/addons/web_gantt/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ka.po b/addons/web_gantt/i18n/ka.po
index 9c903f7871b..90f3c18ddb8 100644
--- a/addons/web_gantt/i18n/ka.po
+++ b/addons/web_gantt/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ko.po b/addons/web_gantt/i18n/ko.po
index 3721e0d932b..4bb4f016c56 100644
--- a/addons/web_gantt/i18n/ko.po
+++ b/addons/web_gantt/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/lo.po b/addons/web_gantt/i18n/lo.po
index c44949f745e..a08787bedc9 100644
--- a/addons/web_gantt/i18n/lo.po
+++ b/addons/web_gantt/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/lt.po b/addons/web_gantt/i18n/lt.po
index 345dc7149ad..3fb0f562afe 100644
--- a/addons/web_gantt/i18n/lt.po
+++ b/addons/web_gantt/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/mk.po b/addons/web_gantt/i18n/mk.po
index efd68a5b856..093489f01dd 100644
--- a/addons/web_gantt/i18n/mk.po
+++ b/addons/web_gantt/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/mn.po b/addons/web_gantt/i18n/mn.po
index c3db07c6840..8141e84170a 100644
--- a/addons/web_gantt/i18n/mn.po
+++ b/addons/web_gantt/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/nb.po b/addons/web_gantt/i18n/nb.po
index c3614bcc05c..347a0a5aafc 100644
--- a/addons/web_gantt/i18n/nb.po
+++ b/addons/web_gantt/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/nl.po b/addons/web_gantt/i18n/nl.po
index 0810961e7ae..4cbb12cb4e5 100644
--- a/addons/web_gantt/i18n/nl.po
+++ b/addons/web_gantt/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-25 07:10+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/nl_BE.po b/addons/web_gantt/i18n/nl_BE.po
index f5d79ecf96e..52ad3877b66 100644
--- a/addons/web_gantt/i18n/nl_BE.po
+++ b/addons/web_gantt/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/pl.po b/addons/web_gantt/i18n/pl.po
index d219765c333..bf59dd42f1b 100644
--- a/addons/web_gantt/i18n/pl.po
+++ b/addons/web_gantt/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/pt.po b/addons/web_gantt/i18n/pt.po
index c500fd33934..8f2db08d7ec 100644
--- a/addons/web_gantt/i18n/pt.po
+++ b/addons/web_gantt/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/pt_BR.po b/addons/web_gantt/i18n/pt_BR.po
index e4afa1306b5..241d9f048e2 100644
--- a/addons/web_gantt/i18n/pt_BR.po
+++ b/addons/web_gantt/i18n/pt_BR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ro.po b/addons/web_gantt/i18n/ro.po
index 2286511957b..57696b57b4d 100644
--- a/addons/web_gantt/i18n/ro.po
+++ b/addons/web_gantt/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ru.po b/addons/web_gantt/i18n/ru.po
index 5fbbdd434bf..1d07ab10589 100644
--- a/addons/web_gantt/i18n/ru.po
+++ b/addons/web_gantt/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sl.po b/addons/web_gantt/i18n/sl.po
index eb922f04cde..00a5e8982d7 100644
--- a/addons/web_gantt/i18n/sl.po
+++ b/addons/web_gantt/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sq.po b/addons/web_gantt/i18n/sq.po
index 1bd6fd1aa43..5ddaa85069b 100644
--- a/addons/web_gantt/i18n/sq.po
+++ b/addons/web_gantt/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sr@latin.po b/addons/web_gantt/i18n/sr@latin.po
index bea9d70ac70..55dad6b52e4 100644
--- a/addons/web_gantt/i18n/sr@latin.po
+++ b/addons/web_gantt/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sv.po b/addons/web_gantt/i18n/sv.po
index 481ce922570..a437f4b9f9e 100644
--- a/addons/web_gantt/i18n/sv.po
+++ b/addons/web_gantt/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/th.po b/addons/web_gantt/i18n/th.po
index 87255a667c0..bb5103d6d02 100644
--- a/addons/web_gantt/i18n/th.po
+++ b/addons/web_gantt/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/tr.po b/addons/web_gantt/i18n/tr.po
index 141f1ae13cc..517d96b64a1 100644
--- a/addons/web_gantt/i18n/tr.po
+++ b/addons/web_gantt/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/zh_CN.po b/addons/web_gantt/i18n/zh_CN.po
index 31ac80b4e28..563665616d0 100644
--- a/addons/web_gantt/i18n/zh_CN.po
+++ b/addons/web_gantt/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_graph/i18n/ar.po b/addons/web_graph/i18n/ar.po
index d4f73dfda2f..39c10e22d7d 100644
--- a/addons/web_graph/i18n/ar.po
+++ b/addons/web_graph/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/bg.po b/addons/web_graph/i18n/bg.po
index 42a8fd2009c..b3fd6b6092c 100644
--- a/addons/web_graph/i18n/bg.po
+++ b/addons/web_graph/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/bn.po b/addons/web_graph/i18n/bn.po
index 004f35cf4b3..cf312be5d18 100644
--- a/addons/web_graph/i18n/bn.po
+++ b/addons/web_graph/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/bs.po b/addons/web_graph/i18n/bs.po
index 43a45aaf7c7..ffde68f56ca 100644
--- a/addons/web_graph/i18n/bs.po
+++ b/addons/web_graph/i18n/bs.po
@@ -14,22 +14,22 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:12
 #, python-format
 msgid "Bars"
-msgstr ""
+msgstr "Šipke"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:33
 #, python-format
 msgid "Show Data"
-msgstr ""
+msgstr "Prikaži podatke"
 
 #. module: web_graph
 #. openerp-web
@@ -43,95 +43,95 @@ msgstr "Graf"
 #: code:addons/web_graph/static/src/xml/web_graph.xml:25
 #, python-format
 msgid "Inside"
-msgstr ""
+msgstr "Unutar"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:3
 #, python-format
 msgid "&iacute;"
-msgstr ""
+msgstr "&iacute;"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:11
 #, python-format
 msgid "Pie"
-msgstr ""
+msgstr "Pita"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:28
 #, python-format
 msgid "Actions"
-msgstr ""
+msgstr "Akcije"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:7
 #, python-format
 msgid "Graph Mode"
-msgstr ""
+msgstr "Grafički mod"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:18
 #, python-format
 msgid "Radar"
-msgstr ""
+msgstr "Radar"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:34
 #, python-format
 msgid "Download as PNG"
-msgstr ""
+msgstr "Skini kao PNG"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:26
 #, python-format
 msgid "Top"
-msgstr ""
+msgstr "Vrh"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:24
 #, python-format
 msgid "Hidden"
-msgstr ""
+msgstr "Skriveno"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:3
 #, python-format
 msgid "Graph Options"
-msgstr ""
+msgstr "Opcije grafa"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:14
 #, python-format
 msgid "Lines"
-msgstr ""
+msgstr "Linije"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:20
 #, python-format
 msgid "Legend"
-msgstr ""
+msgstr "Legenda"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:32
 #, python-format
 msgid "Switch Axis"
-msgstr ""
+msgstr "Zamjeni ose"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:15
 #, python-format
 msgid "Areas"
-msgstr ""
+msgstr "Površine"
diff --git a/addons/web_graph/i18n/ca.po b/addons/web_graph/i18n/ca.po
index 99026f92843..6dfc8e5efb0 100644
--- a/addons/web_graph/i18n/ca.po
+++ b/addons/web_graph/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/cs.po b/addons/web_graph/i18n/cs.po
index 29e9ea4455d..7c764726701 100644
--- a/addons/web_graph/i18n/cs.po
+++ b/addons/web_graph/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/da.po b/addons/web_graph/i18n/da.po
index 43c116b45a4..0ace35ecb37 100644
--- a/addons/web_graph/i18n/da.po
+++ b/addons/web_graph/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-05 04:44+0000\n"
-"X-Generator: Launchpad (build 16758)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/de.po b/addons/web_graph/i18n/de.po
index 97f73bb439c..4f25d3b40c1 100644
--- a/addons/web_graph/i18n/de.po
+++ b/addons/web_graph/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/en_AU.po b/addons/web_graph/i18n/en_AU.po
index 25e1a7be2b5..0eef891318a 100644
--- a/addons/web_graph/i18n/en_AU.po
+++ b/addons/web_graph/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/en_GB.po b/addons/web_graph/i18n/en_GB.po
index 3eaa2fbc9cd..3d5c00bbc51 100644
--- a/addons/web_graph/i18n/en_GB.po
+++ b/addons/web_graph/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es.po b/addons/web_graph/i18n/es.po
index 2f51d157e8c..75736e015d4 100644
--- a/addons/web_graph/i18n/es.po
+++ b/addons/web_graph/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_CL.po b/addons/web_graph/i18n/es_CL.po
index 839e6929110..b3e978c3c92 100644
--- a/addons/web_graph/i18n/es_CL.po
+++ b/addons/web_graph/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_CR.po b/addons/web_graph/i18n/es_CR.po
index 7f2a105475b..c20e5b8b7b6 100644
--- a/addons/web_graph/i18n/es_CR.po
+++ b/addons/web_graph/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_DO.po b/addons/web_graph/i18n/es_DO.po
index 34df7ea49c3..ae6ee0c9aa3 100644
--- a/addons/web_graph/i18n/es_DO.po
+++ b/addons/web_graph/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_EC.po b/addons/web_graph/i18n/es_EC.po
index 2cf76590c27..2e5f242686f 100644
--- a/addons/web_graph/i18n/es_EC.po
+++ b/addons/web_graph/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_MX.po b/addons/web_graph/i18n/es_MX.po
index 0758bd06f43..6fb23ff029e 100644
--- a/addons/web_graph/i18n/es_MX.po
+++ b/addons/web_graph/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/et.po b/addons/web_graph/i18n/et.po
index a35aa0fd586..ee728fd3a64 100644
--- a/addons/web_graph/i18n/et.po
+++ b/addons/web_graph/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fa.po b/addons/web_graph/i18n/fa.po
index ad5e7071b5c..376aba74cca 100644
--- a/addons/web_graph/i18n/fa.po
+++ b/addons/web_graph/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fi.po b/addons/web_graph/i18n/fi.po
index 3ec6aa20a01..2332e80bd0f 100644
--- a/addons/web_graph/i18n/fi.po
+++ b/addons/web_graph/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fr.po b/addons/web_graph/i18n/fr.po
index 13e189497f3..20d80870892 100644
--- a/addons/web_graph/i18n/fr.po
+++ b/addons/web_graph/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fr_CA.po b/addons/web_graph/i18n/fr_CA.po
index c6af09e7fd3..9d099abfc16 100644
--- a/addons/web_graph/i18n/fr_CA.po
+++ b/addons/web_graph/i18n/fr_CA.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/gl.po b/addons/web_graph/i18n/gl.po
index 4b7734320a1..62906436c03 100644
--- a/addons/web_graph/i18n/gl.po
+++ b/addons/web_graph/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/gu.po b/addons/web_graph/i18n/gu.po
index 507440420e6..aa8b9bb0ca7 100644
--- a/addons/web_graph/i18n/gu.po
+++ b/addons/web_graph/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/hr.po b/addons/web_graph/i18n/hr.po
index 1d071f343cb..577487beb51 100644
--- a/addons/web_graph/i18n/hr.po
+++ b/addons/web_graph/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/hu.po b/addons/web_graph/i18n/hu.po
index f0c094c862f..431b636e6dd 100644
--- a/addons/web_graph/i18n/hu.po
+++ b/addons/web_graph/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/it.po b/addons/web_graph/i18n/it.po
index e9ec8d54756..863384dab43 100644
--- a/addons/web_graph/i18n/it.po
+++ b/addons/web_graph/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ja.po b/addons/web_graph/i18n/ja.po
index 857b6ae2e41..a4b3483a0d5 100644
--- a/addons/web_graph/i18n/ja.po
+++ b/addons/web_graph/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ka.po b/addons/web_graph/i18n/ka.po
index e6ae40ce4d6..a5263785524 100644
--- a/addons/web_graph/i18n/ka.po
+++ b/addons/web_graph/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ko.po b/addons/web_graph/i18n/ko.po
index 75e74d33c23..3d19bf8c737 100644
--- a/addons/web_graph/i18n/ko.po
+++ b/addons/web_graph/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/lt.po b/addons/web_graph/i18n/lt.po
index 2587f79f2c4..e49e7fa6c27 100644
--- a/addons/web_graph/i18n/lt.po
+++ b/addons/web_graph/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/mk.po b/addons/web_graph/i18n/mk.po
index f4fa8c606c2..5a451e55f28 100644
--- a/addons/web_graph/i18n/mk.po
+++ b/addons/web_graph/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/mn.po b/addons/web_graph/i18n/mn.po
index 74bb9f3bc49..0177f81e524 100644
--- a/addons/web_graph/i18n/mn.po
+++ b/addons/web_graph/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/nb.po b/addons/web_graph/i18n/nb.po
index fec711e9290..e49712c7e7f 100644
--- a/addons/web_graph/i18n/nb.po
+++ b/addons/web_graph/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/nl.po b/addons/web_graph/i18n/nl.po
index a49a49e053f..42130085455 100644
--- a/addons/web_graph/i18n/nl.po
+++ b/addons/web_graph/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-11-25 07:04+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/nl_BE.po b/addons/web_graph/i18n/nl_BE.po
index a20da382ea5..4505ed42a0e 100644
--- a/addons/web_graph/i18n/nl_BE.po
+++ b/addons/web_graph/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/pl.po b/addons/web_graph/i18n/pl.po
index 6b4c6c08be7..b76f8b131f1 100644
--- a/addons/web_graph/i18n/pl.po
+++ b/addons/web_graph/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/pt.po b/addons/web_graph/i18n/pt.po
index c6ed95d86bd..e442fa4d3bc 100644
--- a/addons/web_graph/i18n/pt.po
+++ b/addons/web_graph/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/pt_BR.po b/addons/web_graph/i18n/pt_BR.po
index b8361a403b8..b8d0f94e999 100644
--- a/addons/web_graph/i18n/pt_BR.po
+++ b/addons/web_graph/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ro.po b/addons/web_graph/i18n/ro.po
index cbcfbaf8019..35b77faf583 100644
--- a/addons/web_graph/i18n/ro.po
+++ b/addons/web_graph/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ru.po b/addons/web_graph/i18n/ru.po
index f1a0efa27ef..9cd8ade9c64 100644
--- a/addons/web_graph/i18n/ru.po
+++ b/addons/web_graph/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sl.po b/addons/web_graph/i18n/sl.po
index 116937e2ca7..57b5ff42c06 100644
--- a/addons/web_graph/i18n/sl.po
+++ b/addons/web_graph/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sq.po b/addons/web_graph/i18n/sq.po
index c4100f3750f..d442a10bb6d 100644
--- a/addons/web_graph/i18n/sq.po
+++ b/addons/web_graph/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sr@latin.po b/addons/web_graph/i18n/sr@latin.po
index 4230171cac9..78e1cfa2e69 100644
--- a/addons/web_graph/i18n/sr@latin.po
+++ b/addons/web_graph/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sv.po b/addons/web_graph/i18n/sv.po
index 4cf13d34687..b4f8f49800f 100644
--- a/addons/web_graph/i18n/sv.po
+++ b/addons/web_graph/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/th.po b/addons/web_graph/i18n/th.po
index ab9c36f1003..894c9c54b61 100644
--- a/addons/web_graph/i18n/th.po
+++ b/addons/web_graph/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/tr.po b/addons/web_graph/i18n/tr.po
index 91f56013311..71c472e31e9 100644
--- a/addons/web_graph/i18n/tr.po
+++ b/addons/web_graph/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/zh_CN.po b/addons/web_graph/i18n/zh_CN.po
index e84f01901ea..409e909c747 100644
--- a/addons/web_graph/i18n/zh_CN.po
+++ b/addons/web_graph/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ar.po b/addons/web_kanban/i18n/ar.po
index 9a8d807e84a..6581363e099 100644
--- a/addons/web_kanban/i18n/ar.po
+++ b/addons/web_kanban/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/bg.po b/addons/web_kanban/i18n/bg.po
index f308f964365..05b152b326a 100644
--- a/addons/web_kanban/i18n/bg.po
+++ b/addons/web_kanban/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/bn.po b/addons/web_kanban/i18n/bn.po
index a882bb0e6a5..e90109c0163 100644
--- a/addons/web_kanban/i18n/bn.po
+++ b/addons/web_kanban/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/bs.po b/addons/web_kanban/i18n/bs.po
index 1cfdd4a904e..210f9c387e1 100644
--- a/addons/web_kanban/i18n/bs.po
+++ b/addons/web_kanban/i18n/bs.po
@@ -14,15 +14,15 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
 #: code:addons/web_kanban/static/src/js/kanban.js:689
 #, python-format
 msgid "Edit column"
-msgstr ""
+msgstr "Uredi kolonu"
 
 #. module: web_kanban
 #. openerp-web
@@ -36,7 +36,7 @@ msgstr ""
 #: code:addons/web_kanban/static/src/js/kanban.js:10
 #, python-format
 msgid "Kanban"
-msgstr ""
+msgstr "Kanban"
 
 #. module: web_kanban
 #. openerp-web
@@ -50,35 +50,35 @@ msgstr "Nedefinisano"
 #: code:addons/web_kanban/static/src/js/kanban.js:708
 #, python-format
 msgid "Are you sure to remove this column ?"
-msgstr ""
+msgstr "Dali ste sigurni da želite ukloniti ovu kolonu?"
 
 #. module: web_kanban
 #. openerp-web
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:47
 #, python-format
 msgid "Edit"
-msgstr ""
+msgstr "Uredi"
 
 #. module: web_kanban
 #. openerp-web
 #: code:addons/web_kanban/static/src/js/kanban.js:192
 #, python-format
 msgid "Add column"
-msgstr ""
+msgstr "Dodaj kolonu"
 
 #. module: web_kanban
 #. openerp-web
 #: code:addons/web_kanban/static/src/js/kanban.js:1085
 #, python-format
 msgid "Create: "
-msgstr ""
+msgstr "Kreiraj: "
 
 #. module: web_kanban
 #. openerp-web
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:24
 #, python-format
 msgid "Add a new column"
-msgstr ""
+msgstr "Dodaj novu kolonu"
 
 #. module: web_kanban
 #. openerp-web
@@ -86,21 +86,21 @@ msgstr ""
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:45
 #, python-format
 msgid "Fold"
-msgstr ""
+msgstr "Skupi"
 
 #. module: web_kanban
 #. openerp-web
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:98
 #, python-format
 msgid "Add"
-msgstr ""
+msgstr "Dodaj"
 
 #. module: web_kanban
 #. openerp-web
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:35
 #, python-format
 msgid "Quick create"
-msgstr ""
+msgstr "Brzo kreiraj"
 
 #. module: web_kanban
 #. openerp-web
@@ -114,7 +114,7 @@ msgstr "Jeste li sigurni da želite izbrisati zapis?"
 #: code:addons/web_kanban/static/src/js/kanban.js:680
 #, python-format
 msgid "Unfold"
-msgstr ""
+msgstr "Raširi"
 
 #. module: web_kanban
 #. openerp-web
@@ -128,7 +128,7 @@ msgstr "Prikaži više"
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:99
 #, python-format
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
 #. module: web_kanban
 #. openerp-web
@@ -143,7 +143,7 @@ msgstr "Preostalo"
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:98
 #, python-format
 msgid "or"
-msgstr ""
+msgstr "ili"
 
 #. module: web_kanban
 #. openerp-web
@@ -151,14 +151,14 @@ msgstr ""
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:55
 #, python-format
 msgid "99+"
-msgstr ""
+msgstr "99+"
 
 #. module: web_kanban
 #. openerp-web
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:48
 #, python-format
 msgid "Delete"
-msgstr ""
+msgstr "Obriši"
 
 #~ msgid "Create"
 #~ msgstr "Kreiraj"
diff --git a/addons/web_kanban/i18n/ca.po b/addons/web_kanban/i18n/ca.po
index 9f213d8d870..4347422cb1c 100644
--- a/addons/web_kanban/i18n/ca.po
+++ b/addons/web_kanban/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/cs.po b/addons/web_kanban/i18n/cs.po
index 47935b16d15..89dd91ef9f6 100644
--- a/addons/web_kanban/i18n/cs.po
+++ b/addons/web_kanban/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/da.po b/addons/web_kanban/i18n/da.po
index f05caf0ab21..cd1fd56bda4 100644
--- a/addons/web_kanban/i18n/da.po
+++ b/addons/web_kanban/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/de.po b/addons/web_kanban/i18n/de.po
index 7bca2ae5a45..cc53bb0bdf2 100644
--- a/addons/web_kanban/i18n/de.po
+++ b/addons/web_kanban/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/en_AU.po b/addons/web_kanban/i18n/en_AU.po
index 5584f3768c4..85775969fe4 100644
--- a/addons/web_kanban/i18n/en_AU.po
+++ b/addons/web_kanban/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/en_GB.po b/addons/web_kanban/i18n/en_GB.po
index 35b05b54812..199bffb5a16 100644
--- a/addons/web_kanban/i18n/en_GB.po
+++ b/addons/web_kanban/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es.po b/addons/web_kanban/i18n/es.po
index cda06227eed..4c8ab42cef1 100644
--- a/addons/web_kanban/i18n/es.po
+++ b/addons/web_kanban/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_CL.po b/addons/web_kanban/i18n/es_CL.po
index b9d8fb1f8f4..d108a1df232 100644
--- a/addons/web_kanban/i18n/es_CL.po
+++ b/addons/web_kanban/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_CR.po b/addons/web_kanban/i18n/es_CR.po
index 112b4ba1cfd..066c4feff87 100644
--- a/addons/web_kanban/i18n/es_CR.po
+++ b/addons/web_kanban/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_DO.po b/addons/web_kanban/i18n/es_DO.po
index 8cdc02b9158..f791189c8f1 100644
--- a/addons/web_kanban/i18n/es_DO.po
+++ b/addons/web_kanban/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_EC.po b/addons/web_kanban/i18n/es_EC.po
index 9ae2c565b68..d7a15e7dec2 100644
--- a/addons/web_kanban/i18n/es_EC.po
+++ b/addons/web_kanban/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_MX.po b/addons/web_kanban/i18n/es_MX.po
index 63b80f8fbeb..9d3b71bf26c 100644
--- a/addons/web_kanban/i18n/es_MX.po
+++ b/addons/web_kanban/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/et.po b/addons/web_kanban/i18n/et.po
index 4d56c02e779..da36e621dd0 100644
--- a/addons/web_kanban/i18n/et.po
+++ b/addons/web_kanban/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fa.po b/addons/web_kanban/i18n/fa.po
index 74dbb5183f7..9c2b2a6cfa0 100644
--- a/addons/web_kanban/i18n/fa.po
+++ b/addons/web_kanban/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fi.po b/addons/web_kanban/i18n/fi.po
index 54647e1e924..e7c8db19d08 100644
--- a/addons/web_kanban/i18n/fi.po
+++ b/addons/web_kanban/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fr.po b/addons/web_kanban/i18n/fr.po
index 0d42f526456..5b4e0bb1085 100644
--- a/addons/web_kanban/i18n/fr.po
+++ b/addons/web_kanban/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fr_CA.po b/addons/web_kanban/i18n/fr_CA.po
index ea3bdf3c1d2..ebc5a517c51 100644
--- a/addons/web_kanban/i18n/fr_CA.po
+++ b/addons/web_kanban/i18n/fr_CA.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/gl.po b/addons/web_kanban/i18n/gl.po
index 13cfe984825..2d95d642ba7 100644
--- a/addons/web_kanban/i18n/gl.po
+++ b/addons/web_kanban/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/gu.po b/addons/web_kanban/i18n/gu.po
index 524294faef8..0fbebcaf383 100644
--- a/addons/web_kanban/i18n/gu.po
+++ b/addons/web_kanban/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/hr.po b/addons/web_kanban/i18n/hr.po
index 22ae167cf1b..5af7eb7a376 100644
--- a/addons/web_kanban/i18n/hr.po
+++ b/addons/web_kanban/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/hu.po b/addons/web_kanban/i18n/hu.po
index 304a8274643..077bb6874ed 100644
--- a/addons/web_kanban/i18n/hu.po
+++ b/addons/web_kanban/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/it.po b/addons/web_kanban/i18n/it.po
index 201aedc19fc..b4cad02c354 100644
--- a/addons/web_kanban/i18n/it.po
+++ b/addons/web_kanban/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ja.po b/addons/web_kanban/i18n/ja.po
index b7349b818f7..6d24f3ba527 100644
--- a/addons/web_kanban/i18n/ja.po
+++ b/addons/web_kanban/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ka.po b/addons/web_kanban/i18n/ka.po
index 5c456dfe75b..027b0aa4a80 100644
--- a/addons/web_kanban/i18n/ka.po
+++ b/addons/web_kanban/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ko.po b/addons/web_kanban/i18n/ko.po
index 2bc3fbf98ef..53f4f05fafa 100644
--- a/addons/web_kanban/i18n/ko.po
+++ b/addons/web_kanban/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/lt.po b/addons/web_kanban/i18n/lt.po
index ef3283baf83..36b8b9125d3 100644
--- a/addons/web_kanban/i18n/lt.po
+++ b/addons/web_kanban/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/mk.po b/addons/web_kanban/i18n/mk.po
index 8b7627b7252..63915764449 100644
--- a/addons/web_kanban/i18n/mk.po
+++ b/addons/web_kanban/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/mn.po b/addons/web_kanban/i18n/mn.po
index 2fcf1953293..837440d4f3f 100644
--- a/addons/web_kanban/i18n/mn.po
+++ b/addons/web_kanban/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/nb.po b/addons/web_kanban/i18n/nb.po
index 37039377cce..56657ab4fae 100644
--- a/addons/web_kanban/i18n/nb.po
+++ b/addons/web_kanban/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/nl.po b/addons/web_kanban/i18n/nl.po
index 99356210d67..7575772ee83 100644
--- a/addons/web_kanban/i18n/nl.po
+++ b/addons/web_kanban/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-05 07:53+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:41+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/nl_BE.po b/addons/web_kanban/i18n/nl_BE.po
index 9c97e1c234b..6c9f695b11f 100644
--- a/addons/web_kanban/i18n/nl_BE.po
+++ b/addons/web_kanban/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/pl.po b/addons/web_kanban/i18n/pl.po
index 7f67e44fc16..4a740cc22e1 100644
--- a/addons/web_kanban/i18n/pl.po
+++ b/addons/web_kanban/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/pt.po b/addons/web_kanban/i18n/pt.po
index d5429321119..680a5addba5 100644
--- a/addons/web_kanban/i18n/pt.po
+++ b/addons/web_kanban/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/pt_BR.po b/addons/web_kanban/i18n/pt_BR.po
index c913979a141..28259b71913 100644
--- a/addons/web_kanban/i18n/pt_BR.po
+++ b/addons/web_kanban/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ro.po b/addons/web_kanban/i18n/ro.po
index 3a817f0e611..ef570456888 100644
--- a/addons/web_kanban/i18n/ro.po
+++ b/addons/web_kanban/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ru.po b/addons/web_kanban/i18n/ru.po
index e6efcf7028e..81bbf28de2f 100644
--- a/addons/web_kanban/i18n/ru.po
+++ b/addons/web_kanban/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/sl.po b/addons/web_kanban/i18n/sl.po
index fd423275403..39e022da922 100644
--- a/addons/web_kanban/i18n/sl.po
+++ b/addons/web_kanban/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/sr@latin.po b/addons/web_kanban/i18n/sr@latin.po
index 9fcdfc171e7..c4e1e22e90b 100644
--- a/addons/web_kanban/i18n/sr@latin.po
+++ b/addons/web_kanban/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/sv.po b/addons/web_kanban/i18n/sv.po
index 4015f96191a..2e84ae2e9f3 100644
--- a/addons/web_kanban/i18n/sv.po
+++ b/addons/web_kanban/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/th.po b/addons/web_kanban/i18n/th.po
index 2190f1fa152..4a74d21debc 100644
--- a/addons/web_kanban/i18n/th.po
+++ b/addons/web_kanban/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/tr.po b/addons/web_kanban/i18n/tr.po
index 358e9a3318f..628cf86ea89 100644
--- a/addons/web_kanban/i18n/tr.po
+++ b/addons/web_kanban/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/zh_CN.po b/addons/web_kanban/i18n/zh_CN.po
index 3e9baac3fc0..24c8397f8c0 100644
--- a/addons/web_kanban/i18n/zh_CN.po
+++ b/addons/web_kanban/i18n/zh_CN.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-01 14:51+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
+"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/zh_TW.po b/addons/web_kanban/i18n/zh_TW.po
index a535c3603d1..103fdd2b00a 100644
--- a/addons/web_kanban/i18n/zh_TW.po
+++ b/addons/web_kanban/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_shortcuts/i18n/da.po b/addons/web_shortcuts/i18n/da.po
new file mode 100644
index 00000000000..3cbeed065b5
--- /dev/null
+++ b/addons/web_shortcuts/i18n/da.po
@@ -0,0 +1,25 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-09-15 20:22+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish <da@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: 2013-09-16 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. module: web_shortcuts
+#. openerp-web
+#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
+#, python-format
+msgid "Add / Remove Shortcut..."
+msgstr "Tilføj/fjern genvej ..."
diff --git a/addons/web_view_editor/i18n/ar.po b/addons/web_view_editor/i18n/ar.po
index c320801ab28..ab8cffb9a39 100644
--- a/addons/web_view_editor/i18n/ar.po
+++ b/addons/web_view_editor/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/bs.po b/addons/web_view_editor/i18n/bs.po
index 4f0dda22f3b..61a1a62f96a 100644
--- a/addons/web_view_editor/i18n/bs.po
+++ b/addons/web_view_editor/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-06 05:34+0000\n"
-"X-Generator: Launchpad (build 16760)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/cs.po b/addons/web_view_editor/i18n/cs.po
index e6818bf6869..4b8a6ca9a3b 100644
--- a/addons/web_view_editor/i18n/cs.po
+++ b/addons/web_view_editor/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/da.po b/addons/web_view_editor/i18n/da.po
index b60248f3e4e..a7efac11c1b 100644
--- a/addons/web_view_editor/i18n/da.po
+++ b/addons/web_view_editor/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-05 04:44+0000\n"
-"X-Generator: Launchpad (build 16758)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/de.po b/addons/web_view_editor/i18n/de.po
index 9aa612152d2..8eb60418a25 100644
--- a/addons/web_view_editor/i18n/de.po
+++ b/addons/web_view_editor/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/en_AU.po b/addons/web_view_editor/i18n/en_AU.po
index 2f5749f8bde..b9df0df36ef 100644
--- a/addons/web_view_editor/i18n/en_AU.po
+++ b/addons/web_view_editor/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/en_GB.po b/addons/web_view_editor/i18n/en_GB.po
new file mode 100644
index 00000000000..16b03837372
--- /dev/null
+++ b/addons/web_view_editor/i18n/en_GB.po
@@ -0,0 +1,184 @@
+# English (United Kingdom) translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-09-14 06:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-09-15 05:55+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:164
+#, python-format
+msgid "The following fields are invalid :"
+msgstr "The following fields are invalid :"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:63
+#, python-format
+msgid "Create"
+msgstr "Create"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:994
+#, python-format
+msgid "New Field"
+msgstr "New Field"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:387
+#, python-format
+msgid "Do you really wants to create an inherited view here?"
+msgstr "Do you really want to create an inherited view here?"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:397
+#, python-format
+msgid "Preview"
+msgstr "Preview"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:183
+#, python-format
+msgid "Do you really want to remove this view?"
+msgstr "Do you really want to remove this view?"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:90
+#, python-format
+msgid "Save"
+msgstr "Save"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:394
+#, python-format
+msgid "Select an element"
+msgstr "Select an element"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:836
+#: code:addons/web_view_editor/static/src/js/view_editor.js:962
+#, python-format
+msgid "Update"
+msgstr "Update"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:264
+#, python-format
+msgid "Please select view in list :"
+msgstr "Please select view in list :"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:37
+#, python-format
+msgid "Manage Views (%s)"
+msgstr "Manage Views (%s)"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:13
+#, python-format
+msgid "Manage Views"
+msgstr "Manage Views"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:833
+#: code:addons/web_view_editor/static/src/js/view_editor.js:959
+#, python-format
+msgid "Properties"
+msgstr "Properties"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:64
+#, python-format
+msgid "Edit"
+msgstr "Edit"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:14
+#, python-format
+msgid "Could not find current view declaration"
+msgstr "Could not find current view declaration"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:383
+#, python-format
+msgid "Inherited View"
+msgstr "Inherited View"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:65
+#, python-format
+msgid "Remove"
+msgstr "Remove"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:517
+#, python-format
+msgid "Do you really want to remove this node?"
+msgstr "Do you really want to remove this node?"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:391
+#, python-format
+msgid "Can't Update View"
+msgstr "Can't Update View"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:380
+#, python-format
+msgid "View Editor %d - %s"
+msgstr "View Editor %d - %s"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:112
+#: code:addons/web_view_editor/static/src/js/view_editor.js:854
+#: code:addons/web_view_editor/static/src/js/view_editor.js:982
+#, python-format
+msgid "Cancel"
+msgstr "Cancel"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:66
+#: code:addons/web_view_editor/static/src/js/view_editor.js:414
+#, python-format
+msgid "Close"
+msgstr "Close"
+
+#. module: web_view_editor
+#. openerp-web
+#: code:addons/web_view_editor/static/src/js/view_editor.js:88
+#, python-format
+msgid "Create a view (%s)"
+msgstr "Create a view (%s)"
diff --git a/addons/web_view_editor/i18n/es.po b/addons/web_view_editor/i18n/es.po
index f4b1748eb8e..fc2aa7d7f18 100644
--- a/addons/web_view_editor/i18n/es.po
+++ b/addons/web_view_editor/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es_DO.po b/addons/web_view_editor/i18n/es_DO.po
index f0e3c2803dc..005a7dd8766 100644
--- a/addons/web_view_editor/i18n/es_DO.po
+++ b/addons/web_view_editor/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es_EC.po b/addons/web_view_editor/i18n/es_EC.po
index 289aa810006..c6e67dc7360 100644
--- a/addons/web_view_editor/i18n/es_EC.po
+++ b/addons/web_view_editor/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es_MX.po b/addons/web_view_editor/i18n/es_MX.po
index b5ab4675849..0cdf5b99809 100644
--- a/addons/web_view_editor/i18n/es_MX.po
+++ b/addons/web_view_editor/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/et.po b/addons/web_view_editor/i18n/et.po
index 6c541f1c716..c4868cde7a7 100644
--- a/addons/web_view_editor/i18n/et.po
+++ b/addons/web_view_editor/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/fa.po b/addons/web_view_editor/i18n/fa.po
index d4bc264ac1d..2a42e79eea1 100644
--- a/addons/web_view_editor/i18n/fa.po
+++ b/addons/web_view_editor/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/fi.po b/addons/web_view_editor/i18n/fi.po
index bea2233678c..f6a71e57f9a 100644
--- a/addons/web_view_editor/i18n/fi.po
+++ b/addons/web_view_editor/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/fr.po b/addons/web_view_editor/i18n/fr.po
index d8e010548c5..30abbf00cfd 100644
--- a/addons/web_view_editor/i18n/fr.po
+++ b/addons/web_view_editor/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/hr.po b/addons/web_view_editor/i18n/hr.po
index 38940c24af2..093a753e384 100644
--- a/addons/web_view_editor/i18n/hr.po
+++ b/addons/web_view_editor/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/hu.po b/addons/web_view_editor/i18n/hu.po
index 9549b92bf5b..d668e76a5f7 100644
--- a/addons/web_view_editor/i18n/hu.po
+++ b/addons/web_view_editor/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/it.po b/addons/web_view_editor/i18n/it.po
index b1435f9883a..465cde476c9 100644
--- a/addons/web_view_editor/i18n/it.po
+++ b/addons/web_view_editor/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ko.po b/addons/web_view_editor/i18n/ko.po
index 359308dd3b9..831631760d3 100644
--- a/addons/web_view_editor/i18n/ko.po
+++ b/addons/web_view_editor/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/lt.po b/addons/web_view_editor/i18n/lt.po
index f2c4e0418e3..f5e3511a2ad 100644
--- a/addons/web_view_editor/i18n/lt.po
+++ b/addons/web_view_editor/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/lv.po b/addons/web_view_editor/i18n/lv.po
index afe91a24a59..2face055cd2 100644
--- a/addons/web_view_editor/i18n/lv.po
+++ b/addons/web_view_editor/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/mk.po b/addons/web_view_editor/i18n/mk.po
index 89d84026301..084461998a5 100644
--- a/addons/web_view_editor/i18n/mk.po
+++ b/addons/web_view_editor/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/mn.po b/addons/web_view_editor/i18n/mn.po
index ac579b9b0bb..19ba61ea1eb 100644
--- a/addons/web_view_editor/i18n/mn.po
+++ b/addons/web_view_editor/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/nb.po b/addons/web_view_editor/i18n/nb.po
index d3454639d43..9766997e270 100644
--- a/addons/web_view_editor/i18n/nb.po
+++ b/addons/web_view_editor/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/nl.po b/addons/web_view_editor/i18n/nl.po
index 13fe8912e87..1a575100391 100644
--- a/addons/web_view_editor/i18n/nl.po
+++ b/addons/web_view_editor/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-05 07:54+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2013-08-27 04:46+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/nl_BE.po b/addons/web_view_editor/i18n/nl_BE.po
index 4f6c88b4dd5..295c60be1dc 100644
--- a/addons/web_view_editor/i18n/nl_BE.po
+++ b/addons/web_view_editor/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/pl.po b/addons/web_view_editor/i18n/pl.po
index dfa1bb275f9..092463a9cd1 100644
--- a/addons/web_view_editor/i18n/pl.po
+++ b/addons/web_view_editor/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/pt.po b/addons/web_view_editor/i18n/pt.po
index 080e3aeaf32..42380891bf1 100644
--- a/addons/web_view_editor/i18n/pt.po
+++ b/addons/web_view_editor/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/pt_BR.po b/addons/web_view_editor/i18n/pt_BR.po
index 7ecef34708b..2a07f03d197 100644
--- a/addons/web_view_editor/i18n/pt_BR.po
+++ b/addons/web_view_editor/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ro.po b/addons/web_view_editor/i18n/ro.po
index 3e25a1c0f72..b3748a5fa2f 100644
--- a/addons/web_view_editor/i18n/ro.po
+++ b/addons/web_view_editor/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ru.po b/addons/web_view_editor/i18n/ru.po
index 337bf9c7afa..114c073582d 100644
--- a/addons/web_view_editor/i18n/ru.po
+++ b/addons/web_view_editor/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/sl.po b/addons/web_view_editor/i18n/sl.po
index dcd1ea53bbe..65e966dc197 100644
--- a/addons/web_view_editor/i18n/sl.po
+++ b/addons/web_view_editor/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/th.po b/addons/web_view_editor/i18n/th.po
index 1552f0ef154..73f6769b3b3 100644
--- a/addons/web_view_editor/i18n/th.po
+++ b/addons/web_view_editor/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/tr.po b/addons/web_view_editor/i18n/tr.po
index d3d252ac7cc..5da9591545b 100644
--- a/addons/web_view_editor/i18n/tr.po
+++ b/addons/web_view_editor/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/zh_CN.po b/addons/web_view_editor/i18n/zh_CN.po
index 8a9ecb53399..47acdc24def 100644
--- a/addons/web_view_editor/i18n/zh_CN.po
+++ b/addons/web_view_editor/i18n/zh_CN.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-01 15:04+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
+"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-27 04:47+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-09-14 05:42+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
 #. module: web_view_editor
 #. openerp-web

From fb4ab9dd0c4559c1e4b0130d4ee9eec746004466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 17 Sep 2013 10:50:03 +0200
Subject: [PATCH 155/164] [IMP] mass mailing: improvements : - improved mass
 mailing wizard creation (everything is showed, better alignment, filter_id
 required, added default document on Partner) - campaign: o2m is now readonly
 in form view, added an empty list help

bzr revid: tde@openerp.com-20130917085003-yof5gfy68y56ougf
---
 addons/mass_mailing/mass_mailing_view.xml     | 17 ++--
 .../mail_mass_mailing_create_segment.py       | 15 +++-
 .../mail_mass_mailing_create_segment.xml      | 81 +++++++++++--------
 3 files changed, 70 insertions(+), 43 deletions(-)

diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index b7128f8e7dd..bfe02c0ca60 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -47,7 +47,7 @@
                         <group>
                             <group>
                                 <field name="name"/>
-                                <field name="mass_mailing_campaign_id"/>
+                                <field name="mass_mailing_campaign_id" readonly="True"/>
                             </group>
                             <group>
                                 <field name="template_id"/>
@@ -55,10 +55,8 @@
                                 <field name="date"/>
                             </group>
                         </group>
-                        <group>
-                            <field name="statistics_ids"/>
-                        </group>
-                        <group>
+                        <group string="Email Statistics">
+                            <field name="statistics_ids" nolabel="1" colspan="2"/>
                             <group>
                                 <field name="sent"/>
                                 <field name="opened"/>
@@ -203,7 +201,7 @@
                             </group>
                         </group>
                         <group>
-                            <field name="mass_mailing_ids"/>
+                            <field name="mass_mailing_ids" readonly="1"/>
                         </group>
                     </sheet>
                 </form>
@@ -289,6 +287,13 @@
             <field name="res_model">mail.mass_mailing.campaign</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to define a new mass mailing campaign.
+              </p><p>
+                Create a campaign to structure mass mailing and get analysis from email status.
+              </p>
+            </field>
         </record>
 
         <!--  MAIL MAIL STATISTICS !-->
diff --git a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py
index 927c34ab5fd..9ea0d8aa1c5 100644
--- a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py
+++ b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py
@@ -36,8 +36,10 @@ class MailMassMailingCreate(osv.TransientModel):
             required=True,
         ),
         'model_id': fields.many2one(
-            'ir.model', 'Model',
+            'ir.model', 'Document',
             required=True,
+            help='Document on which the mass mailing will run. This must be a '
+                 'valid OpenERP model.',
         ),
         'model_model': fields.related(
             'model_id', 'name',
@@ -45,7 +47,10 @@ class MailMassMailingCreate(osv.TransientModel):
         ),
         'filter_id': fields.many2one(
             'ir.filters', 'Filter',
+            required=True,
             domain="[('model_id', '=', model_model)]",
+            help='Filter to be applied on the document to find the records to be '
+                 'mailed.',
         ),
         'domain': fields.related(
             'filter_id', 'domain',
@@ -56,14 +61,20 @@ class MailMassMailingCreate(osv.TransientModel):
             domain="[('model_id', '=', model_id)]",
         ),
         'name': fields.char(
-            'Name', required=True,
+            'Mailing Name', required=True,
+            help='Name of the mass mailing.',
         ),
         'mass_mailing_id': fields.many2one(
             'mail.mass_mailing', 'Mass Mailing',
         ),
     }
 
+    def _get_default_model_id(self, cr, uid, context=None):
+        model_ids = self.pool['ir.model'].search(cr, uid, [('model', '=', 'res.partner')], context=context)
+        return model_ids and model_ids[0] or False
+
     _defaults = {
+        'model_id': lambda self, cr, uid, ctx=None: self._get_default_model_id(cr, uid, context=ctx),
     }
 
     def on_change_model_id(self, cr, uid, ids, model_id, context=None):
diff --git a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
index a10101e9446..e307bdd8909 100644
--- a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
+++ b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
@@ -11,47 +11,58 @@
                     <group>
                         <field name="model_model" invisible="1"/>
                         <field name="domain" invisible="1"/>
-                        <p class="oe_grey" colspan="2"
-                            attrs="{'invisible': [('mass_mailing_campaign_id', '!=', False)]}">
-                            Please choose a mass mailing campaign that will hold the new mailing.
-                        </p>
-                        <field name="mass_mailing_campaign_id"/>
 
-                        <p class="oe_grey" colspan="2"
-                            attrs="{'invisible': ['|', ('model_id', '!=', False), ('mass_mailing_campaign_id', '=', False)]}">
-                            Please choose a model on which you will run the mass mailing.
-                        </p>
-                        <field name="model_id"
-                            on_change="on_change_model_id(model_id, context)"
-                            attrs="{'invisible': [('mass_mailing_campaign_id', '=', False)]}"/>
+                        <label for="mass_mailing_campaign_id"/>
+                        <div>
+                            <field name="mass_mailing_campaign_id"/>
+                            <p class="oe_grey"
+                                attrs="{'invisible': [('mass_mailing_campaign_id', '!=', False)]}">
+                                Please choose a mass mailing campaign that will hold the new mailing.
+                            </p>
+                        </div>
 
-                        <p class="oe_grey" colspan="2"
-                            attrs="{'invisible': ['|', ('filter_id', '!=', False), ('model_id', '=', False)]}">
-                            Please choose a filter that will be applied on the model
-                            to find the records on which you will run the mass mailing.
-                        </p>
-                        <field name="filter_id"
-                            on_change="on_change_filter_id(filter_id, context)"
-                            attrs="{'invisible': [('model_id', '=', False)]}"/>
+                        <label for="model_id"/>
+                        <div>                        
+                            <field name="model_id"
+                                on_change="on_change_model_id(model_id, context)"/>
+                            <p class="oe_grey"
+                                attrs="{'invisible': [('model_id', '!=', False)]}">
+                                Please choose a model on which you will run the mass mailing.
+                            </p>
+                        </div>
 
-                        <p class="oe_grey" colspan="2"
-                            attrs="{'invisible': ['|', ('template_id', '!=', False), ('filter_id', '=', False)]}">
-                            Please choose the template to use to render the emails
-                            to send.
-                        </p>
-                        <field name="template_id"
-                            attrs="{'invisible': [('filter_id', '=', False)]}"/>
+                        <label for="filter_id"/>
+                        <div>
+                            <field name="filter_id"
+                                on_change="on_change_filter_id(filter_id, context)"/>
+                            <p class="oe_grey"
+                                attrs="{'invisible': [('filter_id', '!=', False)]}">
+                                Please choose a filter that will be applied on the model
+                                to find the records on which you will run the mass mailing.
+                            </p>
+                        </div>
 
-                        <p class="oe_grey" colspan="2"
-                            attrs="{'invisible': ['|', ('name', '!=', False), ('template_id', '=', False)]}">
-                            Please choose the name of the mailing.
-                        </p>
-                        <field name="name"
-                            attrs="{'invisible': [('template_id', '=', False)]}"/>
+                        <label for="model_id"/>
+                        <div>
+                            <field name="template_id"/>
+                            <p class="oe_grey"
+                                attrs="{'invisible': [('template_id', '!=', False)]}">
+                                Please choose the template to use to render the emails
+                                to send.
+                            </p>
+                        </div>
+
+                        <label for="name"/>
+                        <div>
+                            <field name="name"/>
+                            <p class="oe_grey"
+                                attrs="{'invisible': [('name', '!=', False)]}">
+                                Please choose the name of the mailing.
+                            </p>
+                        </div>
 
                         <button name="launch_composer" type="object"
-                            string="Create mailing and launch email composer"
-                            attrs="{'invisible': [('name', '=', False)]}"/>
+                            string="Create mailing and launch email composer"/>
                     </group>
                 </form>
             </field>

From 643996de2b1e24bfbd4faf8ef5f9cb6b71c79af5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 17 Sep 2013 11:42:18 +0200
Subject: [PATCH 156/164] [FIX] mass_mailing: fixed bouncing tracking mail_mail
 now have a statistics_ids field, allowing to create statistics when creating
 a mail.mail. This is done in the mail composer, using classic o2m command.
 Mail_mail create is overrided to ipdate the statistics value (message_id)
 that is computed directly in the create and not accessible in the values
 dict. Added model and res_id on stat model, to allow message_bounce update,
 without havign to rely on the mail.mail existence.

bzr revid: tde@openerp.com-20130917094218-7jz5mnldogzhlioh
---
 addons/mass_mailing/mail_mail.py              | 22 ++++++++-----------
 addons/mass_mailing/mail_thread.py            | 12 ++++------
 addons/mass_mailing/mass_mailing.py           | 14 ++++++++----
 addons/mass_mailing/mass_mailing_view.xml     |  3 +++
 .../wizard/mail_compose_message.py            |  2 +-
 5 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/addons/mass_mailing/mail_mail.py b/addons/mass_mailing/mail_mail.py
index e288e5cf1bb..917334bdda4 100644
--- a/addons/mass_mailing/mail_mail.py
+++ b/addons/mass_mailing/mail_mail.py
@@ -32,24 +32,20 @@ class MailMail(osv.Model):
     _inherit = ['mail.mail']
 
     _columns = {
-        'track': fields.boolean('Use tracking'),
-    }
-
-    _defaults = {
-        'track': False,
+        'statistics_ids': fields.one2many(
+            'mail.mail.statistics', 'mail_mail_id',
+            string='Statistics',
+        ),
     }
 
     def create(self, cr, uid, values, context=None):
         """ Override mail_mail creation to create an entry in mail.mail.statistics """
         # TDE note: should be after 'all values computed', to have values (FIXME after merging other branch holding create refactoring)
         mail_id = super(MailMail, self).create(cr, uid, values, context=context)
-        mail = self.browse(cr, SUPERUSER_ID, mail_id)
-        if mail.track:
-            self.pool['mail.mail.statistics'].create(
-                cr, uid, {
-                    'mail_mail_id': mail_id,
-                    'message_id': mail.message_id,
-                }, context=context)
+        if values.get('statistics_ids'):
+            mail = self.browse(cr, SUPERUSER_ID, mail_id)
+            for stat in mail.statistics_ids:
+                self.pool['mail.mail.statistics'].write(cr, uid, [stat.id], {'message_id': mail.message_id}, context=context)
         return mail_id
 
     def _get_tracking_url(self, cr, uid, mail, partner=None, context=None):
@@ -62,7 +58,7 @@ class MailMail(osv.Model):
         body = super(MailMail, self).send_get_mail_body(cr, uid, mail, partner=partner, context=context)
 
         # generate tracking URL
-        if mail.track:
+        if mail.statistics_ids:
             tracking_url = self._get_tracking_url(cr, uid, mail, partner, context=context)
             if tracking_url:
                 body = tools.append_content_to_html(body, tracking_url, plaintext=False, container_tag='div')
diff --git a/addons/mass_mailing/mail_thread.py b/addons/mass_mailing/mail_thread.py
index 985d03ce2cc..5c759e71e23 100644
--- a/addons/mass_mailing/mail_thread.py
+++ b/addons/mass_mailing/mail_thread.py
@@ -46,14 +46,10 @@ class MailThread(osv.Model):
             bounce_match = tools.bounce_re.search(email_to)
             if bounce_match:
                 bounced_mail_id = bounce_match.group(1)
-                self.pool['mail.mail'].set_bounced(cr, uid, [bounced_mail_id], context=context)
-                if self.pool['mail.mail'].exists(cr, uid, bounced_mail_id):
-                    mail = self.pool['mail.mail'].browse(cr, uid, bounced_mail_id, context=context)
-                    bounced_model = mail.model
-                    bounced_thread_id = mail.res_id
-                else:
-                    bounced_model = bounce_match.group(2)
-                    bounced_thread_id = int(bounce_match.group(3)) if bounce_match.group(3) else 0
+                stat_ids = self.pool['mail.mail.statistics'].set_bounced(cr, uid, mail_mail_ids=[bounced_mail_id], context=context)
+                for stat in self.pool['mail.mail.statistics'].browse(cr, uid, stat_ids, context=context):
+                    bounced_model = stat.model
+                    bounced_thread_id = stat.res_id
                 _logger.info('Routing mail from %s to %s with Message-Id %s: bounced mail from mail %s, model: %s, thread_id: %s',
                              email_from, email_to, message_id, bounced_mail_id, bounced_model, bounced_thread_id)
                 if bounced_model and bounced_model in self.pool and hasattr(self.pool[bounced_model], 'message_receive_bounce'):
diff --git a/addons/mass_mailing/mass_mailing.py b/addons/mass_mailing/mass_mailing.py
index f37208e4568..4ef7e260055 100644
--- a/addons/mass_mailing/mass_mailing.py
+++ b/addons/mass_mailing/mass_mailing.py
@@ -288,7 +288,13 @@ class MailMailStats(osv.Model):
                  'the related mail_mail can be deleted separately from its statistics.'
         ),
         'message_id': fields.char(
-            'Message-ID', required=True,
+            'Message-ID',
+        ),
+        'model': fields.char(
+            'Document model',
+        ),
+        'res_id': fields.integer(
+            'Document ID',
         ),
         # campaign / wave data
         'mass_mailing_id': fields.many2one(
@@ -333,7 +339,7 @@ class MailMailStats(osv.Model):
         for stat in self.browse(cr, uid, ids, context=context):
             if not stat.opened:
                 self.write(cr, uid, [stat.id], {'opened': fields.datetime.now()}, context=context)
-        return True
+        return ids
 
     def set_replied(self, cr, uid, ids=None, mail_mail_ids=None, mail_message_ids=None, context=None):
         """ Set as replied """
@@ -346,7 +352,7 @@ class MailMailStats(osv.Model):
         for stat in self.browse(cr, uid, ids, context=context):
             if not stat.replied:
                 self.write(cr, uid, [stat.id], {'replied': fields.datetime.now()}, context=context)
-        return True
+        return ids
 
     def set_bounced(self, cr, uid, ids=None, mail_mail_ids=None, mail_message_ids=None, context=None):
         """ Set as bounced """
@@ -359,4 +365,4 @@ class MailMailStats(osv.Model):
         for stat in self.browse(cr, uid, ids, context=context):
             if not stat.bounced:
                 self.write(cr, uid, [stat.id], {'bounced': fields.datetime.now()}, context=context)
-        return True
+        return ids
diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index bfe02c0ca60..680dfe87092 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -317,6 +317,7 @@
                     <field name="message_id"/>
                     <field name="opened"/>
                     <field name="replied"/>
+                    <field name="bounced"/>
                 </tree>
             </field>
         </record>
@@ -332,6 +333,8 @@
                         <field name="opened"/>
                         <field name="replied"/>
                         <field name="bounced"/>
+                        <field name="model"/>
+                        <field name="res_id"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py
index 6c02357c1bf..8e075eb48c6 100644
--- a/addons/mass_mailing/wizard/mail_compose_message.py
+++ b/addons/mass_mailing/wizard/mail_compose_message.py
@@ -53,5 +53,5 @@ class MailComposeMessage(osv.TransientModel):
                 }, context=context)
             context['default_mass_mailing_id'] = mass_mailing_id
             for res_id in res_ids:
-                res[res_id]['track'] = True
+                res[res_id]['statistics_ids'] = [(0, 0, {'model': wizard.model, 'res_id': res_id})]
         return res

From 54c014c4eab26feddfd0ccbc053a50fc810cb3f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 17 Sep 2013 12:04:47 +0200
Subject: [PATCH 157/164] [IMP] read_group: group_by -> groupby (same variable,
 but was used in previous implementation, so I keep it)

bzr revid: tde@openerp.com-20130917100447-u0qhdsw14wdngxwc
---
 openerp/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 764279bc45e..2fd31a8b80d 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -2749,7 +2749,7 @@ class BaseModel(object):
                     else:
                         domain_dt_begin = groupby_datetime.replace(month=1, day=1)
                         domain_dt_end = groupby_datetime.replace(month=12, day=31)
-                    d['__domain'] = [(group_by, '>=', domain_dt_begin.strftime('%Y-%m-%d')), (group_by, '<=', domain_dt_end.strftime('%Y-%m-%d'))] + domain
+                    d['__domain'] = [(groupby, '>=', domain_dt_begin.strftime('%Y-%m-%d')), (groupby, '<=', domain_dt_end.strftime('%Y-%m-%d'))] + domain
                 del alldata[d['id']][groupby]
             d.update(alldata[d['id']])
             del d['id']

From 65c70b85a701575a1a464e4d561f184cec018885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 17 Sep 2013 12:14:20 +0200
Subject: [PATCH 158/164] [IMP + FIX] point_of_sale: plugged the memory leaks 
 - correctly call destroy on widgets  - unbind backbone events on destroy  -
 jquery show() hide() flooded jQuery.cache  - introduced automated ui tests

bzr revid: fva@openerp.com-20130917101420-g76gos2qjjaii3zf
---
 addons/point_of_sale/__openerp__.py           |  1 +
 addons/point_of_sale/static/src/css/pos.css   |  4 +
 addons/point_of_sale/static/src/js/devices.js | 21 +++--
 addons/point_of_sale/static/src/js/main.js    |  4 +-
 addons/point_of_sale/static/src/js/models.js  |  1 -
 addons/point_of_sale/static/src/js/screens.js | 18 ++--
 addons/point_of_sale/static/src/js/tests.js   | 92 +++++++++++++++++++
 .../static/src/js/widget_base.js              |  4 +-
 .../static/src/js/widget_scrollbar.js         | 22 ++---
 addons/point_of_sale/static/src/js/widgets.js | 68 +++++++-------
 10 files changed, 170 insertions(+), 65 deletions(-)
 create mode 100644 addons/point_of_sale/static/src/js/tests.js

diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index cb05cef46c3..dfdc2c57cb9 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -98,6 +98,7 @@ Main Features
         'static/src/js/widgets.js',
         'static/src/js/devices.js',
         'static/src/js/screens.js',
+        'static/src/js/tests.js',
         'static/src/js/main.js',
     ],
     'css': [
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index d78276b2b97..382dd95bce2 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -21,6 +21,10 @@
             user-select: none;
 }
 
+.point-of-sale .oe_hidden{
+    display: none !important;
+}
+
 .point-of-sale ul, .point-of-sale li  {
     margin: 0;
     padding: 0;
diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js
index 89f705d09bc..bc697e96aca 100644
--- a/addons/point_of_sale/static/src/js/devices.js
+++ b/addons/point_of_sale/static/src/js/devices.js
@@ -40,6 +40,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
                 });
             }else{
                 running = false;
+                scheduled_end_time = 0;
                 end_of_queue.resolve();
             }
         };
@@ -100,15 +101,13 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
             };    
             this.custom_payment_status = this.default_payment_status;
 
+            this.notifications = {};
+            this.bypass_proxy = false;
+
             this.connection = new instance.web.Session(undefined,url);
             this.connection.session_id = _.uniqueId('posproxy');
-            this.connected = true;
-            this.bypass_proxy = false;
-            this.notifications = {};
-            this.message('test_connection').fail(function(){
-                self.connected = false;
-                console.error('Could not connect to the OpenERP Device Proxy Server');
-            });
+            this.test_connection();
+            window.proxy = this;
             
         },
         close: function(){
@@ -125,6 +124,14 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
                 return (new $.Deferred()).reject();
             }
         },
+        test_connection: function(){
+            var self = this;
+            this.connected = true;
+            return this.message('test_connection').fail(function(){
+                    self.connected = false;
+                    console.error('Could not connect to the Proxy');
+                });
+        },
 
         // this allows the client to be notified when a proxy call is made. The notification 
         // callback will be executed with the same arguments as the proxy call
diff --git a/addons/point_of_sale/static/src/js/main.js b/addons/point_of_sale/static/src/js/main.js
index b9263b91314..55f0bbd1f61 100644
--- a/addons/point_of_sale/static/src/js/main.js
+++ b/addons/point_of_sale/static/src/js/main.js
@@ -16,10 +16,12 @@ openerp.point_of_sale = function(instance) {
     openerp_pos_scrollbar(instance,module);  // import pos_scrollbar_widget.js
 
     openerp_pos_screens(instance,module);    // import pos_screens.js
+
+    openerp_pos_devices(instance,module);    // import pos_devices.js
     
     openerp_pos_widgets(instance,module);    // import pos_widgets.js
 
-    openerp_pos_devices(instance,module);    // import pos_devices.js
+    openerp_pos_tests(instance,module);      // import pos_tests.js
 
     instance.web.client_actions.add('pos.ui', 'instance.point_of_sale.PosWidget');
 };
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 55984d0032d..11a3e6d4a68 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -263,7 +263,6 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
         //removes the current order
         delete_current_order: function(){
             this.get('selectedOrder').destroy({'reason':'abandon'});
-            console.log('coucou!');
         },
 
         // saves the order locally and try to send it to the backend. 
diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index 854c1e1adec..e4cb33968b1 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -253,7 +253,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
 
             this.hidden = false;
             if(this.$el){
-                this.$el.show();
+                this.$el.removeClass('oe_hidden');
             }
 
             if(this.pos_widget.action_bar.get_button_count() > 0){
@@ -314,7 +314,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         hide: function(){
             this.hidden = true;
             if(this.$el){
-                this.$el.hide();
+                this.$el.addClass('oe_hidden');
             }
         },
 
@@ -326,7 +326,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             this._super();
             if(this.hidden){
                 if(this.$el){
-                    this.$el.hide();
+                    this.$el.addClass('oe_hidden');
                 }
             }
         },
@@ -335,7 +335,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
     module.PopUpWidget = module.PosBaseWidget.extend({
         show: function(){
             if(this.$el){
-                this.$el.show();
+                this.$el.removeClass('oe_hidden');
             }
         },
         /* called before hide, when a popup is closed */
@@ -345,7 +345,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
          * pos instantiation, so you don't want to do anything fancy in here */
         hide: function(){
             if(this.$el){
-                this.$el.hide();
+                this.$el.addClass('oe_hidden');
             }
         },
     });
@@ -692,7 +692,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         barcode_client_action: function(ean){
             this.pos.proxy.transaction_start();
             this._super(ean);
-            $('.goodbye-message').hide();
+            $('.goodbye-message').addClass('oe_hidden');
             this.pos_widget.screen_selector.show_popup('choose-receipt');
         },
         
@@ -704,14 +704,14 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                     label: _t('Help'),
                     icon: '/point_of_sale/static/src/img/icons/png48/help.png',
                     click: function(){ 
-                        $('.goodbye-message').css({opacity:1}).hide();
+                        $('.goodbye-message').css({opacity:1}).addClass('oe_hidden');
                         self.help_button_action();
                     },
                 });
 
-            $('.goodbye-message').css({opacity:1}).show();
+            $('.goodbye-message').css({opacity:1}).removeClass('oe_hidden');
             setTimeout(function(){
-                $('.goodbye-message').animate({opacity:0},500,'swing',function(){$('.goodbye-message').hide();});
+                $('.goodbye-message').animate({opacity:0},500,'swing',function(){$('.goodbye-message').addClass('oe_hidden');});
             },5000);
         },
     });
diff --git a/addons/point_of_sale/static/src/js/tests.js b/addons/point_of_sale/static/src/js/tests.js
new file mode 100644
index 00000000000..3b1dbc14503
--- /dev/null
+++ b/addons/point_of_sale/static/src/js/tests.js
@@ -0,0 +1,92 @@
+function openerp_pos_tests(instance, module){ //module is instance.point_of_sale
+
+    // Various UI Tests to measure performance and memory leaks.
+    module.UiTester = function(){
+        var running = false;
+        var queue = new module.JobQueue();
+
+        // stop the currently running test
+        this.stop = function(){
+            queue.clear();
+        };
+
+        // randomly switch product categories
+        this.category_switch = function(interval){
+            queue.schedule(function(){
+                var breadcrumbs = $('.breadcrumb a');
+                var categories  = $('li.category-button');
+                if(categories.length > 0){
+                    var rnd = Math.floor(Math.random()*categories.length);
+                    categories.eq(rnd).click();
+                }else{
+                    var rnd = Math.floor(Math.random()*breadcrumbs.length);
+                    breadcrumbs.eq(rnd).click();
+                }
+            },{repeat:true, duration:interval});
+        };
+
+        // randomly order products then resets the order
+        this.order_products = function(interval){
+
+            queue.schedule(function(){
+                var def = new $.Deferred();
+                var order_queue = new module.JobQueue();
+                var order_size = 1 + Math.floor(Math.random()*10);
+
+                while(order_size--){
+                    order_queue.schedule(function(){
+                        var products = $('.product a');
+                        if(products.length > 0){
+                            var rnd = Math.floor(Math.random()*products.length);
+                            products.eq(rnd).click();
+                        }
+                    },{duration:250});
+                }
+                order_queue.finished().then(function(){
+                        $('.deleteorder-button').click();
+                        def.resolve();
+                });
+                return def;
+            },{repeat:true, duration: interval});
+
+        };
+
+        // makes a complete product order cycle ( print via proxy must be activated, and scale deactivated ) 
+        this.full_order_cycle = function(interval){
+            queue.schedule(function(){
+                var def = new $.Deferred();
+                var order_queue = new module.JobQueue();
+                var order_size = 1 + Math.floor(Math.random()*50);
+
+                while(order_size--){
+                    order_queue.schedule(function(){
+                        var products = $('.product a');
+                        if(products.length > 0){
+                            var rnd = Math.floor(Math.random()*products.length);
+                            products.eq(rnd).click();
+                        }
+                    },{duration:250});
+                }
+                order_queue.schedule(function(){
+                    $('.paypad-button:first').click();
+                },{duration:250});
+                order_queue.schedule(function(){
+                    $('.paymentline-amount input:first').val(10000);
+                    $('.paymentline-amount input:first').keyup();
+                },{duration:250});
+                order_queue.schedule(function(){
+                    $('.pos-actionbar-button-list .button:eq(2)').click();
+                },{duration:250});
+                order_queue.schedule(function(){
+                    def.resolve();
+                });
+                return def;
+            },{repeat: true, duration: interval});
+        };
+    };
+    
+    if(jQuery.deparam(jQuery.param.querystring()).debug !== undefined){
+        window.pos_test_ui = new module.UiTester();
+    }
+
+}
diff --git a/addons/point_of_sale/static/src/js/widget_base.js b/addons/point_of_sale/static/src/js/widget_base.js
index 124be4e9f82..30d85f2696a 100644
--- a/addons/point_of_sale/static/src/js/widget_base.js
+++ b/addons/point_of_sale/static/src/js/widget_base.js
@@ -41,10 +41,10 @@ function openerp_pos_basewidget(instance, module){ //module is instance.point_of
 
         },
         show: function(){
-            this.$el.show();
+            this.$el.removeClass('oe_hidden');
         },
         hide: function(){
-            this.$el.hide();
+            this.$el.addClass('oe_hidden');
         },
     });
 
diff --git a/addons/point_of_sale/static/src/js/widget_scrollbar.js b/addons/point_of_sale/static/src/js/widget_scrollbar.js
index e4660a9c458..001e96d0bb6 100644
--- a/addons/point_of_sale/static/src/js/widget_scrollbar.js
+++ b/addons/point_of_sale/static/src/js/widget_scrollbar.js
@@ -81,7 +81,7 @@ function openerp_pos_scrollbar(instance, module){ //module is instance.point_of_
             $(window).unbind('resize',this.resize_handler);
             $(window).bind('resize',this.resize_handler);
 
-            this.target().unbind('mousewheel',this.target_mousweheel_handler);
+            this.target().unbind('mousewheel',this.target_mousewheel_handler);
             this.target().bind('mousewheel',this.target_mousewheel_handler);
             
             // because the rendering is asynchronous we must wait for the next javascript update
@@ -93,22 +93,18 @@ function openerp_pos_scrollbar(instance, module){ //module is instance.point_of_
             },0);
         },
 
-        // binds the window resize and the target scrolling events.
-        // it is good advice not to bind these multiple_times
-        bind_events:function(){
-            $(window).resize(function(){     
-            });
-            this.target().bind('mousewheel',function(event,delta){
-                self.scroll(delta*self.wheel_step);
-            });
+        destroy: function(){
+            $(window).unbind('resize',this.resize_handler);
+            this.target().unbind('mousewheel',this.target_mousewheel_handler);
+            this._super();
         },
 
         // shows the scrollbar. if animated is true, it will do it in an animated fashion
         show: function(animated){   //FIXME: animated show and hide don't work ... ? 
             if(animated){
-                this.$el.show().animate({'width':'48px'}, 500, 'swing');
+                this.$el.removeClass('oe_hidden').animate({'width':'48px'}, 500, 'swing');
             }else{
-                this.$el.show().css('width','48px');
+                this.$el.removeClass('oe_hidden').css('width','48px');
             }
             this.on_show(this);
         },
@@ -117,9 +113,9 @@ function openerp_pos_scrollbar(instance, module){ //module is instance.point_of_
         hide: function(animated){
             var self = this;
             if(animated){
-                this.$el.animate({'width':'0px'}, 500, 'swing', function(){ self.$el.hide();});
+                this.$el.animate({'width':'0px'}, 500, 'swing', function(){ self.$el.addClass('oe_hidden');});
             }else{
-                this.$el.hide().css('width','0px');
+                this.$el.addClass('oe_hidden').css('width','0px');
             }
             this.on_hide(this);
         },
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index 8afd3df6255..26f0159cb28 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -137,17 +137,15 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this.model = options.model;
             this.order = options.order;
 
-            this.model.bind('change', _.bind( function() {
-                this.refresh();
-            }, this));
-        },
-        click_handler: function() {
-            this.order.selectLine(this.model);
-            this.trigger('order_line_selected');
+            this.model.bind('change', this.refresh, this);
         },
         renderElement: function() {
+            var self = this;
             this._super();
-            this.$el.click(_.bind(this.click_handler, this));
+            this.$el.click(function(){
+                self.order.selectLine(this.model);
+                self.trigger('order_line_selected');
+            });
             if(this.model.is_selected()){
                 this.$el.addClass('selected');
             }
@@ -156,6 +154,10 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this.renderElement();
             this.trigger('order_line_refreshed');
         },
+        destroy: function(){
+            this.model.unbind('change',this.refresh,this);
+            this._super();
+        },
     });
     
     module.OrderWidget = module.PosBaseWidget.extend({
@@ -358,16 +360,16 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             var self = this;
 
             this.order = options.order;
-            this.order.bind('destroy',function(){ self.destroy(); });
-            this.order.bind('change', function(){ self.renderElement(); });
-            this.pos.bind('change:selectedOrder', function() {
-                self.renderElement();
-            }, this);
+            this.order.bind('destroy',this.destroy, this );
+            this.order.bind('change', this.renderElement, this );
+            this.pos.bind('change:selectedOrder', this.renderElement,this );
         },
         renderElement:function(){
             this._super();
-            this.$('button.select-order').off('click').click(_.bind(this.selectOrder, this));
-            this.$('button.close-order').off('click').click(_.bind(this.closeOrder, this));
+            var self = this;
+            this.$el.click(function(){ 
+                self.selectOrder();
+            });
             if( this.order === this.pos.get('selectedOrder') ){
                 this.$el.addClass('selected-order');
             }
@@ -377,8 +379,11 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                 selectedOrder: this.order
             });
         },
-        closeOrder: function(event) {
-            this.order.destroy();
+        destroy: function(){
+            this.order.unbind('destroy', this.destroy, this);
+            this.order.unbind('change',  this.renderElement, this);
+            this.pos.unbind('change:selectedOrder', this.renderElement, this);
+            this._super();
         },
     });
 
@@ -422,9 +427,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             if(visible != this.visibility[element]){
                 this.visibility[element] = !!visible;
                 if(visible){
-                    this.$('.'+element).show();
+                    this.$('.'+element).removeClass('oe_hidden');
                 }else{
-                    this.$('.'+element).hide();
+                    this.$('.'+element).addClass('oe_hidden');
                 }
             }
             if(visible && action){
@@ -459,10 +464,10 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             return button;
         },
         show:function(){
-            this.$el.show();
+            this.$el.removeClass('oe_hidden');
         },
         hide:function(){
-            this.$el.hide();
+            this.$el.addClass('oe_hidden');
         },
     });
 
@@ -690,8 +695,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                 this.$el.click(function(){ self.action(); });
             }
         },
-        show: function(){ this.$el.show(); },
-        hide: function(){ this.$el.hide(); },
+        show: function(){ this.$el.removeClass('oe_hidden'); },
+        hide: function(){ this.$el.addClass('oe_hidden'); },
     });
 
     // The debug widget lets the user control and monitor the hardware and software status
@@ -870,13 +875,12 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                     new_order_button.selectOrder();
                 }, self);
 
-                self.pos.get('orders').add(new module.Order({ pos: self.pos }));
+                self.pos.add_new_order();
 
                 self.build_widgets();
 
                 self.screen_selector.set_default_screen();
 
-                window.screen_selector = self.screen_selector;
 
                 self.pos.barcode_reader.connect();
 
@@ -889,7 +893,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                 }
             
                 instance.web.unblockUI();
-                self.$('.loader').animate({opacity:0},1500,'swing',function(){self.$('.loader').hide();});
+                self.$('.loader').animate({opacity:0},1500,'swing',function(){self.$('.loader').addClass('oe_hidden');});
 
                 self.pos.flush();
 
@@ -1078,11 +1082,11 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             if(visible !== this.leftpane_visible){
                 this.leftpane_visible = visible;
                 if(visible){
-                    $('#leftpane').show().animate({'width':this.leftpane_width},500,'swing');
+                    $('#leftpane').removeClass('oe_hidden').animate({'width':this.leftpane_width},500,'swing');
                     $('#rightpane').animate({'left':this.leftpane_width},500,'swing');
                 }else{
                     var leftpane = $('#leftpane');
-                    $('#leftpane').animate({'width':'0px'},500,'swing', function(){ leftpane.hide(); });
+                    $('#leftpane').animate({'width':'0px'},500,'swing', function(){ leftpane.addClass('oe_hidden'); });
                     $('#rightpane').animate({'left':'0px'},500,'swing');
                 }
             }
@@ -1092,11 +1096,11 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             if(visible !== this.cashier_controls_visible){
                 this.cashier_controls_visible = visible;
                 if(visible){
-                    $('#loggedas').show();
-                    $('#rightheader').show();
+                    $('#loggedas').removeClass('oe_hidden');
+                    $('#rightheader').removeClass('oe_hidden');
                 }else{
-                    $('#loggedas').hide();
-                    $('#rightheader').hide();
+                    $('#loggedas').addClass('oe_hidden');
+                    $('#rightheader').addClass('oe_hidden');
                 }
             }
         },

From 2bc275457a271b90dd912414c56208a4389bdc65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 17 Sep 2013 12:20:46 +0200
Subject: [PATCH 159/164] [CLEAN] mail: removed unnecessary change

bzr revid: tde@openerp.com-20130917102046-8khoz9axz5vr6j13
---
 addons/mail/res_config.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/mail/res_config.py b/addons/mail/res_config.py
index a0cc7ef5c53..c19eb4a38ee 100644
--- a/addons/mail/res_config.py
+++ b/addons/mail/res_config.py
@@ -28,10 +28,9 @@ class project_configuration(osv.TransientModel):
     _inherit = 'base.config.settings'
 
     _columns = {
-        'alias_domain': fields.char(
-            'Alias Domain',
-            help="If you have setup a catch-all email domain redirected to the OpenERP server, enter the domain name here."
-        ),
+        'alias_domain': fields.char('Alias Domain',
+                                     help="If you have setup a catch-all email domain redirected to "
+                                          "the OpenERP server, enter the domain name here."),
     }
 
     def get_default_alias_domain(self, cr, uid, ids, context=None):

From 8ae3b158dba4ead28e8f510e7a776a2c98877dff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 17 Sep 2013 12:35:55 +0200
Subject: [PATCH 160/164] [IMP] cleaning before merging : - added fields on
 mail.mail.statistics form view to have all data; - added comments; - cleaned
 get_mail_values override now that statistics are created using o2m command

bzr revid: tde@openerp.com-20130917103555-jwhgl8y49g505ugz
---
 addons/mass_mailing/mail_thread.py            |  6 +++++
 addons/mass_mailing/mass_mailing.py           | 26 ++++++++++++-------
 addons/mass_mailing/mass_mailing_view.xml     | 21 ++++++++++-----
 .../wizard/mail_compose_message.py            | 12 ++++++---
 4 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/addons/mass_mailing/mail_thread.py b/addons/mass_mailing/mail_thread.py
index 5c759e71e23..0570596ba12 100644
--- a/addons/mass_mailing/mail_thread.py
+++ b/addons/mass_mailing/mail_thread.py
@@ -36,6 +36,9 @@ class MailThread(osv.Model):
     _inherit = ['mail.thread']
 
     def message_route_check_bounce(self, cr, uid, message, context=None):
+        """ Override to verify that the email_to is the bounce alias. If it is the
+        case, log the bounce, set the parent and related document as bounced and
+        return False to end the routing process. """
         bounce_alias = self.pool['ir.config_parameter'].get_param(cr, uid, "mail.bounce.alias", context=context)
         message_id = message.get('Message-Id')
         email_from = decode_header(message, 'From')
@@ -74,6 +77,9 @@ class MailThread(osv.Model):
                 self.write(cr, uid, [obj.id], {'message_bounce': obj.message_bounce + 1}, context=context)
 
     def message_route_process(self, cr, uid, message, message_dict, routes, context=None):
+        """ Override to update the parent mail statistics. The parent is found
+        by using the References header of the incoming message and looking for
+        matching message_id in mail.mail.statistics. """
         if message.get('References'):
             message_ids = [x.strip() for x in decode(message['References']).split()]
             self.pool['mail.mail.statistics'].set_replied(cr, uid, mail_message_ids=message_ids, context=context)
diff --git a/addons/mass_mailing/mass_mailing.py b/addons/mass_mailing/mass_mailing.py
index 4ef7e260055..49ee106bc69 100644
--- a/addons/mass_mailing/mass_mailing.py
+++ b/addons/mass_mailing/mass_mailing.py
@@ -32,6 +32,8 @@ class MassMailingCampaign(osv.Model):
     """
     _name = "mail.mass_mailing.campaign"
     _description = 'Mass Mailing Campaign'
+    # number of embedded mailings in kanban view
+    _kanban_mailing_nbr = 4
 
     def _get_statistics(self, cr, uid, ids, name, arg, context=None):
         """ Compute statistics of the mass mailing campaign """
@@ -48,10 +50,12 @@ class MassMailingCampaign(osv.Model):
         return results
 
     def _get_mass_mailing_kanban_ids(self, cr, uid, ids, name, arg, context=None):
+        """ Gather data about mass mailings to display them in kanban view as
+        nested kanban views is not possible currently. """
         results = dict.fromkeys(ids, '')
         for campaign in self.browse(cr, uid, ids, context=context):
             mass_mailing_results = []
-            for mass_mailing in campaign.mass_mailing_ids:
+            for mass_mailing in campaign.mass_mailing_ids[:self._kanban_mailing_nbr]:
                 mass_mailing_object = {}
                 for attr in ['name', 'sent', 'delivered', 'opened', 'replied', 'bounced']:
                     mass_mailing_object[attr] = getattr(mass_mailing, attr)
@@ -74,7 +78,9 @@ class MassMailingCampaign(osv.Model):
         'mass_mailing_kanban_ids': fields.function(
             _get_mass_mailing_kanban_ids,
             type='text', string='Mass Mailings (kanban data)',
-            help='This field has for purpose to gather data about mass mailings to display them in kanban view as nested kanban views is not possible currently',
+            help='This field has for purpose to gather data about mass mailings '
+                 'to display them in kanban view as nested kanban views is not '
+                 'possible currently',
         ),
         'statistics_ids': fields.one2many(
             'mail.mail.statistics', 'mass_mailing_campaign_id',
@@ -139,6 +145,7 @@ class MassMailing(osv.Model):
     _description = 'Wave of sending emails'
     # number of periods for tracking mail_mail statistics
     _period_number = 6
+    _order = 'date DESC'
 
     def __get_bar_values(self, cr, uid, id, obj, domain, read_fields, value_field, groupby_field, context=None):
         """ Generic method to generate data for bar chart values using SparklineBarWidget.
@@ -167,9 +174,10 @@ class MassMailing(osv.Model):
             section_result[timedelta.days] = {'value': group.get(value_field, 0), 'tooltip': group.get(groupby_field)}
         return section_result
 
-    def _get_monthly_statistics(self, cr, uid, ids, field_name, arg, context=None):
-        """ TODO
-        """
+    def _get_daily_statistics(self, cr, uid, ids, field_name, arg, context=None):
+        """ Get the daily statistics of the mass mailing. This is done by a grouping
+        on opened and replied fields. Using custom format in context, we obtain
+        results for the next 6 days following the mass mailing date. """
         obj = self.pool['mail.mail.statistics']
         res = {}
         context['datetime_format'] = {
@@ -254,14 +262,14 @@ class MassMailing(osv.Model):
         ),
         # monthly ratio
         'opened_monthly': fields.function(
-            _get_monthly_statistics,
+            _get_daily_statistics,
             string='Opened',
-            type='char', multi='_get_monthly_statistics',
+            type='char', multi='_get_daily_statistics',
         ),
         'replied_monthly': fields.function(
-            _get_monthly_statistics,
+            _get_daily_statistics,
             string='Replied',
-            type='char', multi='_get_monthly_statistics',
+            type='char', multi='_get_daily_statistics',
         ),
     }
 
diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index 680dfe87092..f0c27f42a4a 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -328,13 +328,20 @@
             <field name="arch" type="xml">
                 <form string="Mail Statistics" version="7.0">
                     <group>
-                        <field name="mail_mail_id"/>
-                        <field name="message_id"/>
-                        <field name="opened"/>
-                        <field name="replied"/>
-                        <field name="bounced"/>
-                        <field name="model"/>
-                        <field name="res_id"/>
+                        <group>
+                            <field name="mail_mail_id"/>
+                            <field name="message_id"/>
+                            <field name="opened"/>
+                            <field name="replied"/>
+                            <field name="bounced"/>
+                        </group>
+                        <group>
+                            <field name="mass_mailing_id"/>
+                            <field name="mass_mailing_campaign_id"/>
+                            <field name="template_id"/>
+                            <field name="model"/>
+                            <field name="res_id"/>
+                        </group>
                     </group>
                 </form>
             </field>
diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py
index 8e075eb48c6..e5276eb7fd5 100644
--- a/addons/mass_mailing/wizard/mail_compose_message.py
+++ b/addons/mass_mailing/wizard/mail_compose_message.py
@@ -38,8 +38,9 @@ class MailComposeMessage(osv.TransientModel):
     }
 
     def get_mail_values(self, cr, uid, wizard, res_ids, context=None):
-        """ Override method that generated the mail content by adding the mass
-        mailing campaign, when doing pure email mass mailing. """
+        """ Override method that generated the mail content by creating the
+        mail.mail.statistics values in the o2m of mail_mail, when doing pure
+        email mass mailing. """
         res = super(MailComposeMessage, self).get_mail_values(cr, uid, wizard, res_ids, context=context)
         if wizard.composition_mode == 'mass_mail' and wizard.mass_mailing_campaign_id:  # TODO: which kind of mass mailing ?
             current_date = fields.datetime.now()
@@ -51,7 +52,10 @@ class MailComposeMessage(osv.TransientModel):
                     'domain': wizard.active_domain,
                     'template_id': wizard.template_id and wizard.template_id.id or False,
                 }, context=context)
-            context['default_mass_mailing_id'] = mass_mailing_id
             for res_id in res_ids:
-                res[res_id]['statistics_ids'] = [(0, 0, {'model': wizard.model, 'res_id': res_id})]
+                res[res_id]['statistics_ids'] = [(0, 0, {
+                    'model': wizard.model,
+                    'res_id': res_id,
+                    'mass_mailing_id': mass_mailing_id,
+                })]
         return res

From 674054c97ee58dca677c18d075c62eefad3bce13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 17 Sep 2013 14:29:29 +0200
Subject: [PATCH 161/164] [IMP] point_of_sale: removed ProductWidget for faster
 product list updates

bzr revid: fva@openerp.com-20130917122929-8pybdbvgrv8kbgru
---
 addons/point_of_sale/static/src/js/widgets.js | 43 ++++---------------
 addons/point_of_sale/static/src/xml/pos.xml   | 12 +++---
 2 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index b0d1bb39aa5..cfec71be68d 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -283,27 +283,6 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         },
     });
 
-    module.ProductWidget = module.PosBaseWidget.extend({
-        template: 'ProductWidget',
-        init: function(parent, options) {
-            this._super(parent,options);
-            this.model = options.model;
-            this.model.attributes.weight = options.weight;
-            this.next_screen = options.next_screen; //when a product is clicked, this screen is set
-            this.click_product_action = options.click_product_action; 
-        },
-        // returns the url of the product thumbnail
-        renderElement: function() {
-            this._super();
-            this.$('img').replaceWith(this.pos_widget.image_cache.get_image(this.model.get_image_url()));
-            var self = this;
-            $("a", this.$el).click(function(e){
-                if(self.click_product_action){
-                    self.click_product_action(self.model);
-                }
-            });
-        },
-    });
 
     module.PaymentlineWidget = module.PosBaseWidget.extend({
         template: 'PaymentlineWidget',
@@ -619,25 +598,19 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         renderElement: function() {
             var self = this;
             this._super();
-
-            // free subwidgets  memory from previous renders
             
-            for(var i = 0, len = this.productwidgets.length; i < len; i++){
-                this.productwidgets[i].destroy();
-            }
-            this.productwidgets = []; 
             if(this.scrollbar){
                 this.scrollbar.destroy();
             }
             var products = this.pos.get('products').models || [];
-            for(var i = 0, len = products.length; i < len; i++){
-                var product = new module.ProductWidget(self, {
-                    model: products[i],
-                    click_product_action: this.click_product_action,
-                });
-                this.productwidgets.push(product);
-                product.appendTo(this.$('.product-list'));
-            }
+            
+            _.each(products,function(product,i){
+                var $product = $(QWeb.render('Product',{ widget:self, product: products[i] }));
+                $product.find('img').replaceWith(self.pos_widget.image_cache.get_image(products[i].get_image_url()));
+                $product.find('a').click(function(){ self.click_product_action(product); });
+                $product.appendTo(self.$('.product-list'));
+            });
+
             this.scrollbar = new module.ScrollbarWidget(this,{
                 target_widget:   this,
                 target_selector: '.product-list-scroller',
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index e1ee84d78ea..7456c29b9e5 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -399,24 +399,24 @@
         </div>
     </t>
 
-    <t t-name="ProductWidget">
+    <t t-name="Product">
         <li class='product'>
             <a href="#">
                 <div class="product-img">
                     <img src='' /> <!-- the product thumbnail -->
-                    <t t-if="!widget.model.get('to_weight')">
+                    <t t-if="!product.get('to_weight')">
                         <span class="price-tag">
-                            <t t-esc="widget.format_currency(widget.model.get('price'))"/>
+                            <t t-esc="widget.format_currency(product.get('price'))"/>
                         </span>
                     </t>
-                    <t t-if="widget.model.get('to_weight')">
+                    <t t-if="product.get('to_weight')">
                         <span class="price-tag">
-                            <t t-esc="widget.format_currency(widget.model.get('price'))+'/Kg'"/>
+                            <t t-esc="widget.format_currency(product.get('price'))+'/Kg'"/>
                         </span>
                     </t>
                 </div>
                 <div class="product-name">
-                    <t t-esc="widget.model.get('name')"/>
+                    <t t-esc="product.get('name')"/>
                 </div>
             </a>
         </li>

From ad6bbe490a204da0d57a453a9c519ccad04284b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 17 Sep 2013 14:34:46 +0200
Subject: [PATCH 162/164] [FIX] point_of_sale: scaled product weren't ordered
 with the correct weight

bzr revid: fva@openerp.com-20130917123446-671ijt70i93p0w67
---
 addons/point_of_sale/static/src/js/screens.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index 9f1b22f2a75..0c3e488d212 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -542,8 +542,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             }
         },
         order_product: function(){
-            var weight = this.pos.proxy.weighting_read_kg();
-            this.pos.get('selectedOrder').addProduct(this.get_product(),{ quantity:weight });
+            this.pos.get('selectedOrder').addProduct(this.get_product(),{ quantity: this.weight });
         },
         get_product_name: function(){
             var product = this.get_product();

From 0d826f64ca6bf16eedffcb33325452252c244467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 17 Sep 2013 14:46:15 +0200
Subject: [PATCH 163/164] [FIX] point_of_sale: missing renamings from the
 JobQueue refactor

bzr revid: fva@openerp.com-20130917124615-kqtix2atp1xguszw
---
 addons/point_of_sale/static/src/js/screens.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index 0c3e488d212..a5017d517b7 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -455,7 +455,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
 
             queue.schedule(function(){
                 return self.pos.proxy.weighting_start();
-            },{ unclearable: true });
+            },{ important: true });
             
             queue.schedule(function(){
                 return self.pos.proxy.weighting_read_kg().then(function(weight){
@@ -479,7 +479,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             this.pos.proxy_queue.clear();
             this.pos.proxy_queue.schedule(function(){
                 return self.pos.proxy.weighting_end();
-            },{ unclearable: true });
+            },{ important: true });
         },
     });
 
@@ -516,7 +516,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             
             queue.schedule(function(){
                 return self.pos.proxy.weighting_start()
-            },{ unclearable: true });
+            },{ important: true });
             
             queue.schedule(function(){
                 return self.pos.proxy.weighting_read_kg().then(function(weight){
@@ -566,7 +566,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             this.pos.proxy_queue.clear();
             this.pos.proxy_queue.schedule(function(){
                 self.pos.proxy.weighting_end();
-            },{ unclearable: true });
+            },{ important: true });
         },
     });
 

From fb7d1001dd30f53be79532aa3e6a81b8b01dff7d Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 18 Sep 2013 04:49:24 +0000
Subject: [PATCH 164/164] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130918044924-csoci28hkz0lyqm3
---
 addons/marketing_campaign/i18n/th.po | 1056 ++++++++++++++++++++++++++
 1 file changed, 1056 insertions(+)
 create mode 100644 addons/marketing_campaign/i18n/th.po

diff --git a/addons/marketing_campaign/i18n/th.po b/addons/marketing_campaign/i18n/th.po
new file mode 100644
index 00000000000..5988dbb8b22
--- /dev/null
+++ b/addons/marketing_campaign/i18n/th.po
@@ -0,0 +1,1056 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-09-18 00:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai <th@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: 2013-09-18 04:49+0000\n"
+"X-Generator: Launchpad (build 16765)\n"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Manual Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_from_id:0
+msgid "Previous Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:819
+#, python-format
+msgid "The current step for this item has no email or report to preview."
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:marketing.campaign.transition:0
+msgid "The To/From Activity of transition must be of the same Campaign "
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Time"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "Custom Action"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Group By..."
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,revenue:0
+msgid ""
+"Set an expected revenue if you consider that every campaign item that has "
+"reached this point has generated a certain revenue. You can get revenue "
+"statistics in the Reporting section"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,trigger:0
+msgid "Trigger"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Follow-Up"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,count:0
+msgid "# of Actions"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Campaign Editor"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: selection:marketing.campaign.segment,state:0
+msgid "Running"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,body_html:marketing_campaign.email_template_3
+msgid ""
+"Hi, we are delighted to let you know that you have entered the select circle "
+"of our Gold Partners"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "March"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,object_id:0
+msgid "Object"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Sync mode: only records created after last sync"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,condition:0
+msgid ""
+"Python expression to decide whether the activity can be executed, otherwise "
+"it will be deleted or cancelled.The expression may use the following "
+"[browsable] variables:\n"
+"   - activity: the campaign activity\n"
+"   - workitem: the campaign workitem\n"
+"   - resource: the resource object this campaign item represents\n"
+"   - transitions: list of campaign transitions outgoing from this activity\n"
+"...- re: Python regular expression module"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,to_ids:0
+msgid "Next Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:148
+#, python-format
+msgid ""
+"The campaign cannot be started. It does not have any starting activity. "
+"Modify campaign's activities to mark one as the starting point."
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,email_template_id:0
+msgid "The email to send when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,date_run:0
+msgid "Launch Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,day:0
+msgid "Day"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Outgoing Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Reset"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,object_id:0
+msgid "Choose the resource on which you want this campaign to be run"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.client,name:marketing_campaign.action_client_marketing_menu
+msgid "Open Marketing Menu"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_last_date:0
+msgid "Last Synchronization"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Year(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_last_date:0
+msgid ""
+"Date on which this segment was synchronized last time (automatically or "
+"manually)"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,state:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Automatic"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,mode:0
+msgid ""
+"Test - It creates and process all the activities directly (without waiting "
+"for the delay on transitions) but does not send emails or produce reports.\n"
+"Test in Realtime - It creates and processes all the activities directly but "
+"does not send emails or produce reports.\n"
+"With Manual Confirmation - the campaigns runs normally, but the user has to "
+"validate all workitem manually.\n"
+"Normal - the campaign runs normally and automatically sends all emails and "
+"reports (be very careful with this mode, you're live!)"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_run:0
+msgid "Initial start date of this segment."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,campaign_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign.activity,campaign_id:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,campaign_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,campaign_id:0
+msgid "Campaign"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,body_html:marketing_campaign.email_template_1
+msgid "Hello, you will receive your welcome pack via email shortly."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,segment_id:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,segment_id:0
+msgid "Segment"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:214
+#, python-format
+msgid "You cannot duplicate a campaign, Not supported yet."
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,type:0
+msgid ""
+"The type of action to execute when an item enters this activity, such as:\n"
+"   - Email: send an email using a predefined email template\n"
+"   - Report: print an existing Report defined on the resource item and save "
+"it into a specific directory\n"
+"   - Custom Action: execute a predefined action, e.g. to modify the fields "
+"of the resource record\n"
+"  "
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_next_sync:0
+msgid "Next time the synchronization job is scheduled to run automatically"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Month(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,partner_id:0
+#: model:ir.model,name:marketing_campaign.model_res_partner
+#: field:marketing.campaign.workitem,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.filters,name:marketing_campaign.filter0
+msgid "Partners"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Marketing Reports"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+msgid "New"
+msgstr ""
+
+#. module: marketing_campaign
+#: sql_constraint:marketing.campaign.transition:0
+msgid "The interval must be positive or zero"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "Email"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,name:0
+#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign.segment,name:0
+#: field:marketing.campaign.transition,name:0
+msgid "Name"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.workitem,res_name:0
+msgid "Resource Name"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_mode:0
+msgid "Synchronization mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Run"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,from_ids:0
+msgid "Previous Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,subject:marketing_campaign.email_template_2
+msgid "Congratulations! You are now a Silver Partner!"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_done:0
+msgid "Date this segment was last closed or cancelled."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Marketing Campaign Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,error_msg:0
+msgid "Error Message"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_form
+#: view:marketing.campaign:0
+#: view:res.partner:0
+msgid "Campaigns"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_type:0
+msgid "Interval Unit"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_id:0
+#: selection:marketing.campaign.activity,type:0
+msgid "Report"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "July"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,variable_cost:0
+msgid ""
+"Set a variable cost if you consider that every campaign item that has "
+"reached this point has entailed a certain cost. You can get cost statistics "
+"in the Reporting section"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Hour(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment
+msgid "Campaign Segment"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid ""
+"By activating this option, workitems that aren't executed because the "
+"condition is not met are marked as cancelled instead of being deleted."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Exceptions"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_followup
+#: field:res.partner,workitem_ids:0
+msgid "Workitems"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,fixed_cost:0
+msgid "Fixed Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Newly Modified"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create a marketing campaign.\n"
+"          </p><p>\n"
+"            OpenERP's marketing campaign allows you to automate "
+"communication\n"
+"            to your prospects. You can define a segment (set of conditions) "
+"on\n"
+"            your leads and partners to fullfil the campaign.\n"
+"          </p><p>\n"
+"            A campaign can have many activities like sending an email, "
+"printing\n"
+"            a letter, assigning to a team, etc. These activities are "
+"triggered\n"
+"            from specific situations; contact form, 10 days after first\n"
+"            contact, if a lead is not closed yet, etc.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_nbr:0
+msgid "Interval Value"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,revenue:0
+#: field:marketing.campaign.activity,revenue:0
+msgid "Revenue"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "September"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "December"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,partner_field_id:0
+msgid ""
+"The generated workitems will be linked to the partner related to the record. "
+"If the record is the partner itself leave this field empty. This is useful "
+"for reporting purposes, via the Campaign Analysis or Campaign Follow-up "
+"views."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,month:0
+msgid "Month"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_to_id:0
+msgid "Next Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_stat
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_workitem
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_marketing_campaign_workitem
+msgid "Campaign Follow-up"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Test Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "Only records modified after last sync (no duplicates)"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Campaign Statistics"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,server_action_id:0
+msgid "The action to perform when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,partner_field_id:0
+msgid "Partner Field"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: model:ir.actions.act_window,name:marketing_campaign.action_campaign_analysis_all
+#: model:ir.model,name:marketing_campaign.model_campaign_analysis
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_campaign_analysis_all
+msgid "Campaign Analysis"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_mode:0
+msgid ""
+"Determines an additional criterion to add to the filter when selecting new "
+"records to inject in the campaign. \"No duplicates\" prevents selecting "
+"records which have already entered the campaign previously.If the campaign "
+"has a \"unique field\" set, \"no duplicates\" will also prevent selecting "
+"records which have the same value for the unique field as other records that "
+"already entered the campaign."
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test in Realtime"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test Directly"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_directory_id:0
+msgid "Directory"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Draft"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Marketing Campaign Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,state:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,state:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,state:0
+msgid "Status"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "August"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Normal"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,start:0
+msgid "This activity is launched when the campaign starts."
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,signal:0
+msgid ""
+"An activity with a signal can be called programmatically. Be careful, the "
+"workitem is always created when a signal is sent"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "To Do"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "June"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_email_template
+msgid "Email Templates"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Sync mode: all records"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "All records (no duplicates)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Newly Created"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,date:0
+msgid "Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "November"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_id:0
+msgid "The report to generate when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,unique_field_id:0
+msgid "Unique Field"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "October"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,email_template_id:0
+msgid "Email Template"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "January"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,date:0
+msgid "Execution Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_workitem
+msgid "Campaign Workitem"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity
+msgid "Campaign Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_directory_id:0
+msgid "This folder is used to store the generated reports"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:136
+#: code:addons/marketing_campaign/marketing_campaign.py:148
+#: code:addons/marketing_campaign/marketing_campaign.py:158
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,server_action_id:0
+msgid "Action"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:528
+#, python-format
+msgid "Automatic transition"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,start:0
+msgid "Start"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:819
+#, python-format
+msgid "No preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Process"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:530
+#: selection:marketing.campaign.transition,trigger:0
+#, python-format
+msgid "Cosmetic"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.transition,trigger:0
+msgid "How is the destination workitem triggered"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Done"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:214
+#, python-format
+msgid "Operation not supported"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Cancel"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Close"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:marketing.campaign.segment:0
+msgid "Model of filter must be same as resource model of Campaign "
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronize Manually"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
+msgid "Campaign Transition"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Marketing Campaign Segment"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_segment_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_segment_form
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Segments"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid "Don't Delete Workitems"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Incoming Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Day(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: field:marketing.campaign,activity_ids:0
+#: view:marketing.campaign.activity:0
+msgid "Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "With Manual Confirmation"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "May"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,type:0
+msgid "Type"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,subject:marketing_campaign.email_template_3
+msgid "Congratulations! You are now one of our Gold Partners!"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,unique_field_id:0
+msgid ""
+"If set, this field will help segments that work in \"no duplicates\" mode to "
+"avoid selecting similar records twice. Similar records are records that have "
+"the same value for this unique field. For example by choosing the "
+"\"email_from\" field for CRM Leads you would prevent sending the same "
+"campaign to the same email address again. If not set, the \"no duplicates\" "
+"segments will only avoid selecting the same record again if it entered the "
+"campaign previously. Only easily comparable fields like textfields, "
+"integers, selections or single relationships may be used."
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:529
+#, python-format
+msgid "After %(interval_nbr)d %(interval_type)s"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign
+#: view:marketing.campaign:0
+msgid "Marketing Campaign"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_done:0
+msgid "End Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "February"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,res_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,object_id:0
+#: field:marketing.campaign.segment,object_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,object_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,fixed_cost:0
+msgid ""
+"Fixed cost for running this campaign. You may also specify variable cost and "
+"revenue on each campaign activity. Cost and Revenue statistics are included "
+"in Campaign Reporting."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Sync mode: only records updated after last sync"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:793
+#, python-format
+msgid "Email Preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,signal:0
+msgid "Signal"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.workitem,date:0
+msgid "If date is not set, this workitem has to be run manually"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "April"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:158
+#, python-format
+msgid "The campaign cannot be marked as done before all segments are closed."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: field:marketing.campaign,mode:0
+msgid "Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,activity_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,activity_id:0
+msgid "Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,ir_filter_id:0
+msgid ""
+"Filter to select the matching resource records that belong to this segment. "
+"New filters can be created and saved using the advanced search on the list "
+"view of the Resource. If no filter is set, all records are selected without "
+"filtering. The synchronization mode may also add a criterion to the filter."
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:136
+#, python-format
+msgid "The campaign cannot be started. There are no activities in it."
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_next_sync:0
+msgid "Next Synchronization"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,body_html:marketing_campaign.email_template_2
+msgid ""
+"Hi, we are delighted to welcome you among our Silver Partners as of today!"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,ir_filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "All"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "Only records created after last sync"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,variable_cost:0
+msgid "Variable Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,subject:marketing_campaign.email_template_1
+msgid "Welcome to the OpenERP Partner Channel!"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,total_cost:0
+msgid "Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,year:0
+msgid "Year"
+msgstr ""