From 412561c37bf814ac11b16de60135256b89cef155 Mon Sep 17 00:00:00 2001
From: niv <niv@niv-laptop>
Date: Mon, 18 Oct 2010 12:35:57 +0200
Subject: [PATCH 01/38] [IMP] Modified Belgian accounting localization to have
 correct default tax account

bzr revid: niv@niv-laptop-20101018103557-au9q9mzcf6ei8ijb
---
 addons/account/account.py               | 10 +++--
 addons/l10n_be/account_pcmn_belgium.xml | 50 +++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index f65f8edd56f..3f0784247cd 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2874,10 +2874,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                     obj_ac_fp.create(cr, uid, vals_acc)
         
         ir_values = self.pool.get('ir.values')
-        ir_values.set(cr, uid, key='default', key2=False, name="taxes_id", company=obj_multi.company_id.id
-                      , models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.sale_tax.id]])
-        ir_values.set(cr, uid, key='default', key2=False, name="supplier_taxes_id", company=obj_multi.company_id.id
-                      , models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.purchase_tax.id]])
+        if obj_multi.sale_tax:
+            ir_values.set(cr, uid, key='default', key2=False, name="taxes_id", company=obj_multi.company_id.id
+                          , models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.sale_tax.id]])
+        if obj_multi.purchase_tax:
+            ir_values.set(cr, uid, key='default', key2=False, name="supplier_taxes_id", company=obj_multi.company_id.id
+                          , models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.purchase_tax.id]])
 
 wizard_multi_charts_accounts()
 
diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml
index dc6c86fc9fa..7482250db8d 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/account_pcmn_belgium.xml
@@ -6666,6 +6666,7 @@
             <field name="base_code_id" ref="vat_code_a45"/>
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="type_tax_use">sale</field>
+            <field name="sequence">5</field>
         </record>
         <record id="vat_0" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6676,6 +6677,7 @@
             <field name="base_code_id" ref="vat_code_a00"/>
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="type_tax_use">sale</field>
+            <field name="sequence">2</field>
         </record>
         <record id="vat_6" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6690,6 +6692,7 @@
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="ref_tax_code_id" ref="vat_code_a64"/>
             <field name="type_tax_use">sale</field>
+            <field name="sequence">3</field>
         </record>
         <record id="vat_12" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6704,6 +6707,7 @@
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="ref_tax_code_id" ref="vat_code_a64"/>
             <field name="type_tax_use">sale</field>
+            <field name="sequence">4</field>
         </record>
         <record id="vat_21" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6718,6 +6722,7 @@
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="ref_tax_code_id" ref="vat_code_a64"/>
             <field name="type_tax_use">sale</field>
+            <field name="sequence">1</field>
         </record>
         <record id="vat_21_s" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6732,6 +6737,7 @@
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="ref_tax_code_id" ref="vat_code_a64"/>
             <field name="type_tax_use">sale</field>
+            <field name="sequence">6</field>
         </record>
 
 
@@ -6744,6 +6750,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">7</field>
         </record>
         <record id="vat_0_buy_bsd_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6754,6 +6761,7 @@
             <field name="base_code_id" ref="vat_code_a82"/>
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">8</field>
         </record>
         <record id="vat_0_buy_bsd_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6764,6 +6772,7 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">9</field>
         </record>
         <record id="vat_0_buy_mar" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6773,6 +6782,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">10</field>
         </record>
         <record id="vat_0_buy_mar_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6783,6 +6793,7 @@
             <field name="base_code_id" ref="vat_code_a81"/>
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">11</field>
         </record>
         <record id="vat_0_buy_mar_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6793,6 +6804,7 @@
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">12</field>
         </record>
         <record id="vat_6_buy_bsd" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6802,6 +6814,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">13</field>
         </record>
         <record id="vat_6_buy_bsd_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6816,6 +6829,7 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">14</field>
         </record>
         <record id="vat_6_buy_bsd_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6826,6 +6840,7 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">15</field>
         </record>
         <record id="vat_12_buy_bsd" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6835,6 +6850,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">16</field>
         </record>
         <record id="vat_12_buy_bsd_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6849,6 +6865,7 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">17</field>
         </record>
         <record id="vat_12_buy_bsd_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6859,6 +6876,7 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">18</field>
         </record>
         <record id="vat_21_buy_bsd" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6868,6 +6886,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">19</field>
         </record>
         <record id="vat_21_buy_bsd_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6882,6 +6901,7 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">20</field>
         </record>
         <record id="vat_21_buy_bsd_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6892,6 +6912,7 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">21</field>
         </record>
         <record id="vat_21_buy_ser" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6901,6 +6922,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">22</field>
         </record>
         <record id="vat_21_buy_ser_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6915,6 +6937,7 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">23</field>
         </record>
         <record id="vat_21_buy_ser_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6925,6 +6948,7 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">24</field>
         </record>
 
 
@@ -6936,6 +6960,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">25</field>
         </record>
         <record id="vat_6_buy_mar_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6950,6 +6975,7 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">26</field>
         </record>
         <record id="vat_6_buy_mar_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6960,6 +6986,7 @@
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">27</field>
         </record>
         <record id="vat_12_buy_mar" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6969,6 +6996,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">28</field>
         </record>
         <record id="vat_12_buy_mar_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6983,6 +7011,7 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">29</field>
         </record>
         <record id="vat_12_buy_mar_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6993,6 +7022,7 @@
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">30</field>
         </record>
         <record id="vat_21_buy_mar" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7002,6 +7032,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">31</field>
         </record>
         <record id="vat_21_buy_mar_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7016,6 +7047,7 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">32</field>
         </record>
         <record id="vat_21_buy_mar_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7026,6 +7058,7 @@
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">33</field>
         </record>
 
     <!-- Régime Extra-Communautaire -->
@@ -7039,6 +7072,7 @@
             <field name="base_code_id" ref="vat_code_a46"/>
             <field name="ref_base_code_id" ref="vat_code_a48"/>
             <field name="type_tax_use">sale</field>
+            <field name="sequence">34</field>
         </record>
     <!-- Purchases VAT -->
         <record id="vat_XO_buy" model="account.tax.template">
@@ -7054,6 +7088,7 @@
             <field name="ref_base_code_id" ref="vat_code_a87"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">35</field>
         </record>
 
 
@@ -7068,6 +7103,7 @@
             <field name="base_code_id" ref="vat_code_a46"/>
             <field name="ref_base_code_id" ref="vat_code_a48"/>
             <field name="type_tax_use">sale</field>
+            <field name="sequence">36</field>
         </record>
         <record id="vat_IO_S" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7078,6 +7114,7 @@
             <field name="base_code_id" ref="vat_code_a44a"/>
             <field name="ref_base_code_id" ref="vat_code_a48"/>
             <field name="type_tax_use">sale</field>
+            <field name="sequence">37</field>
         </record>
         <record id="vat_IO_abc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7088,6 +7125,7 @@
             <field name="base_code_id" ref="vat_code_a44b"/>
             <field name="ref_base_code_id" ref="vat_code_a48"/>
             <field name="type_tax_use">sale</field>
+            <field name="sequence">38</field>
         </record>
 
 
@@ -7100,6 +7138,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">39</field>
         </record>
         <record id="vat_IO_buy_21b_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7113,6 +7152,7 @@
             <field name="tax_code_id" ref="vat_code_a55"/>
             <field name="ref_base_code_id" ref="vat_code_a84"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">40</field>
         </record>
         <record id="vat_IO_buy_21b_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7128,6 +7168,7 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">41</field>
         </record>
         <record id="vat_IO_buy_21b_3" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7138,6 +7179,7 @@
             <field name="ref_base_code_id" ref="vat_code_a86"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">42</field>
         </record>
        <record id="vat_IO_buy_21m" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7147,6 +7189,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">43</field>
         </record>
         <record id="vat_IO_buy_21m_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7160,6 +7203,7 @@
             <field name="tax_code_id" ref="vat_code_a55"/>
             <field name="ref_base_code_id" ref="vat_code_a84"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">44</field>
         </record>
         <record id="vat_IO_buy_21m_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7175,6 +7219,7 @@
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">45</field>
         </record>
         <record id="vat_IO_buy_21m_3" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7185,6 +7230,7 @@
             <field name="ref_base_code_id" ref="vat_code_a86"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">46</field>
         </record>
        <record id="vat_IO_buy_21s" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7194,6 +7240,7 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">47</field>
         </record>
         <record id="vat_IO_buy_21s_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7207,6 +7254,7 @@
             <field name="tax_code_id" ref="vat_code_a59"/>
             <field name="ref_base_code_id" ref="vat_code_a84"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">48</field>
         </record>
         <record id="vat_IO_buy_21s_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7222,6 +7270,7 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">49</field>
         </record>
         <record id="vat_IO_buy_21s_3" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7232,6 +7281,7 @@
             <field name="ref_base_code_id" ref="vat_code_a88"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence">50</field>
         </record>
 
 

From a5f271f50de72282bbaaac624d14295eef7d51f4 Mon Sep 17 00:00:00 2001
From: nvi-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 19 Oct 2010 16:48:45 +0200
Subject: [PATCH 02/38] [FIX] Fixed problem with hr when we use a addons_path
 with multiple paths

bzr revid: nicolas.vanhoren@openerp.com-20101019144845-xaln01cug0hw8ykv
---
 addons/hr/hr.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 240511a03a0..d3cb41fc89d 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -184,9 +184,12 @@ class hr_employee(osv.osv):
         return {'value': {'work_email':mail.user_email}}
 
     def _get_photo(self, cr, uid, context=None):
-        return open(os.path.join(
-            tools.config['addons_path'], 'hr/image', 'photo.png'),
-                    'rb') .read().encode('base64')
+        paths = tools.config['addons_path'].split(",")
+        for path in paths:
+            full_path = os.path.join(path, 'hr/image', 'photo.png')
+            if os.path.exists(full_path):
+                return open(full_path,'rb') .read().encode('base64')
+        raise Exception("photo.png could not be found")
 
     _defaults = {
         'active': 1,

From 7d4e5af835536604b37819675f1eef12f39774cd Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Wed, 20 Oct 2010 15:43:08 +0530
Subject: [PATCH 03/38] [FIX] mrp_repair: yaml corrected.

bzr revid: uco@tinyerp.com-20101020101308-cdjs4am5f9wgzbi8
---
 addons/mrp_repair/test/test_mrp_repair.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp_repair/test/test_mrp_repair.yml b/addons/mrp_repair/test/test_mrp_repair.yml
index 1cf82635825..3d9e85aa3ac 100644
--- a/addons/mrp_repair/test/test_mrp_repair.yml
+++ b/addons/mrp_repair/test/test_mrp_repair.yml
@@ -85,7 +85,7 @@
      obj_lines = self.pool.get('account.invoice.line')
      inv_obj = self.pool.get('account.invoice')
      repair_id = self.browse(cr, uid, [ref('mrp_repair_rma0')], context=context)[0]
-     invoice_ids = inv_obj.search(cr, uid, [('partner_id', '=', repair_id.partner_invoice_id.id)])
+     invoice_ids = inv_obj.search(cr, uid, [('partner_id', '=', repair_id.partner_id.id)])
      invoice_id = inv_obj.browse(cr, uid, invoice_ids)[0]
      
-     assert repair_id.partner_invoice_id.id == invoice_id.partner_id.id, "No invoice existing for the same partner"
+     assert repair_id.partner_id.id == invoice_id.partner_id.id, "No invoice existing for the same partner"

From 988d4d488b187ab3af1dd1aaf2c5bca8f3df468e Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Wed, 20 Oct 2010 19:27:35 +0530
Subject: [PATCH 04/38] [IMP] mrp, stock: Improvements suggested by buildbot.

bzr revid: uco@tinyerp.com-20101020135735-hofrhxqqpvkycjje
---
 addons/mrp/mrp.py     | 2 --
 addons/stock/stock.py | 1 -
 2 files changed, 3 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index cee60e63023..751cf384b6e 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -19,8 +19,6 @@
 #
 ##############################################################################
 
-from itertools import groupby
-from operator import itemgetter
 from datetime import datetime
 from osv import osv, fields
 from tools.translate import _
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index fe984b10f22..4f760936e11 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2008,7 +2008,6 @@ class stock_move(osv.osv):
         for id in ids:
             wf_service.trg_trigger(uid, 'stock.move', id, cr)
 
-        picking_obj = self.pool.get('stock.picking')
         wf_service = netsvc.LocalService("workflow")
         for pick_id in picking_ids:
             wf_service.trg_write(uid, 'stock.picking', pick_id, cr)

From 8d2be57afa67e85019fe6b2219613424d0c67014 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 21 Oct 2010 16:03:45 +0530
Subject: [PATCH 05/38] [FIX] auction: Fixed unicode character error from
 Report.

bzr revid: uco@tinyerp.com-20101021103345-48ook5fhyr8p7ff2
---
 addons/auction/report/catalog2.xsl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/auction/report/catalog2.xsl b/addons/auction/report/catalog2.xsl
index ea27162428d..c44d0e83047 100755
--- a/addons/auction/report/catalog2.xsl
+++ b/addons/auction/report/catalog2.xsl
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format"  xmlns:date="http://exslt.org/dates-and-times"extension-element-prefixes="date">
+<?xml version="1.0" encoding="iso-8859-1"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format"  xmlns:date="http://exslt.org/dates-and-times" extension-element-prefixes="date">
 
 
 <xsl:template match="report">
@@ -30,7 +30,7 @@
 		<pageGraphics>
 <!--			<image x="1.0cm" y="27.3cm" file="/home/tiny/terp/4.2/server/bin/addons/auction/report/images/flagey_head.png"/>-->
 -			<image x="1.0cm" y="26.1cm" file="flagey_logo.jpg"/>
-			<drawRightString x="19.0cm" y="26.6cm"> Vente  antiquitée le  <xsl:value-of select="date:day-name(catalog/AuctionDate1)"/> &#160;<xsl:value-of select="date:day-in-month(catalog/AuctionDate1)"/>&#160;<xsl:value-of select="date:month-name(catalog/AuctionDate1)"/> &#160;<xsl:value-of select="date:year(catalog/AuctionDate1)"/></drawRightString>
+			<drawRightString x="19.0cm" y="26.6cm"> Antiques on sale  <xsl:value-of select="date:day-name(catalog/AuctionDate1)"/> <xsl:value-of select="date:day-in-month(catalog/AuctionDate1)"/><xsl:value-of select="date:month-name(catalog/AuctionDate1)"/> <xsl:value-of select="date:year(catalog/AuctionDate1)"/></drawRightString>
 			<lineMode width="1mm"/>
 			<setFont name="Helvetica" size="26"/>
 <!--			<drawString x="10mm" y="27.8cm">Flagey.com</drawString>-->

From 36dd47081b0e526172d13ebc62e3b06af0546302 Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Thu, 21 Oct 2010 18:16:32 +0530
Subject: [PATCH 06/38] [FIX] mrp : Corrections for Work Order names

bzr revid: jma@tinyerp.com-20101021124632-vfv5jesa55mzkxz7
---
 addons/mrp/mrp.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index cee60e63023..ac75c81426a 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -26,6 +26,7 @@ from osv import osv, fields
 from tools.translate import _
 import netsvc
 import time
+import tools
 
 
 #----------------------------------------------------------
@@ -311,7 +312,7 @@ class mrp_bom(osv.osv):
                     mult = (d + (m and 1.0 or 0.0))
                     cycle = mult * wc_use.cycle_nbr
                     result2.append({
-                        'name': bom.routing_id.name,
+                        'name': tools.ustr(wc_use.name) + ' - '  + tools.ustr(bom.product_id.name),
                         'workcenter_id': wc.id,
                         'sequence': level+(wc_use.sequence or 0),
                         'cycle': cycle,

From bbbcdbdbdbf76cfcecac5450d577ff17ab3fa18c Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 25 Oct 2010 10:51:11 +0530
Subject: [PATCH 07/38] [IMP] mrp_repair: Giving access rights to mrp manager
 to make invoice for repair order.

bzr revid: uco@tinyerp.com-20101025052111-zja70wp086r60ooy
---
 addons/mrp_repair/security/ir.model.access.csv | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/mrp_repair/security/ir.model.access.csv b/addons/mrp_repair/security/ir.model.access.csv
index e8b611bd933..b7f0c156fb9 100644
--- a/addons/mrp_repair/security/ir.model.access.csv
+++ b/addons/mrp_repair/security/ir.model.access.csv
@@ -21,4 +21,9 @@
 "access_account_tax_manager","account.tax manager","account.model_account_tax","mrp.group_mrp_manager",1,0,0,0
 "access_mrp_repair_fee_user_mrp","MRP Repair Fee user mrp","model_mrp_repair_fee","mrp.group_mrp_user",1,1,1,1
 "access_mrp_repair_fee_mgr","MRP Repair Fee mgr","model_mrp_repair_fee","mrp.group_mrp_manager",1,0,0,0
-
+"access_account_invoice_user","account.invoice","account.model_account_invoice","mrp.group_mrp_user",1,1,1,1
+"access_account_invoice_manager","account.invoice manager","account.model_account_invoice","mrp.group_mrp_manager",1,0,0,0
+"access_account_invoice_line_user","account.invoice.line","account.model_account_invoice_line","mrp.group_mrp_user",1,1,1,1
+"access_account_invoice_line_manager","account.invoice.line manager","account.model_account_invoice_line","mrp.group_mrp_manager",1,0,0,0
+"access_account_journal_user","account.journal","account.model_account_journal","mrp.group_mrp_user",1,1,1,1
+"access_account_journal_manager","account.journal manager","account.model_account_journal","mrp.group_mrp_manager",1,0,0,0

From 015e3d3a34f0f56410294a47f1c81ecce4afce9d Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Mon, 25 Oct 2010 12:28:54 +0530
Subject: [PATCH 08/38] [FIX] project : Corrected field name

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 8cf262237da..29b7e244ee6 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -85,7 +85,7 @@
                                 <label string="ID: %%(task_id)s"/>
                                 <label string="Status: %%(state)s"/>
                                 <label string="Date Start: %%(date_start)s"/>
-                                <label string="Date Stop: %%(date_stop)s"/>
+                                <label string="Date Stop: %%(date_end)s"/>
                             </group>
                         </page>
                         <page string="Tasks Stages" groups="base.group_extended">

From 53d9dc8d8119728a7091d7c99eba83c1065ac7be Mon Sep 17 00:00:00 2001
From: nvi-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 25 Oct 2010 12:05:42 +0200
Subject: [PATCH 09/38] [FIX] Fixed hr get_photo issue.

bzr revid: nicolas.vanhoren@openerp.com-20101025100542-bfee6qo0t4e28269
---
 addons/hr/hr.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index f173e7f04ec..0f499c43ddd 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -25,6 +25,8 @@ from osv import fields, osv
 import tools
 from tools.translate import _
 
+import addons
+
 class hr_employee_category(osv.osv):
 
     def name_get(self, cr, uid, ids, context=None):
@@ -180,12 +182,8 @@ class hr_employee(osv.osv):
         return {'value': {'work_email' : work_email}}
 
     def _get_photo(self, cr, uid, context=None):
-        paths = tools.config['addons_path'].split(",")
-        for path in paths:
-            full_path = os.path.join(path, 'hr/image', 'photo.png')
-            if os.path.exists(full_path):
-                return open(full_path,'rb') .read().encode('base64')
-        raise Exception("photo.png could not be found")
+        res_path = addons.get_module_resource("hr","image/photo.png")
+        return open(res_path,'rb').read().encode('base64')
 
     _defaults = {
         'active': 1,

From e6a27d1f4faa773335d586f2bf2852c338101ead Mon Sep 17 00:00:00 2001
From: nvi-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 25 Oct 2010 13:40:45 +0200
Subject: [PATCH 10/38] [IMP] Changed sequences in belgian accouting

bzr revid: nicolas.vanhoren@openerp.com-20101025114045-onrpl83ngufo5lmt
---
 addons/l10n_be/account_pcmn_belgium.xml | 51 +------------------------
 1 file changed, 1 insertion(+), 50 deletions(-)

diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml
index 7482250db8d..3471a184d62 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/account_pcmn_belgium.xml
@@ -6666,7 +6666,6 @@
             <field name="base_code_id" ref="vat_code_a45"/>
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="type_tax_use">sale</field>
-            <field name="sequence">5</field>
         </record>
         <record id="vat_0" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6677,7 +6676,6 @@
             <field name="base_code_id" ref="vat_code_a00"/>
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="type_tax_use">sale</field>
-            <field name="sequence">2</field>
         </record>
         <record id="vat_6" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6692,7 +6690,6 @@
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="ref_tax_code_id" ref="vat_code_a64"/>
             <field name="type_tax_use">sale</field>
-            <field name="sequence">3</field>
         </record>
         <record id="vat_12" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6707,7 +6704,6 @@
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="ref_tax_code_id" ref="vat_code_a64"/>
             <field name="type_tax_use">sale</field>
-            <field name="sequence">4</field>
         </record>
         <record id="vat_21" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6722,7 +6718,7 @@
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="ref_tax_code_id" ref="vat_code_a64"/>
             <field name="type_tax_use">sale</field>
-            <field name="sequence">1</field>
+            <field name="sequence">0</field>
         </record>
         <record id="vat_21_s" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6737,7 +6733,6 @@
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="ref_tax_code_id" ref="vat_code_a64"/>
             <field name="type_tax_use">sale</field>
-            <field name="sequence">6</field>
         </record>
 
 
@@ -6750,7 +6745,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">7</field>
         </record>
         <record id="vat_0_buy_bsd_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6761,7 +6755,6 @@
             <field name="base_code_id" ref="vat_code_a82"/>
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">8</field>
         </record>
         <record id="vat_0_buy_bsd_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6772,7 +6765,6 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">9</field>
         </record>
         <record id="vat_0_buy_mar" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6782,7 +6774,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">10</field>
         </record>
         <record id="vat_0_buy_mar_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6793,7 +6784,6 @@
             <field name="base_code_id" ref="vat_code_a81"/>
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">11</field>
         </record>
         <record id="vat_0_buy_mar_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6804,7 +6794,6 @@
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">12</field>
         </record>
         <record id="vat_6_buy_bsd" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6814,7 +6803,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">13</field>
         </record>
         <record id="vat_6_buy_bsd_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6829,7 +6817,6 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">14</field>
         </record>
         <record id="vat_6_buy_bsd_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6840,7 +6827,6 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">15</field>
         </record>
         <record id="vat_12_buy_bsd" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6850,7 +6836,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">16</field>
         </record>
         <record id="vat_12_buy_bsd_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6865,7 +6850,6 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">17</field>
         </record>
         <record id="vat_12_buy_bsd_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6876,7 +6860,6 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">18</field>
         </record>
         <record id="vat_21_buy_bsd" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6886,7 +6869,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">19</field>
         </record>
         <record id="vat_21_buy_bsd_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6901,7 +6883,6 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">20</field>
         </record>
         <record id="vat_21_buy_bsd_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6912,7 +6893,6 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">21</field>
         </record>
         <record id="vat_21_buy_ser" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6922,7 +6902,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">22</field>
         </record>
         <record id="vat_21_buy_ser_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6937,7 +6916,6 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">23</field>
         </record>
         <record id="vat_21_buy_ser_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6948,7 +6926,6 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">24</field>
         </record>
 
 
@@ -6960,7 +6937,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">25</field>
         </record>
         <record id="vat_6_buy_mar_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6975,7 +6951,6 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">26</field>
         </record>
         <record id="vat_6_buy_mar_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6986,7 +6961,6 @@
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">27</field>
         </record>
         <record id="vat_12_buy_mar" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6996,7 +6970,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">28</field>
         </record>
         <record id="vat_12_buy_mar_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7011,7 +6984,6 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">29</field>
         </record>
         <record id="vat_12_buy_mar_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7022,7 +6994,6 @@
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">30</field>
         </record>
         <record id="vat_21_buy_mar" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7032,7 +7003,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">31</field>
         </record>
         <record id="vat_21_buy_mar_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7047,7 +7017,6 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">32</field>
         </record>
         <record id="vat_21_buy_mar_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7058,7 +7027,6 @@
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">33</field>
         </record>
 
     <!-- Régime Extra-Communautaire -->
@@ -7072,7 +7040,6 @@
             <field name="base_code_id" ref="vat_code_a46"/>
             <field name="ref_base_code_id" ref="vat_code_a48"/>
             <field name="type_tax_use">sale</field>
-            <field name="sequence">34</field>
         </record>
     <!-- Purchases VAT -->
         <record id="vat_XO_buy" model="account.tax.template">
@@ -7088,7 +7055,6 @@
             <field name="ref_base_code_id" ref="vat_code_a87"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">35</field>
         </record>
 
 
@@ -7103,7 +7069,6 @@
             <field name="base_code_id" ref="vat_code_a46"/>
             <field name="ref_base_code_id" ref="vat_code_a48"/>
             <field name="type_tax_use">sale</field>
-            <field name="sequence">36</field>
         </record>
         <record id="vat_IO_S" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7114,7 +7079,6 @@
             <field name="base_code_id" ref="vat_code_a44a"/>
             <field name="ref_base_code_id" ref="vat_code_a48"/>
             <field name="type_tax_use">sale</field>
-            <field name="sequence">37</field>
         </record>
         <record id="vat_IO_abc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7125,7 +7089,6 @@
             <field name="base_code_id" ref="vat_code_a44b"/>
             <field name="ref_base_code_id" ref="vat_code_a48"/>
             <field name="type_tax_use">sale</field>
-            <field name="sequence">38</field>
         </record>
 
 
@@ -7138,7 +7101,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">39</field>
         </record>
         <record id="vat_IO_buy_21b_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7152,7 +7114,6 @@
             <field name="tax_code_id" ref="vat_code_a55"/>
             <field name="ref_base_code_id" ref="vat_code_a84"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">40</field>
         </record>
         <record id="vat_IO_buy_21b_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7168,7 +7129,6 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">41</field>
         </record>
         <record id="vat_IO_buy_21b_3" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7179,7 +7139,6 @@
             <field name="ref_base_code_id" ref="vat_code_a86"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">42</field>
         </record>
        <record id="vat_IO_buy_21m" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7189,7 +7148,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">43</field>
         </record>
         <record id="vat_IO_buy_21m_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7203,7 +7161,6 @@
             <field name="tax_code_id" ref="vat_code_a55"/>
             <field name="ref_base_code_id" ref="vat_code_a84"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">44</field>
         </record>
         <record id="vat_IO_buy_21m_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7219,7 +7176,6 @@
             <field name="ref_base_code_id" ref="vat_code_a81"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">45</field>
         </record>
         <record id="vat_IO_buy_21m_3" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7230,7 +7186,6 @@
             <field name="ref_base_code_id" ref="vat_code_a86"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">46</field>
         </record>
        <record id="vat_IO_buy_21s" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7240,7 +7195,6 @@
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">47</field>
         </record>
         <record id="vat_IO_buy_21s_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7254,7 +7208,6 @@
             <field name="tax_code_id" ref="vat_code_a59"/>
             <field name="ref_base_code_id" ref="vat_code_a84"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">48</field>
         </record>
         <record id="vat_IO_buy_21s_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7270,7 +7223,6 @@
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">49</field>
         </record>
         <record id="vat_IO_buy_21s_3" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -7281,7 +7233,6 @@
             <field name="ref_base_code_id" ref="vat_code_a88"/>
             <field eval="-1" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
-            <field name="sequence">50</field>
         </record>
 
 

From 3d8cbbdaaf9d7b4d6a2460a062cbfda634ec77b7 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 25 Oct 2010 16:38:47 +0200
Subject: [PATCH 11/38] [IMP] share: corrected typo in share URL formatting
 patterns

bzr revid: odo@openerp.com-20101025143847-lhcdroeyayydh71t
---
 addons/share/wizard/share_wizard.py       | 4 ++--
 addons/share/wizard/share_wizard_view.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 2d1fd252ecf..9349980933f 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -290,7 +290,7 @@ class share_create(osv.osv_memory):
         user_obj = self.pool.get('res.users')
         result_obj = self.pool.get('share.wizard.result.line')
         share_root_url = wizard_data.share_root_url
-        format_url = '%(login)' in share_root_url and '%(password)' in share_root_url
+        format_url = '%(login)s' in share_root_url and '%(password)s' in share_root_url
         existing_passwd_str = _('*usual password*')
         if wizard_data.user_type == 'new':
             for email in wizard_data.new_users.split('\n'):
@@ -430,7 +430,7 @@ class share_create(osv.osv_memory):
                 else:
                     body += _("This additional data has been automatically added to your current access.\n")
                     body += _("You may use your existing login and password to view it. As a reminder, your login is %s.\n") % result_line.login
-    
+
                 if not tools.email_send(
                                             user.user_email,
                                             email_to,
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index e6cade91c84..95fbc983c84 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -90,7 +90,7 @@
                     - 'action_id' (id of action)
                     - 'domain' (string expression for full domain to apply as sent to server, 
                                with dynamic data like 'uid' replaced by actual value (i.e. after eval)!)
-                    - 'share_root_url' : URL for direct access to share page (may include %(login) and %(password) placeholders)
+                    - 'share_root_url' : URL for direct access to share page (may include %(login)s and %(password)s placeholders)
          -->
         <record id="action_share_wizard" model="ir.actions.act_window">
             <field name="name">Share Wizard</field>
@@ -106,7 +106,7 @@
                     - 'action_id' (id of action)
                     - 'domain' (string expression for full domain to apply as sent to server, 
                                with dynamic data like 'uid' replaced by actual value (i.e. after eval)!)
-                    - 'share_root_url' : URL for direct access to share page (may include %(login) and %(password) placeholders)
+                    - 'share_root_url' : URL for direct access to share page (may include %(login)s and %(password)s placeholders)
          -->
         <record id="action_share_wizard_step1" model="ir.actions.act_window">
             <field name="name">Share Wizard</field>

From 3572ed909a2294a876fa6329593d976dd94594bb Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 25 Oct 2010 16:54:45 +0200
Subject: [PATCH 12/38] [IMP] project: avoid access rights issue when reading
 time_mode (uom) for fields_view_get

bzr revid: odo@openerp.com-20101025145445-ccgvic2uyqd50hi6
---
 addons/project/project.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 294c711eaac..6c9f66dd009 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -483,7 +483,10 @@ class task(osv.osv):
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         users_obj = self.pool.get('res.users')
-        obj_tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id
+
+        # read uom as admin to avoid access rights issues, e.g. for portal/share users,
+        # this should be safe (no context passed to avoid side-effects)
+        obj_tm = users_obj.browse(cr, 1, uid).company_id.project_time_mode_id
         tm = obj_tm and obj_tm.name or 'Hours'
 
         res = super(task, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)

From dfea5584e7cc861e949c43be5cc7e1a29f9d40a0 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 26 Oct 2010 11:07:43 +0530
Subject: [PATCH 13/38] [REF] point_of_sale: Code cleaning

bzr revid: psi@tinyerp.co.in-20101026053743-kdti4mq98m1iriod
---
 .../point_of_sale/account_bank_statement.py   |  25 +-
 addons/point_of_sale/pos.py                   | 501 ++++++++----------
 .../wizard/all_closed_cashbox_of_the_day.py   |  22 +-
 .../point_of_sale/wizard/pos_add_product.py   |  41 +-
 .../point_of_sale/wizard/pos_box_entries.py   |  34 +-
 5 files changed, 278 insertions(+), 345 deletions(-)

diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
index 28d3befe3c2..9cf50f6d018 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2008 PC Solutions (<http://pcsol.be>). All Rights Reserved
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
@@ -16,21 +16,19 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-from osv import osv
-from osv import fields
+from osv import fields, osv
 
 class account_journal(osv.osv):
-
     _inherit = 'account.journal'
     _columns = {
         'auto_cash': fields.boolean('Automatic Opening', help="This field authorize the automatic creation of the cashbox"),
         'special_journal': fields.boolean('Special Journal', help="Will put all the orders in waiting status till being accepted"),
         'check_dtls': fields.boolean('Check Details', help="This field authorize Validation of Cashbox without checking ending details"),
-        'journal_users': fields.many2many('res.users','pos_journal_users','journal_id','user_id','Users'),
+        'journal_users': fields.many2many('res.users', 'pos_journal_users', 'journal_id', 'user_id', 'Users'),
     }
     _defaults = {
         'check_dtls': False,
@@ -39,7 +37,7 @@ class account_journal(osv.osv):
 account_journal()
 
 class account_cash_statement(osv.osv):
-    
+
     _inherit = 'account.bank.statement'
 
     def _equal_balance(self, cr, uid, cash_id, context=None):
@@ -48,12 +46,11 @@ class account_cash_statement(osv.osv):
         statement = self.browse(cr, uid, cash_id, context=context)
         if not statement.journal_id.check_dtls:
             return True
-        
         if statement.journal_id.check_dtls and (statement.balance_end != statement.balance_end_cash):
             return False
         else:
-            return True            
-    
+            return True
+
     def _user_allow(self, cr, uid, statement_id, context=None):
         if context is None:
             context = {}
@@ -62,12 +59,10 @@ class account_cash_statement(osv.osv):
         statement = self.browse(cr, uid, statement_id, context=context)
         for user in statement.journal_id.journal_users:
             uids.append(user.id)
-        
         if uid in uids:
             res = True
-      
         return res
-    
+
     def _get_cash_open_box_lines(self, cr, uid, context=None):
         if context is None:
             context = {}
@@ -81,7 +76,7 @@ class account_cash_statement(osv.osv):
             res.append(dct)
         res.sort()
         return res
-    
+
     def _get_default_cash_close_box_lines(self, cr, uid, context=None):
         if context is None:
             context = {}
@@ -95,7 +90,7 @@ class account_cash_statement(osv.osv):
             res.append(dct)
         res.sort()
         return res
-    
+
 account_cash_statement()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 6429e21c08d..720fdb465f4 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -20,10 +20,11 @@
 ##############################################################################
 
 import time
-import netsvc
-from osv import fields, osv
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
+
+import netsvc
+from osv import fields, osv
 from tools.translate import _
 from decimal import Decimal
 import decimal_precision as dp
@@ -39,63 +40,55 @@ class pos_config_journal(osv.osv):
     }
 
 pos_config_journal()
+
 class pos_company_discount(osv.osv):
-
     """ Company Discount and Cashboxes """
-
     _inherit = 'res.company'
     _columns = {
-        'company_discount': fields.float('Max Discount(%)', digits_compute= dp.get_precision('Point Of Sale')),
-        'max_diff': fields.float('Max Difference for Cashboxes', digits_compute= dp.get_precision('Point Of Sale Discount')),
-     }
+        'company_discount': fields.float('Max Discount(%)', digits_compute=dp.get_precision('Point Of Sale')),
+        'max_diff': fields.float('Max Difference for Cashboxes', digits_compute=dp.get_precision('Point Of Sale Discount')),
+    }
 
 pos_company_discount()
 
 
 class pos_order(osv.osv):
-
     """ Point of sale gives business owners a convenient way of checking out customers
         and of recording sales """
 
     _name = "pos.order"
     _description = "Point of Sale"
     _order = "date_order, create_date desc"
-    _order = "date_order desc"
-
 
     def unlink(self, cr, uid, ids, context=None):
         for rec in self.browse(cr, uid, ids, context=context):
             for rec_statement in rec.statement_ids:
-                if (rec_statement.statement_id and rec_statement.statement_id.state=='confirm') or rec.state=='done':
+                if (rec_statement.statement_id and rec_statement.statement_id.state == 'confirm') or rec.state == 'done':
                     raise osv.except_osv(_('Invalid action !'), _('Cannot delete a point of sale which is closed or contains confirmed cashboxes!'))
         return super(pos_order, self).unlink(cr, uid, ids, context=context)
 
     def onchange_partner_pricelist(self, cr, uid, ids, part, context=None):
-
         """ Changed price list on_change of partner_id"""
-
         if not part:
             return {}
-        pricelist = self.pool.get('res.partner').browse(cr, uid, part).property_product_pricelist.id
-        return {'value':{'pricelist_id': pricelist}}
+        pricelist = self.pool.get('res.partner').browse(cr, uid, part, context=context).property_product_pricelist.id
+        return {'value': {'pricelist_id': pricelist}}
 
     def _amount_total(self, cr, uid, ids, field_name, arg, context=None):
-
         """ Calculates amount_tax of order line
         @param field_names: Names of fields.
         @return: Dictionary of values """
-
         cr.execute("""
-        SELECT
-            p.id,
-            COALESCE(SUM(
-                l.price_unit*l.qty*(1-(l.discount/100.0)))::decimal(16,2), 0
-                ) AS amount
-        FROM pos_order p
-            LEFT OUTER JOIN pos_order_line l ON (p.id=l.order_id)
-        WHERE p.id IN %s GROUP BY p.id """,(tuple(ids),))
+            SELECT
+                p.id,
+                COALESCE(SUM(
+                    l.price_unit*l.qty*(1-(l.discount/100.0)))::decimal(16,2), 0
+                    ) AS amount
+            FROM pos_order p
+            LEFT OUTER JOIN pos_order_line l ON (p.id = l.order_id)
+            WHERE p.id IN %s GROUP BY p.id """,(tuple(ids),))
         res = dict(cr.fetchall())
-        for rec in self.browse(cr, uid, ids, context):
+        for rec in self.browse(cr, uid, ids, context=context):
             if rec.partner_id \
                and rec.partner_id.property_account_position \
                and rec.partner_id.property_account_position.tax_ids:
@@ -105,81 +98,75 @@ class pos_order(osv.osv):
         return res
 
     def _get_date_payment2(self, cr, uid, ids, context, *a):
-
         # Todo need to check this function
         """ Find payment Date
-
         @param field_names: Names of fields.
         @return: Dictionary of values """
-
         res = {}
-        val=None
+        val = None
         for order in self.browse(cr, uid, ids):
-            cr.execute("SELECT date_payment FROM pos_order WHERE id=%s", (order.id,))
+            cr.execute("SELECT date_payment FROM pos_order WHERE id = %s", (order.id,))
             date_p=cr.fetchone()
             date_p=date_p and date_p[0] or None
             if date_p:
                 res[order.id]=date_p
                 return res
-            cr.execute(" SELECT max(l.date) "
+            cr.execute(" SELECT MAX(l.date) "
                         " FROM account_move_line l, account_move m, account_invoice i, account_move_reconcile r, pos_order o "
-                        " WHERE i.move_id=m.id AND l.move_id=m.id AND l.reconcile_id=r.id AND o.id=%s AND o.invoice_id=i.id",
+                        " WHERE i.move_id = m.id AND l.move_id = m.id AND l.reconcile_id = r.id AND o.id = %s AND o.invoice_id = i.id",
                         (order.id,))
-            val=cr.fetchone()
-            val= val and val[0] or None
+            val = cr.fetchone()
+            val = val and val[0] or None
             if val:
-                res[order.id]=val
+                res[order.id] = val
         return res
 
     def _get_date_payment(self, cr, uid, ids, context, *a):
-
         """ Find  Validation Date
         @return: Dictionary of values """
-
         res = {}
-        val=None
+        val = None
         for order in self.browse(cr, uid, ids):
-            cr.execute("SELECT date_validation FROM pos_order WHERE id=%s", (order.id,))
-            date_p=cr.fetchone()
-            date_p=date_p and date_p[0] or None
+            cr.execute("SELECT date_validation FROM pos_order WHERE id = %s", (order.id,))
+            date_p = cr.fetchone()
+            date_p = date_p and date_p[0] or None
             if date_p:
-                res[order.id]=date_p
+                res[order.id] = date_p
                 return res
-            discount_allowed=order.company_id.company_discount
+            discount_allowed = order.company_id.company_discount
             for line in order.lines:
                 if line.discount > discount_allowed:
                     return {order.id: None }
             if order.amount_paid == order.amount_total and not date_p:
-                cr.execute("SELECT MAX(date) FROM account_bank_statement_line WHERE pos_statement_id=%s", (order.id,))
-                val=cr.fetchone()
-                val=val and val[0] or None
+                cr.execute("SELECT MAX(date) FROM account_bank_statement_line WHERE pos_statement_id = %s", (order.id,))
+                val = cr.fetchone()
+                val = val and val[0] or None
             if order.invoice_id and order.invoice_id.move_id and not date_p and not val:
                 for o in order.invoice_id.move_id.line_id:
-                    if o.balance==0:
-                        if val<o.date_created:
-                            val=o.date_created
+                    if o.balance == 0:
+                        if val < o.date_created:
+                            val = o.date_created
             if val:
-                res[order.id]=val
+                res[order.id] = val
         return res
 
     def _amount_all(self, cr, uid, ids, name, args, context=None):
         tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
-        res={}
-        for order in self.browse(cr, uid, ids):
+        res = {}
+        for order in self.browse(cr, uid, ids, context=context):
             res[order.id] = {
                 'amount_paid': 0.0,
                 'amount_return':0.0,
                 'amount_tax':0.0,
             }
-            val=0.0
-            cur_obj = self.pool.get('res.currency')
+            val = 0.0
             cur = order.pricelist_id.currency_id
             for payment in order.statement_ids:
                 res[order.id]['amount_paid'] +=  payment.amount
                 res[order.id]['amount_return'] += (payment.amount < 0 and payment.amount or 0)
             for line in order.lines:
-                if order.price_type!='tax_excluded':
+                if order.price_type != 'tax_excluded':
                     res[order.id]['amount_tax'] = reduce(lambda x, y: x+round(y['amount'], 2),
                         tax_obj.compute_inv(cr, uid, line.product_id.taxes_id,
                             line.price_unit * \
@@ -191,31 +178,19 @@ class pos_order(osv.osv):
                     res[order.id]['amount_tax'] = cur_obj.round(cr, uid, cur, val)
         return res
 
-
-
-    def _sale_journal_get(self, cr, uid, context):
-
+    def _sale_journal_get(self, cr, uid, context=None):
         """ To get  sale journal for this order"
         @return: journal  """
-
         journal_obj = self.pool.get('account.journal')
-        res = journal_obj.search(cr, uid,
-            [('type', '=', 'sale')], limit=1)
-        if res:
-            return res[0]
-        else:
-            return False
-
-    def _shop_get(self, cr, uid, context):
+        res = journal_obj.search(cr, uid, [('type', '=', 'sale')], limit=1)
+        return res and res[0] or False
 
+    def _shop_get(self, cr, uid, context=None):
         """ To get  Shop  for this order"
         @return: Shop id  """
-
         res = self.pool.get('sale.shop').search(cr, uid, [])
-        if res:
-            return res[0]
-        else:
-            return False
+        return res and res[0] or False
+
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
@@ -225,39 +200,37 @@ class pos_order(osv.osv):
             'invoice_id': False,
             'account_move': False,
             'picking_id': False,
-            'statement_ids':[],
+            'statement_ids': [],
             'nb_print': 0,
             'pickings': []
         })
-        return super(pos_order, self).copy(cr, uid, id, default, context)
-
-    def _get_v( self, cr, uid, ids,*a):
+        return super(pos_order, self).copy(cr, uid, id, default, context=context)
 
+    def _get_v( self, cr, uid, ids, *a):
         """ Changed the Validation state of order
         @return: State  """
-
         res_obj = self.pool.get('res.users')
-        company_disc=self.browse(cr,uid,ids)
+        company_disc = self.browse(cr, uid, ids)
+        list_jrnl = []
+        r = {}
         if not company_disc:
-            comp=res_obj.browse(cr,uid,uid).company_id.company_discount or 0.0
+            comp = res_obj.browse(cr, uid, uid).company_id.company_discount or 0.0
         else:
-            comp= company_disc[0] and company_disc[0].company_id and  company_disc[0].company_id.company_discount  or 0.0
-        cr.execute("select discount from pos_order_line where order_id=%s and discount <= %s", (ids[0],comp))
-        res=cr.fetchone()
-        cr.execute("select discount from pos_order_line where order_id=%s and discount > %s", (ids[0],comp))
-        res2=cr.fetchone()
-        cr.execute("select journal_id from account_bank_statement_line where pos_statement_id=%s ", (ids[0],))
-        res3=cr.fetchall()
-        list_jrnl=[]
+            comp = company_disc[0] and company_disc[0].company_id and company_disc[0].company_id.company_discount or 0.0
+        cr.execute("SELECT discount FROM pos_order_line WHERE order_id = %s AND discount <= %s", (ids[0], comp))
+        res = cr.fetchone()
+        cr.execute("SELECT discount FROM pos_order_line WHERE order_id = %s AND discount > %s", (ids[0], comp))
+        res2 = cr.fetchone()
+        cr.execute("SELECT journal_id FROM account_bank_statement_line WHERE pos_statement_id = %s ", (ids[0], ))
+        res3 = cr.fetchall()
         for r in res3:
-            cr.execute("select id from account_journal where name= '%s' and special_journal='t'", (r[0],))
-            res3=cr.fetchone()
-            is_special=res3 and res3[0] or None
+            cr.execute("SELECT id FROM account_journal WHERE name = '%s' AND special_journal = 't'", (r[0], ))
+            res3 = cr.fetchone()
+            is_special = res3 and res3[0] or None
             if is_special:
                 list_jrnl.append(is_special)
-        r = {}
         for order in self.browse(cr, uid, ids):
-            if order.state in ('paid','done','invoiced') and res and not res2 and not len(list_jrnl):
+            if order.state in ('paid', 'done', 'invoiced') and res and not res2 and not len(list_jrnl):
                 r[order.id] = 'accepted'
         return r
 
@@ -269,8 +242,8 @@ class pos_order(osv.osv):
         'shop_id': fields.many2one('sale.shop', 'Shop', required=True,
             states={'draft': [('readonly', False)]}, readonly=True),
         'date_order': fields.datetime('Date Ordered', readonly=True),
-        'date_validation': fields.function(_get_date_payment, method=True, string='Validation Date', type='date',  store=True),
-        'date_payment': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date',  store=True),
+        'date_validation': fields.function(_get_date_payment, method=True, string='Validation Date', type='date', store=True),
+        'date_payment': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date', store=True),
         'date_validity': fields.date('Validity Date', required=True),
         'user_id': fields.many2one('res.users', 'Connected Salesman', help="Person who uses the the register. It could be a reliever, a student or an interim employee."),
         'user_salesman_id': fields.many2one('res.users', 'Cashier', required=True, help="User who is logged into the system."),
@@ -281,15 +254,19 @@ class pos_order(osv.osv):
         'amount_return': fields.function(_amount_all, 'Returned', method=True, digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
         'lines': fields.one2many('pos.order.line', 'order_id', 'Order Lines', states={'draft': [('readonly', False)]}, readonly=True),
         'price_type': fields.selection([
-            ('tax_excluded','Tax excluded')
-        ], 'Price method', required=True),
-        'statement_ids': fields.one2many('account.bank.statement.line','pos_statement_id','Payments',states={'draft': [('readonly', False)]},readonly=True),
+                                ('tax_excluded','Tax excluded')],
+                                 'Price method', required=True),
+        'statement_ids': fields.one2many('account.bank.statement.line', 'pos_statement_id', 'Payments', states={'draft': [('readonly', False)]}, readonly=True),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, states={'draft': [('readonly', False)]}, readonly=True),
-        'partner_id': fields.many2one( 'res.partner', 'Customer', change_default=True, select=1, states={'draft': [('readonly', False)], 'paid': [('readonly', False)]}),
-        'state': fields.selection([('draft', 'Quotation'), ('payment', 'Payment'),
-                                    ('advance','Advance'),
-                                   ('paid', 'Paid'), ('done', 'Done'), ('invoiced', 'Invoiced'), ('cancel', 'Cancel')],
-                                  'State', readonly=True, ),
+        'partner_id': fields.many2one('res.partner', 'Customer', change_default=True, select=1, states={'draft': [('readonly', False)], 'paid': [('readonly', False)]}),
+        'state': fields.selection([('draft', 'Quotation'),
+                                   ('payment', 'Payment'),
+                                   ('advance','Advance'),
+                                   ('paid', 'Paid'),
+                                   ('done', 'Done'),
+                                   ('invoiced', 'Invoiced'),
+                                   ('cancel', 'Cancel')],
+                                  'State', readonly=True),
         'invoice_id': fields.many2one('account.invoice', 'Invoice'),
         'account_move': fields.many2one('account.move', 'Account Entry', readonly=True),
         'pickings': fields.one2many('stock.picking', 'pos_order', 'Picking', readonly=True),
@@ -297,27 +274,23 @@ class pos_order(osv.osv):
         'first_name': fields.char('First Name', size=64),
         'note': fields.text('Internal Notes'),
         'nb_print': fields.integer('Number of Print', readonly=True),
-        'sale_journal': fields.many2one('account.journal', 'Journal', required=True, states={'draft': [('readonly', False)]}, readonly=True, ),
+        'sale_journal': fields.many2one('account.journal', 'Journal', required=True, states={'draft': [('readonly', False)]}, readonly=True),
         'invoice_wanted': fields.boolean('Create Invoice'),
-        'note_2': fields.char('Customer Note',size=64),
-        'type_rec': fields.char('Type of Receipt',size=64),
+        'note_2': fields.char('Customer Note', size=64),
+        'type_rec': fields.char('Type of Receipt', size=64),
         'remboursed': fields.boolean('Remboursed'),
         'contract_number': fields.char('Contract Number', size=512, select=1),
         'journal_entry': fields.boolean('Journal Entry'),
     }
 
 
-    def _select_pricelist(self, cr, uid, context):
-
+    def _select_pricelist(self, cr, uid, context=None):
         """ To get default pricelist for the order"
         @param name: Names of fields.
         @return: pricelist ID
         """
-        pricelist = self.pool.get('product.pricelist').search(cr, uid, [('name', '=', 'Public Pricelist')])
-        if pricelist:
-            return pricelist[0]
-        else:
-            return False
+        pricelist = self.pool.get('product.pricelist').search(cr, uid, [('name', '=', 'Public Pricelist')], context=context)
+        return pricelist and pricelist[0] or False
 
     def _journal_default(self, cr, uid, context=None):
         """ To get default pricelist for the order"
@@ -325,24 +298,21 @@ class pos_order(osv.osv):
         @return: journal ID
         """
         journal_list = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash')])
-        if journal_list:
-            return journal_list[0]
-        else:
-            return False
+        return journal_list and journal_list[0] or False
 
     _defaults = {
         'user_salesman_id':lambda self, cr, uid, context: uid,
         'user_id': lambda self, cr, uid, context: uid,
         'sale_manager': lambda self, cr, uid, context: uid,
-        'state': lambda *a: 'draft',
-        'price_type': lambda *a: 'tax_excluded',
+        'state': 'draft',
+        'price_type': 'tax_excluded',
         'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'pos.order'),
-        'date_order': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'date_order': time.strftime('%Y-%m-%d %H:%M:%S'),
         'date_validity': lambda *a: (datetime.today() + relativedelta(months=+6)).strftime('%Y-%m-%d'),
-        'nb_print': lambda *a: 0,
+        'nb_print': 0,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
         'sale_journal': _sale_journal_get,
-        'invoice_wanted': lambda *a: False,
+        'invoice_wanted': False,
         'shop_id': _shop_get,
         'pricelist_id': _select_pricelist,
     }
@@ -364,22 +334,19 @@ class pos_order(osv.osv):
         return True
 
     def test_paid(self, cr, uid, ids, context=None):
-
         """ Test all amount is paid for this order
         @return: True
         """
-        for order in self.browse(cr, uid, ids, context):
+        for order in self.browse(cr, uid, ids, context=context):
             if order.lines and not order.amount_total:
                 return True
             if (not order.lines) or (not order.statement_ids) or \
-                Decimal(str(order.amount_total))!=Decimal(str(order.amount_paid)):
+                Decimal(str(order.amount_total)) != Decimal(str(order.amount_paid)):
                 return False
         return True
 
     def _get_qty_differences(self, orders, old_picking):
-
         """check if the customer changed the product quantity """
-
         order_dict = {}
         for order in orders:
             for line in order.lines:
@@ -401,9 +368,7 @@ class pos_order(osv.osv):
         return diff_dict
 
     def _split_picking(self, cr, uid, ids, context, old_picking, diff_dict):
-
         """if the customer changes the product quantity, split the picking in two"""
-
         # create a copy of the original picking and adjust the product qty:
         picking_model = self.pool.get('stock.picking')
         defaults = {
@@ -412,7 +377,7 @@ class pos_order(osv.osv):
         }
 
         new_picking_id = picking_model.copy(cr, uid, old_picking.id, defaults) # state = 'draft'
-        new_picking = picking_model.browse(cr, uid, new_picking_id, context)
+        new_picking = picking_model.browse(cr, uid, new_picking_id, context=context)
 
         for line in new_picking.move_lines:
             p_id = line.product_id.id
@@ -442,17 +407,16 @@ class pos_order(osv.osv):
 
     def create_picking(self, cr, uid, ids, context=None):
         """Create a picking for each order and validate it."""
-
         picking_obj = self.pool.get('stock.picking')
-        property_obj=self.pool.get("ir.property")
+        property_obj = self.pool.get("ir.property")
         move_obj=self.pool.get('stock.move')
-        pick_name=self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
-        orders = self.browse(cr, uid, ids, context)
+        pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
+        orders = self.browse(cr, uid, ids, context=context)
         for order in orders:
             if not order.picking_id:
                 new = True
                 picking_id = picking_obj.create(cr, uid, {
-                    'name':pick_name,
+                    'name': pick_name,
                     'origin': order.name,
                     'type': 'out',
                     'state': 'draft',
@@ -461,12 +425,12 @@ class pos_order(osv.osv):
                     'invoice_state': 'none',
                     'auto_picking': True,
                     'pos_order': order.id,
-                })
-                self.write(cr, uid, [order.id], {'picking_id': picking_id})
+                }, context=context)
+                self.write(cr, uid, [order.id], {'picking_id': picking_id}, context=context)
             else:
                 picking_id = order.picking_id.id
-                picking_obj.write(cr, uid, [picking_id], {'auto_picking': True})
-                picking = picking_obj.browse(cr, uid, [picking_id], context)[0]
+                picking_obj.write(cr, uid, [picking_id], {'auto_picking': True}, context=context)
+                picking = picking_obj.browse(cr, uid, [picking_id], context=context)[0]
                 new = False
 
                 # split the picking (if product quantity has changed):
@@ -476,13 +440,13 @@ class pos_order(osv.osv):
 
             if new:
                 for line in order.lines:
-                    if line.product_id and line.product_id.type=='service':
+                    if line.product_id and line.product_id.type == 'service':
                         continue
-                    prop_ids = property_obj.search(cr, uid, [('name', '=', 'property_stock_customer')])
-                    val = property_obj.browse(cr, uid, prop_ids[0]).value_reference
-                    cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id=%s", (order.shop_id.warehouse_id.id,))
-                    res=cr.fetchone()
-                    location_id=res and res[0] or None
+                    prop_ids = property_obj.search(cr, uid, [('name', '=', 'property_stock_customer')], context=context)
+                    val = property_obj.browse(cr, uid, prop_ids[0], context=context).value_reference
+                    cr.execute("SELECT s.id FROM stock_location s, stock_warehouse w WHERE w.lot_stock_id = s.id AND w.id = %s", (order.shop_id.warehouse_id.id, ))
+                    res = cr.fetchone()
+                    location_id = res and res[0] or None
                     stock_dest_id = val.id
                     if line.qty < 0:
                         location_id, stock_dest_id = stock_dest_id, location_id
@@ -500,37 +464,33 @@ class pos_order(osv.osv):
                             'state': 'waiting',
                             'location_id': location_id,
                             'location_dest_id': stock_dest_id,
-                        })
+                        }, context=context)
 
             wf_service = netsvc.LocalService("workflow")
             wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
-            self.pool.get('stock.picking').force_assign(cr, uid, [picking_id], context)
+            picking_obj.force_assign(cr, uid, [picking_id], context)
 
         return True
 
     def set_to_draft(self, cr, uid, ids, *args):
-
         """ Changes order state to draft
         @return: True
         """
         if not len(ids):
             return False
-
-        self.write(cr, uid, ids, {'state': 'draft'})
-
+        self.write(cr, uid, ids, {'state': 'draft'}, context=context)
         wf_service = netsvc.LocalService("workflow")
         for i in ids:
             wf_service.trg_create(uid, 'pos.order', i, cr)
         return True
 
     def button_invalidate(self, cr, uid, ids, *args):
-
         """ Check the access for the sale order
         @return: True
         """
         res_obj = self.pool.get('res.company')
         try:
-            part_company=res_obj.browse(cr,uid,uid) and res_obj.browse(cr,uid,uid).parent_id and res_obj.browse(cr,uid,uid).parent_id.id or None
+            part_company = res_obj.browse(cr, uid, uid) and res_obj.browse(cr, uid, uid).parent_id and res_obj.browse(cr, uid, uid).parent_id.id or None
         except Exception:
             raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
         if part_company:
@@ -538,42 +498,39 @@ class pos_order(osv.osv):
         return True
 
     def cancel_order(self, cr, uid, ids, context=None):
-
         """ Changes order state to cancel
         @return: True
         """
-        self.write(cr, uid, ids, {'state': 'cancel'})
+        self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
         self.cancel_picking(cr, uid, ids, context=context)
         return True
 
     def add_payment(self, cr, uid, order_id, data, context=None):
-
         """Create a new payment for the order"""
-
         statement_obj= self.pool.get('account.bank.statement')
-        statementl_obj = self.pool.get('account.bank.statement.line')
+        statement_line_obj = self.pool.get('account.bank.statement.line')
         prod_obj = self.pool.get('product.product')
-        property_obj=self.pool.get('ir.property')
-        curr_c=self.pool.get('res.users').browse(cr, uid, uid).company_id
-        curr_company=curr_c.id
-        order = self.browse(cr, uid, order_id, context)
+        property_obj = self.pool.get('ir.property')
+        curr_c = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
+        curr_company = curr_c.id
+        order = self.browse(cr, uid, order_id, context=context)
         if not order.num_sale and data['num_sale']:
-            self.write(cr,uid,order_id,{'num_sale': data['num_sale']})
-        ids_new=[]
+            self.write(cr, uid, order_id, {'num_sale': data['num_sale']}, context=context)
+        ids_new = []
         args = {
             'amount': data['amount'],
         }
         if 'payment_date' in data.keys():
             args['date'] = data['payment_date']
         if 'payment_name' in data.keys():
-            args['name'] = data['payment_name'] + ' ' +order.name
+            args['name'] = data['payment_name'] + ' ' + order.name
         account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
         args['account_id'] = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def.id or curr_c.account_receivable.id
-        if data.get('is_acc',False):
+        if data.get('is_acc', False):
             args['is_acc'] = data['is_acc']
-            args['account_id']= prod_obj.browse(cr,uid, data['product_id']).property_account_income and prod_obj.browse(cr,uid, data['product_id']).property_account_income.id
+            args['account_id'] = prod_obj.browse(cr, uid, data['product_id'], context=context).property_account_income and prod_obj.browse(cr, uid, data['product_id'], context=context).property_account_income.id
             if not args['account_id']:
-                raise osv.except_osv(_('Error'), _('Please provide an account for the product: %s')%(prod_obj.browse(cr,uid, data['product_id']).name))
+                raise osv.except_osv(_('Error'), _('Please provide an account for the product: %s')%(prod_obj.browse(cr, uid, data['product_id'], context=context).name))
         args['partner_id'] = order.partner_id and order.partner_id.id or None
         args['ref'] = order.contract_number or None
 
@@ -581,15 +538,15 @@ class pos_order(osv.osv):
                                                      ('journal_id', '=', data['journal']),
                                                      ('company_id', '=', curr_company),
                                                      ('user_id', '=', uid),
-                                                     ('state', '=', 'open')])
-        if len(statement_id)==0:
+                                                     ('state', '=', 'open')], context=context)
+        if len(statement_id) == 0:
             raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox'))
         if statement_id:
-            statement_id=statement_id[0]
-        args['statement_id']= statement_id
-        args['pos_statement_id']= order_id
-        args['journal_id']= data['journal']
-        statementl_obj.create(cr, uid, args)
+            statement_id = statement_id[0]
+        args['statement_id'] = statement_id
+        args['pos_statement_id'] = order_id
+        args['journal_id'] = data['journal']
+        statement_line_obj.create(cr, uid, args, context=context)
         ids_new.append(statement_id)
 
         wf_service = netsvc.LocalService("workflow")
@@ -599,9 +556,7 @@ class pos_order(osv.osv):
         return statement_id
 
     def add_product(self, cr, uid, order_id, product_id, qty, context=None):
-
         """Create a new order line the order"""
-
         line_obj = self.pool.get('pos.order.line')
         values = self.read(cr, uid, order_id, ['partner_id', 'pricelist_id'])
 
@@ -616,10 +571,9 @@ class pos_order(osv.osv):
             'product_id': product_id,
             'qty': qty,
             'price_unit': price,
-        })
+        }, context=context)
         wf_service = netsvc.LocalService("workflow")
         wf_service.trg_write(uid, 'pos.order', order_id, cr)
-
         return order_line_id, price
 
     def refund(self, cr, uid, ids, context=None):
@@ -627,7 +581,7 @@ class pos_order(osv.osv):
         clone_list = []
         line_obj = self.pool.get('pos.order.line')
 
-        for order in self.browse(cr, uid, ids):
+        for order in self.browse(cr, uid, ids, context=context):
             clone_id = self.copy(cr, uid, order.id, {
                 'name': order.name + ' REFUND',
                 'date_order': time.strftime('%Y-%m-%d'),
@@ -636,26 +590,25 @@ class pos_order(osv.osv):
                 'invoice_id': False,
                 'nb_print': 0,
                 'statement_ids': False,
-                })
+                }, context=context)
             clone_list.append(clone_id)
 
 
-        for clone in self.browse(cr, uid, clone_list):
+        for clone in self.browse(cr, uid, clone_list, context=context):
             for order_line in clone.lines:
                 line_obj.write(cr, uid, [order_line.id], {
                     'qty': -order_line.qty
-                    })
+                    }, context=context)
         return clone_list
 
     def action_invoice(self, cr, uid, ids, context=None):
         """Create a invoice of order  """
-
         inv_ref = self.pool.get('account.invoice')
         inv_line_ref = self.pool.get('account.invoice.line')
-        product_obj= self.pool.get('product.product')
+        product_obj = self.pool.get('product.product')
         inv_ids = []
 
-        for order in self.pool.get('pos.order').browse(cr, uid, ids, context):
+        for order in self.pool.get('pos.order').browse(cr, uid, ids, context=context):
             if order.invoice_id:
                 inv_ids.append(order.invoice_id.id)
                 continue
@@ -663,12 +616,12 @@ class pos_order(osv.osv):
             if not order.partner_id:
                 raise osv.except_osv(_('Error'), _('Please provide a partner for the sale.'))
 
-            acc= order.partner_id.property_account_receivable.id
+            acc = order.partner_id.property_account_receivable.id
             inv = {
                 'name': 'Invoice from POS: '+order.name,
                 'origin': order.name,
-                'account_id':acc,
-                'journal_id':order.sale_journal.id or None,
+                'account_id': acc,
+                'journal_id': order.sale_journal.id or None,
                 'type': 'out_invoice',
                 'reference': order.name,
                 'partner_id': order.partner_id.id,
@@ -677,9 +630,9 @@ class pos_order(osv.osv):
             inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'out_invoice', order.partner_id.id)['value'])
             if not inv.get('account_id', None):
                 inv['account_id'] = acc
-            inv_id = inv_ref.create(cr, uid, inv, context)
+            inv_id = inv_ref.create(cr, uid, inv, context=context)
 
-            self.write(cr, uid, [order.id], {'invoice_id': inv_id, 'state': 'invoiced'})
+            self.write(cr, uid, [order.id], {'invoice_id': inv_id, 'state': 'invoiced'}, context=context)
             inv_ids.append(inv_id)
             for line in order.lines:
                 inv_line = {
@@ -697,10 +650,9 @@ class pos_order(osv.osv):
                 inv_line['discount'] = line.discount
                 inv_line['account_id'] = acc
                 inv_line['name'] = inv_name
-
                 inv_line['invoice_line_tax_id'] = ('invoice_line_tax_id' in inv_line)\
                     and [(6, 0, inv_line['invoice_line_tax_id'])] or []
-                inv_line_ref.create(cr, uid, inv_line, context)
+                inv_line_ref.create(cr, uid, inv_line, context=context)
 
         for i in inv_ids:
             wf_service = netsvc.LocalService("workflow")
@@ -708,9 +660,7 @@ class pos_order(osv.osv):
         return inv_ids
 
     def create_account_move(self, cr, uid, ids, context=None):
-
         """Create a account move line of order  """
-
         account_move_obj = self.pool.get('account.move')
         account_move_line_obj = self.pool.get('account.move.line')
         account_period_obj = self.pool.get('account.period')
@@ -720,9 +670,9 @@ class pos_order(osv.osv):
         period = account_period_obj.find(cr, uid, context=context)[0]
 
         for order in self.browse(cr, uid, ids, context=context):
-            curr_c =res_obj.browse(cr, uid, uid).company_id
+            curr_c = res_obj.browse(cr, uid, uid).company_id
             comp_id = res_obj.browse(cr, order.user_id.id, order.user_id.id).company_id
-            comp_id=comp_id and comp_id.id or False
+            comp_id = comp_id and comp_id.id or False
             to_reconcile = []
             group_tax = {}
             account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context).id
@@ -737,10 +687,9 @@ class pos_order(osv.osv):
 
             # Create an move for each order line
             for line in order.lines:
-
                 tax_amount = 0
                 taxes = [t for t in line.product_id.taxes_id]
-                if order.price_type=='tax_excluded':
+                if order.price_type == 'tax_excluded':
                     computed_taxes = account_tax_obj.compute_all(
                         cr, uid, taxes, line.price_unit, line.qty)['taxes']
                 else:
@@ -757,7 +706,7 @@ class pos_order(osv.osv):
                         group_tax[group_key] += round(tax['amount'], 2)
                     else:
                         group_tax[group_key] = round(tax['amount'], 2)
-                if order.price_type!='tax_excluded':
+                if order.price_type != 'tax_excluded':
                     amount = line.price_subtotal - tax_amount
                 else:
                     amount = line.price_subtotal
@@ -775,7 +724,6 @@ class pos_order(osv.osv):
                         'account defined for this product: "%s" (id:%d)') \
                         % (line.product_id.name, line.product_id.id, ))
 
-
                 # Empty the tax list as long as there is no tax code:
                 tax_code_id = False
                 tax_amount = 0
@@ -797,7 +745,7 @@ class pos_order(osv.osv):
                     'date': order.date_order[:10],
                     'ref': order.contract_number or order.name,
                     'quantity': line.qty,
-                    'product_id':line.product_id.id,
+                    'product_id': line.product_id.id,
                     'move_id': move_id,
                     'account_id': income_account,
                     'company_id': comp_id,
@@ -821,7 +769,7 @@ class pos_order(osv.osv):
                         continue
 
                     account_move_line_obj.create(cr, uid, {
-                        'name': "bb"+order.name,
+                        'name': "bb" + order.name,
                         'date': order.date_order[:10],
                         'ref': order.contract_number or order.name,
                         'product_id':line.product_id.id,
@@ -842,13 +790,13 @@ class pos_order(osv.osv):
             (tax_code_pos, base_code_pos, account_pos)= (0, 1, 2)
             for key, amount in group_tax.items():
                 account_move_line_obj.create(cr, uid, {
-                    'name':"cc"+order.name,
+                    'name': "cc" + order.name,
                     'date': order.date_order[:10],
                     'ref': order.contract_number or order.name,
                     'move_id': move_id,
                     'company_id': comp_id,
                     'quantity': line.qty,
-                    'product_id':line.product_id.id,
+                    'product_id': line.product_id.id,
                     'account_id': key[account_pos],
                     'credit': ((amount>0) and amount) or 0.0,
                     'debit': ((amount<0) and -amount) or 0.0,
@@ -860,15 +808,15 @@ class pos_order(osv.osv):
 
             # counterpart
             to_reconcile.append(account_move_line_obj.create(cr, uid, {
-                'name': "dd"+order.name,
+                'name': "dd" + order.name,
                 'date': order.date_order[:10],
                 'ref': order.contract_number or order.name,
                 'move_id': move_id,
                 'company_id': comp_id,
                 'account_id': order_account,
-                'credit': ((order.amount_total<0) and -order.amount_total)\
+                'credit': ((order.amount_total < 0) and -order.amount_total)\
                     or 0.0,
-                'debit': ((order.amount_total>0) and order.amount_total)\
+                'debit': ((order.amount_total > 0) and order.amount_total)\
                     or 0.0,
                 'journal_id': order.sale_journal.id,
                 'period_id': period,
@@ -882,7 +830,6 @@ class pos_order(osv.osv):
                     _('There is no receivable account defined for this journal:'\
                     ' "%s" (id:%d)') % (order.sale_journal.name, order.sale_journal.id, ))
             for payment in order.statement_ids:
-
                 # Create one entry for the payment
                 if payment.is_acc:
                     continue
@@ -903,23 +850,24 @@ class pos_order(osv.osv):
                                                     })
                                 account_move_line_obj.copy(cr, uid, s.id, {
                                                         'statement_id': False,
-                                                        'account_id':order_account
+                                                        'account_id': order_account
                                                      })
 
-            self.write(cr,uid,order.id,{'state':'done'})
+            self.write(cr, uid, order.id, {'state':'done'}, context=context)
         return True
 
     def cancel_picking(self, cr, uid, ids, context=None):
+        stock_picking_obj = self.pool.get('stock.picking')
         for order in self.browse(cr, uid, ids, context=context):
             for picking in order.pickings:
-                self.pool.get('stock.picking').unlink(cr, uid, [picking.id], context)
+                stock_picking_obj.unlink(cr, uid, [picking.id], context=context)
         return True
 
 
     def action_payment(self, cr, uid, ids, context=None):
         vals = {'state': 'payment'}
-        sequence_obj=self.pool.get('ir.sequence')
-        for pos in self.browse(cr, uid, ids):
+        sequence_obj = self.pool.get('ir.sequence')
+        for pos in self.browse(cr, uid, ids, context=context):
             create_contract_nb = False
             for line in pos.lines:
                 if line.product_id.product_type == 'MD':
@@ -927,21 +875,21 @@ class pos_order(osv.osv):
                     break
             if create_contract_nb:
                 seq = sequence_obj.get(cr, uid, 'pos.user_%s' % pos.user_salesman_id.login)
-                vals['contract_number'] ='%s-%s' % (pos.user_salesman_id.login, seq)
-        self.write(cr, uid, ids, vals)
+                vals['contract_number'] = '%s-%s' % (pos.user_salesman_id.login, seq)
+        self.write(cr, uid, ids, vals, context=context)
 
     def action_paid(self, cr, uid, ids, context=None):
         if not context:
             context = {}
-        if context.get('flag',False):
+        if context.get('flag', False):
             self.create_picking(cr, uid, ids, context=None)
-            self.write(cr, uid, ids, {'state': 'paid'})
+            self.write(cr, uid, ids, {'state': 'paid'}, context=context)
         else:
-            context['flag']=True
+            context['flag'] = True
         return True
 
     def action_cancel(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state': 'cancel'})
+        self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
         return True
 
     def action_done(self, cr, uid, ids, context=None):
@@ -951,12 +899,12 @@ class pos_order(osv.osv):
         return True
 
     def compute_state(self, cr, uid, id):
-        cr.execute("select act.id, act.name from wkf_activity act "
-                   "inner join wkf_workitem item on act.id=item.act_id "
-                   "inner join wkf_instance inst on item.inst_id=inst.id "
-                   "inner join wkf on inst.wkf_id=wkf.id "
-                   "where wkf.osv='pos.order' and inst.res_id=%s "
-                   "order by act.name", (id,))
+        cr.execute("SELECT act.id, act.name FROM wkf_activity act "
+                   "INNER JOIN wkf_workitem item ON act.id = item.act_id "
+                   "INNER JOIN wkf_instance inst ON item.inst_id = inst.id "
+                   "INNER JOIN wkf ON inst.wkf_id = wkf.id "
+                   "WHERE wkf.osv = 'pos.order' AND inst.res_id = %s "
+                   "ORDER BY act.name", (id, ))
         return [name for id, name in cr.fetchall()]
 
 pos_order()
@@ -964,7 +912,7 @@ pos_order()
 class account_bank_statement(osv.osv):
     _inherit = 'account.bank.statement'
     _columns= {
-        'user_id': fields.many2one('res.users',ondelete='cascade',string='User', readonly=True),
+        'user_id': fields.many2one('res.users', ondelete='cascade', string='User', readonly=True),
     }
     _defaults = {
         'user_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).id
@@ -980,9 +928,9 @@ class account_bank_statement_line(osv.osv):
         return res
     _columns= {
         'journal_id': fields.function(_get_statement_journal, method=True,store=True, string='Journal', type='char', size=64),
-        'am_out':fields.boolean("To count"),
-        'is_acc':fields.boolean("Is accompte"),
-        'pos_statement_id': fields.many2one('pos.order',ondelete='cascade'),
+        'am_out': fields.boolean("To count"),
+        'is_acc': fields.boolean("Is accompte"),
+        'pos_statement_id': fields.many2one('pos.order', ondelete='cascade'),
     }
 account_bank_statement_line()
 
@@ -990,18 +938,18 @@ class pos_order_line(osv.osv):
     _name = "pos.order.line"
     _description = "Lines of Point of Sale"
 
-    def _get_amount(self, cr, uid, ids, field_name, arg, context):
+    def _get_amount(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
-        for line in self.browse(cr, uid, ids):
+        for line in self.browse(cr, uid, ids, context=context):
             price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
-            res[line.id]=price
+            res[line.id] = price
         return res
 
-    def _amount_line_ttc(self, cr, uid, ids, field_name, arg, context):
+    def _amount_line_ttc(self, cr, uid, ids, field_name, arg, context=None):
         res = dict.fromkeys(ids, 0.0)
         account_tax_obj = self.pool.get('account.tax')
         self.price_by_product_multi(cr, uid, ids)
-        for line in self.browse(cr, uid, ids):
+        for line in self.browse(cr, uid, ids, context=context):
             tax_amount = 0.0
             taxes = [t for t in line.product_id.taxes_id]
             if line.qty == 0.0:
@@ -1009,27 +957,25 @@ class pos_order_line(osv.osv):
             computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit, line.qty)['taxes']
             for tax in computed_taxes:
                 tax_amount += tax['amount']
-            if line.discount!=0.0:
+            if line.discount != 0.0:
                 res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
             else:
-                res[line.id]=line.price_unit*line.qty
+                res[line.id] = line.price_unit*line.qty
             res[line.id] = res[line.id] + tax_amount
         return res
 
-    def _amount_line(self, cr, uid, ids, field_name, arg, context):
+    def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
-
         self.price_by_product_multi(cr, uid, ids)
-        for line in self.browse(cr, uid, ids):
+        for line in self.browse(cr, uid, ids, context=context):
             if line.discount!=0.0:
                 res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
             else:
-                res[line.id]=line.price_unit*line.qty
+                res[line.id] = line.price_unit * line.qty
         return res
 
     def _amount_line_all(self, cr, uid, ids, field_names, arg, context):
         res = dict([(i, {}) for i in ids])
-
         account_tax_obj = self.pool.get('account.tax')
 
         self.price_by_product_multi(cr, uid, ids)
@@ -1059,9 +1005,7 @@ class pos_order_line(osv.osv):
     def price_by_product_multi(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-
         res = {}.fromkeys(ids, 0.0)
-
         lines = self.browse(cr, uid, ids, context=context)
 
         pricelist_ids = [line.order_id.pricelist_id.id for line in lines]
@@ -1105,10 +1049,10 @@ class pos_order_line(osv.osv):
             raise osv.except_osv(_('No Pricelist !'),
                 _('You have to select a pricelist in the sale form !\n' \
                 'Please set one before choosing a product.'))
-        p_obj = self.pool.get('product.product').browse(cr,uid,[product_id])[0]
+        p_obj = self.pool.get('product.product').browse(cr, uid, [product_id])[0]
         uom_id = p_obj.uom_po_id.id
         price = self.pool.get('product.pricelist').price_get(cr, uid,
-            [pricelist], product_id, qty or 1.0, partner_id,{'uom': uom_id})[pricelist]
+            [pricelist], product_id, qty or 1.0, partner_id, {'uom': uom_id})[pricelist]
         unit_price=price or p_obj.list_price
         if unit_price is False:
             raise osv.except_osv(_('No valid pricelist line found !'),
@@ -1119,38 +1063,38 @@ class pos_order_line(osv.osv):
 
     def onchange_product_id(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False):
         price = self.price_by_product(cr, uid, ids, pricelist, product_id, qty, partner_id)
-        self.write(cr,uid,ids,{'price_unit':price})
+        self.write(cr, uid, ids, {'price_unit':price})
         pos_stot = (price * qty)
-        return {'value': {'price_unit': price,'price_subtotal_incl': pos_stot}}
+        return {'value': {'price_unit': price, 'price_subtotal_incl': pos_stot}}
 
-    def onchange_subtotal(self, cr, uid, ids, discount, price, pricelist,qty,partner_id, product_id,*a):
+    def onchange_subtotal(self, cr, uid, ids, discount, price, pricelist, qty,partner_id, product_id, *a):
         prod_obj = self.pool.get('product.product')
         price_f = self.price_by_product(cr, uid, ids, pricelist, product_id, qty, partner_id)
-        prod_id=''
+        prod_id = ''
         if product_id:
-            prod_id=prod_obj.browse(cr,uid,product_id).disc_controle
-        disc=0.0
-        if (disc != 0.0 or prod_id) and price_f>0:
-            disc=100-(price/price_f*100)
-            return {'value':{'discount':disc, 'price_unit':price_f}}
+            prod_id = prod_obj.browse(cr, uid, product_id).disc_controle
+        disc = 0.0
+        if (disc != 0.0 or prod_id) and price_f > 0:
+            disc = 100 - (price/price_f*100)
+            return {'value': {'discount': disc, 'price_unit': price_f}}
         return {}
 
-    def onchange_dis(self, cr, uid,ids,  qty, price_subtotal_incl, discount,*a):
+    def onchange_dis(self, cr, uid, ids,  qty, price_subtotal_incl, discount, *a):
         price_sub = price_subtotal_incl
-        sub_total_discount = price_sub-(price_subtotal_incl*(discount*0.01))
-        return {'value': {'price_subtotal_incl':sub_total_discount}}
+        sub_total_discount = price_sub - (price_subtotal_incl*(discount*0.01))
+        return {'value': {'price_subtotal_incl': sub_total_discount}}
 
-    def onchange_ded(self, cr, uid,ids, val_ded,price_u,*a):
+    def onchange_ded(self, cr, uid, ids, val_ded, price_u, *a):
         res_obj = self.pool.get('res.users')
-        comp = res_obj.browse(cr,uid,uid).company_id.company_discount or 0.0
-        val=0.0
+        comp = res_obj.browse(cr, uid, uid).company_id.company_discount or 0.0
+        val = 0.0
         if val_ded and price_u:
-            val=100.0*val_ded/price_u
+            val=100.0 * val_ded / price_u
         if val > comp:
-            return {'value': {'discount':val, 'notice':'' }}
-        return {'value': {'discount':val}}
+            return {'value': {'discount': val, 'notice': '' }}
+        return {'value': {'discount': val}}
 
-    def onchange_discount(self, cr, uid,ids, discount,price,*a):
+    def onchange_discount(self, cr, uid, ids, discount, price, *a):
         pos_order = self.pool.get('pos.order.line')
         res_obj = self.pool.get('res.users')
         company_disc = pos_order.browse(cr,uid,ids)
@@ -1161,11 +1105,11 @@ class pos_order_line(osv.osv):
                 comp= company_disc[0] and company_disc[0].order_id.company_id and  company_disc[0].order_id.company_id.company_discount  or 0.0
 
             if discount > comp :
-                return {'value': {'notice':'','price_ded':price*discount*0.01 or 0.0  }}
+                return {'value': {'notice': '', 'price_ded': price * discount * 0.01 or 0.0  }}
             else:
-                return {'value': {'notice':'Minimum Discount','price_ded':price*discount*0.01 or 0.0  }}
+                return {'value': {'notice': 'Minimum Discount', 'price_ded': price * discount * 0.01 or 0.0  }}
         else :
-            return {'value': {'notice':'No Discount', 'price_ded':price*discount*0.01 or 0.0}}
+            return {'value': {'notice': 'No Discount', 'price_ded': price * discount * 0.01 or 0.0}}
 
     def onchange_qty(self, cr, uid, ids, discount, qty, price, context=None):
         subtotal = qty * price
@@ -1175,12 +1119,12 @@ class pos_order_line(osv.osv):
 
     _columns = {
         'name': fields.char('Line Description', size=512),
-        'company_id':fields.many2one('res.company', 'Company', required=True),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
         'notice': fields.char('Discount Notice', size=128, required=True),
         'serial_number': fields.char('Serial Number', size=128),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], required=True, change_default=True),
         'price_unit': fields.function(_get_amount, method=True, string='Unit Price', store=True),
-        'price_ded': fields.float('Discount(Amount)',digits_compute=dp.get_precision('Point Of Sale')),
+        'price_ded': fields.float('Discount(Amount)', digits_compute=dp.get_precision('Point Of Sale')),
         'qty': fields.float('Quantity'),
         'qty_rfd': fields.float('Refunded Quantity'),
         'price_subtotal': fields.function(_amount_line_all, method=True, multi='pos_order_line_amount', string='Subtotal w/o Tax'),
@@ -1201,17 +1145,17 @@ class pos_order_line(osv.osv):
 
     def create(self, cr, user, vals, context=None):
         if vals.get('product_id'):
-            return super(pos_order_line, self).create(cr, user, vals, context)
+            return super(pos_order_line, self).create(cr, user, vals, context=context)
         return False
 
     def write(self, cr, user, ids, values, context=None):
         if 'product_id' in values and not values['product_id']:
             return False
-        return super(pos_order_line, self).write(cr, user, ids, values, context)
+        return super(pos_order_line, self).write(cr, user, ids, values, context=context)
 
     def _scan_product(self, cr, uid, ean, qty, order):
         # search pricelist_id
-        product_obj=self.pool.get('product.product')
+        product_obj = self.pool.get('product.product')
         pricelist_id = self.pool.get('pos.order').read(cr, uid, [order], ['pricelist_id'] )
         if not pricelist_id:
             return False
@@ -1223,11 +1167,11 @@ class pos_order_line(osv.osv):
            return False
 
         # search price product
-        product =product_obj.read(cr, uid, product_id)
+        product = product_obj.read(cr, uid, product_id)
         product_name = product[0]['name']
         price = self.price_by_product(cr, uid, 0, pricelist_id[0]['pricelist_id'][0], product_id[0], 1)
 
-        order_line_ids = self.search(cr, uid, [('name','=',product_name),('order_id','=',order)])
+        order_line_ids = self.search(cr, uid, [('name', '=', product_name), ('order_id', '=' ,order)])
         if order_line_ids:
             new_line = False
             order_line_id = order_line_ids[0]
@@ -1253,7 +1197,7 @@ class pos_order_line(osv.osv):
                 raise osv.except_osv(_('Error'), _('Modify line failed !'))
             line_id = order_line_id
 
-        price_line = float(qty)*float(price)
+        price_line = float(qty) * float(price)
         return {
             'name': product_name,
             'product_id': product_id[0],
@@ -1273,12 +1217,11 @@ class product_product(osv.osv):
         'disc_controle': fields.boolean('Discount Control'),
     }
     _defaults = {
-        'disc_controle': lambda *a: True,
+        'disc_controle': True,
     }
 product_product()
 
 class stock_picking(osv.osv):
-
     _inherit = 'stock.picking'
     _columns = {
         'pos_order': fields.many2one('pos.order', 'Pos order'),
diff --git a/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
index 58f78902a14..3f561848edf 100644
--- a/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
+++ b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
@@ -19,38 +19,32 @@
 #
 ##############################################################################
 
-import netsvc
-from osv import osv,fields
-from tools.translate import _
 import time
 
+import netsvc
+from osv import osv, fields
+from tools.translate import _
+
 class all_closed_cashbox_of_the_day(osv.osv_memory):
     _name = 'all.closed.cashbox.of.the.day'
     _description = 'All closed cashbox of the day'
 
-    _columns = {
-
-    }
-
     def print_report(self, cr, uid, ids, context=None):
-
         """
              To get the date and print the report
-
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
              @param context: A standard dictionary
              @return : retrun report
         """
-        datas = {'ids' : context.get('active_ids',[])}
+        datas = {'ids': context.get('active_ids', [])}
         res =  {}
         datas['form'] = res
-
         return {
-            'type' : 'ir.actions.report.xml',
-            'report_name':'all.closed.cashbox.of.the.day',
-            'datas' : datas,
+            'type': 'ir.actions.report.xml',
+            'report_name': 'all.closed.cashbox.of.the.day',
+            'datas': datas,
        }
 
 all_closed_cashbox_of_the_day()
diff --git a/addons/point_of_sale/wizard/pos_add_product.py b/addons/point_of_sale/wizard/pos_add_product.py
index 5735d2976a4..601c3d3f305 100644
--- a/addons/point_of_sale/wizard/pos_add_product.py
+++ b/addons/point_of_sale/wizard/pos_add_product.py
@@ -32,10 +32,10 @@ class add_product(osv.osv_memory):
         'quantity': fields.float('Quantity', required=True),
     }
     _defaults = {
-        'quantity': lambda *a: 1,
+        'quantity': 1,
     }
 
-    def select_product(self, cr, uid, ids, context):
+    def select_product(self, cr, uid, ids, context=None):
         """
              To get the product and quantity and add in order .
              @param self: The object pointer.
@@ -44,13 +44,14 @@ class add_product(osv.osv_memory):
              @param context: A standard dictionary
              @return : Return the add product form again for adding more product
         """
+        if context is None:
+            context = {}
         this = self.browse(cr, uid, ids[0], context=context)
         record_id = context and context.get('active_id', False)
         assert record_id, _('Active ID is not found')
         if record_id:
             order_obj = self.pool.get('pos.order')
             order_obj.add_product(cr, uid, record_id, this.product_id.id, this.quantity, context=context)
-
         return {
             'name': _('Add Product'),
             'view_type': 'form',
@@ -61,34 +62,36 @@ class add_product(osv.osv_memory):
             'views': False,
             'type': 'ir.actions.act_window',
         }
-    def close_action(self, cr, uid, ids, context):
+
+    def close_action(self, cr, uid, ids, context=None):
         """
              To get the product and Make the payment .
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
              @param context: A standard dictionary
-             @return : Return the Make Payment 
+             @return : Return the Make Payment
         """
-
+        if context is None:
+            context = {}
         record_id = context and context.get('active_id', False)
         order_obj= self.pool.get('pos.order')
-        obj=order_obj.browse(cr, uid, record_id)
-        order_obj.write(cr, uid, [record_id], {'state':'done'})
+        obj = order_obj.browse(cr, uid, record_id, context=context)
+        order_obj.write(cr, uid, [record_id], {'state': 'done'}, context=context)
         if obj.amount_total != obj.amount_paid:
             return {
-            'name': _('Make Payment'),
-            'context ':context and context.get('active_id', False),
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'pos.make.payment',
-            'view_id': False,
-            'target': 'new',
-            'views': False,
-            'type': 'ir.actions.act_window',
-            
+                'name': _('Make Payment'),
+                'context': context and context.get('active_id', False),
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'pos.make.payment',
+                'view_id': False,
+                'target': 'new',
+                'views': False,
+                'type': 'ir.actions.act_window',
             }
-        return {}   
+        return {}
+
 add_product()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_box_entries.py b/addons/point_of_sale/wizard/pos_box_entries.py
index 103e49be62d..d9fd5a61573 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.py
+++ b/addons/point_of_sale/wizard/pos_box_entries.py
@@ -19,30 +19,31 @@
 #
 ##############################################################################
 
-from osv import osv, fields
 import time
+
+from osv import osv, fields
 from tools.translate import _
 
 
-def get_journal(self, cr, uid, context):
+def get_journal(self, cr, uid, context=None):
     """
-             Make the selection list of Cash Journal  .
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param context: A standard dictionary
-             @return :Return the list of journal
+         Make the selection list of Cash Journal  .
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary
+         @return :Return the list of journal
     """
 
-    obj = self.pool.get('account.journal')
+    journal_obj = self.pool.get('account.journal')
     statement_obj = self.pool.get('account.bank.statement')
-    cr.execute("SELECT DISTINCT journal_id from pos_journal_users where user_id=%s order by journal_id", (uid,))
+    cr.execute("SELECT DISTINCT journal_id FROM pos_journal_users WHERE user_id = %s ORDER BY journal_id", (uid, ))
     j_ids = map(lambda x1: x1[0], cr.fetchall())
-    ids = obj.search(cr, uid, [('type', '=', 'cash'), ('id', 'in', j_ids)])
-    obj_ids= statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', 'in', ids)])
-    res_obj = obj.read(cr, uid, ids, ['journal_id'], context)
-    res_obj = [(r1['id'])for r1 in res_obj]
-    res = statement_obj.read(cr, uid, obj_ids, ['journal_id'], context)
+    ids = journal_obj.search(cr, uid, [('type', '=', 'cash'), ('id', 'in', j_ids)], context=context)
+    obj_ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', 'in', ids)], context=context)
+    res_obj = journal_obj.read(cr, uid, ids, ['journal_id'], context=context)
+    res_obj = [(r1['id']) for r1 in res_obj]
+    res = statement_obj.read(cr, uid, obj_ids, ['journal_id'], context=context)
     res = [(r['journal_id']) for r in res]
     res.insert(0, ('', ''))
     return res
@@ -51,10 +52,7 @@ class pos_box_entries(osv.osv_memory):
     _name = 'pos.box.entries'
     _description = 'Pos Box Entries'
 
-
-
     def _get_income_product(self, cr, uid, context):
-
         """
              Make the selection list of purchasing  products.
              @param self: The object pointer.

From 2cc265aaef420d20bfb1bc5b7b57e397276ab755 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 26 Oct 2010 11:13:51 +0530
Subject: [PATCH 14/38] [REF] Account: Remove some warnings from buildbot

bzr revid: mra@mra-laptop-20101026054351-68olcwfpq81rinr2
---
 addons/account/report/account_partner_balance.py |  1 -
 addons/account/report/account_profit_loss.py     |  1 -
 addons/account/report/account_tax_code.py        |  2 +-
 addons/account/report/rml_parse.py               | 12 +++++-------
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/addons/account/report/account_partner_balance.py b/addons/account/report/account_partner_balance.py
index ab1c6f656f2..ab3cfd70970 100644
--- a/addons/account/report/account_partner_balance.py
+++ b/addons/account/report/account_partner_balance.py
@@ -79,7 +79,6 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
             move_state = ['posted']
 
         full_account = []
-        result_tmp = 0.0
         self.cr.execute(
             "SELECT p.ref,l.account_id,ac.name AS account_name,ac.code AS code,p.name, sum(debit) AS debit, sum(credit) AS credit, " \
                     "CASE WHEN sum(debit) > sum(credit) " \
diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py
index 9469c3e0d7e..0bfaea7a570 100644
--- a/addons/account/report/account_profit_loss.py
+++ b/addons/account/report/account_profit_loss.py
@@ -77,7 +77,6 @@ class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header):
         db_pool = pooler.get_pool(self.cr.dbname)
 
         account_pool = db_pool.get('account.account')
-        year_pool = db_pool.get('account.fiscalyear')
 
         types = [
             'expense',
diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py
index e59839f8267..42bbe305381 100644
--- a/addons/account/report/account_tax_code.py
+++ b/addons/account/report/account_tax_code.py
@@ -21,9 +21,9 @@
 ##############################################################################
 
 import time
+
 import rml_parse
 from report import report_sxw
-import re
 
 def _get_country(record):
     if record.partner_id \
diff --git a/addons/account/report/rml_parse.py b/addons/account/report/rml_parse.py
index c71c0254849..aab5e14c777 100644
--- a/addons/account/report/rml_parse.py
+++ b/addons/account/report/rml_parse.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import time
 import re
 import sys
 
@@ -55,15 +54,15 @@ class rml_parse(report_sxw.rml_parse):
         ellipsis = ellipsis or ''
         try:
             return string[:maxlen - len(ellipsis) ] + (ellipsis, '')[len(string) < maxlen]
-        except Exception, e:
+        except:
             return False
     def _strip_name(self, name, maxlen=50):
         return self._ellipsis(name, maxlen, '...')
 
-    def _get_and_change_date_format_for_swiss (self,date_to_format):
+    def _get_and_change_date_format_for_swiss(self,date_to_format):
         date_formatted=''
         if date_to_format:
-            date_formatted = strptime (date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y')
+            date_formatted = strptime(date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y')
         return date_formatted
 
     def _explode_name(self,chaine,length):
@@ -109,15 +108,14 @@ class rml_parse(report_sxw.rml_parse):
             i = i + length
         chaine = str("".join(ast))
         return chaine
-    def repair_string(self,chaine):
+    def repair_string(self, chaine):
         ast = list(chaine)
         UnicodeAst = []
-        _previouslyfound = False
         i = 0
         while i < len(ast):
             elem = ast[i]
             try:
-                Stringer = elem.encode("utf-8")
+                elem.encode("utf-8")
             except UnicodeDecodeError:
                 to_reencode = elem + ast[i+1]
                 print str(to_reencode)

From c73e17329c92d262f57a45e57664e059f5ce62c3 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 26 Oct 2010 14:17:22 +0530
Subject: [PATCH 15/38] [FIX] email_template:
 email_template.preview.fields_view_get() is broken

bzr revid: psi@tinyerp.co.in-20101026084722-00oyp8j3d92yxqkh
---
 addons/email_template/email_template.py | 77 +++++++++++++------------
 1 file changed, 39 insertions(+), 38 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 4e53a895587..1189e1c4cec 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -103,7 +103,7 @@ def get_value(cursor, user, recid, message=None, template=None, context=None):
 
 class email_template(osv.osv):
     "Templates for sending Email"
-    
+
     _name = "email.template"
     _description = 'Email Templates for Models'
 
@@ -131,7 +131,7 @@ class email_template(osv.osv):
         'def_to':fields.char(
                  'Recipient (To)',
                  size=250,
-                 help="The Recipient of email. " 
+                 help="The Recipient of email. "
                  "Placeholders can be used here. "
                  "e.g. ${object.email_to}"),
         'def_cc':fields.char(
@@ -146,20 +146,20 @@ class email_template(osv.osv):
                   help="Blind Carbon Copy address(es), comma-separated."
                     " Placeholders can be used here. "
                     "e.g. ${object.email_bcc}"),
-        'reply_to':fields.char('Reply-To', 
-                    size=250, 
+        'reply_to':fields.char('Reply-To',
+                    size=250,
                     help="The address recipients should reply to,"
                     " if different from the From address."
                     " Placeholders can be used here. "
                     "e.g. ${object.email_reply_to}"),
-        'message_id':fields.char('Message-ID', 
-                    size=250, 
+        'message_id':fields.char('Message-ID',
+                    size=250,
                     help="Specify the Message-ID SMTP header to use in outgoing emails. Please note that this overrides the Resource tracking option! Placeholders can be used here."),
         'track_campaign_item':fields.boolean('Resource Tracking',
                                 help="Enable this is you wish to include a special \
 tracking marker in outgoing emails so you can identify replies and link \
 them back to the corresponding resource record. \
-This is useful for CRM leads for example"), 
+This is useful for CRM leads for example"),
         'lang':fields.char(
                    'Language',
                    size=250,
@@ -182,7 +182,7 @@ This is useful for CRM leads for example"),
                     translate=True),
         'use_sign':fields.boolean(
                   'Signature',
-                  help="the signature from the User details" 
+                  help="the signature from the User details"
                   " will be appended to the mail"),
         'file_name':fields.char(
                 'Report Filename',
@@ -199,16 +199,16 @@ This is useful for CRM leads for example"),
                     'attachment_id',
                     'Attached Files',
                     help="You may attach existing files to this template, "
-                         "so they will be added in all emails created from this template"), 
+                         "so they will be added in all emails created from this template"),
         'ref_ir_act_window':fields.many2one(
                     'ir.actions.act_window',
                     'Window Action',
-                    help="Action that will open this email template on Resource records", 
+                    help="Action that will open this email template on Resource records",
                     readonly=True),
         'ref_ir_value':fields.many2one(
                    'ir.values',
                    'Wizard Button',
-                   help="Button in the side bar of the form view of this Resource that will invoke the Window Action", 
+                   help="Button in the side bar of the form view of this Resource that will invoke the Window Action",
                    readonly=True),
         'allowed_groups':fields.many2many(
                   'res.groups',
@@ -265,7 +265,7 @@ This is useful for CRM leads for example"),
         'template_language' : lambda *a:'mako',
 
     }
-    
+
     _sql_constraints = [
         ('name', 'unique (name)', _('The template name must be unique !'))
     ]
@@ -312,11 +312,11 @@ This is useful for CRM leads for example"),
     def delete_action(self, cr, uid, ids, context):
         self.unlink_action(cr, uid, ids, context)
         return True
-        
+
     def unlink(self, cr, uid, ids, context=None):
         self.unlink_action(cr, uid, ids, context)
         return super(email_template, self).unlink(cr, uid, ids, context)
-    
+
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
@@ -328,7 +328,7 @@ This is useful for CRM leads for example"),
             new_name = new_name + '_' + random.choice('abcdefghij') + random.choice('lmnopqrs') + random.choice('tuvwzyz')
         default.update({'name':new_name})
         return super(email_template, self).copy(cr, uid, id, default, context)
-    
+
     def build_expression(self, field_name, sub_field_name, null_value, template_language='mako'):
         """
         Returns a template expression based on data provided
@@ -354,10 +354,10 @@ This is useful for CRM leads for example"),
                 if sub_field_name:
                     expression += "." + sub_field_name
                 if null_value:
-                    expression += "|default: '''%s'''" % null_value  
+                    expression += "|default: '''%s'''" % null_value
                 expression += "}}"
-        return expression 
-            
+        return expression
+
     def onchange_model_object_field(self, cr, uid, ids, model_object_field, template_language, context=None):
         if not model_object_field:
             return {}
@@ -385,7 +385,7 @@ This is useful for CRM leads for example"),
             result['sub_model_object_field'] = False
             result['null_value'] = False
         return {'value':result}
-        
+
     def onchange_sub_model_object_field(self, cr, uid, ids, model_object_field, sub_model_object_field, template_language, context=None):
         if not model_object_field or not sub_model_object_field:
             return {}
@@ -447,7 +447,7 @@ This is useful for CRM leads for example"),
     def _add_attachment(self, cursor, user, mailbox_id, name, data, filename, context=None):
         """
         Add an attachment to a given mailbox entry.
-        
+
         :param data: base64 encoded attachment data to store
         """
         attachment_obj = self.pool.get('ir.attachment')
@@ -484,7 +484,7 @@ This is useful for CRM leads for example"),
         """
         Generate report to be attached and attach it
         to the email, and add any directly attached files as well.
-        
+
         @param cursor: Database Cursor
         @param user: ID of User
         @param template: Browse record of
@@ -492,8 +492,8 @@ This is useful for CRM leads for example"),
         @param record_id: ID of the target model
                           for which this mail has
                           to be generated
-        @param mail: Browse record of email object 
-        @return: True 
+        @param mail: Browse record of email object
+        @return: True
         """
         if template.report_template:
             reportname = 'report.' + \
@@ -510,7 +510,7 @@ This is useful for CRM leads for example"),
                                               user,
                                               [record_id],
                                               data,
-                                              context)   
+                                              context)
             fname = tools.ustr(get_value(cursor, user, record_id,
                                          template.file_name, template, context)
                                or 'Report')
@@ -524,7 +524,7 @@ This is useful for CRM leads for example"),
                 self._add_attachment(cursor, user, mail.id, attachment.name, attachment.datas, attachment.datas_fname, context)
 
         return True
-    
+
     def _generate_mailbox_item_from_template(self,
                                       cursor,
                                       user,
@@ -534,7 +534,7 @@ This is useful for CRM leads for example"),
         """
         Generates an email from the template for
         record record_id of target object
-        
+
         @param cursor: Database Cursor
         @param user: ID of User
         @param template: Browse record of
@@ -542,7 +542,7 @@ This is useful for CRM leads for example"),
         @param record_id: ID of the target model
                           for which this mail has
                           to be generated
-        @return: ID of created object 
+        @return: ID of created object
         """
         if context is None:
             context = {}
@@ -571,9 +571,9 @@ This is useful for CRM leads for example"),
             ctx = context.copy()
             ctx.update({'lang':lang})
             template = self.browse(cursor, user, template.id, context=ctx)
-        
-        # determine name of sender, either it is specified in email_id or we 
-        # use the account name 
+
+        # determine name of sender, either it is specified in email_id or we
+        # use the account name
         email_id = from_account['email_id'].strip()
         email_from = re.findall(r'([^ ,<@]+@[^> ,]+)', email_id)[0]
         if email_from != email_id:
@@ -663,7 +663,7 @@ This is useful for CRM leads for example"),
                                                              context)
 
         return mailbox_id
-        
+
 
     def generate_mail(self,
                       cursor,
@@ -721,7 +721,7 @@ email_template()
 class email_template_preview(osv.osv_memory):
     _name = "email_template.preview"
     _description = "Email Template Preview"
-    
+
     def _get_model_recs(self, cr, uid, context=None):
         if context is None:
             context = {}
@@ -738,6 +738,7 @@ class email_template_preview(osv.osv_memory):
             if default_id and default_id not in ref_obj_ids:
                 ref_obj_ids.insert(0, default_id)
             return model_obj.name_get(cr, uid, ref_obj_ids, context)
+        return []
 
     def default_get(self, cr, uid, fields, context=None):
         if context is None:
@@ -762,7 +763,7 @@ class email_template_preview(osv.osv_memory):
                                                    context['template_id'],
                                                    ['object_name'],
                                                    context)['object_name']
-        
+
     _columns = {
         'ref_template':fields.many2one(
                                        'email.template',
@@ -772,13 +773,13 @@ class email_template_preview(osv.osv_memory):
         'to':fields.char('To', size=250, readonly=True),
         'cc':fields.char('CC', size=250, readonly=True),
         'bcc':fields.char('BCC', size=250, readonly=True),
-        'reply_to':fields.char('Reply-To', 
-                    size=250, 
+        'reply_to':fields.char('Reply-To',
+                    size=250,
                     help="The address recipients should reply to,"
                          " if different from the From address."
                          " Placeholders can be used here."),
-        'message_id':fields.char('Message-ID', 
-                    size=250, 
+        'message_id':fields.char('Message-ID',
+                    size=250,
                     help="The Message-ID header value, if you need to"
                          "specify it, for example to automatically recognize the replies later."
                         " Placeholders can be used here."),
@@ -819,7 +820,7 @@ class email_template_preview(osv.osv_memory):
         vals['body_html'] = get_value(cr, uid, rel_model_ref, template.def_body_html, template, context)
         vals['report'] = get_value(cr, uid, rel_model_ref, template.file_name, template, context)
         return {'value':vals}
-        
+
 email_template_preview()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 4b09311a7342151ec794c610eafc2ea578fd49b9 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 26 Oct 2010 14:41:28 +0530
Subject: [PATCH 16/38] [FIX] account anlalytic plan: correct
 _ca_invoiced_calc, _total_cost_calc for total costs and total inoviced (now
 it will work with amount instead on amount currency)

bzr revid: mra@mra-laptop-20101026091128-v17ftfamhi3exc6b
---
 .../account_analytic_analysis.py              | 47 ++++++++++++++-----
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index b1b4ece2f64..90fc9f1fd6a 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -250,33 +250,56 @@ class account_analytic_account(osv.osv):
 
     def _ca_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)], context=context))
-        if parent_ids:
-            cr.execute("SELECT account_analytic_line.account_id, COALESCE(SUM(amount_currency), 0.0) \
+        res_final = {}
+        child_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)], context=context))
+        for i in child_ids:
+            res[i] =  {}
+            for n in [name]:
+                res[i][n] = 0.0
+        if not child_ids:
+            return res
+
+        if child_ids:
+            cr.execute("SELECT account_analytic_line.account_id, COALESCE(SUM(amount), 0.0) \
                     FROM account_analytic_line \
                     JOIN account_analytic_journal \
                         ON account_analytic_line.journal_id = account_analytic_journal.id  \
                     WHERE account_analytic_line.account_id IN %s \
                         AND account_analytic_journal.type = 'sale' \
-                    GROUP BY account_analytic_line.account_id", (parent_ids,))
+                    GROUP BY account_analytic_line.account_id", (child_ids,))
             for account_id, sum in cr.fetchall():
-                res[account_id] = round(sum,2)
-        return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context=context)
+                res[account_id][name] = round(sum,2)
+        data = self._compute_level_tree(cr, uid, ids, child_ids, res, [name], context)
+        for i in data:
+            res_final[i] = data[i][name]
+        return res_final
 
     def _total_cost_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)], context=context))
-        if parent_ids:
-            cr.execute("""SELECT account_analytic_line.account_id, COALESCE(SUM(amount_currency), 0.0) \
+        res_final = {}
+        child_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)], context=context))
+
+        for i in child_ids:
+            res[i] =  {}
+            for n in [name]:
+                res[i][n] = 0.0
+        if not child_ids:
+            return res
+
+        if child_ids:
+            cr.execute("""SELECT account_analytic_line.account_id, COALESCE(SUM(amount), 0.0) \
                     FROM account_analytic_line \
                     JOIN account_analytic_journal \
                         ON account_analytic_line.journal_id = account_analytic_journal.id \
                     WHERE account_analytic_line.account_id IN %s \
                         AND amount<0 \
-                    GROUP BY account_analytic_line.account_id""",(parent_ids,))
+                    GROUP BY account_analytic_line.account_id""",(child_ids,))
             for account_id, sum in cr.fetchall():
-                res[account_id] = round(sum,2)
-        return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context=context)
+                res[account_id][name] = round(sum,2)
+        data = self._compute_level_tree(cr, uid, ids, child_ids, res, [name], context)
+        for i in data:
+            res_final[i] = data[i][name]
+        return res_final
 
     def _remaining_hours_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}

From 6514ed5aae80e1cad1665cbec0816a2739c6e9bf Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 26 Oct 2010 15:12:23 +0530
Subject: [PATCH 17/38] [IMP] survey:-improvements in fields_view_get() of
 survey.question.wiz

bzr revid: mtr@mtr-20101026094223-jf0ej2bawwpbist4
---
 addons/survey/wizard/survey_answer.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 109f4509d81..8248359a928 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -49,7 +49,7 @@ class survey_question_wiz(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @return : Dictionary value for created view of particular survey pages.
         """
-
+        
         result = super(survey_question_wiz, self).fields_view_get(cr, uid, view_id, \
                                         view_type, context, toolbar,submenu)
 
@@ -61,7 +61,8 @@ class survey_question_wiz(osv.osv_memory):
         sur_response_obj = self.pool.get('survey.response')
         que_col_head = self.pool.get('survey.question.column.heading')
         user_obj = self.pool.get('res.users')
-
+        if context is None:
+            context = {}
         if view_type in ['form']:
             wiz_id = 0
             if not context.has_key('sur_name_id'):
@@ -82,6 +83,8 @@ class survey_question_wiz(osv.osv_memory):
                 context.pop('active_id')
 
             survey_id = context.get('survey_id', False)
+            if not survey_id:
+                return {}
             sur_rec = survey_obj.browse(cr, uid, survey_id)
             p_id = map(lambda x:x.id, sur_rec.page_ids)
             total_pages = len(p_id)

From 623dfd17d508569efc2e1087a757fc34df7c1702 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 26 Oct 2010 15:54:00 +0530
Subject: [PATCH 18/38] [IMP] point_of_sale:-removed unused imported files and
 corrected warning

bzr revid: mtr@mtr-20101026102400-j8pocgfwpmce2cbt
---
 addons/point_of_sale/pos.py                               | 2 +-
 .../point_of_sale/wizard/all_closed_cashbox_of_the_day.py | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 720fdb465f4..41f3274c667 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -478,7 +478,7 @@ class pos_order(osv.osv):
         """
         if not len(ids):
             return False
-        self.write(cr, uid, ids, {'state': 'draft'}, context=context)
+        self.write(cr, uid, ids, {'state': 'draft'})
         wf_service = netsvc.LocalService("workflow")
         for i in ids:
             wf_service.trg_create(uid, 'pos.order', i, cr)
diff --git a/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
index 3f561848edf..e38d1c1aa03 100644
--- a/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
+++ b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
@@ -19,11 +19,7 @@
 #
 ##############################################################################
 
-import time
-
-import netsvc
-from osv import osv, fields
-from tools.translate import _
+from osv import osv
 
 class all_closed_cashbox_of_the_day(osv.osv_memory):
     _name = 'all.closed.cashbox.of.the.day'
@@ -49,4 +45,4 @@ class all_closed_cashbox_of_the_day(osv.osv_memory):
 
 all_closed_cashbox_of_the_day()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From d49ef5795e0c3e6fc925c0887750b1d8be5150d9 Mon Sep 17 00:00:00 2001
From: "DHS (OpenERP)" <dhs@tinyerp.com>
Date: Tue, 26 Oct 2010 15:57:26 +0530
Subject: [PATCH 19/38] [FIX] account:account_tax_chart form name corrected

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

bzr revid: dhs@tinyerp.com-20101026102726-n2phrs3jxzgbu462
---
 addons/account/wizard/account_tax_chart.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account/wizard/account_tax_chart.py b/addons/account/wizard/account_tax_chart.py
index 1595a603dd0..82925d1a53d 100644
--- a/addons/account/wizard/account_tax_chart.py
+++ b/addons/account/wizard/account_tax_chart.py
@@ -66,7 +66,8 @@ class account_tax_chart(osv.osv_memory):
             result['context'] = str({'state': data['target_move']})
 
         if data['period_id']:
-            result['name'] += ':' + self.pool.get('account.period').read(cr, uid, [data['period_id']], context=context)[0]['code']
+            period_code = period_obj.read(cr, uid, [data['period_id']], context=context)[0]['code']
+            result['name'] += period_code and (':' + period_code) or ''
         return result
 
     _defaults = {

From 2b6bde7f719c04b461d817001e4fe548e48d1f40 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Tue, 26 Oct 2010 16:13:06 +0530
Subject: [PATCH 20/38] [REF] point_of_sales: ref in yml

bzr revid: vth@tinyerp.com-20101026104306-707j6nzsndvtng20
---
 addons/point_of_sale/test/pos_report.yml |   2 +-
 addons/point_of_sale/test/pos_test.yml   | 162 +++++++++++------------
 2 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/addons/point_of_sale/test/pos_report.yml b/addons/point_of_sale/test/pos_report.yml
index 7eeea10bd1a..d058c8fd691 100644
--- a/addons/point_of_sale/test/pos_report.yml
+++ b/addons/point_of_sale/test/pos_report.yml
@@ -88,7 +88,7 @@
         - name: statement
           date: "2010-10-13"
           type: customer
-          account_id: account_account_sales0
+          account_id: account_pos_account_sales
           amount: 100
           partner_id: base.res_partner_agrolait
     period_id: account.period_5
diff --git a/addons/point_of_sale/test/pos_test.yml b/addons/point_of_sale/test/pos_test.yml
index 6baffce34f4..347ea961c8f 100644
--- a/addons/point_of_sale/test/pos_test.yml
+++ b/addons/point_of_sale/test/pos_test.yml
@@ -3,42 +3,42 @@
 
 -
   I  configure all details for the Customer, Salesman and Product, Account.
-- 
+-
   I create View Account Type.
-- 
+-
   !record {model: account.account.type, id: account_account_type_view0}:
     close_method: none
     code: View
     name: View
     sign: 1
-- 
+-
   I create Income Account Type.
-- 
+-
   !record {model: account.account.type, id: account_account_type_income0}:
     close_method: unreconciled
     code: Income
     name: Income
     sign: 1
-- 
+-
   I create Expense Account Type.
-- 
+-
   !record {model: account.account.type, id: account_account_type_expense0}:
     close_method: unreconciled
     code: Expense
     name: Expense
     sign: 1
-- 
+-
   I create Cash Account Type.
-- 
+-
   !record {model: account.account.type, id: account_account_type_cash0}:
     close_method: balance
     code: Cash
     name: Cash
     sign: 1
-- 
+-
   I create Minimal Chart Account.
-- 
-  !record {model: account.account, id: account_account_minimalchart0}:
+-
+  !record {model: account.account, id: account_pos_account_minimalchart}:
     code: '0'
     company_id: base.main_company
     currency_mode: current
@@ -47,188 +47,188 @@
     parent_right: 12
     type: view
     user_type: account_account_type_view0
-- 
+-
    I create Payable Account.
-- 
-  !record {model: account.account, id: account_account_payable1}:
+-
+  !record {model: account.account, id: account_pos_account_payable}:
     code: AP
     company_id: base.main_company
     currency_mode: current
     name: Payable
-    parent_id: account_account_minimalchart0
+    parent_id: account_pos_account_minimalchart
     parent_left: 2
     parent_right: 3
     reconcile: true
     type: payable
     user_type: account_account_type_expense0
-- 
+-
    I create Receivable Account.
-- 
-  !record {model: account.account, id: account_account_receivable0}:
+-
+  !record {model: account.account, id: account_pos_account_receivable}:
     code: AR
     company_id: base.main_company
     currency_mode: current
     name: Receivable
-    parent_id: account_account_minimalchart0
+    parent_id: account_pos_account_minimalchart
     parent_left: 4
     parent_right: 5
     reconcile: true
     type: receivable
     user_type: account_account_type_income0
-- 
+-
   I create Cash Account.
-- 
-  !record {model: account.account, id: account_account_cash0}:
+-
+  !record {model: account.account, id: account_pos_account_cash}:
     code: C
     company_id: base.main_company
     currency_mode: current
     name: Cash
-    parent_id: account_account_minimalchart0
+    parent_id: account_pos_account_minimalchart
     parent_left: 6
     parent_right: 7
     type: other
     user_type: account_account_type_cash0
-- 
+-
   I create Purchases Account.
-- 
-  !record {model: account.account, id: account_account_purchases0}:
+-
+  !record {model: account.account, id: account_pos_account_purchases}:
     code: P
     company_id: base.main_company
     currency_mode: current
     name: Purchases
-    parent_id: account_account_minimalchart0
+    parent_id: account_pos_account_minimalchart
     parent_left: 8
     parent_right: 9
     type: other
     user_type: account_account_type_expense0
-- 
+-
   I create Sales Account.
-- 
-  !record {model: account.account, id: account_account_sales0}:
+-
+  !record {model: account.account, id: account_pos_account_sales}:
     code: Sale
     company_id: base.main_company
     currency_mode: current
     name: Sales
-    parent_id: account_account_minimalchart0
+    parent_id: account_pos_account_minimalchart
     parent_left: 10
     parent_right: 11
     type: other
     user_type: account_account_type_income0
-- 
+-
   I create Purchase Journal.
-- 
-  !record {model: account.journal, id: account_journal_purchasejournal0}:
+-
+  !record {model: account.journal, id: account_pos_account_journal_purchasejournal}:
     code: PUJ
     company_id: base.main_company
-    default_credit_account_id: account_account_purchases0
-    default_debit_account_id: account_account_purchases0
+    default_credit_account_id: account_pos_account_purchases
+    default_debit_account_id: account_pos_account_purchases
     name: Purchase Journal
     sequence_id: account.sequence_purchase_journal
     type: purchase
     view_id: account.account_journal_view
-- 
+-
   I create Sale Journal.
-- 
-  !record {model: account.journal, id: account_journal_salejournal0}:
+-
+  !record {model: account.journal, id: account_pos_account_journal_salejournal}:
     code: SAJ
     company_id: base.main_company
-    default_credit_account_id: account_account_sales0
-    default_debit_account_id: account_account_sales0
+    default_credit_account_id: account_pos_account_sales
+    default_debit_account_id: account_pos_account_sales
     name: Sale Journal
     sequence_id: account.sequence_sale_journal
     type: sale
     view_id: account.account_journal_view
-- 
+-
   I create Bank Journal.
-- 
-  !record {model: account.journal, id: account_journal_bankjournal0}:
+-
+  !record {model: account.journal, id: account_pos_account_journal_bankjournal}:
     code: BNK
     company_id: base.main_company
-    default_credit_account_id: account_account_cash0
-    default_debit_account_id: account_account_cash0
+    default_credit_account_id: account_pos_account_cash
+    default_debit_account_id: account_pos_account_cash
     name: Bank Journal
     sequence_id: account.sequence_journal
     type: cash
     view_id: account.account_journal_bank_view
-- 
+-
   I create property for account payable.
-- 
+-
   !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
     company_id: base.main_company
     fields_id: account.field_res_partner_property_account_payable
     name: property_account_expense_categ
     value_reference: account.account,5
-- 
+-
   I create property for account receivable.
-- 
+-
   !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
     company_id: base.main_company
     fields_id: account.field_res_partner_property_account_receivable
     name: property_account_income_categ
     value_reference: account.account,6
-- 
+-
   I create Partner category Customers.
-- 
+-
   !record {model: res.partner.category, id: res_partner_category_customers0}:
     name: Customers
 -
   I create partner
-- 
+-
   !record {model: res.partner, id: res_partner_cleartrail0}:
     category_id:
       - res_partner_category_customers0
     name: Cleartrail
-- 
+-
   I create partner address.
-- 
+-
   !record {model: res.partner.address, id: res_partner_address_1}:
     partner_id: res_partner_cleartrail0
     street: onam plaza, 14 B palasia A B Road
     type: contact
-- 
+-
   I create partner  invoice address.
-- 
+-
   !record {model: res.partner.address, id: res_partner_address_2}:
     partner_id: res_partner_cleartrail0
     type: invoice
-- 
+-
   I create partner delivery address.
-- 
+-
   !record {model: res.partner.address, id: res_partner_address_3}:
     partner_id: res_partner_cleartrail0
     street: sangam house 15 B palasia, A B Road
     type: delivery
 -
-  I create product category.    
-- 
+  I create product category.
+-
   !record {model: product.category, id: product_category_allproductssellable0}:
     name: Mobile Products Sellable
 -
    I create partner.
-- 
+-
   !record {model: res.partner, id: res_partner_microlinktechnologies0}:
     address:
       - street: Kailash Vaibhav, Parksite
     name: Micro Link Technologies
-    property_account_payable: account_account_payable1
-    property_account_receivable: account_account_receivable0   
-    supplier: true        
+    property_account_payable: account_pos_account_payable
+    property_account_receivable: account_pos_account_receivable
+    supplier: true
 -
   I create partner address .
-- 
+-
   !record {model: res.partner.address, id: res_partner_address_0}:
     country_id: base.in
     partner_id: res_partner_microlinktechnologies0
     street: Ash House, Ash Road
     title: base.res_partner_title_miss
-- 
+-
   I create product category .
-- 
+-
   !record {model: product.category, id: product_category_services0}:
     name: Mobile Services
-- 
+-
   I create product template .
-- 
+-
   !record {model: product.template, id: product_template_lgviewtysmart0}:
     categ_id: product_category_allproductssellable0
     cost_method: standard
@@ -241,9 +241,9 @@
     type: product
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
--    
+-
   I create product  LG Viewty Smart.
-- 
+-
   !record {model: product.product, id: product_product_lgviewtysmart0}:
     categ_id: product_category_allproductssellable0
     cost_method: standard
@@ -251,22 +251,22 @@
     mes_type: fixed
     name: LG Viewty Smart
     procure_method: make_to_order
-    property_account_expense: account_account_payable1
-    property_account_income: account_account_receivable0
+    property_account_expense: account_pos_account_payable
+    property_account_income: account_pos_account_receivable
     seller_delay: '1'
     standard_price: 160.0
     supply_method: produce
     type: product
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
--  
-  I create product category .        
+-
+  I create product category .
 -
   !record {model: product.category, id: product_category_computer0}:
     name: Computer
-- 
+-
   I create product  HP Pavilion Desktop PCs
-- 
+-
   !record {model: product.product, id: product_product_hppaviliondesktoppcs0}:
     categ_id: product_category_computer0
     cost_method: standard
@@ -282,9 +282,9 @@
     type: product
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
-    property_account_expense: account_account_payable1
-    property_account_income: account_account_receivable0
--  
+    property_account_expense: account_pos_account_payable
+    property_account_income: account_pos_account_receivable
+-
   I create New Order by adding the details of Salesman and  "Product" as LG Viewty Smart Quantity as 10.
 -
   !record {model: pos.order, id: pos_order_pos0}:

From 4458bad51b2ba102cca862c829b90579b0598d76 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 26 Oct 2010 16:36:19 +0530
Subject: [PATCH 21/38] [FIX] pos: Add user on cash statement journal demo

bzr revid: mra@mra-laptop-20101026110619-30qdpn0r4quk9dbo
---
 addons/point_of_sale/pos_demo.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/point_of_sale/pos_demo.xml b/addons/point_of_sale/pos_demo.xml
index 913a2907e03..aa76e3e9976 100644
--- a/addons/point_of_sale/pos_demo.xml
+++ b/addons/point_of_sale/pos_demo.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
+    	<record id="account.cash_journal" model="account.journal">
+            <field eval="[(6, 0, [ref('base.user_root')])]" name="journal_users"/>
+        </record>
+
     	 <record id="account_invoice_invoicefrompospos0" model="account.invoice">
 			<field name="origin">POS/019</field>
 			<field name="reference">POS/019</field>

From 0d00f5770d6bb7f8b9f71cba68d621248380ad30 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 26 Oct 2010 17:19:03 +0530
Subject: [PATCH 22/38] [IMP] sale_analytic_plans: Used xpath in inherited view

bzr revid: psi@tinyerp.co.in-20101026114903-fmtz6dnjb9oyqmdy
---
 .../sale_analytic_plans/sale_analytic_plans_view.xml   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/sale_analytic_plans/sale_analytic_plans_view.xml b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
index c912f5edb81..b8b24775614 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans_view.xml
+++ b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
+  <data>
 
     <record model="ir.ui.view" id="view_order_form_inherit">
         <field name="name">sale.order.form.inherit</field>
@@ -18,9 +18,9 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
-            <field name="product_id" position="after">
-                <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
-            </field>
+           <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='product_id']" position="after">
+               <field name="analytics_id"/>
+           </xpath>
         </field>
     </record>
 
@@ -36,5 +36,5 @@
         </field>
     </record>
 
-	</data>
+  </data>
 </openerp>

From 19a6dd08c0018b34f90d13b8a94ca7054595ce37 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 26 Oct 2010 17:25:46 +0530
Subject: [PATCH 23/38] [IMP] sale_analytic_plans: Add group and domain of
 field

bzr revid: psi@tinyerp.co.in-20101026115546-wessdjlr3g3ejjmw
---
 addons/sale_analytic_plans/sale_analytic_plans_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale_analytic_plans/sale_analytic_plans_view.xml b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
index b8b24775614..944bc629d13 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans_view.xml
+++ b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
@@ -19,7 +19,7 @@
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
            <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='product_id']" position="after">
-               <field name="analytics_id"/>
+               <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" groups="analytic.group_analytic_accounting"/>
            </xpath>
         </field>
     </record>
@@ -31,7 +31,7 @@
         <field name="inherit_id" ref="sale.view_order_line_form2"/>
         <field name="arch" type="xml">
             <field name="product_id" position="after">
-                <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
+                <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" groups="analytic.group_analytic_accounting"/>
             </field>
         </field>
     </record>

From aeddd5e664e5558c466ca96a6bac66af2e598a3a Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 26 Oct 2010 17:41:22 +0530
Subject: [PATCH 24/38] [REM] partner_geo_assign

bzr revid: mra@mra-laptop-20101026121122-u9uq5s4mmwk3g4tr
---
 addons/partner_geo_assign/i18n/de.po | 117 ------------------------
 addons/partner_geo_assign/i18n/fr.po | 116 ------------------------
 addons/partner_geo_assign/i18n/it.po | 128 ---------------------------
 3 files changed, 361 deletions(-)
 delete mode 100644 addons/partner_geo_assign/i18n/de.po
 delete mode 100644 addons/partner_geo_assign/i18n/fr.po
 delete mode 100644 addons/partner_geo_assign/i18n/it.po

diff --git a/addons/partner_geo_assign/i18n/de.po b/addons/partner_geo_assign/i18n/de.po
deleted file mode 100644
index 86d223a36ba..00000000000
--- a/addons/partner_geo_assign/i18n/de.po
+++ /dev/null
@@ -1,117 +0,0 @@
-# German translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-20 08:40+0000\n"
-"PO-Revision-Date: 2010-10-05 13:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: partner_geo_assign
-#: code:addons/partner_geo_assign/partner_geo_assign.py:0
-#, python-format
-msgid "Network error"
-msgstr ""
-
-#. module: partner_geo_assign
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: partner_geo_assign
-#: help:res.partner,partner_weight:0
-msgid ""
-"Gives the probability to assign a lead to this partner. (0 means no "
-"assignation.)"
-msgstr ""
-
-#. module: partner_geo_assign
-#: model:ir.module.module,description:partner_geo_assign.module_meta_information
-msgid ""
-"\n"
-"This is the module used by OpenERP SA to redirect customers to his "
-"partners,\n"
-"based on geolocalization.\n"
-"    "
-msgstr ""
-
-#. module: partner_geo_assign
-#: field:res.partner,partner_weight:0
-msgid "Weight"
-msgstr ""
-
-#. module: partner_geo_assign
-#: model:ir.module.module,shortdesc:partner_geo_assign.module_meta_information
-msgid "Partner Geo-Localisation"
-msgstr ""
-
-#. module: partner_geo_assign
-#: view:res.partner:0
-msgid "Geo Localization"
-msgstr ""
-
-#. module: partner_geo_assign
-#: code:addons/partner_geo_assign/partner_geo_assign.py:0
-#, python-format
-msgid ""
-"Could not contact geolocation servers, please make sure you have a working "
-"internet connection (%s)"
-msgstr ""
-
-#. module: partner_geo_assign
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: partner_geo_assign
-#: field:res.partner,date_localization:0
-msgid "Geo Localization Date"
-msgstr ""
-
-#. module: partner_geo_assign
-#: view:crm.lead:0
-msgid "Geo Assign"
-msgstr ""
-
-#. module: partner_geo_assign
-#: field:crm.lead,partner_latitude:0
-#: field:res.partner,partner_latitude:0
-msgid "Geo Latitude"
-msgstr ""
-
-#. module: partner_geo_assign
-#: model:ir.model,name:partner_geo_assign.model_crm_lead
-msgid "crm.lead"
-msgstr ""
-
-#. module: partner_geo_assign
-#: model:ir.model,name:partner_geo_assign.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: partner_geo_assign
-#: view:crm.lead:0
-msgid "Geo Assignation"
-msgstr ""
-
-#. module: partner_geo_assign
-#: view:res.partner:0
-msgid "Geo Localize"
-msgstr ""
-
-#. module: partner_geo_assign
-#: field:crm.lead,partner_longitude:0
-#: field:res.partner,partner_longitude:0
-msgid "Geo Longitude"
-msgstr ""
diff --git a/addons/partner_geo_assign/i18n/fr.po b/addons/partner_geo_assign/i18n/fr.po
deleted file mode 100644
index 093542f4993..00000000000
--- a/addons/partner_geo_assign/i18n/fr.po
+++ /dev/null
@@ -1,116 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* partner_geo_assign
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-08-20 08:40+0000\n"
-"PO-Revision-Date: 2010-08-30 12:19+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:17+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: partner_geo_assign
-#: code:addons/partner_geo_assign/partner_geo_assign.py:0
-#, python-format
-msgid "Network error"
-msgstr ""
-
-#. module: partner_geo_assign
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: partner_geo_assign
-#: help:res.partner,partner_weight:0
-msgid ""
-"Gives the probability to assign a lead to this partner. (0 means no "
-"assignation.)"
-msgstr ""
-
-#. module: partner_geo_assign
-#: model:ir.module.module,description:partner_geo_assign.module_meta_information
-msgid ""
-"\n"
-"This is the module used by OpenERP SA to redirect customers to his "
-"partners,\n"
-"based on geolocalization.\n"
-"    "
-msgstr ""
-
-#. module: partner_geo_assign
-#: field:res.partner,partner_weight:0
-msgid "Weight"
-msgstr ""
-
-#. module: partner_geo_assign
-#: model:ir.module.module,shortdesc:partner_geo_assign.module_meta_information
-msgid "Partner Geo-Localisation"
-msgstr ""
-
-#. module: partner_geo_assign
-#: view:res.partner:0
-msgid "Geo Localization"
-msgstr ""
-
-#. module: partner_geo_assign
-#: code:addons/partner_geo_assign/partner_geo_assign.py:0
-#, python-format
-msgid ""
-"Could not contact geolocation servers, please make sure you have a working "
-"internet connection (%s)"
-msgstr ""
-
-#. module: partner_geo_assign
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: partner_geo_assign
-#: field:res.partner,date_localization:0
-msgid "Geo Localization Date"
-msgstr ""
-
-#. module: partner_geo_assign
-#: view:crm.lead:0
-msgid "Geo Assign"
-msgstr ""
-
-#. module: partner_geo_assign
-#: field:crm.lead,partner_latitude:0
-#: field:res.partner,partner_latitude:0
-msgid "Geo Latitude"
-msgstr ""
-
-#. module: partner_geo_assign
-#: model:ir.model,name:partner_geo_assign.model_crm_lead
-msgid "crm.lead"
-msgstr ""
-
-#. module: partner_geo_assign
-#: model:ir.model,name:partner_geo_assign.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: partner_geo_assign
-#: view:crm.lead:0
-msgid "Geo Assignation"
-msgstr ""
-
-#. module: partner_geo_assign
-#: view:res.partner:0
-msgid "Geo Localize"
-msgstr ""
-
-#. module: partner_geo_assign
-#: field:crm.lead,partner_longitude:0
-#: field:res.partner,partner_longitude:0
-msgid "Geo Longitude"
-msgstr ""
diff --git a/addons/partner_geo_assign/i18n/it.po b/addons/partner_geo_assign/i18n/it.po
deleted file mode 100644
index bcc5ac363a1..00000000000
--- a/addons/partner_geo_assign/i18n/it.po
+++ /dev/null
@@ -1,128 +0,0 @@
-# Italian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-20 08:40+0000\n"
-"PO-Revision-Date: 2010-09-29 09:26+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Italian <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:44+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: partner_geo_assign
-#: code:addons/partner_geo_assign/partner_geo_assign.py:0
-#, python-format
-msgid "Network error"
-msgstr "Errore di rete"
-
-#. module: partner_geo_assign
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzare l'architettura!"
-
-#. module: partner_geo_assign
-#: help:res.partner,partner_weight:0
-msgid ""
-"Gives the probability to assign a lead to this partner. (0 means no "
-"assignation.)"
-msgstr ""
-"Fornisce la probabilità di assegnare una richesta a questo partner (0 "
-"significa nessuna assegnazione)."
-
-#. module: partner_geo_assign
-#: model:ir.module.module,description:partner_geo_assign.module_meta_information
-msgid ""
-"\n"
-"This is the module used by OpenERP SA to redirect customers to his "
-"partners,\n"
-"based on geolocalization.\n"
-"    "
-msgstr ""
-"\n"
-"Questo è il modulo usato da OpenERP SA per indirizzare i venditori ai loro "
-"partners,\n"
-"basandosi sulla geolocalizzazione.\n"
-"    "
-
-#. module: partner_geo_assign
-#: field:res.partner,partner_weight:0
-msgid "Weight"
-msgstr "Peso"
-
-#. module: partner_geo_assign
-#: model:ir.module.module,shortdesc:partner_geo_assign.module_meta_information
-msgid "Partner Geo-Localisation"
-msgstr "Geo-Localizzazione Partner"
-
-#. module: partner_geo_assign
-#: view:res.partner:0
-msgid "Geo Localization"
-msgstr "Geo-Localizzazione"
-
-#. module: partner_geo_assign
-#: code:addons/partner_geo_assign/partner_geo_assign.py:0
-#, python-format
-msgid ""
-"Could not contact geolocation servers, please make sure you have a working "
-"internet connection (%s)"
-msgstr ""
-"Non è possibile contattare i server per la geo-localizzaziome, per favore "
-"assicurarsi di avere una connessione ad internet funzionante (%s)"
-
-#. module: partner_geo_assign
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
-
-#. module: partner_geo_assign
-#: field:res.partner,date_localization:0
-msgid "Geo Localization Date"
-msgstr "Data Geo-localizzazione"
-
-#. module: partner_geo_assign
-#: view:crm.lead:0
-msgid "Geo Assign"
-msgstr "Geo assegnamento"
-
-#. module: partner_geo_assign
-#: field:crm.lead,partner_latitude:0
-#: field:res.partner,partner_latitude:0
-msgid "Geo Latitude"
-msgstr "Geo Latitudine"
-
-#. module: partner_geo_assign
-#: model:ir.model,name:partner_geo_assign.model_crm_lead
-msgid "crm.lead"
-msgstr "crm.lead"
-
-#. module: partner_geo_assign
-#: model:ir.model,name:partner_geo_assign.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
-#. module: partner_geo_assign
-#: view:crm.lead:0
-msgid "Geo Assignation"
-msgstr "Geo Assegnazione"
-
-#. module: partner_geo_assign
-#: view:res.partner:0
-msgid "Geo Localize"
-msgstr "Geo Localizzazione"
-
-#. module: partner_geo_assign
-#: field:crm.lead,partner_longitude:0
-#: field:res.partner,partner_longitude:0
-msgid "Geo Longitude"
-msgstr "Geo Longitudine"

From 21b05dafac063a9f92f5df7722aeb6a2f5b92ca8 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 26 Oct 2010 17:42:59 +0530
Subject: [PATCH 25/38] [IMP] point_of_sale:-renamed files

bzr revid: mtr@mtr-20101026121259-tbowld1yx3skezpr
---
 addons/point_of_sale/__init__.py               |  2 +-
 addons/point_of_sale/__openerp__.py            | 18 +++++++++---------
 ...ent_demo.xml => account_statement_demo.xml} |  0
 ...report.xml => account_statement_report.xml} |  0
 ...ent_view.xml => account_statement_view.xml} |  0
 ...wizard.xml => account_statement_wizard.xml} |  0
 .../point_of_sale/{pos.py => point_of_sale.py} |  0
 ...osrule_data2.xml => point_of_sale_data.xml} |  0
 .../{pos_demo.xml => point_of_sale_demo.xml}   |  0
 ...pos_report.xml => point_of_sale_report.xml} |  0
 ...sequence.xml => point_of_sale_sequence.xml} |  0
 .../{pos_view.xml => point_of_sale_view.xml}   |  0
 ...workflow.xml => point_of_sale_workflow.xml} |  0
 ...pos_report.yml => point_of_sale_report.yml} |  0
 .../{pos_test.yml => point_of_sale_test.yml}   |  0
 15 files changed, 10 insertions(+), 10 deletions(-)
 rename addons/point_of_sale/{singer_statement_demo.xml => account_statement_demo.xml} (100%)
 rename addons/point_of_sale/{statement_report.xml => account_statement_report.xml} (100%)
 rename addons/point_of_sale/{statement_view.xml => account_statement_view.xml} (100%)
 rename addons/point_of_sale/{statement_wizard.xml => account_statement_wizard.xml} (100%)
 rename addons/point_of_sale/{pos.py => point_of_sale.py} (100%)
 rename addons/point_of_sale/{posrule_data2.xml => point_of_sale_data.xml} (100%)
 rename addons/point_of_sale/{pos_demo.xml => point_of_sale_demo.xml} (100%)
 rename addons/point_of_sale/{pos_report.xml => point_of_sale_report.xml} (100%)
 rename addons/point_of_sale/{pos_sequence.xml => point_of_sale_sequence.xml} (100%)
 rename addons/point_of_sale/{pos_view.xml => point_of_sale_view.xml} (100%)
 rename addons/point_of_sale/{pos_workflow.xml => point_of_sale_workflow.xml} (100%)
 rename addons/point_of_sale/test/{pos_report.yml => point_of_sale_report.yml} (100%)
 rename addons/point_of_sale/test/{pos_test.yml => point_of_sale_test.yml} (100%)

diff --git a/addons/point_of_sale/__init__.py b/addons/point_of_sale/__init__.py
index 88f00077d16..be73103125f 100644
--- a/addons/point_of_sale/__init__.py
+++ b/addons/point_of_sale/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import pos
+import point_of_sale
 import account_bank_statement
 import wizard
 import report
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 1c23a27acd1..6e742830148 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -62,18 +62,18 @@ Main features :
         'wizard/pos_payment.xml',
         'wizard/pos_scan_product_view.xml',
         'wizard/pos_return_view.xml',
-        'pos_report.xml',
-        'pos_view.xml',
+        'point_of_sale_report.xml',
+        'point_of_sale_view.xml',
         'report/report_pos_order_view.xml',
         'report/report_cash_register_view.xml',
-        'pos_sequence.xml',
-        'pos_workflow.xml',
-        'statement_view.xml',
-        'statement_report.xml',
+        'point_of_sale_sequence.xml',
+        'point_of_sale_workflow.xml',
+        'account_statement_view.xml',
+        'account_statement_report.xml',
     ],
-    'demo_xml': ['pos_demo.xml','singer_statement_demo.xml'],
-    'test':['test/pos_test.yml',
-            'test/pos_report.yml',
+    'demo_xml': ['point_of_sale_demo.xml','account_statement_demo.xml'],
+    'test': ['test/point_of_sale_test.yml',
+            'test/point_of_sale_report.yml',
     ],
     'installable': True,
 }
diff --git a/addons/point_of_sale/singer_statement_demo.xml b/addons/point_of_sale/account_statement_demo.xml
similarity index 100%
rename from addons/point_of_sale/singer_statement_demo.xml
rename to addons/point_of_sale/account_statement_demo.xml
diff --git a/addons/point_of_sale/statement_report.xml b/addons/point_of_sale/account_statement_report.xml
similarity index 100%
rename from addons/point_of_sale/statement_report.xml
rename to addons/point_of_sale/account_statement_report.xml
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/account_statement_view.xml
similarity index 100%
rename from addons/point_of_sale/statement_view.xml
rename to addons/point_of_sale/account_statement_view.xml
diff --git a/addons/point_of_sale/statement_wizard.xml b/addons/point_of_sale/account_statement_wizard.xml
similarity index 100%
rename from addons/point_of_sale/statement_wizard.xml
rename to addons/point_of_sale/account_statement_wizard.xml
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/point_of_sale.py
similarity index 100%
rename from addons/point_of_sale/pos.py
rename to addons/point_of_sale/point_of_sale.py
diff --git a/addons/point_of_sale/posrule_data2.xml b/addons/point_of_sale/point_of_sale_data.xml
similarity index 100%
rename from addons/point_of_sale/posrule_data2.xml
rename to addons/point_of_sale/point_of_sale_data.xml
diff --git a/addons/point_of_sale/pos_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
similarity index 100%
rename from addons/point_of_sale/pos_demo.xml
rename to addons/point_of_sale/point_of_sale_demo.xml
diff --git a/addons/point_of_sale/pos_report.xml b/addons/point_of_sale/point_of_sale_report.xml
similarity index 100%
rename from addons/point_of_sale/pos_report.xml
rename to addons/point_of_sale/point_of_sale_report.xml
diff --git a/addons/point_of_sale/pos_sequence.xml b/addons/point_of_sale/point_of_sale_sequence.xml
similarity index 100%
rename from addons/point_of_sale/pos_sequence.xml
rename to addons/point_of_sale/point_of_sale_sequence.xml
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/point_of_sale_view.xml
similarity index 100%
rename from addons/point_of_sale/pos_view.xml
rename to addons/point_of_sale/point_of_sale_view.xml
diff --git a/addons/point_of_sale/pos_workflow.xml b/addons/point_of_sale/point_of_sale_workflow.xml
similarity index 100%
rename from addons/point_of_sale/pos_workflow.xml
rename to addons/point_of_sale/point_of_sale_workflow.xml
diff --git a/addons/point_of_sale/test/pos_report.yml b/addons/point_of_sale/test/point_of_sale_report.yml
similarity index 100%
rename from addons/point_of_sale/test/pos_report.yml
rename to addons/point_of_sale/test/point_of_sale_report.yml
diff --git a/addons/point_of_sale/test/pos_test.yml b/addons/point_of_sale/test/point_of_sale_test.yml
similarity index 100%
rename from addons/point_of_sale/test/pos_test.yml
rename to addons/point_of_sale/test/point_of_sale_test.yml

From 68dc715dfaef357ae094b995eb9fa4d39edf61fd Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 26 Oct 2010 18:10:14 +0530
Subject: [PATCH 26/38] [REF] event

bzr revid: mra@mra-laptop-20101026124014-gm1iqua5s01ql9ty
---
 addons/event/event.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 61a24901b0a..e8c60660136 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -55,7 +55,8 @@ class event_event(osv.osv):
             'registration_ids': False,
         })
         return super(event_event, self).copy(cr, uid, id, default=default, context=context)
-    def onchange_product(self, cr, uid, ids, product_id):
+
+    def onchange_product(self, cr, uid, ids, product_id=False):
         """This function returns value of  product's unit price based on product id.
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -132,7 +133,6 @@ class event_event(osv.osv):
             }
         return res
 
-
     def _get_register(self, cr, uid, ids, fields, args, context=None):
         """Get Confirm or uncofirm register value.
         @param ids: List of Event registration type's id
@@ -165,7 +165,6 @@ class event_event(osv.osv):
                 res[event.id]['register_current'] = number and number[0] or 0.0
             if 'register_prospect' in fields:
                 res[event.id]['register_prospect'] = number and number[0] or 0.0
-
         return res
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -707,7 +706,7 @@ class event_registration_badge(osv.osv):
     _name = 'event.registration.badge'
     _description = __doc__
     _columns = {
-        'registration_id': fields.many2one('event.registration', 'Registration', required=True),
+        "registration_id": fields.many2one('event.registration', 'Registration', required=True),
         "title": fields.char('Title', size=128),
         "name": fields.char('Name', size=128, required=True),
         "address_id": fields.many2one('res.partner.address', 'Address'),

From 26edcb80e4bbba0fb87deea6551d77e291121206 Mon Sep 17 00:00:00 2001
From: Jacara <>
Date: Tue, 26 Oct 2010 18:11:54 +0530
Subject: [PATCH 27/38] [FIX] Account : Usability change

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

bzr revid: jvo@tinyerp.com-20101026124154-la1x697mpxrjkpdk
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 922256dece6..901fe2bc11d 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -198,7 +198,7 @@
                 <search string="Accounts">
                     <group col="10" colspan="4">
                         <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
-                        <filter icon="terp-purchase" string="Purchase Accounts" domain="[('type','=','purchase')]"/>
+                        <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
                         <separator orientation="vertical"/>
                         <field name="code"/>
                         <field name="name"/>

From 09badf3375cabe1dd91dd2f6fb690e873b86fcf1 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 26 Oct 2010 18:30:12 +0530
Subject: [PATCH 28/38] [IMP] point_of_sale: code cleaning

bzr revid: psi@tinyerp.co.in-20101026130012-olfktqj5qr578lpb
---
 .../point_of_sale/wizard/pos_box_entries.py   | 53 +++++++------
 addons/point_of_sale/wizard/pos_box_out.py    | 74 +++++++++----------
 2 files changed, 61 insertions(+), 66 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_box_entries.py b/addons/point_of_sale/wizard/pos_box_entries.py
index d9fd5a61573..243cbc02c7d 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.py
+++ b/addons/point_of_sale/wizard/pos_box_entries.py
@@ -52,7 +52,7 @@ class pos_box_entries(osv.osv_memory):
     _name = 'pos.box.entries'
     _description = 'Pos Box Entries'
 
-    def _get_income_product(self, cr, uid, context):
+    def _get_income_product(self, cr, uid, context=None):
         """
              Make the selection list of purchasing  products.
              @param self: The object pointer.
@@ -61,10 +61,10 @@ class pos_box_entries(osv.osv_memory):
              @param context: A standard dictionary
              @return :Return of operation of product
         """
-        obj = self.pool.get('product.product')
-        ids = obj.search(cr, uid, [('income_pdt', '=', True)])
-        res = obj.read(cr, uid, ids, ['id', 'name'], context)
-        res = [(r['id'],r['name']) for r in res]
+        product_obj = self.pool.get('product.product')
+        ids = product_obj.search(cr, uid, [('income_pdt', '=', True)], context=context)
+        res = product_obj.read(cr, uid, ids, ['id', 'name'], context=context)
+        res = [(r['id'], r['name']) for r in res]
         res.insert(0, ('', ''))
 
         return res
@@ -72,17 +72,17 @@ class pos_box_entries(osv.osv_memory):
 
     _columns = {
         'name': fields.char('Description', size=32, required=True),
-        'journal_id': fields.selection(get_journal, "Register", required=True),
-        'product_id': fields.selection(_get_income_product, "Operation", required=True),
+        'journal_id': fields.selection(get_journal, 'Register', required=True),
+        'product_id': fields.selection(_get_income_product, 'Operation', required=True),
         'amount': fields.float('Amount', digits=(16, 2)),
         'ref': fields.char('Ref', size=32),
     }
     _defaults = {
-         'journal_id': lambda *a: 1,
-         'product_id': lambda *a: 1,
+         'journal_id': 1,
+         'product_id': 1,
     }
 
-    def get_in(self, cr, uid, ids, context):
+    def get_in(self, cr, uid, ids, context=None):
         """
              Create the entry of statement in journal.
              @param self: The object pointer.
@@ -92,14 +92,13 @@ class pos_box_entries(osv.osv_memory):
              @return :Return of operation of product
         """
         statement_obj = self.pool.get('account.bank.statement')
-        product_obj = self.pool.get('product.template')
         res_obj = self.pool.get('res.users')
         product_obj = self.pool.get('product.product')
         bank_statement = self.pool.get('account.bank.statement.line')
-        for data in  self.read(cr, uid, ids):
-            args = {}
-            curr_company = res_obj.browse(cr, uid, uid).company_id.id
-            statement_id = statement_obj.search(cr, uid, [('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')])
+        for data in  self.read(cr, uid, ids, context=context):
+            vals = {}
+            curr_company = res_obj.browse(cr, uid, uid, context=context).company_id.id
+            statement_id = statement_obj.search(cr, uid, [('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')], context=context)
             if not statement_id:
                 raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox'))
 
@@ -114,22 +113,20 @@ class pos_box_entries(osv.osv_memory):
                                     'journal_id': data['journal_id'],
                                     'company_id': curr_company,
                                     'user_id': uid,
-                                })
+                                }, context=context)
 
-            args['statement_id'] = statement_id
-            args['journal_id'] = data['journal_id']
+            vals['statement_id'] = statement_id
+            valss['journal_id'] = data['journal_id']
             if acc_id:
-                args['account_id'] = acc_id.id
-            args['amount'] = data['amount'] or 0.0
-            args['ref'] = "%s" % (data['ref'] or '')
-            args['name'] = "%s: %s " % (product_obj.browse(cr, uid, data['product_id']).name, data['name'].decode('utf8'))
-            address_u = res_obj.browse(cr, uid, uid).address_id
+                vals['account_id'] = acc_id.id
+            vals['amount'] = data['amount'] or 0.0
+            vals['ref'] = "%s" % (data['ref'] or '')
+            vals['name'] = "%s: %s " % (product_obj.browse(cr, uid, data['product_id'], context=context).name, data['name'].decode('utf8'))
+            address_u = res_obj.browse(cr, uid, uid, context=context).address_id
             if address_u:
-                partner_id = address_u.partner_id and address_u.partner_id.id or None
-                args['partner_id'] = partner_id
-            bank_statement.create(cr, uid, args)
-
-            return {}
+                vals['partner_id'] = address_u.partner_id and address_u.partner_id.id or None
+            bank_statement.create(cr, uid, vals, context=context)
+        return {}
 
 pos_box_entries()
 
diff --git a/addons/point_of_sale/wizard/pos_box_out.py b/addons/point_of_sale/wizard/pos_box_out.py
index e4aebe2cc1d..d2eb7b62509 100644
--- a/addons/point_of_sale/wizard/pos_box_out.py
+++ b/addons/point_of_sale/wizard/pos_box_out.py
@@ -19,20 +19,19 @@
 #
 ##############################################################################
 
-from osv import osv, fields
 import time
-from tools.translate import _
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
-import pos_box_entries
 
+from osv import osv, fields
+from tools.translate import _
+import pos_box_entries
 
 class pos_box_out(osv.osv_memory):
     _name = 'pos.box.out'
     _description = 'Pos Box Out'
 
-    def _get_expense_product(self, cr, uid, context):
-
+    def _get_expense_product(self, cr, uid, context=None):
         """
              Make the selection list of expense product.
              @param self: The object pointer.
@@ -41,26 +40,26 @@ class pos_box_out(osv.osv_memory):
              @param context: A standard dictionary
              @return :Return of operation of product
         """
-        obj = self.pool.get('product.product')
-        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
-        ids = obj.search(cr, uid, ['&', ('expense_pdt', '=', True), '|', ('company_id', '=', company_id), ('company_id', '=', None)])
-        res = obj.read(cr, uid, ids, ['id', 'name'], context)
+        product_obj = self.pool.get('product.product')
+        company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
+        ids = product_obj.search(cr, uid, ['&', ('expense_pdt', '=', True), '|', ('company_id', '=', company_id), ('company_id', '=', None)], context=context)
+        res = product_obj.read(cr, uid, ids, ['id', 'name'], context=context)
         res = [(r['id'], r['name']) for r in res]
         res.insert(0, ('', ''))
         return res
 
     _columns = {
         'name': fields.char('Description', size=32, required=True),
-        'journal_id': fields.selection(pos_box_entries.get_journal, "Register", required=True),
-        'product_id': fields.selection(_get_expense_product, "Operation", required=True),
+        'journal_id': fields.selection(pos_box_entries.get_journal, 'Register', required=True),
+        'product_id': fields.selection(_get_expense_product, 'Operation', required=True),
         'amount': fields.float('Amount', digits=(16, 2)),
         'ref': fields.char('Ref', size=32),
     }
     _defaults = {
-         'journal_id': lambda *a: 1,
-         'product_id': lambda *a: 1,
+         'journal_id': 1,
+         'product_id': 1,
     }
-    def get_out(self, cr, uid, ids, context):
+    def get_out(self, cr, uid, ids, context=None):
 
         """
          Create the entries in the CashBox   .
@@ -70,34 +69,34 @@ class pos_box_out(osv.osv_memory):
          @param context: A standard dictionary
          @return :Return of operation of product
         """
-        args = {}
+        vals = {}
         statement_obj = self.pool.get('account.bank.statement')
         statement_line_obj = self.pool.get('account.bank.statement.line')
         product_obj = self.pool.get('product.template')
         productp_obj = self.pool.get('product.product')
         res_obj = self.pool.get('res.users')
-        for data in  self.read(cr, uid, ids):
-            curr_company = res_obj.browse(cr, uid, uid).company_id.id
-            statement_id = statement_obj.search(cr, uid, [('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')])
+        for data in  self.read(cr, uid, ids, context=context):
+            curr_company = res_obj.browse(cr, uid, uid, context=context).company_id.id
+            statement_id = statement_obj.search(cr, uid, [('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')], context=context)
             monday = (datetime.today() + relativedelta(weekday=0)).strftime('%Y-%m-%d')
             sunday = (datetime.today() + relativedelta(weekday=6)).strftime('%Y-%m-%d')
-            done_statmt = statement_obj.search(cr, uid, [('date', '>=', monday+' 00:00:00'), ('date', '<=', sunday+' 23:59:59'), ('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid)])
-            stat_done = statement_obj.browse(cr, uid, done_statmt)
-            address_u = res_obj.browse(cr, uid, uid).address_id
+            done_statmt = statement_obj.search(cr, uid, [('date', '>=', monday+' 00:00:00'), ('date', '<=', sunday+' 23:59:59'), ('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid)], context=context)
+            stat_done = statement_obj.browse(cr, uid, done_statmt, context=context)
+            address_u = res_obj.browse(cr, uid, uid, context=context).address_id
             am = 0.0
 
-            amount_check = productp_obj.browse(cr, uid, data['product_id']).am_out or False
+            amount_check = productp_obj.browse(cr, uid, data['product_id'], context=context).am_out or False
             for st in stat_done:
                 for s in st.line_ids:
                     if address_u and s.partner_id == address_u.partner_id and s.am_out:
                         am += s.amount
-            if (-data['amount'] or 0.0) + am < -(res_obj.browse(cr, uid, uid).company_id.max_diff or 0.0) and amount_check:
+            if (-data['amount'] or 0.0) + am < -(res_obj.browse(cr, uid, uid, context=context).company_id.max_diff or 0.0) and amount_check:
                 val = (res_obj.browse(cr, uid, uid).company_id.max_diff or 0.0) + am
                 raise osv.except_osv(_('Error !'), _('The maximum value you can still withdraw is exceeded. \n Remaining value is equal to %d ')%(val))
 
-            acc_id = product_obj.browse(cr, uid, data['product_id']).property_account_income
+            acc_id = product_obj.browse(cr, uid, data['product_id'], context=context).property_account_income
             if not acc_id:
-                raise osv.except_osv(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr, uid, data['product_id']).name))
+                raise osv.except_osv(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr, uid, data['product_id'], context=context).name))
             if not statement_id:
                 raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox'))
             if statement_id:
@@ -108,24 +107,23 @@ class pos_box_out(osv.osv_memory):
                                     'journal_id': data['journal_id'],
                                     'company_id': curr_company,
                                     'user_id': uid,
-                                })
-            args['statement_id'] = statement_id
-            args['journal_id'] = data['journal_id']
+                                }, context=context)
+            vals['statement_id'] = statement_id
+            vals['journal_id'] = data['journal_id']
             if acc_id:
-                args['account_id'] = acc_id.id
+                vals['account_id'] = acc_id.id
             amount = data['amount'] or 0.0
             if data['amount'] > 0:
                 amount = -data['amount']
-            args['amount'] = amount
-            if productp_obj.browse(cr, uid, data['product_id']).am_out:
-                args['am_out'] = True
-            args['ref'] = data['ref'] or ''
-            args['name'] = "%s: %s " % (product_obj.browse(cr, uid, data['product_id']).name, data['name'].decode('utf8'))
-            address_u = res_obj.browse(cr, uid, uid).address_id
+            vals['amount'] = amount
+            if productp_obj.browse(cr, uid, data['product_id'], context=context).am_out:
+                vals['am_out'] = True
+            vals['ref'] = data['ref'] or ''
+            vals['name'] = "%s: %s " % (product_obj.browse(cr, uid, data['product_id'], context=context).name, data['name'].decode('utf8'))
+            address_u = res_obj.browse(cr, uid, uid, context=context).address_id
             if address_u:
-                partner_id = address_u.partner_id and address_u.partner_id.id or None
-                args['partner_id'] = partner_id
-            statement_line_id = statement_line_obj.create(cr, uid, args)
+                vals['partner_id'] = address_u.partner_id and address_u.partner_id.id or None
+            statement_line_id = statement_line_obj.create(cr, uid, vals, context=context)
         return {}
 
 pos_box_out()

From 481c50471e287f30c7dae9e5807fc5bfc9b7bb43 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 26 Oct 2010 18:33:37 +0530
Subject: [PATCH 29/38] [REF, REM] Membership: Cleaning remove demo file

bzr revid: mra@mra-laptop-20101026130337-n0wnsw4pz76dvhir
---
 addons/membership/demo_data.xml               | 166 ------------------
 addons/membership/membership.py               |   5 +-
 addons/membership/report/report_membership.py |  27 ++-
 .../membership/wizard/membership_invoice.py   |  13 +-
 4 files changed, 21 insertions(+), 190 deletions(-)
 delete mode 100644 addons/membership/demo_data.xml

diff --git a/addons/membership/demo_data.xml b/addons/membership/demo_data.xml
deleted file mode 100644
index 6809702a113..00000000000
--- a/addons/membership/demo_data.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data noupdate="1">
-        <record id="account_tax_testingtax0" model="account.tax">
-            <field eval="1" name="sequence"/>
-            <field eval="1.0" name="base_sign"/>
-            <field eval="&quot;true&quot;" name="applicable_type"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="&quot;# price_unit
-# address : res.partner.address object or False
-# product : product.product object or False
-
-result = price_unit * 0.10&quot;" name="python_compute_inv"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field eval="&quot;percent&quot;" name="type"/>
-            <field eval="1.0" name="ref_base_sign"/>
-            <field eval="&quot;1&quot;" name="active"/>
-            <field eval="&quot;testing tax&quot;" name="name"/>
-            <field eval="0.069" name="amount"/>
-            <field eval="&quot;# price_unit
-# address : res.partner.address object or False
-# product : product.product object or None
-# partner : res.partner object or None
-
-result = price_unit * 0.10&quot;" name="python_compute"/>
-            <field eval="1.0" name="tax_sign"/>
-        </record>
-    </data>
-    <data noupdate="1">
-        <record id="base.EUR" model="res.currency"/>
-    </data>
-    <data>
-        <record id="product_template_0" model="product.template">
-            <field name="list_price" eval="150.0"/>
-            <field name="name" eval="&quot;Membership 2006&quot;"/>
-            <field name="categ_id" eval="7"/>
-            <field name="type" eval="&quot;service&quot;"/>
-        </record>
-    </data>
-    <data>
-        <record id="product_product_0" model="product.product">
-            <field eval="&quot;2007-03-31&quot;" name="membership_date_to"/>
-            <field eval="&quot;1&quot;" name="membership"/>
-            <field eval="&quot;m2006&quot;" name="default_code"/>
-            <field eval="&quot;2006-01-01&quot;" name="membership_date_from"/>
-            <field eval="&quot;1&quot;" name="active"/>
-            <field eval="150.0" name="price_margin"/>
-            <field name="product_tmpl_id" ref="product_template_0"/>
-        </record>
-    </data>
-    <data>
-        <record id="product_template_1" model="product.template">
-            <field name="list_price" eval="160.0"/>
-            <field name="name" eval="&quot;Membership 2007&quot;"/>
-            <field name="categ_id" eval="7"/>
-            <field name="type" eval="&quot;service&quot;"/>
-        </record>
-    </data>
-    <data>
-        <record id="product_product_1" model="product.product">
-            <field eval="&quot;2008-03-31&quot;" name="membership_date_to"/>
-            <field eval="&quot;1&quot;" name="membership"/>
-            <field eval="&quot;m2007&quot;" name="default_code"/>
-            <field eval="&quot;2007-01-01&quot;" name="membership_date_from"/>
-            <field eval="&quot;1&quot;" name="active"/>
-            <field eval="160.0" name="price_margin"/>
-            <field name="product_tmpl_id" ref="product_template_1"/>
-        </record>
-    </data>
-    <data>
-        <record id="product_template_2" model="product.template">
-            <field name="list_price" eval="165.0"/>
-            <field name="name" eval="&quot;Membership 2008&quot;"/>
-            <field name="categ_id" eval="7"/>
-            <field name="type" eval="&quot;service&quot;"/>
-        </record>
-    </data>
-    <data>
-        <record id="product_product_2" model="product.product">
-            <field eval="&quot;2009-03-31&quot;" name="membership_date_to"/>
-            <field eval="&quot;1&quot;" name="membership"/>
-            <field eval="&quot;m2008&quot;" name="default_code"/>
-            <field eval="&quot;2008-01-01&quot;" name="membership_date_from"/>
-            <field eval="&quot;1&quot;" name="active"/>
-            <field eval="165.0" name="price_margin"/>
-            <field name="product_tmpl_id" ref="product_template_2"/>
-        </record>
-    </data>
-    <data noupdate="1">
-        <record id="account_invoice_0" model="account.invoice">
-            <field name="partner_id" ref="base.res_partner_agrolait"/>
-            <field name="account_id" ref="account.a_recv"/>
-            <field name="address_contact_id" ref="base.res_partner_address_8"/>
-            <field eval="&quot;none&quot;" name="reference_type"/>
-            <field name="journal_id" ref="account.sales_journal"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="currency_id" ref="base.EUR"/>
-            <field name="address_invoice_id" ref="base.res_partner_address_8"/>
-            <field eval="&quot;paid&quot;" name="state"/>
-            <field eval="&quot;out_invoice&quot;" name="type"/>
-            <field eval="&quot;2006-02-10&quot;" name="date_invoice"/>
-        </record>
-        <record id="account_invoice_line_membership0" model="account.invoice.line">
-            <field name="uos_id" ref="product.product_uom_unit"/>
-            <field eval="&quot;Membership 2006&quot;" name="name"/>
-            <field name="invoice_id" ref="account_invoice_0"/>
-            <field eval="150.0" name="price_unit"/>
-            <field eval="[(6,0,[ref('account_tax_testingtax0')])]" name="invoice_line_tax_id"/>
-            <field name="product_id" ref="product_product_0"/>
-            <field eval="1.0" name="quantity"/>
-            <field name="account_id" ref="account.a_sale"/>
-        </record>
-    </data>
-
-    <data noupdate="1">
-        <record id="account_invoice_1" model="account.invoice">
-            <field name="partner_id" ref="base.res_partner_agrolait"/>
-            <field name="account_id" ref="account.a_recv"/>
-            <field name="address_contact_id" ref="base.res_partner_address_8"/>
-            <field eval="&quot;none&quot;" name="reference_type"/>
-            <field name="journal_id" ref="account.sales_journal"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="currency_id" ref="base.EUR"/>
-            <field name="address_invoice_id" ref="base.res_partner_address_8"/>
-            <field eval="&quot;paid&quot;" name="state"/>
-            <field eval="&quot;out_invoice&quot;" name="type"/>
-            <field eval="&quot;2007-01-30&quot;" name="date_invoice"/>
-        </record>
-        <record id="account_invoice_line_membership1" model="account.invoice.line">
-            <field name="uos_id" ref="product.product_uom_unit"/>
-            <field eval="&quot;Membership 2007&quot;" name="name"/>
-            <field name="invoice_id" ref="account_invoice_1"/>
-            <field eval="160.0" name="price_unit"/>
-            <field eval="[(6,0,[ref('account_tax_testingtax0')])]" name="invoice_line_tax_id"/>
-            <field name="product_id" ref="product_product_1"/>
-            <field eval="1.0" name="quantity"/>
-            <field name="account_id" ref="account.a_sale"/>
-        </record>
-    </data>
-
-    <data noupdate="1">
-        <record id="account_invoice_2" model="account.invoice">
-            <field name="partner_id" ref="base.res_partner_agrolait"/>
-            <field name="account_id" ref="account.a_recv"/>
-            <field name="address_contact_id" ref="base.res_partner_address_8"/>
-            <field eval="&quot;none&quot;" name="reference_type"/>
-            <field name="journal_id" ref="account.sales_journal"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="currency_id" ref="base.EUR"/>
-            <field name="address_invoice_id" ref="base.res_partner_address_8"/>
-            <field eval="&quot;paid&quot;" name="state"/>
-            <field eval="&quot;out_invoice&quot;" name="type"/>
-            <field eval="&quot;2007-11-30&quot;" name="date_invoice"/>
-        </record>
-        <record id="account_invoice_line_membership1" model="account.invoice.line">
-            <field name="uos_id" ref="product.product_uom_unit"/>
-            <field eval="&quot;Membership 2007&quot;" name="name"/>
-            <field name="invoice_id" ref="account_invoice_2"/>
-            <field eval="160.0" name="price_unit"/>
-            <field eval="[(6,0,[ref('account_tax_testingtax0')])]" name="invoice_line_tax_id"/>
-            <field name="product_id" ref="product_product_2"/>
-            <field eval="1.0" name="quantity"/>
-            <field name="account_id" ref="account.a_sale"/>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 12a36fb7e8a..a7f84603608 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -484,6 +484,7 @@ class Product(osv.osv):
     _defaults = {
         'membership': False,
     }
+
 Product()
 
 
@@ -501,6 +502,7 @@ class Invoice(osv.osv):
                         [l.id for l in invoice.invoice_line])])
             member_line_obj.write(cr, uid, mlines, {'date_cancel': today})
         return super(Invoice, self).action_cancel(cr, uid, ids)
+
 Invoice()
 
 class account_invoice_line(osv.osv):
@@ -573,4 +575,5 @@ class account_invoice_line(osv.osv):
         return result
 
 account_invoice_line()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/membership/report/report_membership.py b/addons/membership/report/report_membership.py
index 34ca21e0e9c..43ffa7a5b28 100644
--- a/addons/membership/report/report_membership.py
+++ b/addons/membership/report/report_membership.py
@@ -23,7 +23,6 @@ from osv import fields, osv
 import tools
 import decimal_precision as dp
 
-
 STATE = [
     ('none', 'Non Member'),
     ('canceled', 'Cancelled Member'),
@@ -63,7 +62,7 @@ class report_membership(osv.osv):
         'membership_state': fields.selection(STATE, 'Current Membership State', readonly=True),
         'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True)
-}
+        }
 
     def init(self, cr):
         '''Create the view'''
@@ -127,20 +126,20 @@ class report_membership(osv.osv):
               ml.state,
               ml.id
         ) AS foo
-        GROUP BY 
-            year, 
-            month, 
-            date_from, 
-            date_to, 
-            partner_id, 
-            user_id, 
-            membership_id, 
-            company_id, 
-            membership_state, 
-            associate_member_id, 
+        GROUP BY
+            year,
+            month,
+            date_from,
+            date_to,
+            partner_id,
+            user_id,
+            membership_id,
+            company_id,
+            membership_state,
+            associate_member_id,
             membership_amount
         )""")
 
 report_membership()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/membership/wizard/membership_invoice.py b/addons/membership/wizard/membership_invoice.py
index 9b9fddc2313..b0a46f3951d 100644
--- a/addons/membership/wizard/membership_invoice.py
+++ b/addons/membership/wizard/membership_invoice.py
@@ -19,11 +19,7 @@
 #
 ##############################################################################
 
-import time
-
 from osv import fields, osv
-from tools.translate import _
-import tools
 import decimal_precision as dp
 
 class membership_invoice(osv.osv_memory):
@@ -35,7 +31,7 @@ class membership_invoice(osv.osv_memory):
         'product_id': fields.many2one('product.product','Membership', required=True),
         'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True),
     }
-    def onchange_product(self, cr, uid, ids, product_id):
+    def onchange_product(self, cr, uid, ids, product_id=False):
         """This function returns value of  product's member price based on product id.
         """
         if not product_id:
@@ -49,15 +45,14 @@ class membership_invoice(osv.osv_memory):
         datas = {}
         if not context:
             context = {}
-        data = self.browse(cr, uid, ids)
+        data = self.browse(cr, uid, ids, context=context)
         if data:
             data = data[0]
             datas = {
                 'membership_product_id': data.product_id.id,
                 'amount': data.member_price
             }
-        invoice_ids = context.get('active_ids', [])
-        invoice_list = partner_obj.create_membership_invoice(cr, uid, invoice_ids, datas=datas, context=context)
+        invoice_list = partner_obj.create_membership_invoice(cr, uid, context.get('active_ids', []), datas=datas, context=context)
 
         return  {
             'domain': [('id', 'in', invoice_list)],
@@ -70,4 +65,4 @@ class membership_invoice(osv.osv_memory):
 
 membership_invoice()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From bd5d891417b6a32c1297fcaf82b82ffeafee12df Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Tue, 26 Oct 2010 19:03:52 +0530
Subject: [PATCH 30/38] [IMP] account_voucher: code cleaning

bzr revid: ara@tinyerp.com-20101026133352-0tb4fmrby1yv8vyg
---
 addons/account_voucher/__init__.py               |  2 +-
 addons/account_voucher/account_voucher.py        | 16 ++++++++++------
 addons/account_voucher/report/account_voucher.py |  7 ++++---
 .../wizard/account_statement_from_invoice.py     |  1 +
 .../wizard/account_voucher_unreconcile.py        | 10 +++++-----
 5 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/addons/account_voucher/__init__.py b/addons/account_voucher/__init__.py
index 2b1478d9fa0..9796f81d5e5 100644
--- a/addons/account_voucher/__init__.py
+++ b/addons/account_voucher/__init__.py
@@ -24,4 +24,4 @@ import invoice
 import report
 import wizard
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 9dca6fdd9c6..a07e41ff000 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -573,6 +573,7 @@ class account_voucher(osv.osv):
         move_line_pool = self.pool.get('account.move.line')
         currency_pool = self.pool.get('res.currency')
         tax_obj = self.pool.get('account.tax')
+        seq_obj = self.pool.get('ir.sequence')
         for inv in self.browse(cr, uid, ids):
             if not inv.line_ids:
                 raise osv.except_osv(_('No Lines !'), _('Please create some lines'))
@@ -581,7 +582,7 @@ class account_voucher(osv.osv):
             if inv.number:
                 name = inv.number
             elif inv.journal_id.sequence_id:
-                name = self.pool.get('ir.sequence').get_id(cr, uid, inv.journal_id.sequence_id.id)
+                name = seq_obj.get_id(cr, uid, inv.journal_id.sequence_id.id)
             else:
                 raise osv.except_osv(_('Error !'), _('Please define a sequence on the journal !'))
             if not inv.reference:
@@ -687,7 +688,7 @@ class account_voucher(osv.osv):
                     rec_ids = [master_line, line.move_line_id.id]
                     rec_list_ids.append(rec_ids)
 
-            if not self.pool.get('res.currency').is_zero(cr, uid, inv.currency_id, line_total):
+            if not currency_pool.is_zero(cr, uid, inv.currency_id, line_total):
                 diff = line_total
                 move_line = {
                     'name': name,
@@ -854,17 +855,19 @@ class account_bank_statement(osv.osv):
     _inherit = 'account.bank.statement'
 
     def button_cancel(self, cr, uid, ids, context=None):
+        voucher_obj = self.pool.get('account.voucher')
         for st in self.browse(cr, uid, ids, context):
             voucher_ids = []
             for line in st.line_ids:
                 if line.voucher_id:
                     voucher_ids.append(line.voucher_id.id)
-            self.pool.get('account.voucher').cancel_voucher(cr, uid, voucher_ids, context)
+            voucher_obj.cancel_voucher(cr, uid, voucher_ids, context)
         return super(account_bank_statement, self).button_cancel(cr, uid, ids, context=context)
 
     def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, next_number, context=None):
         voucher_obj = self.pool.get('account.voucher')
         wf_service = netsvc.LocalService("workflow")
+        move_line_obj = self.pool.get('account.move.line')
         bank_st_line_obj = self.pool.get('account.bank.statement.line')
         st_line = bank_st_line_obj.browse(cr, uid, st_line_id, context=context)
         if st_line.voucher_id:
@@ -878,7 +881,7 @@ class account_bank_statement(osv.osv):
                 'move_ids': [(4, v.move_id.id, False)]
             })
 
-            return self.pool.get('account.move.line').write(cr, uid, [x.id for x in v.move_ids], {'statement_id': st_line.statement_id.id}, context=context)
+            return move_line_obj.write(cr, uid, [x.id for x in v.move_ids], {'statement_id': st_line.statement_id.id}, context=context)
         return super(account_bank_statement, self).create_move_from_st_line(cr, uid, st_line.id, company_currency_id, next_number, context=context)
 
 account_bank_statement()
@@ -912,14 +915,15 @@ class account_bank_statement_line(osv.osv):
     }
 
     def unlink(self, cr, uid, ids, context=None):
+        voucher_obj = self.pool.get('account.voucher')
         statement_line = self.browse(cr, uid, ids, context)
         unlink_ids = []
         for st_line in statement_line:
             if st_line.voucher_id:
                 unlink_ids.append(st_line.voucher_id.id)
-        self.pool.get('account.voucher').unlink(cr, uid, unlink_ids, context=context)
+        voucher_obj.unlink(cr, uid, unlink_ids, context=context)
         return super(account_bank_statement_line, self).unlink(cr, uid, ids, context=context)
 
 account_bank_statement_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:=======
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_voucher/report/account_voucher.py b/addons/account_voucher/report/account_voucher.py
index 7931daffbac..e44adee974e 100644
--- a/addons/account_voucher/report/account_voucher.py
+++ b/addons/account_voucher/report/account_voucher.py
@@ -32,7 +32,7 @@ class report_voucher(report_sxw.rml_parse):
             'get_title': self.get_title,
             'debit':self.debit,
             'credit':self.credit,
-            'get_ref' : self._get_ref
+            'get_ref': self._get_ref
         })
 
     def convert(self, amount, cur):
@@ -58,9 +58,10 @@ class report_voucher(report_sxw.rml_parse):
         return credit
 
     def _get_ref(self, voucher_id, move_ids):
-        voucher_line = self.pool.get('account.voucher.line').search(self.cr, self.uid, [('partner_id', '=', move_ids.partner_id.id), ('voucher_id', '=', voucher_id)])
+        voucher_line_obj = self.pool.get('account.voucher.line')
+        voucher_line = voucher_line_obj.search(self.cr, self.uid, [('partner_id', '=', move_ids.partner_id.id), ('voucher_id', '=', voucher_id)])
         if voucher_line:
-            voucher = self.pool.get('account.voucher.line').browse(self.cr, self.uid, voucher_line)[0]
+            voucher = voucher_line_obj.browse(self.cr, self.uid, voucher_line)[0]
             return voucher.name
         else:
             return
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py
index 507fdcabffa..b4671ae208a 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice.py
+++ b/addons/account_voucher/wizard/account_statement_from_invoice.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 
 from osv import fields, osv
diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile.py b/addons/account_voucher/wizard/account_voucher_unreconcile.py
index 71b4fbc8fb5..69aa6e1181d 100644
--- a/addons/account_voucher/wizard/account_voucher_unreconcile.py
+++ b/addons/account_voucher/wizard/account_voucher_unreconcile.py
@@ -25,15 +25,15 @@ from osv import fields
 class account_voucher_unreconcile(osv.osv_memory):
     _name = "account.voucher.unreconcile"
     _description = "Account voucher unreconcile"
-    
+
     _columns = {
         'remove':fields.boolean('Want to remove accounting entries too ?', required=False),
     }
-    
+
     _defaults = {
         'remove': True,
     }
-    
+
     def trans_unrec(self, cr, uid, ids, context=None):
 #        res = self.browse(cr, uid, ids[0])
         if context is None:
@@ -54,9 +54,9 @@ class account_voucher_unreconcile(osv.osv_memory):
             voucher_pool.cancel_voucher(cr, uid, [context.get('active_id')], context)
 #                wf_service = netsvc.LocalService("workflow")
 #                wf_service.trg_validate(uid, 'account.voucher', context.get('active_id'), 'cancel_voucher', cr)
-            
+
         return {}
 
 account_voucher_unreconcile()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 71460802a508b5c41ce52f2d4f5f7ec7dd94e20b Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 26 Oct 2010 19:10:31 +0530
Subject: [PATCH 31/38] [IMP] point_of_sale: code cleaning

bzr revid: psi@tinyerp.co.in-20101026134031-ee7geo6vzj1npv5r
---
 .../wizard/pos_close_statement.py             | 29 ++++---
 addons/point_of_sale/wizard/pos_confirm.py    |  7 +-
 addons/point_of_sale/wizard/pos_details.py    | 15 ++--
 addons/point_of_sale/wizard/pos_discount.py   | 19 ++---
 addons/point_of_sale/wizard/pos_get_sale.py   | 23 +++---
 .../wizard/pos_open_statement.py              | 33 ++++----
 addons/point_of_sale/wizard/pos_payment.py    | 80 +++++++++----------
 .../wizard/pos_payment_report.py              | 11 ++-
 .../wizard/pos_payment_report_date.py         | 17 ++--
 .../wizard/pos_payment_report_user.py         | 14 ++--
 10 files changed, 122 insertions(+), 126 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_close_statement.py b/addons/point_of_sale/wizard/pos_close_statement.py
index 82e47a2caa3..02c82a3cf98 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.py
+++ b/addons/point_of_sale/wizard/pos_close_statement.py
@@ -26,7 +26,7 @@ class pos_close_statement(osv.osv_memory):
     _name = 'pos.close.statement'
     _description = 'Close Statements'
 
-    def close_statement(self, cr, uid, ids, context):
+    def close_statement(self, cr, uid, ids, context=None):
         """
              Close the statements
              @param self: The object pointer.
@@ -39,34 +39,33 @@ class pos_close_statement(osv.osv_memory):
         statement_obj = self.pool.get('account.bank.statement')
         journal_obj = self.pool.get('account.journal')
         cr.execute("SELECT DISTINCT journal_id FROM pos_journal_users "
-                    "WHERE user_id=%s ORDER BY journal_id", (uid,))
+                    "WHERE user_id=%s ORDER BY journal_id", (uid, ))
         j_ids = map(lambda x1: x1[0], cr.fetchall())
-        journal_ids = journal_obj.search(cr, uid, [('auto_cash', '=', True), ('type', '=', 'cash'), ('id', 'in', j_ids)])
-        ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', 'in', journal_ids)])
-        for journal in journal_obj.browse(cr, uid, journal_ids):
+        journal_ids = journal_obj.search(cr, uid, [('auto_cash', '=', True), ('type', '=', 'cash'), ('id', 'in', j_ids)], context=context)
+        ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', 'in', journal_ids)], context=context)
+        for journal in journal_obj.browse(cr, uid, journal_ids, context=context):
             if not ids:
                 raise osv.except_osv(_('Message'), _('Registers are already closed.'))
             else:
                 if not journal.check_dtls:
-                    statement_obj.button_confirm_cash(cr, uid, ids, context)
+                    statement_obj.button_confirm_cash(cr, uid, ids, context=context)
 
-        data_obj = self.pool.get('ir.model.data')
-        id2 = data_obj._get_id(cr, uid, 'account', 'view_bank_statement_tree')
-        id3 = data_obj._get_id(cr, uid, 'account', 'view_bank_statement_form2')
-        result = data_obj._get_id(cr, uid, 'point_of_sale', 'view_pos_confirm_cash_statement_filter')
+        id2 = mod_obj._get_id(cr, uid, 'account', 'view_bank_statement_tree')
+        id3 = mod_obj._get_id(cr, uid, 'account', 'view_bank_statement_form2')
+        result = mod_obj._get_id(cr, uid, 'point_of_sale', 'view_pos_confirm_cash_statement_filter')
         search_id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
         if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            id2 = mod_obj.browse(cr, uid, id2, context=context).res_id
         if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+            id3 = mod_obj.browse(cr, uid, id3, context=context).res_id
         return {
-            'domain': "[('id','in'," + str(ids) + ")]",
+            'domain': "[('id', 'in', " + str(ids) + ")]",
             'name': 'Close Statements',
             'view_type': 'form',
-            'view_mode': 'tree,form',
+            'view_mode': 'tree, form',
             'search_view_id': search_id['res_id'],
             'res_model': 'account.bank.statement',
-            'views': [(id2, 'tree'),(id3, 'form')],
+            'views': [(id2, 'tree'), (id3, 'form')],
             'type': 'ir.actions.act_window'
         }
 
diff --git a/addons/point_of_sale/wizard/pos_confirm.py b/addons/point_of_sale/wizard/pos_confirm.py
index de293eaebc7..f4c53d66297 100644
--- a/addons/point_of_sale/wizard/pos_confirm.py
+++ b/addons/point_of_sale/wizard/pos_confirm.py
@@ -28,7 +28,7 @@ class pos_confirm(osv.osv_memory):
     _name = 'pos.confirm'
     _description = 'Point of Sale Confirm'
 
-    def action_confirm(self, cr, uid, ids, context):
+    def action_confirm(self, cr, uid, ids, context=None):
         """
              Confirm the order and close the sales.
              @param self: The object pointer.
@@ -37,7 +37,8 @@ class pos_confirm(osv.osv_memory):
              @param context: A standard dictionary
              @return :Blank dictionary
         """
-
+        if context is None:
+            context = {}
         record_id = context and context.get('active_id', False)
         if record_id:
             if isinstance(record_id, (int, long)):
@@ -47,7 +48,7 @@ class pos_confirm(osv.osv_memory):
 
                 for order_id in order_obj.browse(cr, uid, record_id, context=context):
                     if  order_id.state == 'paid':
-                        order_obj.write(cr, uid, [order_id.id], {'journal_entry': True})
+                        order_obj.write(cr, uid, [order_id.id], {'journal_entry': True}, context=context)
                         order_obj.create_account_move(cr, uid, [order_id.id], context=context)
 
                 wf_service = netsvc.LocalService("workflow")
diff --git a/addons/point_of_sale/wizard/pos_details.py b/addons/point_of_sale/wizard/pos_details.py
index 22d29b469fa..2e272826b4f 100644
--- a/addons/point_of_sale/wizard/pos_details.py
+++ b/addons/point_of_sale/wizard/pos_details.py
@@ -19,9 +19,10 @@
 #
 ##############################################################################
 
+import time
+
 from osv import osv, fields
 from tools.translate import _
-import time
 
 
 class pos_details(osv.osv_memory):
@@ -33,11 +34,11 @@ class pos_details(osv.osv_memory):
         'date_end': fields.date('Date End', required=True)
     }
     _defaults = {
-        'date_start': lambda *a: time.strftime('%Y-%m-%d'),
-        'date_end': lambda *a: time.strftime('%Y-%m-%d'),
+        'date_start': time.strftime('%Y-%m-%d'),
+        'date_end': time.strftime('%Y-%m-%d'),
     }
 
-    def print_report(self, cr, uid, ids, context={}):
+    def print_report(self, cr, uid, ids, context=None):
         """
          To get the date and print the report
          @param self: The object pointer.
@@ -46,12 +47,12 @@ class pos_details(osv.osv_memory):
          @param context: A standard dictionary
          @return : retrun report
         """
-
+        if context is None:
+            context = {}
         datas = {'ids': context.get('active_ids', [])}
-        res = self.read(cr, uid, ids, ['date_start', 'date_end'], context)
+        res = self.read(cr, uid, ids, ['date_start', 'date_end'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
-
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'pos.details',
diff --git a/addons/point_of_sale/wizard/pos_discount.py b/addons/point_of_sale/wizard/pos_discount.py
index 375b7dc20d4..d92a545a4ab 100644
--- a/addons/point_of_sale/wizard/pos_discount.py
+++ b/addons/point_of_sale/wizard/pos_discount.py
@@ -32,7 +32,7 @@ class pos_discount(osv.osv_memory):
         'discount_notes': fields.char('Discount Notes', size= 128, required=True),
     }
     _defaults = {
-        'discount': lambda *a: 5,
+        'discount': 5,
     }
 
 
@@ -47,11 +47,11 @@ class pos_discount(osv.osv_memory):
         """
         res = super(pos_discount, self).view_init(cr, uid, fields_list, context=context)
         record_id = context and context.get('active_id', False) or False
-        order = self.pool.get('pos.order').browse(cr, uid, record_id)
+        order = self.pool.get('pos.order').browse(cr, uid, record_id, context=context)
         if not order.lines:
                 raise osv.except_osv('Error!','No Order Lines ')
         True
-    def apply_discount(self, cr, uid, ids, context):
+    def apply_discount(self, cr, uid, ids, context=None):
         """
          To give the discount of  product and check the.
 
@@ -61,16 +61,16 @@ class pos_discount(osv.osv_memory):
          @param context: A standard dictionary
          @return : nothing
         """
+        order_ref = self.pool.get('pos.order')
+        order_line_ref = self.pool.get('pos.order.line')
+        if context is None:
+            context = {}
         this = self.browse(cr, uid, ids[0], context=context)
         record_id = context and context.get('active_id', False)
         if isinstance(record_id, (int, long)):
             record_id = [record_id]
 
-        order_ref = self.pool.get('pos.order')
-        order_line_ref = self.pool.get('pos.order.line')
-
         for order in order_ref.browse(cr, uid, record_id, context=context):
-
             for line in order.lines:
                 company_discount = order.company_id.company_discount
                 applied_discount = this.discount
@@ -81,10 +81,7 @@ class pos_discount(osv.osv_memory):
                     notice = 'Minimum Discount'
                 else:
                     notice = this.discount_notes
-
-                res_new = {
-                }
-
+                res_new = {}
                 if this.discount <= company_discount:
                     res_new = {
                         'discount': this.discount,
diff --git a/addons/point_of_sale/wizard/pos_get_sale.py b/addons/point_of_sale/wizard/pos_get_sale.py
index 1cc9675bf84..48bd89bce7f 100644
--- a/addons/point_of_sale/wizard/pos_get_sale.py
+++ b/addons/point_of_sale/wizard/pos_get_sale.py
@@ -28,10 +28,10 @@ class pos_get_sale(osv.osv_memory):
     _description = 'Get From Sale'
 
     _columns = {
-        'picking_id': fields.many2one('stock.picking', 'Sale Order', domain=[('state', 'in', ('assigned', 'confirmed')), ('type', '=', 'out')], context="{'contact_display':'partner'}", required=True),
+        'picking_id': fields.many2one('stock.picking', 'Sale Order', domain=[('state', 'in', ('assigned', 'confirmed')), ('type', '=', 'out')], context="{'contact_display': 'partner'}", required=True),
     }
 
-    def sale_complete(self, cr, uid, ids, context):
+    def sale_complete(self, cr, uid, ids, context=None):
         """
              Select the picking order and add the in Point of sale order
              @param self: The object pointer.
@@ -40,29 +40,29 @@ class pos_get_sale(osv.osv_memory):
              @param context: A standard dictionary
              @return : nothing
         """
-        this = self.browse(cr, uid, ids[0], context=context)
-        record_id = context and context.get('active_id', False)
-
         proxy_pos = self.pool.get('pos.order')
         proxy_pick = self.pool.get('stock.picking')
         proxy_order_line = self.pool.get('pos.order.line')
+        if context is None:
+            context = {}
+        this = self.browse(cr, uid, ids[0], context=context)
+        record_id = context and context.get('active_id', False)
 
         if record_id:
-            order = proxy_pos.browse(cr, uid, record_id, context)
-
+            order = proxy_pos.browse(cr, uid, record_id, context=context)
             if order.state in ('paid', 'invoiced'):
                 raise osv.except_osv(_('UserError '), _("You can't modify this order. It has already been paid"))
 
-            for pick in proxy_pick.browse(cr, uid, [this.picking_id.id], context):
+            for pick in proxy_pick.browse(cr, uid, [this.picking_id.id], context=context):
                 proxy_pos.write(cr, uid, record_id, {
                     'picking_id': this.picking_id.id,
                     'partner_id': pick.address_id and pick.address_id.partner_id.id
-                })
+                }, context=context)
 
             order = proxy_pick.write(cr, uid, [this.picking_id.id], {
                                         'invoice_state': 'none',
                                         'pos_order': record_id
-                                    })
+                                    }, context=context)
 
             for line in pick.move_lines:
                 proxy_order_line.create(cr, uid, {
@@ -72,8 +72,7 @@ class pos_get_sale(osv.osv_memory):
                     'product_id': line.product_id.id,
                     'price_unit': line.sale_line_id.price_unit,
                     'discount': line.sale_line_id.discount,
-                })
-
+                }, context=context)
         return {}
 
 pos_get_sale()
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index 67c5b125768..9bbed850dfc 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.py
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -26,7 +26,7 @@ class pos_open_statement(osv.osv_memory):
     _name = 'pos.open.statement'
     _description = 'Open Statements'
 
-    def open_statement(self, cr, uid, ids, context):
+    def open_statement(self, cr, uid, ids, context=None):
         """
              Open the statements
              @param self: The object pointer.
@@ -37,20 +37,20 @@ class pos_open_statement(osv.osv_memory):
         """
         data = {}
         mod_obj = self.pool.get('ir.model.data')
-        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
         statement_obj = self.pool.get('account.bank.statement')
         sequence_obj = self.pool.get('ir.sequence')
         journal_obj = self.pool.get('account.journal')
+        company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
         cr.execute("SELECT DISTINCT journal_id FROM pos_journal_users "
-                    "WHERE user_id=%s ORDER BY journal_id"% (uid,))
+                    "WHERE user_id = %s ORDER BY journal_id"% (uid, ))
         j_ids = map(lambda x1: x1[0], cr.fetchall())
-        journal_ids = journal_obj.search(cr, uid, [('auto_cash', '=', True), ('type', '=', 'cash'), ('id', 'in', j_ids)])
+        journal_ids = journal_obj.search(cr, uid, [('auto_cash', '=', True), ('type', '=', 'cash'), ('id', 'in', j_ids)], context=context)
 
-        for journal in journal_obj.browse(cr, uid, journal_ids):
-            ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)])
+        for journal in journal_obj.browse(cr, uid, journal_ids, context=context):
+            ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)], context=context)
             if len(ids):
                 raise osv.except_osv(_('Message'), _('You can not open a Cashbox for "%s".\nPlease close its related Register.' %(journal.name)))
-            
+
             number = ''
             if journal.sequence_id:
                 number = sequence_obj.get_id(cr, uid, journal.sequence_id.id)
@@ -62,27 +62,26 @@ class pos_open_statement(osv.osv_memory):
                          'user_id': uid,
                          'state': 'draft',
                          'name': number })
-            statement_id = statement_obj.create(cr, uid, data)
+            statement_id = statement_obj.create(cr, uid, data, context=context)
             statement_obj.button_open(cr, uid, [statement_id], context)
 
-        data_obj = self.pool.get('ir.model.data')
-        id2 = data_obj._get_id(cr, uid, 'account', 'view_bank_statement_tree')
-        id3 = data_obj._get_id(cr, uid, 'account', 'view_bank_statement_form2')
-        result = data_obj._get_id(cr, uid, 'point_of_sale', 'view_pos_open_cash_statement_filter')
+        id2 = mod_obj._get_id(cr, uid, 'account', 'view_bank_statement_tree')
+        id3 = mod_obj._get_id(cr, uid, 'account', 'view_bank_statement_form2')
+        result = mod_obj._get_id(cr, uid, 'point_of_sale', 'view_pos_open_cash_statement_filter')
         search_id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
         if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            id2 = mod_obj.browse(cr, uid, id2, context=context).res_id
         if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+            id3 = mod_obj.browse(cr, uid, id3, context=context).res_id
 
         return {
-            'domain': "[('state','=','open'),('user_id','=',"+ str(uid) +")]",
+            'domain': "[('state', '=', 'open'),('user_id', '=', "+ str(uid) +")]",
             'name': 'Open Statement',
             'view_type': 'form',
-            'view_mode': 'tree,form',
+            'view_mode': 'tree, form',
             'search_view_id': search_id['res_id'],
             'res_model': 'account.bank.statement',
-            'views': [(id2, 'tree'),(id3, 'form')],
+            'views': [(id2, 'tree'), (id3, 'form')],
             'context': {'search_default_open': 1},
             'type': 'ir.actions.act_window'
         }
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index 1c92ad24132..2d9b1a5d402 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -19,16 +19,18 @@
 #
 ##############################################################################
 
-from osv import osv,fields
+import time
+
+from osv import osv, fields
 from tools.translate import _
 import pos_box_entries
-import time
+
 
 class pos_make_payment(osv.osv_memory):
     _name = 'pos.make.payment'
     _description = 'Point of Sale Payment'
 
-    def default_get(self, cr, uid, fields, context):
+    def default_get(self, cr, uid, fields, context=None):
         """
          To get default values for the object.
          @param self: The object pointer.
@@ -38,40 +40,40 @@ class pos_make_payment(osv.osv_memory):
          @param context: A standard dictionary
          @return: A dictionary which of fields with values.
         """
+        if context is None:
+            context = {}
+        j_obj = self.pool.get('account.journal')
+        order_obj=self.pool.get('pos.order')
         res = super(pos_make_payment, self).default_get(cr, uid, fields, context=context)
-        active_id = context and context.get('active_id',False)
+        active_id = context and context.get('active_id', False)
         if active_id:
-            j_obj = self.pool.get('account.journal')
             cr.execute("SELECT DISTINCT journal_id FROM pos_journal_users "
-                        "WHERE user_id=%d ORDER BY journal_id"% (uid,))
+                        "WHERE user_id = %d ORDER BY journal_id"% (uid, ))
             j_ids = map(lambda x1: x1[0], cr.fetchall())
-            journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('id', 'in', j_ids)])
-
+            journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('id', 'in', j_ids)], context=context)
             journal = journal and journal[0] or False
-
-            order_obj=self.pool.get('pos.order')
-            order = order_obj.browse(cr, uid, active_id, context)
+            order = order_obj.browse(cr, uid, active_id, context=context)
             #get amount to pay
             amount = order.amount_total - order.amount_paid
             if amount <= 0.0:
                 context.update({'flag': True})
                 order_obj.action_paid(cr, uid, [active_id], context)
             elif order.amount_paid > 0.0:
-                order_obj.write(cr, uid, [active_id], {'state': 'advance'})
+                order_obj.write(cr, uid, [active_id], {'state': 'advance'}, context=context)
             invoice_wanted_checked = False
 
             current_date = time.strftime('%Y-%m-%d')
 
             if 'journal' in fields:
-                res.update({'journal':journal})
+                res.update({'journal': journal})
             if 'amount' in fields:
-                res.update({'amount':amount})
+                res.update({'amount': amount})
             if 'invoice_wanted' in fields:
-                res.update({'invoice_wanted':invoice_wanted_checked})
+                res.update({'invoice_wanted': invoice_wanted_checked})
             if 'payment_date' in fields:
-                res.update({'payment_date':current_date})
+                res.update({'payment_date': current_date})
             if 'payment_name'  in fields:
-                res.update({'payment_name':'Payment'})
+                res.update({'payment_name': 'Payment'})
             if 'partner_id' in fields:
                 res.update({'partner_id': order.partner_id.id or False})
             if 'pricelist_id' in fields:
@@ -82,7 +84,7 @@ class pos_make_payment(osv.osv_memory):
         super(pos_make_payment, self).view_init(cr, uid, fields_list, context=context)
         active_id = context and context.get('active_id', False) or False
         if active_id:
-            order = self.pool.get('pos.order').browse(cr, uid, active_id)
+            order = self.pool.get('pos.order').browse(cr, uid, active_id, context=context)
             if not order.lines:
                 raise osv.except_osv(_('Error!'),_('No order lines defined for this sale '))
         return True
@@ -99,15 +101,15 @@ class pos_make_payment(osv.osv_memory):
              @return: New arch of view.
 
         """
-
-
         result = super(pos_make_payment, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        if context is None:
+            context = {}
         active_model = context.get('active_model')
         active_id = context.get('active_id', False)
         if not active_id or (active_model and active_model != 'pos.order'):
             return result
 
-        order = self.pool.get('pos.order').browse(cr, uid, active_id)
+        order = self.pool.get('pos.order').browse(cr, uid, active_id, context=context)
         if order.amount_total == order.amount_paid:
             result['arch'] = """ <form string="Make Payment" colspan="4">
                             <group col="2" colspan="2">
@@ -132,26 +134,25 @@ class pos_make_payment(osv.osv_memory):
             amount = amount - product.list_price
         return {'value': {'amount': amount}}
 
-    def check(self, cr, uid, ids, context):
-
+    def check(self, cr, uid, ids, context=None):
         """Check the order:
         if the order is not paid: continue payment,
         if the order is paid print invoice (if wanted) or ticket.
         """
-        active_id = context and context.get('active_id',False)
         order_obj = self.pool.get('pos.order')
+        active_id = context and context.get('active_id', False)
         order = order_obj.browse(cr, uid, active_id, context)
         amount = order.amount_total - order.amount_paid
-        data =  self.read(cr, uid, ids)[0]
+        data =  self.read(cr, uid, ids, context=context)[0]
         invoice_wanted = data['invoice_wanted']
         is_accompte = data['is_acc']
         # Todo need to check ...
         if is_accompte:
             line_id, price = order_obj.add_product(cr, uid, order.id, data['product_id'], -1.0, context)
             amount = order.amount_total - order.amount_paid - price
-        
+
         if amount != 0.0:
-            order_obj.write(cr, uid, [active_id], {'invoice_wanted': invoice_wanted, 'partner_id': data['partner_id']})
+            order_obj.write(cr, uid, [active_id], {'invoice_wanted': invoice_wanted, 'partner_id': data['partner_id']}, context=context)
             order_obj.add_payment(cr, uid, active_id, data, context=context)
 
         if order_obj.test_paid(cr, uid, [active_id]):
@@ -159,33 +160,33 @@ class pos_make_payment(osv.osv_memory):
                 order_obj.action_invoice(cr, uid, [active_id], context)
                 order_obj.create_picking(cr, uid, [active_id], context)
                 if context.get('return'):
-                    order_obj.write(cr, uid, [active_id],{'state':'done'})
+                    order_obj.write(cr, uid, [active_id], {'state':'done'}, context=context)
                 else:
-                    order_obj.write(cr, uid, [active_id],{'state':'paid'})
+                    order_obj.write(cr, uid, [active_id],{'state':'paid'}, context=context)
                 return self.create_invoice(cr, uid, ids, context)
             else:
                 context.update({'flag': True})
                 order_obj.action_paid(cr, uid, [active_id], context)
                 if context.get('return'):
-                    order_obj.write(cr, uid, [active_id],{'state':'done'})
+                    order_obj.write(cr, uid, [active_id], {'state':'done'}, context=context)
                 else:
-                    order_obj.write(cr, uid, [active_id],{'state':'paid'})
+                    order_obj.write(cr, uid, [active_id], {'state':'paid'}, context=context)
                 return self.print_report(cr, uid, ids, context)
 
         if order.amount_paid > 0.0:
             context.update({'flag': True})
             # Todo need to check
             order_obj.action_paid(cr, uid, [active_id], context)
-            order_obj.write(cr, uid, [active_id],{'state': 'advance'})
+            order_obj.write(cr, uid, [active_id], {'state': 'advance'}, context=context)
             return self.print_report(cr, uid, ids, context)
         return {}
 
 
-    def create_invoice(self, cr, uid, ids, context):
+    def create_invoice(self, cr, uid, ids, context=None):
         """
           Create  a invoice
         """
-        active_ids = [context and context.get('active_id',False)]
+        active_ids = [context and context.get('active_id', False)]
         datas = {'ids': active_ids}
         datas['form'] = {}
         return {
@@ -204,12 +205,11 @@ class pos_make_payment(osv.osv_memory):
          @return : retrun report
         """
         if not context:
-            context={}
-        active_id=context.get('active_id',[])
+            context = {}
+        active_id = context.get('active_id', [])
         datas = {'ids' : [active_id]}
         res =  {}
         datas['form'] = res
-
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'pos.receipt',
@@ -217,14 +217,14 @@ class pos_make_payment(osv.osv_memory):
        }
 
     _columns = {
-        'journal':fields.selection(pos_box_entries.get_journal, "Cash Register",required=True),
+        'journal': fields.selection(pos_box_entries.get_journal, "Cash Register", required=True),
         'product_id': fields.many2one('product.product', "Advance"),
-        'amount':fields.float('Amount', digits=(16,2) ,required= True),
+        'amount': fields.float('Amount', digits=(16,2) ,required= True),
         'payment_name': fields.char('Payment name', size=32, required=True),
         'payment_date': fields.date('Payment date', required=True),
         'is_acc': fields.boolean('Advance'),
         'invoice_wanted': fields.boolean('Invoice'),
-        'num_sale':fields.char('Num.File', size=32),
+        'num_sale': fields.char('Num.File', size=32),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist'),
         'partner_id': fields.many2one('res.partner', 'Customer'),
     }
diff --git a/addons/point_of_sale/wizard/pos_payment_report.py b/addons/point_of_sale/wizard/pos_payment_report.py
index 85863315bdb..893cb3c0fda 100644
--- a/addons/point_of_sale/wizard/pos_payment_report.py
+++ b/addons/point_of_sale/wizard/pos_payment_report.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,20 +15,18 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-
 from osv import osv
 from tools.translate import _
 
-
 class pos_payment_report(osv.osv_memory):
     _name = 'pos.payment.report'
     _description = 'Payment Report'
 
-    def print_report(self, cr, uid, ids, context={}):
+    def print_report(self, cr, uid, ids, context=None):
         """
          To get the date and print the report
          @param self: The object pointer.
@@ -37,7 +35,8 @@ class pos_payment_report(osv.osv_memory):
          @param context: A standard dictionary
          @return : retrun report
         """
-
+        if context is None:
+            context = {}
         datas = {'ids': context.get('active_ids', [])}
         return {
             'type': 'ir.actions.report.xml',
diff --git a/addons/point_of_sale/wizard/pos_payment_report_date.py b/addons/point_of_sale/wizard/pos_payment_report_date.py
index 0830e092081..f2e3fb40419 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_date.py
+++ b/addons/point_of_sale/wizard/pos_payment_report_date.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,20 +15,21 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
+import time
+
 from osv import osv
 from osv import fields
-import time
 
 
 class pos_payment_report_date(osv.osv_memory):
     _name = 'pos.payment.report.date'
     _description = 'POS Payment Report according to date'
-    def print_report(self, cr, uid, ids, context=None):
 
+    def print_report(self, cr, uid, ids, context=None):
         """
              To get the date and print the report
              @param self: The object pointer.
@@ -37,8 +38,10 @@ class pos_payment_report_date(osv.osv_memory):
              @param context: A standard dictionary
              @return : retrun report
         """
+        if context is None:
+            context = {}
         datas = {'ids': context.get('active_ids', [])}
-        res = self.read(cr, uid, ids, ['date_start', 'date_end', 'user_id'])
+        res = self.read(cr, uid, ids, ['date_start', 'date_end', 'user_id'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
 
@@ -54,8 +57,8 @@ class pos_payment_report_date(osv.osv_memory):
         'user_id': fields.many2many('res.users', 'res_user_sale', 'user_id', 'sale_id', 'Salesman')
     }
     _defaults = {
-        'date_start': lambda *a: time.strftime('%Y-%m-%d'),
-        'date_end': lambda *a: time.strftime('%Y-%m-%d'),
+        'date_start': time.strftime('%Y-%m-%d'),
+        'date_end': time.strftime('%Y-%m-%d'),
     }
 
 pos_payment_report_date()
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user.py b/addons/point_of_sale/wizard/pos_payment_report_user.py
index 1ac927a4fcd..02db921618b 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user.py
+++ b/addons/point_of_sale/wizard/pos_payment_report_user.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,19 +15,16 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-from osv import osv
-from osv import fields
-
+from osv import osv, fields
 
 class pos_payment_report_user(osv.osv_memory):
     _name = 'pos.payment.report.user'
     _description = 'Sales lines by Users'
     def print_report(self, cr, uid, ids, context=None):
-
         """
              To get the date and print the report
              @param self: The object pointer.
@@ -36,11 +33,12 @@ class pos_payment_report_user(osv.osv_memory):
              @param context: A standard dictionary
              @return : retrun report
         """
+        if context is None:
+            context = {}
         datas = {'ids': context.get('active_ids', [])}
-        res = self.read(cr, uid, ids, ['user_id'])
+        res = self.read(cr, uid, ids, ['user_id'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
-
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'pos.payment.report.user',

From b68dda729b523dcadf7803c498ce19607bd5241e Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 26 Oct 2010 15:44:49 +0200
Subject: [PATCH 32/38] [FIX] document_ftp: fix server shutdown

bzr revid: chs@openerp.com-20101026134449-mfan2d5pfj9m0pqx
---
 addons/document_ftp/ftpserver/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py
index eef04d3eb93..d110267f175 100644
--- a/addons/document_ftp/ftpserver/__init__.py
+++ b/addons/document_ftp/ftpserver/__init__.py
@@ -59,6 +59,7 @@ if HOST.lower() == 'none':
 else:
     netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Serving FTP on %s:%s\n" % (HOST, PORT))
     ds = ftp_server()
+    ds.daemon = True
     ds.start()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 15e29993bac22d4bd15457bdf78ec89071cab3a3 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 27 Oct 2010 04:59:58 +0000
Subject: [PATCH 33/38] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101027045958-rsoogevs33siq1kv
---
 addons/account/i18n/it.po                     |    4 +-
 addons/account/i18n/mn.po                     |    6 +-
 addons/account/i18n/ro.po                     |   12 +-
 addons/account/i18n/ru.po                     |   14 +-
 addons/account/i18n/sr.po                     |    6 +-
 addons/account_analytic_analysis/i18n/sr.po   |    6 +-
 addons/account_analytic_default/i18n/et.po    |  209 +-
 addons/account_analytic_default/i18n/sr.po    |    6 +-
 addons/account_analytic_plans/i18n/sr.po      |    6 +-
 addons/account_anglo_saxon/i18n/de.po         |  110 +-
 addons/account_budget/i18n/sr.po              |  658 ++---
 addons/account_coda/i18n/de.po                |  254 +-
 addons/account_followup/i18n/sr.po            | 1063 +++++---
 addons/account_invoice_layout/i18n/sr.po      |  298 ++-
 addons/account_payment/i18n/sr.po             |  364 ++-
 addons/account_reporting/i18n/sr.po           |    6 +-
 addons/account_voucher/i18n/sr.po             |    6 +-
 addons/analytic/i18n/sr.po                    |    6 +-
 .../analytic_journal_billing_rate/i18n/sr.po  |   30 +-
 addons/analytic_user_function/i18n/sr.po      |   54 +-
 addons/auction/i18n/sr.po                     | 2282 +++++++++++++++++
 addons/base_contact/i18n/ru.po                |   47 +-
 addons/base_iban/i18n/et.po                   |   40 +-
 addons/base_setup/i18n/ru.po                  |  639 +++--
 addons/base_vat/i18n/ru.po                    |    5 +-
 addons/crm/i18n/nl.po                         |    6 +-
 addons/crm/i18n/pl.po                         |    6 +-
 addons/crm_profiling/i18n/ru.po               |    4 +-
 addons/delivery/i18n/ru.po                    |    4 +-
 addons/hr/i18n/mn.po                          |  190 +-
 addons/hr/i18n/pl.po                          |    6 +-
 addons/hr/i18n/pt.po                          |  805 ++++--
 addons/hr_attendance/i18n/mn.po               |  819 +++---
 addons/hr_attendance/i18n/pt.po               |  797 +++---
 addons/hr_contract/i18n/mn.po                 |  410 ++-
 addons/hr_expense/i18n/mn.po                  |  601 ++++-
 addons/hr_holidays/i18n/mn.po                 | 1115 +++++---
 addons/hr_holidays/i18n/pl.po                 |    6 +-
 addons/mrp/i18n/pl.po                         |    6 +-
 addons/multi_company/i18n/ru.po               |    4 +-
 addons/procurement/i18n/ru.po                 |    4 +-
 addons/product/i18n/ru.po                     |    4 +-
 addons/purchase/i18n/fr.po                    |   26 +-
 addons/purchase/i18n/ru.po                    |    4 +-
 addons/sale_analytic_plans/i18n/ru.po         |    4 +-
 addons/sale_crm/i18n/ru.po                    |  317 +--
 addons/sale_journal/i18n/ru.po                |  703 ++---
 addons/sale_layout/i18n/ru.po                 |  281 ++
 addons/sale_margin/i18n/ru.po                 |  431 ++--
 addons/sale_mrp/i18n/ru.po                    |   10 +-
 addons/stock/i18n/ru.po                       |    6 +-
 addons/wiki_faq/i18n/ru.po                    |    4 +-
 52 files changed, 8919 insertions(+), 3785 deletions(-)
 create mode 100644 addons/auction/i18n/sr.po
 create mode 100644 addons/sale_layout/i18n/ru.po

diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 0b82719a3b0..4a77a9b29c8 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-25 21:04+0000\n"
+"PO-Revision-Date: 2010-10-26 08:27+0000\n"
 "Last-Translator: Davide Corio - Domsense <davide.corio@domsense.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index 55d3114fa94..36ccf56abb3 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-26 04:01+0000\n"
-"Last-Translator: sugi <Unknown>\n"
+"PO-Revision-Date: 2010-10-26 08:47+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po
index b213daacaa4..709deb3fd95 100644
--- a/addons/account/i18n/ro.po
+++ b/addons/account/i18n/ro.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 09:51+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-26 17:49+0000\n"
+"Last-Translator: OpenERP Romania <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1053,7 +1053,7 @@ msgstr "Descendenţi"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Mapping"
-msgstr ""
+msgstr "Corespondență fiscală taxe"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1142,7 +1142,7 @@ msgstr "Cont analitic nou"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
 msgid "Fiscal Mapping Templates"
-msgstr ""
+msgstr "ȘCorespondență fiscală"
 
 #. module: account
 #: rml:account.invoice:0
@@ -1174,7 +1174,7 @@ msgstr "Suma exprimată întro altă monedă opţională"
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Mapping Template"
-msgstr ""
+msgstr "ȘCorespondență fiscală"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index a1019d56947..e02d03971ec 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-25 07:13+0000\n"
+"PO-Revision-Date: 2010-10-26 13:21+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1108,7 +1108,7 @@ msgstr "Общий объем списания"
 #. module: account
 #: view:account.tax.template:0
 msgid "Compute Code for Taxes included prices"
-msgstr ""
+msgstr "Код расчета для цен с налогами"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -1568,7 +1568,7 @@ msgstr "Основной план счетов на основе шаблона"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Statements"
-msgstr ""
+msgstr "Правовые акты"
 
 #. module: account
 #: field:account.tax.code,parent_id:0
@@ -1745,7 +1745,7 @@ msgstr "Включить в базовую сумму"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Credit"
-msgstr ""
+msgstr "Дельта Кредит"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
@@ -1786,7 +1786,7 @@ msgstr "Согласование проводок из счета (ов) и оп
 #: model:ir.actions.wizard,name:account.wizard_central_journal
 #: model:ir.ui.menu,name:account.menu_central_journal
 msgid "Print Central Journal"
-msgstr ""
+msgstr "Печать центрального журнала"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,period_length:0
@@ -2935,7 +2935,7 @@ msgstr "1см 27,7см 20см 27,7см"
 #: model:ir.actions.act_window,name:account.action_invoice_tree12
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree12
 msgid "Draft Supplier Refunds"
-msgstr ""
+msgstr "Черновик возврата денег от поставщика"
 
 #. module: account
 #: model:process.node,name:account.process_node_accountingstatemententries0
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index 4cad5720c03..56caceda12f 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-25 21:56+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-26 08:51+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account_analytic_analysis/i18n/sr.po b/addons/account_analytic_analysis/i18n/sr.po
index 42ae022cd18..355dc8fd0af 100644
--- a/addons/account_analytic_analysis/i18n/sr.po
+++ b/addons/account_analytic_analysis/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-25 17:55+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-26 08:25+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_default/i18n/et.po b/addons/account_analytic_default/i18n/et.po
index c48c34d610c..07449bef42e 100644
--- a/addons/account_analytic_default/i18n/et.po
+++ b/addons/account_analytic_default/i18n/et.po
@@ -6,33 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 16:10+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-26 17:31+0000\n"
+"Last-Translator: Jalakas <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: account_analytic_default
-#: view:account.analytic.default:0
-#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_form
-#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_defaul_form
-msgid "Analytic Defaults"
-msgstr "Analüütilised vaikeväärtused"
-
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
 msgid "Account Analytic Default"
 msgstr "Vaikimisi analüütiline konto"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
 #. module: account_analytic_default
 #: constraint:ir.model:0
 msgid ""
@@ -40,57 +28,161 @@ msgid ""
 msgstr ""
 "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
 
+#. module: account_analytic_default
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Viga! Te ei saa luua rekursiivset menüüd."
+
+#. module: account_analytic_default
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"select a partner which will use analytical account specified in analytic "
+"default (eg. create new cutomer invoice or Sale order if we select this "
+"partner, it will automatically take this as an analytical account)"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
+msgid "Analytic Rules"
+msgstr "Analüütilised reeglid"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,analytic_id:0
+msgid "Analytical Account"
+msgstr "Analüütiline Konto"
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
-msgid "Seq"
-msgstr "Jrk"
+msgid "Current"
+msgstr ""
 
 #. module: account_analytic_default
-#: field:account.analytic.default,date_stop:0
-msgid "End Date"
-msgstr "Lõppkuupäev"
+#: view:account.analytic.default:0
+msgid "Group By..."
+msgstr ""
 
 #. module: account_analytic_default
-#: field:account.analytic.default,company_id:0
-msgid "Company"
-msgstr "Ettevõte"
-
-#. module: account_analytic_default
-#: field:account.analytic.default,sequence:0
-msgid "Sequence"
-msgstr "Jada"
-
-#. module: account_analytic_default
-#: field:account.analytic.default,product_id:0
-msgid "Product"
-msgstr "Toode"
-
-#. module: account_analytic_default
-#: field:account.analytic.default,analytic_id:0
-msgid "Analytic Account"
-msgstr "Analüütiline konto"
-
-#. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distributions"
-msgstr "Analüütilised jaotused"
-
-#. module: account_analytic_default
-#: field:account.analytic.default,user_id:0
-msgid "User"
-msgstr "Kasutaja"
+#: help:account.analytic.default,date_stop:0
+msgid "Default end date for this Analytical Account"
+msgstr ""
 
 #. module: account_analytic_default
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Vigane mudeli nimi toimingu definitsioonis."
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Conditions"
+msgstr "Tingimused"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"select a company which will use analytical account specified in analytic "
+"default (eg. create new cutomer invoice or Sale order if we select this "
+"company, it will automatically take this as an analytical account)"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_sale_order_line
+msgid "Sale Order Line"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,date_start:0
+msgid "Default start date for this Analytical Account"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,product_id:0
+msgid "Product"
+msgstr "Toode"
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,company_id:0
+msgid "Company"
+msgstr "Ettevõte"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,user_id:0
+msgid "User"
+msgstr "Kasutaja"
+
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
 msgid "Entries"
 msgstr "Kirjed"
 
 #. module: account_analytic_default
+#: field:account.analytic.default,date_stop:0
+msgid "End Date"
+msgstr "Lõppkuupäev"
+
+#. module: account_analytic_default
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Vigane XML vaate arhitektuurile!"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,user_id:0
+msgid ""
+"select a user which will use analytical account specified in analytic default"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
+#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
+msgid "Analytic Defaults"
+msgstr "Analüütilised vaikeväärtused"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"select a product which will use analytical account specified in analytic "
+"default (eg. create new cutomer invoice or Sale order if we select this "
+"product, it will automatically take this as an analytical account)"
+msgstr ""
+
+#. module: account_analytic_default
+#: field:account.analytic.default,sequence:0
+msgid "Sequence"
+msgstr "Jada"
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,analytic_id:0
+msgid "Analytic Account"
+msgstr "Analüütiline konto"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Accounts"
+msgstr "Kontod"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
 #: field:account.analytic.default,partner_id:0
 msgid "Partner"
 msgstr "Partner"
@@ -101,13 +193,14 @@ msgid "Start Date"
 msgstr "Alguskuupäev"
 
 #. module: account_analytic_default
-#: view:account.analytic.default:0
-msgid "Conditions"
-msgstr "Tingimused"
+#: help:account.analytic.default,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of analytic distribution"
+msgstr ""
+"Annab sorteeritud järjestuse, kui näidatakse nimekirja analüütilist jaotust"
 
-#. module: account_analytic_default
-#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
-#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
-#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
-msgid "Analytic Rules"
-msgstr "Analüütilised reeglid"
+#~ msgid "Seq"
+#~ msgstr "Jrk"
+
+#~ msgid "Analytic Distributions"
+#~ msgstr "Analüütilised jaotused"
diff --git a/addons/account_analytic_default/i18n/sr.po b/addons/account_analytic_default/i18n/sr.po
index 2dac621098c..0d0e0cffdf9 100644
--- a/addons/account_analytic_default/i18n/sr.po
+++ b/addons/account_analytic_default/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-25 20:26+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-26 08:45+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_plans/i18n/sr.po b/addons/account_analytic_plans/i18n/sr.po
index a5612c2ecb2..6c3f26dc10c 100644
--- a/addons/account_analytic_plans/i18n/sr.po
+++ b/addons/account_analytic_plans/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-25 21:37+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-26 08:43+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_anglo_saxon/i18n/de.po b/addons/account_anglo_saxon/i18n/de.po
index 27439bf449d..ba1699e16c2 100644
--- a/addons/account_anglo_saxon/i18n/de.po
+++ b/addons/account_anglo_saxon/i18n/de.po
@@ -1,58 +1,91 @@
-# German translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_anglo_saxon
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-11-24 12:50+0000\n"
-"PO-Revision-Date: 2010-10-05 13:15+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-26 18:09+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: account_anglo_saxon
-#: view:product.category:0
-msgid " Accounting Property"
-msgstr ""
-
-#. module: account_anglo_saxon
-#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
-msgid ""
-"This module will support the Anglo-Saxons accounting methodology by \n"
-"    changing the accounting logic with stock transactions. The difference "
-"between the Anglo-Saxon accounting countries \n"
-"    and the Rhine or also called Continental accounting countries is the "
-"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
-"    Anglo-Saxons accounting does take the cost when sales invoice is "
-"created, Continental accounting will take the cost at he moment the goods "
-"are shipped.\n"
-"    This module will add this functionality by using a interim account, to "
-"store the value of shipped goods and will contra book this interim account \n"
-"    when the invoice is created to transfer this amount to the debtor or "
-"creditor account."
-msgstr ""
-
-#. module: account_anglo_saxon
-#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
-msgid "Stock Account"
-msgstr ""
-
 #. module: account_anglo_saxon
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
+msgstr "Fehler in XML Quellen für diese Ansicht"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_purchase_order
+msgid "Purchase Order"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Accounting for Anglo Saxon countries"
 msgstr ""
 
 #. module: account_anglo_saxon
 #: field:product.category,property_account_creditor_price_difference_categ:0
 #: field:product.template,property_account_creditor_price_difference:0
 msgid "Price Difference Account"
+msgstr "Konto Preisdifferenz"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by\n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries\n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales.\n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at the moment the goods "
+"are shipped.\n"
+"    This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account\n"
+"    when the invoice is created to transfer this amount to the debtor or "
+"creditor account.\n"
+"    Secondly, price differences between actual purchase price and fixed "
+"product standard price are booked on a separate account"
 msgstr ""
 
 #. module: account_anglo_saxon
@@ -62,3 +95,6 @@ msgid ""
 "This account will be used to value price difference between purchase price "
 "and cost price."
 msgstr ""
+"Dieses Konto wird genutzt, um Unterschiede zwischen Einkaufs- und "
+"Verkaufspreis der Rechnung und Durchschnittspreisen zum Zeitpunkt des "
+"Warenzu- oder Warenabgangs als Preisdifferenz zu buchen."
diff --git a/addons/account_budget/i18n/sr.po b/addons/account_budget/i18n/sr.po
index c98287d9e32..93406a03ca4 100644
--- a/addons/account_budget/i18n/sr.po
+++ b/addons/account_budget/i18n/sr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 08:22+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-26 08:06+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
@@ -23,9 +23,9 @@ msgid "Responsible User"
 msgstr "Odgovorni korisnik"
 
 #. module: account_budget
-#: rml:account.budget:0
-msgid "% performance"
-msgstr "% performansa"
+#: selection:crossovered.budget,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.open_budget_post_form
@@ -39,8 +39,8 @@ msgid "Invalid model name in the action definition."
 msgstr "Pogrešno ime modela u definiciji akcije."
 
 #. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Printed at:"
 msgstr "Ispisano na:"
 
@@ -54,6 +54,47 @@ msgstr "Potvrdi"
 msgid "Validate User"
 msgstr "Potvrdi korisnika"
 
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
+msgid "Print Summary"
+msgstr "Stampa Suamrnog"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,paid_date:0
+msgid "Paid Date"
+msgstr "Datum plaćanja"
+
+#. module: account_budget
+#: field:account.budget.analytic,date_to:0
+#: field:account.budget.crossvered.report,date_to:0
+#: field:account.budget.crossvered.summary.report,date_to:0
+#: field:account.budget.report,date_to:0
+msgid "End of period"
+msgstr "Završetak perioda"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Draft"
+msgstr "Priprema"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "at"
+msgstr "u"
+
+#. module: account_budget
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska! Ne mozete kreirati rekursivni meni."
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Currency:"
+msgstr "Valuta:"
+
 #. module: account_budget
 #: constraint:ir.model:0
 msgid ""
@@ -61,82 +102,250 @@ msgid ""
 msgstr ""
 "Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !"
 
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_report
+msgid "Account Budget crossvered report"
+msgstr "Izvestaj Unakrsnog budzeta Naloga"
+
 #. module: account_budget
 #: selection:crossovered.budget,state:0
-msgid "Confirmed"
+msgid "Validated"
 msgstr "Potvrđeno"
 
-#. module: account_budget
-#: wizard_field:account.budget.report,init,date2:0
-#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
-#: wizard_field:wizard.crossovered.budget,init,date_to:0
-#: wizard_field:wizard.crossovered.budget.summary,init,date_to:0
-msgid "End of period"
-msgstr "Završetak perioda"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Printing date:"
-msgstr "Datum Stampe:"
-
-#. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Draft"
-msgstr "Priprema"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "at"
-msgstr "u"
-
-#. module: account_budget
-#: view:account.budget.post:0
-msgid "Dotations"
-msgstr "Dotacija"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Performance"
-msgstr "Performansa"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Currency:"
-msgstr "Valuta:"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "From"
-msgstr "Od"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,percentage:0
 msgid "Percentage"
 msgstr "Procenat"
 
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Results"
-msgstr "Резултати"
-
 #. module: account_budget
 #: field:crossovered.budget,state:0
 msgid "Status"
 msgstr "Status"
 
+#. module: account_budget
+#: view:account.budget.crossvered.summary.report:0
+msgid "This wizard is used to print summary of budgets"
+msgstr "Ovaj carobnjak je koriscen za prikaz sumarnog budzeta"
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "%"
+msgstr "%"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: account_budget
+#: field:account.budget.post,company_id:0
+#: field:crossovered.budget,company_id:0
+#: field:crossovered.budget.lines,company_id:0
+msgid "Company"
+msgstr "Preduzeće"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Reset to Draft"
+msgstr "Vrati na Pripremu"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,planned_amount:0
+msgid "Planned Amount"
+msgstr "Planirani iznos"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Perc(%)"
+msgstr "Proc(%)"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Done"
+msgstr "Gotovo"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Practical Amt"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,practical_amount:0
+msgid "Practical Amount"
+msgstr "Stvarni iznos"
+
+#. module: account_budget
+#: field:crossovered.budget,date_to:0
+#: field:crossovered.budget.lines,date_to:0
+msgid "End Date"
+msgstr "Završni Datum"
+
+#. module: account_budget
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_analytic
+#: model:ir.model,name:account_budget.model_account_budget_report
+msgid "Account Budget report for analytic account"
+msgstr "Izvestaj Budzeta Naloga za Analiticki Konto"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,theoritical_amount:0
+msgid "Theoritical Amount"
+msgstr "Teoretski Iznos"
+
+#. module: account_budget
+#: field:account.budget.post,name:0
+#: field:crossovered.budget,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget_lines
+msgid "Budget Line"
+msgstr "Lnija Budzeta"
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: view:account.budget.post:0
+msgid "Lines"
+msgstr "redova"
+
+#. module: account_budget
+#: report:account.budget:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,crossovered_budget_id:0
+#: report:crossovered.budget.report:0
+#: model:ir.actions.report.xml,name:account_budget.account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget
+msgid "Budget"
+msgstr "Budzet"
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:0
+#, python-format
+msgid "Error!"
+msgstr "Greška"
+
+#. module: account_budget
+#: field:account.budget.post,code:0
+#: field:crossovered.budget,code:0
+msgid "Code"
+msgstr "Kod"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+msgid "This wizard is used to print budget"
+msgstr "Ovaj carobnjak je koristen za prikaz budzeta"
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_report
+#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
+#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
+#: model:ir.ui.menu,name:account_budget.next_id_31
+#: model:ir.ui.menu,name:account_budget.next_id_pos
+msgid "Budgets"
+msgstr "Budzeti"
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:0
+#, python-format
+msgid "The General Budget '%s' has no Accounts!"
+msgstr "Osnovni Budzet '%s' nema Naloga !"
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Cancelled"
+msgstr "Отказано"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Approve"
+msgstr "Odobri"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "To Approve"
+msgstr "Za Odobravanje"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:crossovered.budget.lines,general_budget_id:0
+#: model:ir.model,name:account_budget.model_account_budget_post
+msgid "Budgetary Position"
+msgstr "Budzetska pozicija"
+
+#. module: account_budget
+#: field:account.budget.analytic,date_from:0
+#: field:account.budget.crossvered.report,date_from:0
+#: field:account.budget.crossvered.summary.report,date_from:0
+#: field:account.budget.report,date_from:0
+msgid "Start of period"
+msgstr "Početak razdoblja"
+
+#. module: account_budget
+#: view:account.budget.report:0
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_analytic
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_report
+msgid "Print Budgets"
+msgstr "Stampa Budzeta"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
+msgid "Account Budget  crossvered summary report"
+msgstr "Izvestaj unakrsnog budzeta naloga"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Theoretical Amt"
+msgstr ""
+
+#. module: account_budget
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Select Dates Period"
+msgstr "Selektuj Datume razdoblja"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Print"
+msgstr "Štampaj"
+
 #. module: account_budget
 #: model:ir.module.module,description:account_budget.module_meta_information
 msgid ""
 "This module allows accountants to manage analytic and crossovered budgets.\n"
 "\n"
-"Once the Master Budgets and the Budgets defined (in Financial\n"
-"Management/Budgets/), the Project Managers can set the planned amount on "
-"each\n"
-"Analytic Account.\n"
+"Once the Master Budgets and the Budgets are defined (in "
+"Accounting/Budgets/),\n"
+"the Project Managers 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"
@@ -158,235 +367,23 @@ msgid ""
 "\n"
 msgstr ""
 
-#. module: account_budget
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "%"
-msgstr "%"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-msgid "Analytic Account :"
-msgstr "Analiticki konto :"
-
-#. module: account_budget
-#: wizard_button:account.budget.report,init,report:0
-#: wizard_button:wizard.analytic.account.budget.report,init,report:0
-#: wizard_button:wizard.crossovered.budget,init,report:0
-#: wizard_button:wizard.crossovered.budget.summary,init,report:0
-msgid "Print"
-msgstr "Štampaj"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "A/c No."
-msgstr "Račun br."
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "to"
-msgstr "do"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Total :"
-msgstr "Ukupno:"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: field:crossovered.budget.lines,planned_amount:0
-#: rml:crossovered.budget.report:0
-msgid "Planned Amount"
-msgstr "Planirani iznos"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Perc(%)"
-msgstr "Proc(%)"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Period Budget"
-msgstr "Budžetsko razdoblje"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Budget Analysis"
-msgstr "Analiza Budžeta"
-
-#. module: account_budget
-#: view:crossovered.budget:0
-#: selection:crossovered.budget,state:0
-msgid "Done"
-msgstr "Gotovo"
-
-#. module: account_budget
-#: view:crossovered.budget:0
-msgid "Validate"
-msgstr "Overi"
-
-#. module: account_budget
-#: wizard_view:wizard.crossovered.budget,init:0
-#: wizard_view:wizard.crossovered.budget.summary,init:0
-msgid "Select Options"
-msgstr "Selektuj Opciju"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: field:crossovered.budget.lines,practical_amount:0
-#: rml:crossovered.budget.report:0
-msgid "Practical Amount"
-msgstr "Stvarni iznos"
-
-#. module: account_budget
-#: field:crossovered.budget,date_to:0
-#: field:crossovered.budget.lines,date_to:0
-msgid "End Date"
-msgstr "Završni Datum"
-
-#. module: account_budget
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za pregled arhitekture"
-
-#. module: account_budget
-#: field:crossovered.budget.lines,theoritical_amount:0
-msgid "Theoritical Amount"
-msgstr "Teoretski Iznos"
-
-#. module: account_budget
-#: field:account.budget.post,name:0
-#: field:crossovered.budget,name:0
-msgid "Name"
-msgstr "Ime"
-
-#. module: account_budget
-#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu_1
-msgid "Print Summary of Budgets"
-msgstr "Ispis Sumarnog Budzeta"
-
-#. module: account_budget
-#: model:ir.actions.wizard,name:account_budget.wizard_budget_spread
-msgid "Spread amount"
-msgstr "Iznos širenja"
-
-#. module: account_budget
-#: view:account.analytic.account:0
-#: view:account.budget.post:0
-msgid "Lines"
-msgstr "redova"
-
-#. module: account_budget
-#: rml:account.budget:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,crossovered_budget_id:0
-#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
-#: model:ir.actions.wizard,name:account_budget.wizard_budget_report
-#: model:ir.model,name:account_budget.model_crossovered_budget
-#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
-msgid "Budget"
-msgstr "Budzet"
-
-#. module: account_budget
-#: field:crossovered.budget.lines,paid_date:0
-msgid "Paid Date"
-msgstr "Datum plaćanja"
-
-#. module: account_budget
-#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
-#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
-#: model:ir.ui.menu,name:account_budget.next_id_31
-msgid "Budgets"
-msgstr "Budzeti"
-
-#. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Cancelled"
-msgstr "Отказано"
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Budget Item Detail"
-msgstr "Detalj Budzetske stavke"
-
-#. module: account_budget
-#: view:account.budget.post:0
-#: field:crossovered.budget.lines,general_budget_id:0
-#: model:ir.model,name:account_budget.model_account_budget_post
-msgid "Budgetary Position"
-msgstr "Budzetska pozicija"
-
-#. module: account_budget
-#: wizard_field:account.budget.report,init,date1:0
-#: wizard_field:wizard.analytic.account.budget.report,init,date_from:0
-#: wizard_field:wizard.crossovered.budget,init,date_from:0
-#: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
-msgid "Start of period"
-msgstr "Početak razdoblja"
-
-#. module: account_budget
-#: model:ir.actions.report.xml,name:account_budget.account_analytic_account_budget
-#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
-#: model:ir.actions.wizard,name:account_budget.account_analytic_account_budget_report
-#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu
-msgid "Print Budgets"
-msgstr "Stampa Budzeta"
-
-#. module: account_budget
-#: field:account.budget.post,code:0
-#: field:crossovered.budget,code:0
-msgid "Code"
-msgstr "Kod"
-
-#. module: account_budget
-#: wizard_view:wizard.analytic.account.budget.report,init:0
-msgid "Select Dates Period"
-msgstr "Selektuj Datume razdoblja"
-
-#. module: account_budget
-#: field:account.budget.post,dotation_ids:0
-msgid "Spreading"
-msgstr "Raspon"
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Theoretical Amount"
-msgstr "Teoretski Iznos"
-
-#. module: account_budget
-#: wizard_field:account.budget.spread,init,fiscalyear:0
-msgid "Fiscal Year"
-msgstr "Fiskalna Godina"
-
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
+#: model:ir.model,name:account_budget.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analitički nalog"
 
 #. module: account_budget
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Budget :"
 msgstr "Budzet"
 
 #. module: account_budget
-#: rml:account.budget:0
-#: view:account.budget.post:0
-#: wizard_view:account.budget.spread,init:0
-#: wizard_button:account.budget.spread,init,spread:0
-msgid "Spread"
-msgstr "Raspon"
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Planned Amt"
+msgstr ""
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -394,11 +391,6 @@ msgstr "Raspon"
 msgid "Accounts"
 msgstr "Nalozi"
 
-#. module: account_budget
-#: model:ir.actions.report.xml,name:account_budget.account_budget
-msgid "Print Budget"
-msgstr ""
-
 #. module: account_budget
 #: view:account.analytic.account:0
 #: field:account.analytic.account,crossovered_budget_line:0
@@ -409,18 +401,16 @@ msgstr ""
 #: view:crossovered.budget.lines:0
 #: model:ir.actions.act_window,name:account_budget.act_account_analytic_account_cb_lines
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
-#: model:ir.model,name:account_budget.model_crossovered_budget_lines
 #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
 msgid "Budget Lines"
 msgstr "Budzetski Redovi"
 
 #. module: account_budget
-#: wizard_button:account.budget.report,init,end:0
-#: wizard_button:account.budget.spread,init,end:0
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
 #: view:crossovered.budget:0
-#: wizard_button:wizard.analytic.account.budget.report,init,end:0
-#: wizard_button:wizard.crossovered.budget,init,end:0
-#: wizard_button:wizard.crossovered.budget.summary,init,end:0
 msgid "Cancel"
 msgstr "Otkaži"
 
@@ -436,17 +426,73 @@ msgid "Start Date"
 msgstr "Početni datum"
 
 #. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Analysis from"
 msgstr "Analiza od"
 
-#. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Validated"
-msgstr "Potvrđeno"
+#~ msgid "% performance"
+#~ msgstr "% performansa"
 
-#. module: account_budget
-#: wizard_view:account.budget.report,init:0
-msgid "Select period"
-msgstr "Izaberi period"
+#~ msgid "Results"
+#~ msgstr "Резултати"
+
+#~ msgid "From"
+#~ msgstr "Od"
+
+#~ msgid "Dotations"
+#~ msgstr "Dotacija"
+
+#~ msgid "Performance"
+#~ msgstr "Performansa"
+
+#~ msgid "Printing date:"
+#~ msgstr "Datum Stampe:"
+
+#~ msgid "A/c No."
+#~ msgstr "Račun br."
+
+#~ msgid "Analytic Account :"
+#~ msgstr "Analiticki konto :"
+
+#~ msgid "to"
+#~ msgstr "do"
+
+#~ msgid "Total :"
+#~ msgstr "Ukupno:"
+
+#~ msgid "Period Budget"
+#~ msgstr "Budžetsko razdoblje"
+
+#~ msgid "Budget Analysis"
+#~ msgstr "Analiza Budžeta"
+
+#~ msgid "Select Options"
+#~ msgstr "Selektuj Opciju"
+
+#~ msgid "Validate"
+#~ msgstr "Overi"
+
+#~ msgid "Spread amount"
+#~ msgstr "Iznos širenja"
+
+#~ msgid "Print Summary of Budgets"
+#~ msgstr "Ispis Sumarnog Budzeta"
+
+#~ msgid "Spreading"
+#~ msgstr "Raspon"
+
+#~ msgid "Budget Item Detail"
+#~ msgstr "Detalj Budzetske stavke"
+
+#~ msgid "Spread"
+#~ msgstr "Raspon"
+
+#~ msgid "Theoretical Amount"
+#~ msgstr "Teoretski Iznos"
+
+#~ msgid "Fiscal Year"
+#~ msgstr "Fiskalna Godina"
+
+#~ msgid "Select period"
+#~ msgstr "Izaberi period"
diff --git a/addons/account_coda/i18n/de.po b/addons/account_coda/i18n/de.po
index 41b4e0f2ef3..8750c022b80 100644
--- a/addons/account_coda/i18n/de.po
+++ b/addons/account_coda/i18n/de.po
@@ -1,166 +1,272 @@
-# German translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_coda
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-11-24 13:11+0000\n"
-"PO-Revision-Date: 2010-10-05 13:15+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-26 18:11+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
-#: field:account.coda,journal_id:0
-#: wizard_field:account.coda_import,init,journal_id:0
+#: help:account.coda,journal_id:0
+#: field:account.coda.import,journal_id:0
 msgid "Bank Journal"
-msgstr ""
+msgstr "Bank Journal"
 
 #. module: account_coda
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Die Objektbezeichnung muss mit x_ beginnen und darf keine Sonderzeichen "
+"beinhalten!"
 
 #. module: account_coda
-#: wizard_field:account.coda_import,extraction,note:0
-msgid "Log"
-msgstr ""
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Fehler bei Modellbezeichnung der Aktion"
 
 #. module: account_coda
-#: wizard_button:account.coda_import,extraction,open:0
-msgid "_Open Statement"
-msgstr ""
-
-#. module: account_coda
-#: model:ir.module.module,shortdesc:account_coda.module_meta_information
-msgid "Account CODA"
+#: model:ir.model,name:account_coda.model_account_coda_import
+msgid "Account Coda Import"
 msgstr ""
 
 #. module: account_coda
 #: field:account.coda,name:0
 msgid "Coda file"
+msgstr "Datei CODA"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Group By..."
 msgstr ""
 
 #. module: account_coda
-#: wizard_view:account.coda_import,init:0
-msgid "Clic on 'New' to select your file :"
+#: field:account.coda.import,awaiting_account:0
+msgid "Default Account for Unrecognized Movement"
 msgstr ""
 
 #. module: account_coda
-#: model:ir.actions.wizard,name:account_coda.wizard_account_coda_import
-msgid "Import Coda File"
-msgstr ""
+#: help:account.coda,date:0
+msgid "Import Date"
+msgstr "Importiere Datum"
 
 #. module: account_coda
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
 msgstr ""
 
 #. module: account_coda
 #: field:account.coda,note:0
 msgid "Import log"
-msgstr ""
+msgstr "Import Protokoll"
 
 #. module: account_coda
-#: wizard_field:account.coda_import,init,def_receivable:0
-msgid "Default receivable Account"
-msgstr ""
-
-#. module: account_coda
-#: model:ir.module.module,description:account_coda.module_meta_information
-msgid ""
-"Module provides functionality to import\n"
-"    bank statements from .csv file.\n"
-"    Import coda file wizard is used to import bank statements."
-msgstr ""
-
-#. module: account_coda
-#: wizard_button:account.coda_import,extraction,end:0
-msgid "_Close"
-msgstr ""
-
-#. module: account_coda
-#: field:account.coda,statement_id:0
-msgid "Generated Bank Statement"
+#: view:account.coda.import:0
+msgid "Import"
 msgstr ""
 
 #. module: account_coda
 #: view:account.coda:0
-#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
-#: model:ir.actions.act_window,name:account_coda.action_account_coda
 msgid "Coda import"
+msgstr "CODA Import"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "Protokoll"
+
+#. module: account_coda
+#: help:account.coda.import,awaiting_account:0
+msgid ""
+"Set here the default account that will be used, if the partner is found but "
+"does not have the bank account, or if he is domiciled"
 msgstr ""
 
 #. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda.import,def_payable:0
+msgid ""
+"Set here the payable account that will be used, by default, if the partner "
+"is not found"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Search Coda"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
 #: field:account.coda,user_id:0
 msgid "User"
+msgstr "Benutzer"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
+msgid "Coda Import Logs"
 msgstr ""
 
 #. module: account_coda
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Fehlerhafter XML Quellcode für diese Ansicht"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda
 msgid "coda for an Account"
-msgstr ""
+msgstr "CODA für Konto"
 
 #. module: account_coda
-#: wizard_field:account.coda_import,init,def_payable:0
+#: field:account.coda.import,def_payable:0
 msgid "Default Payable Account"
+msgstr "Standard Kreditoren Konto"
+
+#. module: account_coda
+#: help:account.coda,name:0
+msgid "Store the detail of bank statements"
 msgstr ""
 
 #. module: account_coda
-#: model:ir.ui.menu,name:account_coda.menu_account_coda
-msgid "Coda Statements"
+#: view:account.coda.import:0
+msgid "Cancel"
 msgstr ""
 
 #. module: account_coda
-#: model:ir.ui.menu,name:account_coda.menu_account_coda_wizard
+#: view:account.coda.import:0
+msgid "Open Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_import
 msgid "Import Coda Statements"
-msgstr ""
+msgstr "Importiere CODA Bankauszüge"
 
 #. module: account_coda
-#: wizard_button:account.coda_import,init,extraction:0
-msgid "_Ok"
-msgstr ""
-
-#. module: account_coda
-#: wizard_view:account.coda_import,extraction:0
-#: wizard_view:account.coda_import,init:0
+#: view:account.coda.import:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_import
 msgid "Import Coda Statement"
+msgstr "Import CODA Bankauszug"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Statements"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
 msgstr ""
 
 #. module: account_coda
 #: field:account.bank.statement,coda_id:0
 msgid "Coda"
-msgstr ""
+msgstr "CODA"
 
 #. module: account_coda
-#: wizard_view:account.coda_import,extraction:0
+#: view:account.coda.import:0
 msgid "Results :"
+msgstr "Ergebnis :"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Result of Imported Coda Statements"
 msgstr ""
 
 #. module: account_coda
-#: wizard_field:account.coda_import,init,coda:0
+#: help:account.coda.import,def_receivable:0
+msgid ""
+"Set here the receivable account that will be used, by default, if the "
+"partner is not found"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
 msgid "Coda File"
+msgstr "CODA Datei"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_bank_statement
+msgid "Bank Statement"
 msgstr ""
 
 #. module: account_coda
-#: field:account.coda,date:0
-msgid "Import Date"
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda Logs"
 msgstr ""
 
 #. module: account_coda
-#: wizard_view:account.coda_import,init:0
-msgid "Select your bank journal :"
+#: code:addons/account_coda/wizard/account_coda_import.py:0
+#, python-format
+msgid "Result"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Click on 'New' to select your file :"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,def_receivable:0
+msgid "Default Receivable Account"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Close"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,statement_ids:0
+msgid "Generated Bank Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA - import bank statements from coda file"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Configure Your Journal and Account :"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda Import"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:0
+#, python-format
+msgid "The bank account %s is not defined for the partner %s.\n"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,journal_id:0
+msgid "Journal"
 msgstr ""
diff --git a/addons/account_followup/i18n/sr.po b/addons/account_followup/i18n/sr.po
index d882a65d26a..313b6317eb3 100644
--- a/addons/account_followup/i18n/sr.po
+++ b/addons/account_followup/i18n/sr.po
@@ -7,72 +7,37 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 09:03+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-26 08:00+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Date :"
-msgstr "Datum :"
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Follwoup Summary"
+msgstr "Sumarno Pracenje"
 
 #. module: account_followup
-#: wizard_field:account_followup.followup.print.all,next,partner_ids:0
-msgid "Partners"
-msgstr "Partneri"
+#: view:account_followup.followup:0
+msgid "Search Followup"
+msgstr "Pretrazi Pracenja"
 
 #. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Customer Ref :"
-msgstr "Poziv na broj"
+#: view:account_followup.stat:0
+msgid "Group By..."
+msgstr "Grupirano po"
 
 #. module: account_followup
-#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
-#: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile_payable
-msgid "All payable entries"
-msgstr "Sve stavke potraživanja"
-
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Pogrešno ime modela u definiciji akcije."
-
-#. module: account_followup
-#: field:account_followup.followup.line,description:0
-msgid "Printed Message"
-msgstr "Ispisana Poruka"
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Amount In Currency"
-msgstr "Iznos u valuti"
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Due"
-msgstr "Dospeće"
-
-#. module: account_followup
-#: view:account.move.line:0
-msgid "Total debit"
-msgstr "Ukupno duguje"
-
-#. module: account_followup
-#: view:account_followup.followup.line:0
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(user_signature)s: User name"
-msgstr "%(korisnicka_oznaka)e: Korisničko ime"
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "Select partners"
-msgstr "Odaberi partnere"
+#: view:res.company:0
+#: field:res.company,follow_up_msg:0
+msgid "Follow-up Message"
+msgstr "Poruka Pracenja"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -80,193 +45,89 @@ msgstr "Odaberi partnere"
 msgid "Follow-Up"
 msgstr "Следи"
 
-#. module: account_followup
-#: field:account_followup.stat,debit:0
-msgid "Debit"
-msgstr "Duguje"
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "Email Settings"
-msgstr "Email Postavke"
-
-#. module: account_followup
-#: field:account_followup.stat,account_type:0
-msgid "Account Type"
-msgstr "Vrsta konta"
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Ref"
-msgstr "Referenca"
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(followup_amount)s: Total Amount Due"
-msgstr "%(iznos_pracenja): Ukupan iznos duga"
-
-#. module: account_followup
-#: view:account_followup.followup.line:0
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(date)s: Current Date"
-msgstr "%(datum)i: Trenutni Datum"
-
-#. module: account_followup
-#: field:account.move.line,followup_date:0
-msgid "Latest Follow-up"
-msgstr "Poslednje praćenje"
-
-#. module: account_followup
-#: field:account_followup.followup.line,followup_id:0
-#: field:account_followup.stat,followup_id:0
-msgid "Follow Ups"
-msgstr "Praćenja"
-
-#. module: account_followup
-#: wizard_field:account_followup.followup.print.all,init,date:0
-msgid "Follow-up Sending Date"
-msgstr "Datum Slanja Pracenja"
-
-#. module: account_followup
-#: view:account_followup.followup:0
-#: field:account_followup.followup,description:0
-#: rml:account_followup.followup.print:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Balance:"
-msgstr "Saldo"
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "VAT:"
-msgstr "PDV:"
-
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
+#: view:account_followup.stat:0
+#: field:account_followup.stat,company_id:0
 msgid "Company"
 msgstr "Preduzeće"
 
 #. module: account_followup
-#: rml:account_followup.followup.print:0
+#: report:account_followup.followup.print:0
 msgid "Invoice Date"
 msgstr "Datum računa"
 
 #. module: account_followup
-#: wizard_field:account_followup.followup.print.all,next,email_subject:0
+#: field:account.followup.print.all,email_subject:0
 msgid "Email Subject"
 msgstr "Tema Email-a"
 
 #. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Paid"
-msgstr "Plaćeno"
+#: view:account.followup.print.all:0
+#: view:account_followup.followup.line:0
+msgid "Legend"
+msgstr "Legenda"
 
 #. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(line)s: Account Move lines"
-msgstr "%(red): redovi prenosa računa"
-
-#. module: account_followup
-#: field:account_followup.stat,date_followup:0
-msgid "Latest followup"
-msgstr "Poslednje praćenje"
-
-#. module: account_followup
-#: view:account.move.line:0
-msgid "Partner entries"
-msgstr "Stavke Partnera"
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_account_followup_followup_line
-msgid "Follow-Ups Criteria"
-msgstr "Kriterijumi Praćenja"
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "Partner Selection"
-msgstr "Selekcija Partnera"
-
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za pregled arhitekture"
-
-#. module: account_followup
-#: field:account_followup.followup.line,start:0
-msgid "Type of Term"
-msgstr "Tip Uslova"
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,init:0
-msgid "Follow-up and Date Selection"
-msgstr "Praćenja i Datum Selekcije"
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "Select partners to remind"
-msgstr "Odaberite partnere za opomenu"
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Li."
-msgstr "Li."
-
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid ""
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following "
-"amount staid unpaid. Please, take appropriate measures in order to carry out "
-"this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please "
-"consider the present one as void. Do not hesitate to contact our accounting "
-"department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-"\t\t\t"
-msgstr ""
-"\n"
-"Postovani %(partner_name)s,\n"
-"\n"
-"Izvinjavamo se unapred ako je greska nastala kod nas, cini se da su sledeci "
-"iznosi ostali neplaceni. Molimo, preduzmite neophodne akcije u cilju isplate "
-"ovih racuna u sledecih 8 dana.\n"
-"\n"
-"Ukoliko uradite isplatu nakon ovog maila, molimo obavestite nas, Takodje se "
-"nemojte ustrucavati da kontaktirate nasu\n"
-"racunovodstvenu sluzbu na tel (032) 69 555 666\n"
-"\n"
-"Srdacan pozdrav\n"
-"\t\t\t"
-
-#. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#. module: account_followup
-#: wizard_button:account_followup.followup.print.all,summary,end:0
+#: view:account.followup.print.all:0
 msgid "Ok"
 msgstr "U redu"
 
 #. module: account_followup
-#: field:account_followup.followup,name:0
-#: field:account_followup.followup.line,name:0
-msgid "Name"
-msgstr "Ime"
+#: field:account.followup.print,date:0
+msgid "Follow-up Sending Date"
+msgstr "Datum Slanja Pracenja"
 
 #. module: account_followup
-#: field:account_followup.stat,date_move:0
-msgid "First move"
-msgstr "Prvi potez"
+#: selection:account_followup.followup.line,start:0
+msgid "Net Days"
+msgstr "Neto dana"
+
+#. module: account_followup
+#: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
+#: model:ir.ui.menu,name:account_followup.account_followup_menu
+msgid "Follow-Ups"
+msgstr "Pracenja"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "PDV:"
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr "Ukupno duguje"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(heading)s: Move line header"
+msgstr "%(heading): Zaglavlje reda prijenosa"
+
+#. module: account_followup
+#: field:account.followup.print,followup_id:0
+msgid "Follow-up"
+msgstr "Pracenje"
+
+#. module: account_followup
+#: field:account_followup.stat,name:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Date :"
+msgstr "Datum :"
+
+#. module: account_followup
+#: field:account.followup.print.all,partner_ids:0
+msgid "Partners"
+msgstr "Partneri"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_followup
+msgid "Account Follow Up"
+msgstr "Nalog Pracenja"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
@@ -274,27 +135,40 @@ msgid "End of Month"
 msgstr "Kraj Meseca"
 
 #. module: account_followup
-#: view:account_followup.followup.line:0
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(company_name)s: User's Company name"
-msgstr "%(company_name)s: Ime preduzeca Korisnika"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
+msgstr "Nije Sporno"
 
 #. module: account_followup
-#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
-#: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile
-msgid "All receivable entries"
-msgstr "Sve stavke potraživanja"
+#: view:account.followup.print.all:0
+msgid "%(user_signature)s: User name"
+msgstr "%(korisnicka_oznaka)e: Korisničko ime"
 
 #. module: account_followup
-#: view:account_followup.followup:0
-msgid "Lines"
-msgstr "redova"
+#: field:account_followup.stat,debit:0
+msgid "Debit"
+msgstr "Duguje"
 
 #. module: account_followup
-#: model:ir.actions.wizard,name:account_followup.action_account_followup_all_wizard
-#: model:ir.ui.menu,name:account_followup.account_followup_wizard_menu
-msgid "Send followups"
-msgstr "Pošalji praćenja"
+#: field:account_followup.stat,account_type:0
+msgid "Account Type"
+msgstr "Vrsta konta"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Ref"
+msgstr "Referenca"
+
+#. module: account_followup
+#: help:account_followup.followup.line,sequence:0
+msgid "Gives the sequence order when displaying a list of follow-up lines."
+msgstr "Daje redosled sekvenci pri prikazivanju linija pracenja"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+#: field:account.followup.print.all,email_body:0
+msgid "Email body"
+msgstr "Sadrzaj Email-a"
 
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
@@ -302,68 +176,9 @@ msgid "Follow-up Level"
 msgstr "Nivo praćenja"
 
 #. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
-msgstr "Kredit"
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_account_followup_stat
-msgid "Followup statistics"
-msgstr "Statisktike Praćenja"
-
-#. module: account_followup
-#: wizard_button:account_followup.followup.print.all,init,next:0
-msgid "Continue"
-msgstr "Nastavi"
-
-#. module: account_followup
-#: model:ir.module.module,shortdesc:account_followup.module_meta_information
-msgid "Accounting follow-ups management"
-msgstr "Menadzment naloga Praćenja"
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,summary:0
-#: wizard_field:account_followup.followup.print.all,summary,summary:0
-msgid "Summary"
-msgstr "Sumarno"
-
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "Follow-Up Lines"
-msgstr "Redovi Praćenja"
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Document : Customer account statement"
-msgstr "Dokument:Korisnicka stavka naloga"
-
-#. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-Up lines"
-msgstr "Redovi Praćenja"
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(company_currency)s: User's Company Currency"
-msgstr "%(company_currency)s: Valuta Preduzeca Korisnika"
-
-#. module: account_followup
-#: field:account_followup.stat,balance:0
-msgid "Balance"
-msgstr "Saldo"
-
-#. module: account_followup
-#: help:account_followup.followup.print.all,init,date:0
-msgid ""
-"This field allow you to select a forecast date to plan your follow-ups"
-msgstr ""
-"Ovo polje vam omogucava da selektujete udaljeni datum za planiranje vaseg "
-"pracenja"
-
-#. module: account_followup
-#: view:account.move.line:0
-msgid "Total credit"
-msgstr "Ukupno potražuje"
+#: field:account_followup.stat,date_followup:0
+msgid "Latest followup"
+msgstr "Poslednje praćenje"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -387,69 +202,104 @@ msgid ""
 "Details of due payments is printed below.\n"
 "\n"
 "Best Regards,\n"
-"\t\t\t"
 msgstr ""
 "\n"
-"Postovani %(partner_name)s\n"
+"Postovani %(partner_name)\n"
+"Razocarani smo sto vam se moramo obracati ovako, saljuci vam opomenu, ali "
+"vas nalog je u ozbiljnom prekoracenju.\n"
 "\n"
-"Zao nam je sto vas moramo podsecati, ali vas je nalog sada u ozbiljnom "
-"prekoracenju.\n"
+"Vrlo je vazno da ispunite vase obaveze ka nama, inace ce mo biti prisiljeni "
+"da obustavimo vas nalog, sto u stvari znaci da necemo vise biti\n"
+"u mogucnosti da vase preduzece nadalje snabdevamo ( robom / servisiranjem).\n"
+"Molimo vas da preduzmete mere kako bi regulisali vasa dugovanja u sledecih 8 "
+"dana.\n"
 "\n"
-"Vrlo je bitno da izmirite vase obaveze ka nama, u suprotnom ce mo morati "
-"razmotriti dalju saradnju sa vama, sto znaci da necemo\n"
-"vise biti u mogucnosti da vas snabdevamo ( servisiramo)\n"
+"Ukoliko postoji problem, vezan za fakturu, sa kojim nismo upoznati, ne "
+"ustrucavajte se da kontaktirate nase racunovodstvo na broj (+32) 20 555 666 "
+"kako bi smo razmotrili problem sto je hitnije moguce.\n"
 "\n"
-"Molimo vas da preduzmete hitne mere kako bi se izvrsila ova uplata u roku od "
-"8 dana.\n"
+"Detalji vase fakture su prikazani ispod.\n"
 "\n"
-"Ukoliko postoji problem vezan za vas racun, a mi nismo upoznati, ne "
-"ustrucavajte se da kontaktirate nase racunovodstvo na (+32_69 555 666 kako "
-"bi mogli resiti nastalu gresku sto pre.\n"
+"Uz svo postovanje.\n"
+
+#. module: account_followup
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: account_followup
+#: field:account.followup.print.all,partner_lang:0
+msgid "Send Email in Partner Language"
+msgstr "Posalji Email na jeziku Partnera"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select partners to remind"
+msgstr "Odaberite partnere za opomenu"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Partner Selection"
+msgstr "Selekcija Partnera"
+
+#. module: account_followup
+#: field:account_followup.followup.line,description:0
+msgid "Printed Message"
+msgstr "Ispisana Poruka"
+
+#. module: account_followup
+#: view:account.followup.print:0
+#: view:account.followup.print.all:0
+#: model:ir.actions.act_window,name:account_followup.action_account_followup_print
+#: model:ir.actions.act_window,name:account_followup.action_account_followup_print_all
+#: model:ir.ui.menu,name:account_followup.account_followup_print_menu
+msgid "Send followups"
+msgstr "Pošalji praćenja"
+
+#. module: account_followup
+#: field:account_followup.followup.line,followup_id:0
+#: field:account_followup.stat,followup_id:0
+msgid "Follow Ups"
+msgstr "Praćenja"
+
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
 "\n"
-"Detalji vaseg racuna se nalaze ispod.\n"
+"Dear %(partner_name)s,\n"
 "\n"
-"Srdacan pozdrav.\n"
-"\t\t\t"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount staid unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"consider the present one as void. Do not hesitate to contact our accounting "
+"department at (+32).10.68.94.39.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+"\n"
+"postovani %(partner_name)\n"
+"\n"
+"Nacinjen je izuzetak ukoliko je ovo nasa greska, ali , cini se da je sledeci "
+"iznos ostao neplacen. Molimo vas da preduzmete odgovarajuce mere kako bi se "
+"ovo resilo u sledecih 8 dana.\n"
+"\n"
+"Ukoliko ste izvrsili uplatu u medjuvremenu, pre ovog Emaila, molimo "
+"smatrajte ga nebitnim. Ne ustrucavajte se da kontaktirate nase racunovodstvo "
+"na broj (+32) 555 666.\n"
+"\n"
+"Svo Postovanje.\n"
 
 #. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Sub-Total:"
-msgstr "Subtotal"
-
-#. module: account_followup
-#: selection:account_followup.followup.line,start:0
-msgid "Net Days"
-msgstr "Neto dana"
-
-#. module: account_followup
-#: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
-#: model:ir.actions.act_window,name:account_followup.action_followup_stat
-#: model:ir.model,name:account_followup.model_account_followup_followup
-#: model:ir.ui.menu,name:account_followup.account_followup_menu
-#: model:ir.ui.menu,name:account_followup.menu_action_followup_stat
-msgid "Follow-Ups"
-msgstr "Pracenja"
-
-#. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-#: wizard_field:account_followup.followup.print.all,next,email_body:0
-msgid "Email body"
-msgstr "Sadrzaj Email-a"
-
-#. module: account_followup
-#: field:account_followup.stat,date_move_last:0
-msgid "Last move"
-msgstr "Poslednji potez"
-
-#. module: account_followup
-#: rml:account_followup.followup.print:0
-msgid "Maturity"
-msgstr "Dospeće"
-
-#. module: account_followup
-#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
-msgid "Followup Report"
-msgstr "Izvestaj Pracenja"
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+msgstr ""
+"Svi Email-ovi su uspeno poslati vasim partnerima:.\n"
+"\n"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
@@ -469,72 +319,325 @@ msgid ""
 "our accounting department at (+32).10.68.94.39.\n"
 "\n"
 "Best Regards,\n"
-"\t\t\t"
 msgstr ""
 "\n"
-"Postovani %(partner_name)s,\n"
+"Postovani %(partner_name),\n"
 "\n"
-"Uprkos nekoliko opomena, vase dugovanje nije izmireno.\n"
+"Uprkos nekoliko opomena, vas racun i dalje nije sravnjen.\n"
 "\n"
-"Ukoliko ne izvrsite uplatu u sledecih 8 dana, bicemo prinudjeni da se "
-"obratimo nadleznim organima za sravnjenje ovog duga.\n"
+"Ukoliko ne izvrsite punu uplatu u sledecih 8 dana, bicemo prinudjeni da se "
+"obratimo nadleznim organima kako bi naplatili nasa potrazivanja,\n"
 "\n"
-"Verujem da ce se ova varijanta pokazati kao nepotrebna i da ce te vi "
-"izvrsiti uplatu dugova opisanih ispod.\n"
+"Mi verujemo da je takva akcija zaista nepotrebna, i da ce te vi izmiriti "
+"vasa dugovanja koja su prikazana ispod.\n"
 "\n"
-"U slucaju bilo kakve nedoumice, ili nase greske, nemojte se ustrucavati da "
-"kontaktirate nase knjigovodstvo na (+32)69 555 666.\n"
+"U slucaju bilo kakvih nejasnoca, ne ustrucavajte se da kontaktirate nase "
+"racunovodstveno odelenje na broj ( +32) 555 666.\n"
 "\n"
-"Srdacan Pozdrav.\n"
-"\t\t\t"
+"Svo Postovanje.\n"
 
 #. module: account_followup
-#: rml:account_followup.followup.print:0
+#: view:account.followup.print.all:0
+msgid "Send Mails"
+msgstr "Slanje Emailova"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: account_followup
+#: model:ir.module.module,shortdesc:account_followup.module_meta_information
+msgid "Accounting follow-ups management"
+msgstr "Menadzment naloga Praćenja"
+
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Blokiran"
+
+#. module: account_followup
+#: help:account.followup.print,date:0
+msgid ""
+"This field allow you to select a forecast date to plan your follow-ups"
+msgstr ""
+"Ovo polje vam omogucava da selektujete udaljeni datum za planiranje vaseg "
+"pracenja"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Due"
+msgstr "Dospeće"
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "Select Partners"
+msgstr "Selektuj Partnere"
+
+#. module: account_followup
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska! Ne mozete kreirati rekursivni meni."
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Email Settings"
+msgstr "Email Postavke"
+
+#. module: account_followup
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Print Follow Ups"
+msgstr "Stampaj Pracenja"
+
+#. module: account_followup
+#: field:account.move.line,followup_date:0
+msgid "Latest Follow-up"
+msgstr "Poslednje praćenje"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Sub-Total:"
+msgstr "Subtotal"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Balance:"
+msgstr "Saldo"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat
+msgid "Followup Statistics"
+msgstr "Statistika Pracenja"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Paid"
+msgstr "Plaćeno"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s: User Name"
+msgstr "%(user_signature): Korisnicko Ime"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_move_line
+msgid "Journal Items"
+msgstr "Sadrzaj Dnevnika"
+
+#. module: account_followup
+#: field:account.followup.print.all,email_conf:0
+msgid "Send email confirmation"
+msgstr "Pošalji Email potvrdu"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(company_name)s: User's Company name"
+msgstr "%(company_name)s: Ime preduzeca Korisnika"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_res_company
+msgid "Companies"
+msgstr "Kompanije"
+
+#. module: account_followup
+#: view:account_followup.followup:0
+msgid "Followup Lines"
+msgstr "Linije Pracenja"
+
+#. module: account_followup
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Kredit"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
 msgid "Maturity Date"
 msgstr "Datum Dospeća"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "Legend"
-msgstr "Legenda"
+msgid "%(partner_name)s: Partner Name"
+msgstr "%(partner_name): Partnerovo Ime"
 
 #. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
-msgstr "Sekvenca"
+#: view:account_followup.stat:0
+msgid "Follow-Up lines"
+msgstr "Redovi Praćenja"
 
 #. module: account_followup
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(heading)s: Move line header"
-msgstr "%(heading): Zaglavlje reda prijenosa"
+#: view:account.followup.print.all:0
+msgid "%(company_currency)s: User's Company Currency"
+msgstr "%(company_currency)s: Valuta Preduzeca Korisnika"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,balance:0
+msgid "Balance"
+msgstr "Saldo"
+
+#. module: account_followup
+#: field:account_followup.followup.line,start:0
+msgid "Type of Term"
+msgstr "Tip Uslova"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_print
+#: model:ir.model,name:account_followup.model_account_followup_print_all
+msgid "Print Followup & Send Mail to Customers"
+msgstr "Stampaj Pracenje & Posalji Emailove Strankama"
+
+#. module: account_followup
+#: field:account_followup.stat,date_move_last:0
+msgid "Last move"
+msgstr "Poslednji potez"
+
+#. module: account_followup
+#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
+msgid "Followup Report"
+msgstr "Izvestaj Pracenja"
+
+#. module: account_followup
+#: field:account_followup.stat,period_id:0
+msgid "Period"
+msgstr "Razdoblje"
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+msgstr ""
+"E-mail NIJE poslat sledecim Partnerima, Email nije dostupan !\n"
+"\n"
+
+#. module: account_followup
+#: view:account.followup.print:0
+#: view:account.followup.print.all:0
+msgid "Cancel"
+msgstr "Otkaži"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
-#: wizard_view:account_followup.followup.print.all,next:0
-msgid "%(partner_name)s: Partner name"
-msgstr "%(partner_name)s: Partnerovo Ime"
+msgid "Follow-Up Lines"
+msgstr "Redovi Praćenja"
 
 #. module: account_followup
-#: wizard_field:account_followup.followup.print.all,next,email_conf:0
-msgid "Send email confirmation"
-msgstr "Pošalji Email potvrdu"
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid ""
+"\n"
+"\n"
+"E-Mail sent to following Partners successfully. !\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"E-mail je USPESNO prosledjen sledecim Partnerima. !\n"
+"\n"
 
 #. module: account_followup
-#: wizard_field:account_followup.followup.print.all,init,followup_id:0
-msgid "Follow-up"
-msgstr "Pracenje"
+#: view:account_followup.stat:0
+msgid "Litigation"
+msgstr "Sporno"
 
 #. module: account_followup
-#: field:account_followup.stat,name:0
-msgid "Partner"
-msgstr "Partner"
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
 
 #. module: account_followup
-#: wizard_button:account_followup.followup.print.all,init,end:0
-#: wizard_button:account_followup.followup.print.all,next,end:0
-msgid "Cancel"
-msgstr "Otkaži"
+#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
+msgid "Payable Items"
+msgstr "Stavke Placanja"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(followup_amount)s: Total Amount Due"
+msgstr "%(iznos_pracenja): Ukupan iznos duga"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+#: view:account_followup.followup.line:0
+msgid "%(date)s: Current Date"
+msgstr "%(datum)i: Trenutni Datum"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Followup Level"
+msgstr "Nivo Pracenja"
+
+#. module: account_followup
+#: view:account_followup.followup:0
+#: field:account_followup.followup,description:0
+#: report:account_followup.followup.print:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "This Fiscal year"
+msgstr "Fiskalna Godina"
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Partner entries"
+msgstr "Stavke Partnera"
+
+#. module: account_followup
+#: help:account.followup.print.all,partner_lang:0
+msgid ""
+"Do not change message text, if you want to send email in partner language, "
+"or configure from company"
+msgstr ""
+"Ne menjajte ovaj text ukoliko zelite da posaljete Email na jeziku Partnera, "
+"ili ga konfigurisete po Preduzecu."
+
+#. module: account_followup
+#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
+msgid "Receivable Items"
+msgstr "Prijemne Stavke"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: model:ir.actions.act_window,name:account_followup.action_followup_stat
+#: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow
+msgid "Follow-ups Sent"
+msgstr "Pracenja Poslata"
+
+#. module: account_followup
+#: field:account_followup.followup,name:0
+#: field:account_followup.followup.line,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: account_followup
+#: field:account_followup.stat,date_move:0
+msgid "First move"
+msgstr "Prvi potez"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Li."
+msgstr "Li."
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity"
+msgstr "Dospeće"
+
+#. module: account_followup
+#: view:account.followup.print:0
+msgid "Continue"
+msgstr "Nastavi"
 
 #. module: account_followup
 #: field:account_followup.followup.line,delay:0
@@ -542,6 +645,190 @@ msgid "Days of delay"
 msgstr "Dana kašnjenja"
 
 #. module: account_followup
-#: wizard_button:account_followup.followup.print.all,next,print:0
-msgid "Print Follow Ups & Send Mails"
-msgstr "Odstampaj Pracenja & Posalji Meilove"
+#: report:account_followup.followup.print:0
+msgid "Document : Customer account statement"
+msgstr "Dokument:Korisnicka stavka naloga"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+#: field:account.followup.print.all,summary:0
+msgid "Summary"
+msgstr "Sumarno"
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr "Ukupno potražuje"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(line)s: Ledger Posting lines"
+msgstr "%(line): Ledger Posting lines"
+
+#. module: account_followup
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "%(company_name)s: User's Company Name"
+msgstr "%(company_name): Strankino Ime Preduzeca"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Customer Ref :"
+msgstr "Poziv na broj"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(partner_name)s: Partner name"
+msgstr "%(partner_name)s: Partnerovo Ime"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Latest Followup Date"
+msgstr "Datum poslednjeg Pracenja"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_followup_line
+msgid "Follow-Up Criteria"
+msgstr "Kriterijum Pracenja"
+
+#~ msgid "All payable entries"
+#~ msgstr "Sve stavke potraživanja"
+
+#~ msgid "Amount In Currency"
+#~ msgstr "Iznos u valuti"
+
+#~ msgid "Select partners"
+#~ msgstr "Odaberi partnere"
+
+#~ msgid "%(line)s: Account Move lines"
+#~ msgstr "%(red): redovi prenosa računa"
+
+#~ msgid "Follow-Ups Criteria"
+#~ msgstr "Kriterijumi Praćenja"
+
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Exception made if there was a mistake of ours, it seems that the following "
+#~ "amount staid unpaid. Please, take appropriate measures in order to carry out "
+#~ "this payment in the next 8 days.\n"
+#~ "\n"
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "consider the present one as void. Do not hesitate to contact our accounting "
+#~ "department at (+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ "\t\t\t"
+#~ msgstr ""
+#~ "\n"
+#~ "Postovani %(partner_name)s,\n"
+#~ "\n"
+#~ "Izvinjavamo se unapred ako je greska nastala kod nas, cini se da su sledeci "
+#~ "iznosi ostali neplaceni. Molimo, preduzmite neophodne akcije u cilju isplate "
+#~ "ovih racuna u sledecih 8 dana.\n"
+#~ "\n"
+#~ "Ukoliko uradite isplatu nakon ovog maila, molimo obavestite nas, Takodje se "
+#~ "nemojte ustrucavati da kontaktirate nasu\n"
+#~ "racunovodstvenu sluzbu na tel (032) 69 555 666\n"
+#~ "\n"
+#~ "Srdacan pozdrav\n"
+#~ "\t\t\t"
+
+#~ msgid "Follow-up and Date Selection"
+#~ msgstr "Praćenja i Datum Selekcije"
+
+#~ msgid "Lines"
+#~ msgstr "redova"
+
+#~ msgid "All receivable entries"
+#~ msgstr "Sve stavke potraživanja"
+
+#~ msgid "Followup statistics"
+#~ msgstr "Statisktike Praćenja"
+
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "We are disappointed to see that despite sending a reminder, that your "
+#~ "account is now seriously overdue.\n"
+#~ "\n"
+#~ "It is essential that immediate payment is made, otherwise we will have to "
+#~ "consider placing a stop on your account which means that we will no longer "
+#~ "be able to supply your company with (goods/services).\n"
+#~ "Please, take appropriate measures in order to carry out this payment in the "
+#~ "next 8 days\n"
+#~ "\n"
+#~ "If there is a problem with paying invoice that we are not aware of, do not "
+#~ "hesitate to contact our accounting department at (+32).10.68.94.39. so that "
+#~ "we can resolve the matter quickly.\n"
+#~ "\n"
+#~ "Details of due payments is printed below.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ "\t\t\t"
+#~ msgstr ""
+#~ "\n"
+#~ "Postovani %(partner_name)s\n"
+#~ "\n"
+#~ "Zao nam je sto vas moramo podsecati, ali vas je nalog sada u ozbiljnom "
+#~ "prekoracenju.\n"
+#~ "\n"
+#~ "Vrlo je bitno da izmirite vase obaveze ka nama, u suprotnom ce mo morati "
+#~ "razmotriti dalju saradnju sa vama, sto znaci da necemo\n"
+#~ "vise biti u mogucnosti da vas snabdevamo ( servisiramo)\n"
+#~ "\n"
+#~ "Molimo vas da preduzmete hitne mere kako bi se izvrsila ova uplata u roku od "
+#~ "8 dana.\n"
+#~ "\n"
+#~ "Ukoliko postoji problem vezan za vas racun, a mi nismo upoznati, ne "
+#~ "ustrucavajte se da kontaktirate nase racunovodstvo na (+32_69 555 666 kako "
+#~ "bi mogli resiti nastalu gresku sto pre.\n"
+#~ "\n"
+#~ "Detalji vaseg racuna se nalaze ispod.\n"
+#~ "\n"
+#~ "Srdacan pozdrav.\n"
+#~ "\t\t\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Despite several reminders, your account is still not settled.\n"
+#~ "\n"
+#~ "Unless full payment is made in next 8 days , then legal action for the "
+#~ "recovery of the debt, will be taken without further notice.\n"
+#~ "\n"
+#~ "I trust that this action will prove unnecessary and details of due payments "
+#~ "is printed below.\n"
+#~ "\n"
+#~ "In case of any queries concerning this matter, do not hesitate to contact "
+#~ "our accounting department at (+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ "\t\t\t"
+#~ msgstr ""
+#~ "\n"
+#~ "Postovani %(partner_name)s,\n"
+#~ "\n"
+#~ "Uprkos nekoliko opomena, vase dugovanje nije izmireno.\n"
+#~ "\n"
+#~ "Ukoliko ne izvrsite uplatu u sledecih 8 dana, bicemo prinudjeni da se "
+#~ "obratimo nadleznim organima za sravnjenje ovog duga.\n"
+#~ "\n"
+#~ "Verujem da ce se ova varijanta pokazati kao nepotrebna i da ce te vi "
+#~ "izvrsiti uplatu dugova opisanih ispod.\n"
+#~ "\n"
+#~ "U slucaju bilo kakve nedoumice, ili nase greske, nemojte se ustrucavati da "
+#~ "kontaktirate nase knjigovodstvo na (+32)69 555 666.\n"
+#~ "\n"
+#~ "Srdacan Pozdrav.\n"
+#~ "\t\t\t"
+
+#~ msgid "Print Follow Ups & Send Mails"
+#~ msgstr "Odstampaj Pracenja & Posalji Meilove"
diff --git a/addons/account_invoice_layout/i18n/sr.po b/addons/account_invoice_layout/i18n/sr.po
index ae168dc498c..496f3bd8c19 100644
--- a/addons/account_invoice_layout/i18n/sr.po
+++ b/addons/account_invoice_layout/i18n/sr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 09:39+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-26 07:25+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
@@ -23,9 +23,10 @@ msgid "Sub Total"
 msgstr "Subtotal"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Invoice Date:"
-msgstr "Datum fakture:"
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Note:"
+msgstr "Napomena:"
 
 #. module: account_invoice_layout
 #: constraint:ir.model:0
@@ -35,7 +36,8 @@ msgstr ""
 "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Cancelled Invoice"
 msgstr "Otkazane Fakture"
 
@@ -46,29 +48,26 @@ msgid "Title"
 msgstr "Naslov"
 
 #. module: account_invoice_layout
-#: model:ir.actions.wizard,name:account_invoice_layout.wizard_notify_message
+#: model:ir.actions.act_window,name:account_invoice_layout.action_account_invoice_special_msg
+#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_layout_message
 msgid "Invoices with Layout and Message"
 msgstr "Formatirana Faktura sa Porukom"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Disc. (%)"
 msgstr "Popust (%)"
 
-#. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "(Incl. taxes):"
-msgstr "Urac.porezi"
-
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Note"
 msgstr "Napomena"
 
 #. module: account_invoice_layout
-#: wizard_button:wizard.notify_message,init,print:0
-msgid "Print"
-msgstr "Štampaj"
+#: model:ir.model,name:account_invoice_layout.model_notify_message
+msgid "Notify By Messages"
+msgstr "Napomena po porukama"
 
 #. module: account_invoice_layout
 #: help:notify.message,msg:0
@@ -77,22 +76,35 @@ msgid ""
 msgstr "Ova napomena ce se pojaviti na dnu fakture pri stampi"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Unit Price"
 msgstr "Jedinična cijena"
 
+#. module: account_invoice_layout
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska! Ne mozete kreirati rekursivni meni."
+
+#. module: account_invoice_layout
+#: model:notify.message,msg:account_invoice_layout.demo_message1
+msgid "Be Expert with the Experts..."
+msgstr "Budite Expert sa Expertima..."
+
 #. module: account_invoice_layout
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Pogrešno ime modela u definiciji akcije."
 
 #. module: account_invoice_layout
-#: model:ir.model,name:account_invoice_layout.model_notify_message
-msgid "Notify By Messages"
-msgstr "Napomena po porukama"
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Document"
+msgstr "Dokument"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "PRO-FORMA"
 msgstr "Predračun"
 
@@ -112,32 +124,30 @@ msgid "Notification Message"
 msgstr "Poruka Napomene"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Customer Ref:"
-msgstr "Referenca kupca:"
+#: selection:account.invoice.line,state:0
+msgid "Product"
+msgstr "Proizvod"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid ")"
-msgstr ")"
+#: help:account.invoice.line,sequence:0
+msgid "Gives the sequence order when displaying a list of invoice lines."
+msgstr "poredja sekvence pri prikazu liste faktura."
 
 #. module: account_invoice_layout
-#: field:account.invoice.line,state:0
-msgid "Type"
-msgstr "Tip"
-
-#. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Price"
 msgstr "Cena"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "/ ("
-msgstr "/("
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Invoice Date"
+msgstr "Datum Fakture"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Taxes:"
 msgstr "Porezi:"
 
@@ -152,47 +162,59 @@ msgid "Write Messages"
 msgstr "Napisi Poruke"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Base"
 msgstr "Osnova"
 
-#. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: account_invoice_layout
-#: field:notify.message,msg:0
-msgid "Special Message"
-msgstr "Specijalna Poruka"
-
-#. module: account_invoice_layout
-#: view:notify.message:0
-msgid "Write a notification or a wishful message."
-msgstr "Napisi napomenu ili celu poruku"
-
-#. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: account_invoice_layout
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za pregled arhitekture"
-
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Page Break"
 msgstr "Прелом стране"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Document:"
-msgstr "Dokument"
+#: view:notify.message:0
+#: field:notify.message,msg:0
+msgid "Special Message"
+msgstr "Specijalna Poruka"
 
 #. module: account_invoice_layout
-#: wizard_view:wizard.notify_message,init:0
+#: help:account.invoice.special.msg,message:0
+msgid "Message to Print at the bottom of report"
+msgstr "Poruka koja se stampa pri dnu izvestaja"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Partner Ref."
+msgstr "Vezani partner"
+
+#. module: account_invoice_layout
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: model:ir.model,name:account_invoice_layout.model_account_invoice
+#: report:notify_account.invoice:0
+msgid "Invoice"
+msgstr "Račun"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Total:"
+msgstr "Ukupno:"
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
 msgid "Select Message"
 msgstr "Odaberite poruku"
 
@@ -201,33 +223,32 @@ msgstr "Odaberite poruku"
 msgid "Messages"
 msgstr "Poruke"
 
-#. module: account_invoice_layout
-#: selection:account.invoice.line,state:0
-msgid "Product"
-msgstr "Proizvod"
-
 #. module: account_invoice_layout
 #: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
 msgid "Invoices with Layout"
 msgstr "Formatirana Faktura"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Description / Taxes"
 msgstr "Opis / Porezi"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Amount"
 msgstr "Iznos"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Description/Taxes"
-msgstr "Opis/Porezi"
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Tel. :"
+msgstr "Tel. :"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Draft Invoice"
 msgstr "Neodobreni računi"
 
@@ -237,19 +258,20 @@ msgid "Sequence Number"
 msgstr "Broj Sekvence"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Quantity"
-msgstr "Količina"
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg
+msgid "Account Invoice Special Message"
+msgstr "Specijalna poruka naloga fakture"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Refund"
 msgstr "Refundiraj"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "VAT :"
-msgstr "PDV :"
+#: field:account.invoice.line,state:0
+msgid "Type"
+msgstr "Tip"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -257,56 +279,114 @@ msgid "Separator Line"
 msgstr "Linija za odvajanje"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
+msgid "Invoices Layout Improvement"
+msgstr "Unapredjenje izgleda fakture"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Supplier Invoice"
 msgstr "Račun dobavljača"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Note :"
-msgstr "Napomena :"
+#: view:account.invoice.special.msg:0
+msgid "Print"
+msgstr "Štampaj"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "VAT :"
+msgstr "PDV :"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Tax"
 msgstr "Porez"
 
 #. module: account_invoice_layout
-#: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
-msgid "account_invoice_layout"
-msgstr "izgled_fakture_naloga"
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Redak računa"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Total (Excl. taxes):"
-msgstr "Ukupno (bez poreza):"
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Net Total:"
+msgstr "Neto Ukupno"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Invoice"
-msgstr "Račun"
+#: view:notify.message:0
+msgid "Write a notification or a wishful message."
+msgstr "Napisi napomenu ili celu poruku"
 
 #. module: account_invoice_layout
-#: wizard_button:wizard.notify_message,init,end:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Fax :"
+msgstr "Faks :"
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
 msgid "Cancel"
 msgstr "Otkaži"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Supplier Refund"
 msgstr "Povrat Dobavljaču"
 
 #. module: account_invoice_layout
-#: wizard_field:wizard.notify_message,init,message:0
+#: field:account.invoice.special.msg,message:0
 msgid "Message"
 msgstr "Poruka"
 
-#. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Total"
-msgstr "Ukupno"
-
 #. module: account_invoice_layout
 #: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
 msgid "All Notification Messages"
 msgstr "Sve Napomene"
+
+#~ msgid "Invoice Date:"
+#~ msgstr "Datum fakture:"
+
+#~ msgid "(Incl. taxes):"
+#~ msgstr "Urac.porezi"
+
+#~ msgid "Customer Ref:"
+#~ msgstr "Referenca kupca:"
+
+#~ msgid ")"
+#~ msgstr ")"
+
+#~ msgid "/ ("
+#~ msgstr "/("
+
+#~ msgid "Fax :"
+#~ msgstr "Fax :"
+
+#~ msgid "Document:"
+#~ msgstr "Dokument"
+
+#~ msgid "Tel. :"
+#~ msgstr "Tel. :"
+
+#~ msgid "VAT :"
+#~ msgstr "PDV :"
+
+#~ msgid "Note :"
+#~ msgstr "Napomena :"
+
+#~ msgid "Description/Taxes"
+#~ msgstr "Opis/Porezi"
+
+#~ msgid "Total"
+#~ msgstr "Ukupno"
+
+#~ msgid "Total (Excl. taxes):"
+#~ msgstr "Ukupno (bez poreza):"
+
+#~ msgid "account_invoice_layout"
+#~ msgstr "izgled_fakture_naloga"
diff --git a/addons/account_payment/i18n/sr.po b/addons/account_payment/i18n/sr.po
index 4fd733e9ea5..cf79de27525 100644
--- a/addons/account_payment/i18n/sr.po
+++ b/addons/account_payment/i18n/sr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 09:18+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-26 07:34+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
@@ -37,6 +37,12 @@ msgstr "Postavi za obradu"
 msgid "Select the Payment Mode to be applied."
 msgstr "Odaberite način plaćanja koji će biti primenjen."
 
+#. module: account_payment
+#: view:payment.mode:0
+#: view:payment.order:0
+msgid "Group By..."
+msgstr "Grupirano po"
+
 #. module: account_payment
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
@@ -49,6 +55,17 @@ msgstr "Pogrešno ime modela u definiciji akcije."
 msgid "Owner Account"
 msgstr "Račun vlasnika"
 
+#. module: account_payment
+#: help:payment.order,state:0
+msgid ""
+"When an order is placed the state is 'Draft'.\n"
+" Once the bank is confirmed the state is set to 'Confirmed'.\n"
+" Then the order is paid the state is 'Done'."
+msgstr ""
+"Kada je narudzba postavljena stanje je 'Priprema'\n"
+" Jednom kada je banka potvrdi, stanje je 'Potvrdjeno'.\n"
+" Kada je narudzba placena stanje je 'Zavrseno'."
+
 #. module: account_payment
 #: help:account.invoice,amount_to_pay:0
 msgid ""
@@ -78,12 +95,18 @@ msgid "Free"
 msgstr "slobodno"
 
 #. module: account_payment
-#: wizard_field:populate_payment,search,entries:0
+#: field:payment.order.create,entries:0
 msgid "Entries"
 msgstr "Stavke"
 
 #. module: account_payment
-#: wizard_field:populate_payment,init,duedate:0
+#: report:payment.order:0
+msgid "Used Account"
+msgstr "Koristeni Nalog"
+
+#. module: account_payment
+#: field:payment.line,ml_maturity_date:0
+#: field:payment.order.create,duedate:0
 msgid "Due Date"
 msgstr "Datum dospeća"
 
@@ -93,21 +116,22 @@ msgid "Account Entry Line"
 msgstr "Stavke knjiženja"
 
 #. module: account_payment
-#: wizard_button:populate_payment,search,create:0
+#: view:payment.order.create:0
 msgid "_Add to payment order"
 msgstr "_Dodaj u nalog za plaćanje"
 
 #. module: account_payment
-#: rml:payment.order:0
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
+#: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
+msgid "Payment Populate statement"
+msgstr "Ispuna sadrzaja fakture"
+
+#. module: account_payment
+#: report:payment.order:0
 #: view:payment.order:0
 msgid "Amount"
 msgstr "Iznos"
 
-#. module: account_payment
-#: rml:payment.order:0
-msgid "Execution date:"
-msgstr "Datum izvršenja:"
-
 #. module: account_payment
 #: view:payment.order:0
 msgid "Total in Company Currency"
@@ -120,12 +144,11 @@ msgstr "Otkazano"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
-#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form_new
 msgid "New Payment Order"
 msgstr "Novi nalog za plaćanje"
 
 #. module: account_payment
-#: rml:payment.order:0
+#: report:payment.order:0
 #: field:payment.order,reference:0
 msgid "Reference"
 msgstr "Referenca"
@@ -142,17 +165,10 @@ msgid "Directly"
 msgstr "Direktno"
 
 #. module: account_payment
-#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
-#: model:ir.model,name:account_payment.model_payment_line
-#: view:payment.line:0
 #: view:payment.order:0
-msgid "Payment Line"
-msgstr "Red plaćanja"
-
-#. module: account_payment
-#: field:payment.type,suitable_bank_types:0
-msgid "Suitable bank types"
-msgstr "Pogodni tipovi banaka"
+#: selection:payment.order,state:0
+msgid "Draft"
+msgstr "Priprema"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -160,6 +176,7 @@ msgid "Amount Total"
 msgstr "Ukupni iznos"
 
 #. module: account_payment
+#: view:payment.order:0
 #: selection:payment.order,state:0
 msgid "Confirmed"
 msgstr "Potvrđeno"
@@ -175,9 +192,9 @@ msgid "Payment lines"
 msgstr "Redovi plaćanja"
 
 #. module: account_payment
-#: help:payment.order,date_scheduled:0
-msgid "Select a date if you have chosen Preferred Date to be fixed."
-msgstr "Odaberite datum ako ste odabrali fiksni željeni datum"
+#: report:payment.order:0
+msgid "Execution Type"
+msgstr "Tip Izuzetka"
 
 #. module: account_payment
 #: selection:payment.line,state:0
@@ -185,6 +202,7 @@ msgid "Structured"
 msgstr "Strukturiran"
 
 #. module: account_payment
+#: view:payment.order:0
 #: field:payment.order,state:0
 msgid "State"
 msgstr "Stanje"
@@ -197,8 +215,10 @@ msgstr "Informacije Transakcije"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
+#: model:ir.model,name:account_payment.model_payment_mode
 #: model:ir.ui.menu,name:account_payment.menu_action_payment_mode_form
 #: view:payment.mode:0
+#: view:payment.order:0
 msgid "Payment Mode"
 msgstr "Način plaćanja"
 
@@ -223,6 +243,12 @@ msgstr ""
 "vaše strane. \"Direktno\" znači direktno izvršenje. \"Datum odgode\" znači "
 "zakazan datum izvršenja."
 
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:0
+#, python-format
+msgid "Error !"
+msgstr "Greška !"
+
 #. module: account_payment
 #: view:account.move.line:0
 msgid "Total debit"
@@ -240,32 +266,35 @@ msgstr "Fiksni datum"
 
 #. module: account_payment
 #: field:payment.line,info_partner:0
+#: view:payment.order:0
 msgid "Destination Account"
 msgstr "Ciljni račun"
 
 #. module: account_payment
 #: view:payment.line:0
-#: view:payment.order:0
 msgid "Desitination Account"
 msgstr "Ciljni račun"
 
+#. module: account_payment
+#: view:payment.order:0
+msgid "Search Payment Orders"
+msgstr "Pretrazi naloge za placanje"
+
 #. module: account_payment
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Nevažeći XML za pregled arhitekture"
 
-#. module: account_payment
-#: wizard_button:populate_payment,init,end:0
-#: wizard_button:populate_payment,search,end:0
-#: wizard_button:populate_statement,init,end:0
-msgid "_Cancel"
-msgstr "_Odustani"
-
 #. module: account_payment
 #: field:payment.line,create_date:0
 msgid "Created"
 msgstr "Kreirano"
 
+#. module: account_payment
+#: view:payment.order:0
+msgid "Select Invoices to Pay"
+msgstr "Odaberite fakture za plaćanje"
+
 #. module: account_payment
 #: view:payment.line:0
 msgid "Currency Amount Total"
@@ -287,9 +316,9 @@ msgid "Payment Management"
 msgstr "Menadzment Plaćanja"
 
 #. module: account_payment
-#: field:payment.line,communication:0
-msgid "Communication"
-msgstr "Komunikacija"
+#: field:payment.line,bank_statement_line_id:0
+msgid "Bank statement line"
+msgstr "Red Izvoda iz Banke"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
@@ -301,19 +330,43 @@ msgstr "Krajnji Rok"
 msgid "Amount to be paid"
 msgstr "Iznos za plaćanje"
 
+#. module: account_payment
+#: report:payment.order:0
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Yes"
+msgstr "Da"
+
 #. module: account_payment
 #: help:payment.line,info_owner:0
 msgid "Address of the Main Partner"
 msgstr "Adresa glavnog partnera"
 
+#. module: account_payment
+#: field:payment.mode,company_id:0
+msgid "Company"
+msgstr "Preduzeće"
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_populate_statement
+msgid "Account Payment Populate Statement"
+msgstr "Popunjeni platni nalog"
+
 #. module: account_payment
 #: help:payment.mode,name:0
 msgid "Mode of Payment"
 msgstr "Način plaćanja"
 
 #. module: account_payment
-#: view:payment.type:0
-#: help:payment.type,name:0
+#: report:payment.order:0
+msgid "Value Date"
+msgstr "Datum"
+
+#. module: account_payment
+#: report:payment.order:0
 msgid "Payment Type"
 msgstr "Tip plaćanja"
 
@@ -323,35 +376,48 @@ msgid "Payment amount in the partner currency"
 msgstr "Iznos plaćanja u valuti partnera"
 
 #. module: account_payment
-#: selection:payment.order,state:0
-msgid "Draft"
-msgstr "Priprema"
+#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
+#: model:ir.model,name:account_payment.model_payment_line
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment Line"
+msgstr "Red plaćanja"
 
 #. module: account_payment
-#: field:payment.line,partner_id:0
-#: rml:payment.order:0
-msgid "Partner"
-msgstr "Partner"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska! Ne mozete kreirati rekursivni meni."
 
 #. module: account_payment
 #: help:payment.line,communication2:0
 msgid "The successor message of Communication."
 msgstr "Nasljedna poruka komunikacije."
 
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:0
+#, python-format
+msgid "No partner defined on entry line"
+msgstr "Partner nije definisan"
+
 #. module: account_payment
 #: help:payment.line,info_partner:0
 msgid "Address of the Ordering Customer."
 msgstr "Adresa kupca naručitelja."
 
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "Populate Statement:"
+msgstr "Popuni sadrzaj:"
+
 #. module: account_payment
 #: view:account.move.line:0
 msgid "Total credit"
 msgstr "Ukupno potražuje"
 
 #. module: account_payment
-#: model:ir.actions.wizard,name:account_payment.wizard_populate_payment
-msgid "Populate payment"
-msgstr "Popuni plaćanje"
+#: help:payment.order,date_scheduled:0
+msgid "Select a date if you have chosen Preferred Date to be fixed."
+msgstr "Odaberite datum ako ste odabrali fiksni željeni datum"
 
 #. module: account_payment
 #: field:payment.order,user_id:0
@@ -359,20 +425,15 @@ msgid "User"
 msgstr "Korisnik"
 
 #. module: account_payment
+#: field:account.payment.populate.statement,lines:0
 #: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line
-#: wizard_field:populate_statement,init,lines:0
 msgid "Payment Lines"
 msgstr "Redovi plaćanja"
 
 #. module: account_payment
-#: rml:payment.order:0
-msgid "Date"
-msgstr "Datum"
-
-#. module: account_payment
-#: rml:payment.order:0
-msgid "Reference:"
-msgstr "Referenca:"
+#: model:ir.model,name:account_payment.model_account_move_line
+msgid "Journal Items"
+msgstr "Sadrzaj Dnevnika"
 
 #. module: account_payment
 #: help:payment.line,move_line_id:0
@@ -381,31 +442,36 @@ msgid ""
 "customer."
 msgstr "Ovaj red će biti određen za informaciju o naručitelju."
 
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search"
+msgstr "Pretraga"
+
 #. module: account_payment
 #: field:payment.line,date:0
 msgid "Payment Date"
 msgstr "Datum Isplate"
 
+#. module: account_payment
+#: report:payment.order:0
+msgid "Total:"
+msgstr "Ukupno:"
+
 #. module: account_payment
 #: field:payment.order,date_created:0
 msgid "Creation date"
 msgstr "Datum kreiranja"
 
 #. module: account_payment
-#: field:payment.line,ml_maturity_date:0
-msgid "Maturity Date"
-msgstr "Datum Dospeća"
+#: view:account.payment.populate.statement:0
+msgid "ADD"
+msgstr "Dodaj"
 
 #. module: account_payment
 #: view:account.bank.statement:0
 msgid "Import payment lines"
 msgstr "Uvezi redove plaćanja"
 
-#. module: account_payment
-#: help:payment.type,code:0
-msgid "Specify the Code for Payment Type"
-msgstr "Navedite šifru tipa plaćanja"
-
 #. module: account_payment
 #: field:account.move.line,amount_to_pay:0
 msgid "Amount to pay"
@@ -422,15 +488,25 @@ msgid "The Ordering Customer"
 msgstr "Kupac naručitelj"
 
 #. module: account_payment
-#: field:payment.type,code:0
-msgid "Code"
-msgstr "Šifra"
+#: model:ir.model,name:account_payment.model_account_payment_make_payment
+msgid "Account make payment"
+msgstr "Izvrsi placanje naloga"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Invoice Ref"
+msgstr "Referenca fakture"
 
 #. module: account_payment
 #: field:payment.line,name:0
 msgid "Your Reference"
 msgstr "Vaše veze"
 
+#. module: account_payment
+#: field:payment.order,mode:0
+msgid "Payment mode"
+msgstr "Način plaćanja"
+
 #. module: account_payment
 #: view:payment.order:0
 msgid "Payment order"
@@ -443,17 +519,26 @@ msgid "General Information"
 msgstr "Opšte informacije"
 
 #. module: account_payment
+#: view:payment.order:0
 #: selection:payment.order,state:0
 msgid "Done"
 msgstr "Gotovo"
 
 #. module: account_payment
-#: view:payment.order:0
-msgid "Select Invoices to Pay"
-msgstr "Odaberite fakture za plaćanje"
+#: model:ir.model,name:account_payment.model_account_invoice
+msgid "Invoice"
+msgstr "Faktura"
 
 #. module: account_payment
+#: field:payment.line,communication:0
+msgid "Communication"
+msgstr "Komunikacija"
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: view:account.payment.populate.statement:0
 #: view:payment.order:0
+#: view:payment.order.create:0
 msgid "Cancel"
 msgstr "Otkaži"
 
@@ -470,30 +555,19 @@ msgid ""
 msgstr ""
 "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
 
-#. module: account_payment
-#: model:ir.actions.wizard,name:account_payment.wizard_pay_payment
-msgid "Pay"
-msgstr "Plati"
-
 #. module: account_payment
 #: model:ir.actions.report.xml,name:account_payment.payment_order1
 #: model:ir.model,name:account_payment.model_payment_order
 msgid "Payment Order"
 msgstr "Nalog za plaćanje"
 
-#. module: account_payment
-#: model:ir.actions.act_window,name:account_payment.action_payment_order_draft
-#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_draft
-msgid "Draft Payment Order"
-msgstr "Nalog za plaćanje u pripremi"
-
 #. module: account_payment
 #: help:payment.line,amount:0
 msgid "Payment amount in the company currency"
 msgstr "Iznos plaćanja u valuti preduzeca"
 
 #. module: account_payment
-#: wizard_view:populate_payment,init:0
+#: view:payment.order.create:0
 msgid "Search Payment lines"
 msgstr "Traži redove plaćanja"
 
@@ -512,6 +586,11 @@ msgstr "Komunikacija 2"
 msgid "Destination Bank account"
 msgstr "Destinacioni bankovni račun"
 
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Are you sure you want to make payment?"
+msgstr "Jeste li sigurni da zelite da izvrsite isplatu?"
+
 #. module: account_payment
 #: help:payment.mode,journal:0
 msgid "Cash Journal for the Payment Mode"
@@ -519,7 +598,6 @@ msgstr "Gotovisnki Dnevnik za način plaćanja"
 
 #. module: account_payment
 #: field:payment.mode,bank_id:0
-#: rml:payment.order:0
 msgid "Bank account"
 msgstr "Bankovni račun"
 
@@ -530,17 +608,22 @@ msgstr "Potvrdi plaćanja"
 
 #. module: account_payment
 #: field:payment.line,company_currency:0
+#: report:payment.order:0
 msgid "Company Currency"
 msgstr "Valuta preduzeca"
 
 #. module: account_payment
-#: model:ir.ui.menu,name:account_payment.menu_main
-#: model:ir.ui.menu,name:account_payment.next_id_44
+#: model:ir.ui.menu,name:account_payment.menu_main_payment
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Payment"
 msgstr "Isplata"
 
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Order / Payment"
+msgstr "Isplata  Faktura / Placanje"
+
 #. module: account_payment
 #: field:payment.line,move_line_id:0
 msgid "Entry line"
@@ -557,14 +640,13 @@ msgstr ""
 
 #. module: account_payment
 #: field:payment.mode,name:0
-#: field:payment.type,name:0
 msgid "Name"
 msgstr "Ime"
 
 #. module: account_payment
-#: wizard_button:populate_payment,init,search:0
-msgid "_Search"
-msgstr "_Traži"
+#: report:payment.order:0
+msgid "Bank Account"
+msgstr "Bankovni račun"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -573,47 +655,41 @@ msgid "Entry Information"
 msgstr "Unos Informacije"
 
 #. module: account_payment
-#: model:ir.actions.wizard,name:account_payment.wizard_populate_statement
-msgid "Populate Statement with Payment lines"
-msgstr "Popunite izvod sa redovima plaćanja"
+#: model:ir.model,name:account_payment.model_payment_order_create
+msgid "payment.order.create"
+msgstr "payment.order.create"
 
 #. module: account_payment
 #: field:payment.line,order_id:0
 msgid "Order"
 msgstr "Nalog"
 
-#. module: account_payment
-#: model:ir.actions.act_window,name:account_payment.action_payment_order_open
-#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_open
-msgid "Payment Orders to Validate"
-msgstr "Nalozi za plaćanje za potvrdu"
-
-#. module: account_payment
-#: model:ir.model,name:account_payment.model_payment_type
-#: field:payment.mode,type:0
-msgid "Payment type"
-msgstr "Tip plaćanja"
-
 #. module: account_payment
 #: field:payment.order,total:0
 msgid "Total"
 msgstr "Ukupno"
 
 #. module: account_payment
-#: wizard_button:populate_statement,init,add:0
-msgid "_Add"
-msgstr "_Dodaj"
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
 
 #. module: account_payment
-#: help:payment.mode,type:0
-msgid "Select the Payment Type for the Payment Mode."
-msgstr "Odaberite tip plaćanja za način plaćanja"
+#: view:account.payment.make.payment:0
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
+msgid "Make Payment"
+msgstr "Izvrsi placanje"
 
 #. module: account_payment
-#: model:ir.model,name:account_payment.model_payment_mode
-#: field:payment.order,mode:0
-msgid "Payment mode"
-msgstr "Način plaćanja"
+#: field:payment.line,partner_id:0
+#: report:payment.order:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_create_payment_order
+msgid "Populate Payment"
+msgstr "Popuni Placanje"
 
 #. module: account_payment
 #: help:payment.mode,bank_id:0
@@ -621,6 +697,58 @@ msgid "Bank Account for the Payment Mode"
 msgstr "Bankovni račun za način plaćanja"
 
 #. module: account_payment
+#: view:payment.mode:0
 #: field:payment.mode,journal:0
 msgid "Journal"
 msgstr "Dnevnik"
+
+#~ msgid "Execution date:"
+#~ msgstr "Datum izvršenja:"
+
+#~ msgid "Suitable bank types"
+#~ msgstr "Pogodni tipovi banaka"
+
+#~ msgid "_Cancel"
+#~ msgstr "_Odustani"
+
+#~ msgid "Reference:"
+#~ msgstr "Referenca:"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Maturity Date"
+#~ msgstr "Datum Dospeća"
+
+#~ msgid "Populate payment"
+#~ msgstr "Popuni plaćanje"
+
+#~ msgid "Code"
+#~ msgstr "Šifra"
+
+#~ msgid "Specify the Code for Payment Type"
+#~ msgstr "Navedite šifru tipa plaćanja"
+
+#~ msgid "Draft Payment Order"
+#~ msgstr "Nalog za plaćanje u pripremi"
+
+#~ msgid "Pay"
+#~ msgstr "Plati"
+
+#~ msgid "_Search"
+#~ msgstr "_Traži"
+
+#~ msgid "_Add"
+#~ msgstr "_Dodaj"
+
+#~ msgid "Payment type"
+#~ msgstr "Tip plaćanja"
+
+#~ msgid "Populate Statement with Payment lines"
+#~ msgstr "Popunite izvod sa redovima plaćanja"
+
+#~ msgid "Payment Orders to Validate"
+#~ msgstr "Nalozi za plaćanje za potvrdu"
+
+#~ msgid "Select the Payment Type for the Payment Mode."
+#~ msgstr "Odaberite tip plaćanja za način plaćanja"
diff --git a/addons/account_reporting/i18n/sr.po b/addons/account_reporting/i18n/sr.po
index d516e486df5..733e84d3ca4 100644
--- a/addons/account_reporting/i18n/sr.po
+++ b/addons/account_reporting/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-25 21:58+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-26 08:38+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_voucher/i18n/sr.po b/addons/account_voucher/i18n/sr.po
index 99d569dc9f5..dc3823a2aae 100644
--- a/addons/account_voucher/i18n/sr.po
+++ b/addons/account_voucher/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-25 21:24+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-26 08:39+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/analytic/i18n/sr.po b/addons/analytic/i18n/sr.po
index 22fbdb5b4bf..ed287335040 100644
--- a/addons/analytic/i18n/sr.po
+++ b/addons/analytic/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-25 21:45+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-26 08:24+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
diff --git a/addons/analytic_journal_billing_rate/i18n/sr.po b/addons/analytic_journal_billing_rate/i18n/sr.po
index cad00d3772c..3d45e16db2b 100644
--- a/addons/analytic_journal_billing_rate/i18n/sr.po
+++ b/addons/analytic_journal_billing_rate/i18n/sr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 09:19+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-26 11:45+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
@@ -41,6 +41,7 @@ msgstr "Stepen naplate po Dnevniku za ovaj Analiticki Konto"
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,account_id:0
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analitički konto"
 
@@ -56,10 +57,27 @@ msgstr "Stepen fakturiranja po Dnevniku"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
-msgid "Analytic Journal Billing Rate"
-msgstr "Analiticki Dnevnik obracunate cene"
+msgid ""
+"Analytic Journal Billing Rate, Define the default invoicing rate for a "
+"specific journal"
+msgstr ""
+"Analiticki Dnevnik Obracunate rate, definise podrazumevanu fakturnu vrednost "
+"za specificni dnevnik"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
+msgid "Invoice"
+msgstr "Faktura"
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,rate_id:0
 msgid "Invoicing Rate"
 msgstr "Fakturisanje cene"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Timesheet Linija"
+
+#~ msgid "Analytic Journal Billing Rate"
+#~ msgstr "Analiticki Dnevnik obracunate cene"
diff --git a/addons/analytic_user_function/i18n/sr.po b/addons/analytic_user_function/i18n/sr.po
index 846409dd53d..1344e26bd8b 100644
--- a/addons/analytic_user_function/i18n/sr.po
+++ b/addons/analytic_user_function/i18n/sr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 09:40+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-26 07:36+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
@@ -23,9 +23,22 @@ msgid "Invalid XML for View Architecture!"
 msgstr "Nevažeći XML za pregled arhitekture"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Relaciona tabela izmedju korisnika i proizvoda u analitickom kontu"
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "Error !"
+msgstr "Greška !"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Niz Kontrolne kartice"
+
+#. module: analytic_user_function
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
@@ -34,9 +47,19 @@ msgstr "Proizvod"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
+#: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analitički konto"
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid ""
+"There is no expense account define ' \\n                                    "
+"'for this product: \"%s\" (id:%d)"
+msgstr ""
+"Nisu definisani troskovi naloga '\\n' za ovaj proizvod \"%s\" (sifra:%d)"
+
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -49,17 +72,24 @@ msgid "User"
 msgstr "Korisnik"
 
 #. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Relaciona tabela izmedju korisnika i proizvoda u analitickom kontu"
 
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr "Korisnicka Funkcija Analitike"
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid ""
+"There is no expense account define ' \\n                                'for "
+"this product: \"%s\" (id:%d)"
+msgstr ""
+"Nisu definisani troskovi naloga '\\n' za ovaj proizvod \"%s\" (sifra:%d)"
+
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
diff --git a/addons/auction/i18n/sr.po b/addons/auction/i18n/sr.po
new file mode 100644
index 00000000000..68852dbd188
--- /dev/null
+++ b/addons/auction/i18n/sr.po
@@ -0,0 +1,2282 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-26 14:42+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_report_menu
+msgid "Reporting"
+msgstr "Izvestavanje"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_taken
+msgid "Auction taken"
+msgstr "Aukcija zahvata"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Set to draft"
+msgstr "Posalji na priporemu"
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,partner_id:0
+#: field:auction.lots,seller_id:0
+#: view:report.auction:0
+#: field:report.auction,seller:0
+msgid "Seller"
+msgstr "Prodavac"
+
+#. module: auction
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Neispravno ime modula u definiciji akcije."
+
+#. module: auction
+#: field:auction.lots,name:0
+msgid "Title"
+msgstr "Naslov"
+
+#. module: auction
+#: field:auction.lots.sms.send,text:0
+msgid "SMS Message"
+msgstr "SMS Poruka"
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+#: view:auction.lots.auction.move:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid " "
+msgstr " "
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+msgid "Warning, Erase The Object Adjudication Price and Its Buyer!"
+msgstr "Upozorenje, Brisanje objekta cene i kupca !"
+
+#. module: auction
+#: help:auction.pay.buy,statement_id1:0
+msgid "First Bank Statement For Buyer"
+msgstr "Prva Bancina Stavka za Kupca"
+
+#. module: auction
+#: field:auction.bid_line,lot_id:0
+#: field:auction.lot.history,lot_id:0
+msgid "Object"
+msgstr "Objekt"
+
+#. module: auction
+#: field:report.auction.object.date,obj_num:0
+msgid "# of Objects"
+msgstr "# Objekata"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Authors"
+msgstr "Autori"
+
+#. module: auction
+#: view:auction.bid:0
+#: report:auction.bids:0
+#: view:auction.lots:0
+#: field:auction.lots,ach_uid:0
+#: field:auction.lots.buyer_map,ach_uid:0
+#: field:auction.lots.make.invoice.buyer,buyer_id:0
+#: field:auction.pay.buy,buyer_id:0
+#: report:buyer.list:0
+#: view:report.auction:0
+#: field:report.auction,buyer:0
+#: report:report.auction.buyer.result:0
+msgid "Buyer"
+msgstr "Kupac"
+
+#. module: auction
+#: field:report.auction,object:0
+msgid "No of objects"
+msgstr "Br.Objekata"
+
+#. module: auction
+#: help:auction.lots,paid_vnd:0
+msgid ""
+"When state of Seller Invoice is 'Paid', this field is selected as True."
+msgstr ""
+"Kada je stanje Prodajne Fakture \"Placeno\", ovo je polje selektovano."
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of paid items (based on invoices):"
+msgstr "# placenih stavki ( bazirano na fakturama)"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Border"
+msgstr "Granice Depozita"
+
+#. module: auction
+#: field:auction.lots.make.invoice,amount:0
+#: field:auction.lots.make.invoice.buyer,amount:0
+msgid "Invoiced Amount"
+msgstr "Iznos Fakture"
+
+#. module: auction
+#: help:auction.lots,name:0
+msgid "Auction object name"
+msgstr "Naziv Objekta Aukcije"
+
+#. module: auction
+#: model:ir.model,name:auction.model_aie_category
+msgid "aie.category"
+msgstr "aie.category"
+
+#. module: auction
+#: field:auction.deposit.cost,amount:0
+#: field:auction.pay.buy,amount:0
+#: field:auction.pay.buy,amount2:0
+#: field:auction.pay.buy,amount3:0
+msgid "Amount"
+msgstr "Iznos"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_deposit_border
+#: model:ir.ui.menu,name:auction.menu_auction_deposit_border
+msgid "Deposit border"
+msgstr "Granica Depozita"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Reference"
+msgstr "Referenca"
+
+#. module: auction
+#: help:auction.dates,state:0
+msgid ""
+"When auction starts the state is 'Draft'.\n"
+" At the end of auction, the state becomes 'Closed'."
+msgstr ""
+"Kada Aukcija startuje stanje je 'U Pripremi'.\n"
+" Kada se aukcija zavrsi, stanje postaje ' Zatvoreno'."
+
+#. module: auction
+#: field:auction.dates,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Analiticki Konto"
+
+#. module: auction
+#: help:auction.pay.buy,amount3:0
+msgid "Amount For Third Bank Statement"
+msgstr "Iznos izvestaja trece Banke"
+
+#. module: auction
+#: field:auction.lots,lot_num:0
+msgid "List Number"
+msgstr "Broj Liste"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Date:"
+msgstr "Datum:"
+
+#. module: auction
+#: field:auction.deposit.cost,name:0
+msgid "Cost Name"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: field:auction.dates,state:0
+#: view:auction.lots:0
+#: field:auction.lots,state:0
+#: view:report.auction:0
+#: field:report.auction,state:0
+msgid "State"
+msgstr "Stanje"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "First Auction Date"
+msgstr "Datum prve Akukcije"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Ref"
+msgstr "Ref"
+
+#. module: auction
+#: field:report.auction,total_price:0
+msgid "Total Price"
+msgstr "Ukupna Cena"
+
+#. module: auction
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
+"Greska: Prijava ((resp. Sign out) mora da prati Odjavu (resp. Sign in)"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Total Adj."
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "SMS - Gateway: clickatell','Bulk SMS send"
+msgstr "SMS - Gateway: clickatell','Bulk SMS send"
+
+#. module: auction
+#: help:auction.lots,costs:0
+msgid "Deposit cost"
+msgstr "Iznos Depozita"
+
+#. module: auction
+#: selection:auction.lots,state:0
+#: selection:report.auction,state:0
+#: selection:report.object.encoded,state:0
+msgid "Unsold"
+msgstr "Ne Prodato"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Search Auction deposit"
+msgstr "Pretrazi Aukcioni Depozit"
+
+#. module: auction
+#: help:auction.lots,lot_num:0
+msgid "List number in depositer inventory"
+msgstr ""
+
+#. module: auction
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Items"
+msgstr "Artikli"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax5
+#: field:auction.dates,seller_costs:0
+msgid "Seller Costs"
+msgstr "Prodajna Cena"
+
+#. module: auction
+#: view:auction.bid:0
+#: view:auction.bid_line:0
+#: view:auction.lots:0
+#: field:auction.lots,bid_lines:0
+#: model:ir.actions.report.xml,name:auction.bid_auction
+#: model:ir.ui.menu,name:auction.menu_action_bid_open
+msgid "Bids"
+msgstr "Ponude"
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Buyer Map"
+msgstr "Mapa Kupca"
+
+#. module: auction
+#: field:report.object.encoded,obj_ret:0
+msgid "# obj ret"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_bid
+msgid "Bid Auctions"
+msgstr "Ponude Aukcije"
+
+#. module: auction
+#: help:auction.lots,image:0
+msgid "Object Image"
+msgstr "Slika Objekta"
+
+#. module: auction
+#: code:addons/auction/auction.py:0
+#, python-format
+msgid "The Buyer \"%s\" has no Invoice Address."
+msgstr "Kupac \"%s\" nema Adresu Fakture"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Commissions"
+msgstr "Komisije"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_deposit_cost
+msgid "Auction Deposit Cost"
+msgstr "Cena Aukcionog Depozita"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Border Form"
+msgstr "Forma Granice depozita"
+
+#. module: auction
+#: help:auction.lots,statement_id:0
+msgid "Bank statement line for given buyer"
+msgstr "Bancin IZvestaj za datog kupca"
+
+#. module: auction
+#: field:auction.lot.category,aie_categ:0
+msgid "Category"
+msgstr "Kategorija"
+
+#. module: auction
+#: help:auction.lot.category,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the auction "
+"lot category without removing it."
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_view_auction_buyer_map
+msgid "Map buyer username to Partners"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Search Auction Lots"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,net_revenue:0
+msgid "Net Revenue"
+msgstr ""
+
+#. module: auction
+#: field:report.auction.adjudication,state:0
+#: field:report.object.encoded,state:0
+msgid "Status"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_sms_send
+msgid "SMS Send"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "August"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+#: view:report.auction:0
+#: selection:report.auction,state:0
+msgid "Sold"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "June"
+msgstr ""
+
+#. module: auction
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "October"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid_line,name:0
+msgid "Bid date"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,acc_expense:0
+msgid "Expense Account"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_wizard_emporte
+msgid "Deliveries Management"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_desc:0
+msgid "Object Description"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,artist2_id:0
+msgid "Artist/Author2"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line1"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_make_invoice_buyer
+msgid "Make Invoice for Buyer"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_invoice.py:0
+#, python-format
+msgid ""
+"Two different buyers for the same invoice !\n"
+"Please correct this problem before invoicing"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,gross_revenue:0
+#: field:report.object.encoded,gross_revenue:0
+msgid "Gross revenue"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_pay_buy
+msgid "Pay objects of the buyer"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,auction2:0
+msgid "End date of auction"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "Send SMS"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,name2:0
+msgid "Short Description (2)"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_buyers_menu
+msgid "Buyers"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id4
+msgid "VAT 12%"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Buyer Invoices"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.res_w_buyer
+msgid "Results with buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid_line,price:0
+msgid "Maximum Price"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,auction1:0
+msgid "Start date of auction"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_auction_move
+msgid "Auction Move"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,buyer_costs:0
+msgid "Account tax for buyer"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Next Auction"
+msgstr ""
+
+#. module: auction
+#: view:auction.taken:0
+msgid "Select lots which are Sold"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,statement_id:0
+msgid "Payment"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:0
+#, python-format
+msgid "The object \"%s\" has no buyer assigned."
+msgstr ""
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Keep until sold"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Last Auction Date"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,obj_num:0
+msgid "# of Encoded obj."
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,paid_vnd:0
+msgid "Seller Paid"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+#: view:report.object.encoded:0
+msgid "Objects statistics"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of sellers:"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,date:0
+#: field:report.object.encoded,date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: selection:report.object.encoded,state:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of items taken away:"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction
+#: view:report.auction:0
+msgid "Auction's Summary"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "%)"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buyer Information"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,gross_revenue:0
+msgid "Buyer Price - Seller Price"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.make.invoice,objects:0
+#: field:auction.lots.make.invoice.buyer,objects:0
+msgid "# of objects"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_est2:0
+msgid "Maximum Estimation"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,buyer_price:0
+msgid "Buyer price"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Bids Details"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,is_ok:0
+msgid "Buyer's payment"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "End of auction"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_catalog_flagey_wizard
+#: model:ir.model,name:auction.model_auction_catalog_flagey
+msgid "Auction Catalog Flagey"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "March"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax4
+msgid "Seller Costs1"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,create_uid:0
+#: field:auction.lots,create_uid:0
+msgid "Created by"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of buyers:"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,costs:0
+msgid "Indirect costs"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,seller_costs:0
+msgid "Account tax for seller"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_invoice.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: auction
+#: constraint:account.account:0
+#: constraint:account.tax.code:0
+msgid "Error ! You can not create recursive accounts."
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Auction Management"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,journal_seller_id:0
+msgid "Seller Journal"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: selection:auction.dates,state:0
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+#: view:report.auction:0
+#: selection:report.auction,state:0
+#: selection:report.auction.adjudication,state:0
+#: selection:report.object.encoded,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,state:0
+msgid ""
+" * The 'Draft' state is used when a object is encoding as a new object.      "
+"           \n"
+"* The 'Unsold' state is used when object does not sold for long time, user "
+"can also set it as draft state after unsold.                 \n"
+"* The 'Paid' state is used when user pay for the object                 \n"
+"* The 'Sold' state is used when user buy the object."
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Print"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Type"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,ach_emp:0
+msgid "When state is Taken Away, this field is marked as True"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_taken
+msgid "Gestion emporte"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+#: report:auction.bids:0
+#: view:auction.dates:0
+#: view:auction.lots:0
+#: field:auction.lots,auction_id:0
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_menu_root
+#: view:report.auction:0
+msgid "Auction"
+msgstr ""
+
+#. module: auction
+#: view:auction.lot.category:0
+#: model:ir.ui.menu,name:auction.menu_auction_object_cat
+msgid "Object Categories"
+msgstr ""
+
+#. module: auction
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.sms.send,app_id:0
+msgid "API ID"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,name:0
+#: field:auction.bid_line,bid_id:0
+msgid "Bid ID"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Min Estimate:"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "September"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,net_margin:0
+msgid "Net Margin"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,vnd_lim_net:0
+msgid "Net limit ?"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of commissions:"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid_line,auction:0
+#: field:auction.dates,name:0
+msgid "Auction Name"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.tax_seller
+msgid "Seller Costs (12%)"
+msgstr ""
+
+#. module: auction
+#: field:aie.category,parent_id:0
+msgid "Parent aie Category"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction Summary"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "(Keep empty for automatic number)"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:0
+#, python-format
+msgid "No Invoice Address"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.v_huissier
+msgid "Bailiffs Listing"
+msgstr ""
+
+#. module: auction
+#: field:aie.category,child_ids:0
+msgid "unknown"
+msgstr ""
+
+#. module: auction
+#: field:auction.pay.buy,total:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,amount:0
+msgid "Amount For First Bank Statement"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction_object_date
+#: view:report.auction.object.date:0
+msgid "Objects per day"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,author_right:0
+msgid "Account tax for author commission"
+msgstr ""
+
+#. module: auction
+#: model:product.template,name:auction.monproduit_product_template
+msgid "Oeuvres a 21%"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,adj:0
+msgid "Adj."
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.history,name:0
+#: field:report.auction.adjudication,date:0
+msgid "Date"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_ret:0
+msgid "Price retired"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Extra Costs"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Map "
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,paid_ach:0
+msgid "Buyer Invoice Reconciled"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,date_dep:0
+msgid "Deposit date"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.id_deposit
+msgid "Deposits"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,specific_cost_ids:0
+msgid "Specific Costs"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "To pay ("
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.tax_buyer
+msgid "Buyer Costs (20%)"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Dashboard"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: model:ir.actions.act_window,name:auction.action_auction_dates_next
+#: model:ir.ui.menu,name:auction.auction_date_menu
+#: model:ir.ui.menu,name:auction.menu_auction_dates_next1
+msgid "Auctions"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_make_invoice
+msgid "Make invoice"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "November"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: view:auction.lots:0
+msgid "History"
+msgstr ""
+
+#. module: auction
+#: field:aie.category,code:0
+msgid "Code"
+msgstr ""
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid "Nr."
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.v_report_barcode_lot
+msgid "Barcode batch"
+msgstr ""
+
+#. module: auction
+#: report:report.auction.buyer.result:0
+msgid "Num"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Cancel"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buyer's Payment History"
+msgstr ""
+
+#. module: auction
+#: view:auction.artists:0
+#: field:auction.artists,biography:0
+msgid "Biography"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Inventory"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+msgid "Create Invoices For Seller"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,obj_margin:0
+msgid "Net margin"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,lot_local:0
+msgid "Auction Location"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Analytic"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,paid_ach:0
+msgid ""
+"When state of Buyer Invoice is 'Paid', this field is selected as True."
+msgstr ""
+
+#. module: auction
+#: report:bids.lots:0
+#: report:bids.phones.details:0
+msgid "Cat.N"
+msgstr ""
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Decrease limit of 10%"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,adj_total:0
+#: field:report.auction.adjudication,adj_total:0
+msgid "Total Adjudication"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice_buyer
+msgid "Invoice Buyer objects"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "My Auction"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,gross_margin:0
+msgid "(Gross Revenue*100.0)/ Object Price"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,contact_tel:0
+msgid "Contact Number"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Price"
+msgstr ""
+
+#. module: auction
+#: report:bids.phones.details:0
+msgid "-"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Photos"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.make.invoice,number:0
+#: field:auction.lots.make.invoice.buyer,number:0
+msgid "Invoice Number"
+msgstr ""
+
+#. module: auction
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_aie_send.py:0
+#: code:addons/auction/wizard/auction_aie_send_result.py:0
+#, python-format
+msgid "Connection to WWW.Auction-in-Europe.com failed !"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,gross_revenue:0
+msgid "Gross Revenue"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction board"
+msgstr ""
+
+#. module: auction
+#: field:aie.category,name:0
+#: view:auction.artists:0
+#: report:bids.lots:0
+msgid "Name"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,name:0
+#: field:auction.lots,bord_vnd_id:0
+msgid "Depositer Inventory"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:0
+#, python-format
+msgid "The Buyer has no Invoice Address."
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total adj."
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.sms.send,user:0
+msgid "Login"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction_adjudication
+msgid "report_auction_adjudication"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.seller_lots_3
+msgid "Seller Form"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_type:0
+#: field:report.auction,lot_type:0
+msgid "Object category"
+msgstr ""
+
+#. module: auction
+#: view:auction.taken:0
+msgid "Mark Lots"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots
+msgid "Auction Object"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_num:0
+#: field:auction.lots.enable,confirm_en:0
+msgid "Catalog Number"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Accounting"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.bid_phone
+msgid "Bids phones"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,avg_estimation:0
+msgid "Avg estimation"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Debit:"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,author_right:0
+msgid "Author rights"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+#: view:auction.dates:0
+#: view:auction.deposit:0
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Group By..."
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,journal_id:0
+msgid "Account journal for buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,bid_lines:0
+#: report:auction.bids:0
+#: report:bids.lots:0
+#: model:ir.model,name:auction.model_auction_bid_line
+msgid "Bid"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total net rev."
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Update"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_seller_menu
+msgid "Sellers"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,lot_est2:0
+msgid "Maximum Estimate Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Notes"
+msgstr ""
+
+#. module: auction
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+msgid "Move to Auction date"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of unsold items:"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,auction_id:0
+#: view:auction.dates:0
+#: field:auction.lots.auction.move,auction_id:0
+msgid "Auction Date"
+msgstr ""
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid ", ID"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Adj.("
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.lot_list_inv
+msgid "Lots List - Landscape"
+msgstr ""
+
+#. module: auction
+#: view:auction.artists:0
+msgid "Author/Artist"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,ach_login:0
+#: field:auction.lots.buyer_map,ach_login:0
+msgid "Buyer Username"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.category,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_local:0
+msgid "Location"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "Month -1"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,is_ok:0
+msgid "When buyer pay for bank statement', this field is marked"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,ach_emp:0
+msgid "Taken Away"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total gross rev."
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,lot_est1:0
+msgid "Minimum Estimate Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Date"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "July"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid_line,call:0
+msgid "To be Called"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+#: model:ir.actions.act_window,name:auction.action_report_auction_lots_estimation_adj_category_tree
+msgid "Min est/Adj/Max est"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_est1:0
+msgid "Minimum Estimation"
+msgstr ""
+
+#. module: auction
+#: selection:auction.dates,state:0
+#: selection:report.auction.adjudication,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_sms_send
+msgid "Sms send "
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+#: model:ir.actions.act_window,name:auction.action_auction_lots_auction_move
+msgid "Change Auction Date"
+msgstr ""
+
+#. module: auction
+#: field:auction.artists,birth_death_dates:0
+msgid "Lifespan"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,method:0
+msgid "Withdrawned method"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Buyer Commissions"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction
+#: model:ir.ui.menu,name:auction.menu_report_auction
+msgid "Auction Analysis"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.history,price:0
+msgid "Withdrawn price"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Beginning of the auction"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,statement_id3:0
+msgid "Third Bank Statement For Buyer"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,month:0
+#: field:report.auction.object.date,month:0
+msgid "Month"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Max Estimate:"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Statistical"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_deposit
+msgid "Auction Deposit Border"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_object_encoded_tree
+msgid "Object statistics"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,net_margin:0
+msgid "(Net Revenue * 100)/ Object Price"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lot_history
+msgid "Lot History"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: auction
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id5
+msgid "VAT 5%"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,expo1:0
+msgid "First Exposition Day"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Lot"
+msgstr ""
+
+#. module: auction
+#: help:aie.category,child_ids:0
+msgid "Childs aie category"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_artists
+msgid "auction.artists"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,avg_price:0
+msgid "Avg Price."
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,statement_id2:0
+msgid "Second Bank Statement For Buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,journal_id:0
+msgid "Buyer Journal"
+msgstr ""
+
+#. module: auction
+#: selection:auction.lots,state:0
+#: selection:report.object.encoded,state:0
+msgid "Paid"
+msgstr ""
+
+#. module: auction
+#: report:bids.lots:0
+#: report:bids.phones.details:0
+msgid "Phone"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.category,active:0
+msgid "Active"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Exposition Dates"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax1
+msgid "TVA"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,important:0
+msgid "To be Emphatized"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Total:"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax2
+msgid "TVA1"
+msgstr ""
+
+#. module: auction
+#: view:report.auction.object.date:0
+msgid "Objects per Day"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,seller_invoice_history:0
+#: field:auction.lots,sel_inv_id:0
+#: view:auction.lots.make.invoice:0
+msgid "Seller Invoice"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,expo2:0
+msgid "Last exposition date for auction"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:0
+#, python-format
+msgid "Missed buyer !"
+msgstr ""
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid "Flagey"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Invoice"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,vnd_lim:0
+msgid "Seller limit"
+msgstr ""
+
+#. module: auction
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,transfer:0
+msgid "Transfer"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line3"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line2"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,obj_ret:0
+msgid "Object Ret"
+msgstr ""
+
+#. module: auction
+#: view:report.auction.adjudication:0
+msgid "Total adjudication"
+msgstr ""
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Contact the Seller"
+msgstr ""
+
+#. module: auction
+#: field:auction.taken,lot_ids:0
+msgid "Lots Emportes"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,net_margin:0
+msgid "Net Margin (%)"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid ")"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Seller Information"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,lot_id:0
+#: view:auction.lots:0
+#: model:ir.actions.act_window,name:auction.action_all_objects
+#: model:ir.ui.menu,name:auction.auction_all_objects_menu
+msgid "Objects"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Seller Invoices"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Paid:"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,total_neg:0
+msgid "Allow Negative Amount"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,amount2:0
+msgid "Amount For Second Bank Statement"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.history,auction_id:0
+#: field:report.auction,auction:0
+#: field:report.auction.adjudication,name:0
+msgid "Auction date"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "SMS Text"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,auction1:0
+msgid "First Auction Day"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Create Invoices For Buyer"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Names"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:0
+#: code:addons/auction/wizard/auction_lots_numerotate.py:0
+#, python-format
+msgid "Active IDs not Found"
+msgstr ""
+
+#. module: auction
+#: view:auction.artists:0
+#: model:ir.ui.menu,name:auction.menu_auction_artist
+msgid "Artists"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay Objects"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,expo1:0
+msgid "Beginning exposition date for auction"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_line_open
+msgid "Open lots"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_open_deposit
+msgid "Deposit slip"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_enable
+msgid "Lots Enable"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Lots"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,seller_price:0
+msgid "Seller price"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.buy_id_list
+msgid "Buyer List"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Buyer costs("
+msgstr ""
+
+#. module: auction
+#: field:auction.pay.buy,statement_id1:0
+#: field:auction.pay.buy,statement_id2:0
+#: field:auction.pay.buy,statement_id3:0
+msgid "Statement"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,seller_price:0
+#: help:auction.lots.make.invoice,amount:0
+msgid "Seller Price"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax20
+#: model:account.tax,name:auction.auction_tax6
+msgid "Frais de vente"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id1
+msgid "VAT 1%"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax
+msgid "Droit d'auteur"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_buyer_map
+msgid "Map Buyer"
+msgstr ""
+
+#. module: auction
+#: field:report.auction.object.date,name:0
+msgid "Created date"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,bord_vnd_id:0
+msgid ""
+"Provide deposit information: seller, Withdrawned Method, Object, Deposit "
+"Costs"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,net_revenue:0
+#: field:report.object.encoded,net_revenue:0
+msgid "Net revenue"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of items:"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.tax_buyer_author
+msgid "Author rights (4%)"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,estimation:0
+msgid "Estimation"
+msgstr ""
+
+#. module: auction
+#: view:auction.taken:0
+msgid "OK"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.buyer_form_id
+msgid "Buyer Form"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,partner_id:0
+msgid "Buyer Name"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,day:0
+msgid "Day"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice
+msgid "Invoice Seller objects"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,gross_margin:0
+msgid "Gross Margin (%)"
+msgstr ""
+
+#. module: auction
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Search Next Auction Dates"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Print Auction Catalog Flagey Report..."
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,ach_avance:0
+msgid "Buyer Advance"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_comm:0
+msgid "Commission"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Catalog Flagey Report"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,obj_price:0
+msgid "Object Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+msgid "Bids Lines"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Catalog"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,auction_id:0
+msgid "Auction for object"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,account:0
+msgid "Destination Account"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_config_menu
+msgid "Configuration"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_pay_buy
+msgid "Pay buy"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_outils_menu
+msgid "Tools Bar Codes"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,deposit_id:0
+msgid "Deposit"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,expo2:0
+msgid "Last Exposition Day"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_able
+msgid "Lots able"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id3
+msgid "VAT 10%"
+msgstr ""
+
+#. module: auction
+#: field:auction.artists,name:0
+msgid "Artist/Author Name"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "December"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,image:0
+msgid "Image"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,buyer_price:0
+#: help:auction.lots.make.invoice.buyer,amount:0
+msgid "Buyer Price"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lot_category
+msgid "Auction Lots Category"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id2
+msgid "VAT 20%"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_payer_sel
+msgid "Auction payment for seller"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+msgid "Taken away"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.seller_form_id
+msgid "Seller List"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Costs"
+msgstr ""
+
+#. module: auction
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.category,name:0
+msgid "Category Name"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "........."
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction Summary tree view"
+msgstr ""
+
+#. module: auction
+#: report:report.auction.buyer.result:0
+msgid "Adj"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: model:ir.model,name:auction.model_auction_dates
+msgid "Auction Dates"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_open
+msgid "Auction DashBoard"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,user_id:0
+#: field:report.auction.adjudication,user_id:0
+#: field:report.auction.object.date,user_id:0
+#: field:report.object.encoded,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:0
+#, python-format
+msgid "Missed Address !"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,net_revenue:0
+msgid "Buyer Price - Seller Price - Indirect Cost"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_open_bid
+msgid "Open Bids"
+msgstr ""
+
+#. module: auction
+#: field:auction.artists,pseudo:0
+msgid "Pseudo"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Not sold"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax3
+#: field:auction.dates,buyer_costs:0
+msgid "Buyer Costs"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Auction Date:"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_aie_send.py:0
+#: code:addons/auction/wizard/auction_aie_send_result.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,buyer_invoice_history:0
+#: field:auction.lots,ach_inv_id:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Buyer Invoice"
+msgstr ""
+
+#. module: auction
+#: report:auction.bids:0
+msgid "Tel"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,artist_id:0
+msgid "Artist/Author"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.total_result1
+msgid "Auction Totals with lists"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "General Information"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+#: view:auction.lots.buyer_map:0
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+#: view:auction.lots.sms.send:0
+#: view:auction.pay.buy:0
+msgid "Close"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_object_encoded
+msgid "Object encoded"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+msgid "Search Auction Bid"
+msgstr ""
+
+#. module: auction
+#: report:bids.phones.details:0
+msgid "Est"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Seller Commissions"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Object statistic"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,journal_seller_id:0
+msgid "Account journal for seller"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,auction2:0
+msgid "Last Auction Day"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Objects Description"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,info:0
+#: report:bids.phones.details:0
+msgid "Description"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "May"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_price:0
+msgid "Adjudication price"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,acc_income:0
+msgid "Income Account"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.sms.send,password:0
+msgid "Password"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "February"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "April"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay objects"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "# objects"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Adjudication:"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.details_bids_phones
+msgid "Bids per lot (phone)"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,buyer_login:0
+msgid "Buyer Login"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,tax_id:0
+msgid "Expenses"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_payer
+msgid "Auction payer"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Auction name:"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.art2
+msgid "Artists Biography"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,year:0
+msgid "Year"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,history_ids:0
+msgid "Auction history"
+msgstr ""
diff --git a/addons/base_contact/i18n/ru.po b/addons/base_contact/i18n/ru.po
index fe3105581d2..b9ee50ddf08 100644
--- a/addons/base_contact/i18n/ru.po
+++ b/addons/base_contact/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-25 19:25+0000\n"
+"PO-Revision-Date: 2010-10-26 17:03+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -49,12 +49,12 @@ msgstr ""
 #. module: base_contact
 #: help:res.partner.job,function:0
 msgid "Function of this contact with this partner"
-msgstr ""
+msgstr "Должность этого контакта в фирме-партнере"
 
 #. module: base_contact
 #: help:res.partner.job,state:0
 msgid "Status of Address"
-msgstr ""
+msgstr "Статус адреса"
 
 #. module: base_contact
 #: help:res.partner.job,name:0
@@ -62,6 +62,8 @@ msgid ""
 "You may                     enter Address first,Partner will be linked "
 "automatically if any."
 msgstr ""
+"Вы можете сначала ввести адрес, партнер будет привязан автоматически, если "
+"он есть."
 
 #. module: base_contact
 #: help:res.partner.job,fax:0
@@ -98,7 +100,7 @@ msgstr ""
 #: view:base.contact.installer:0
 #: field:base.contact.installer,migrate:0
 msgid "Migrate"
-msgstr ""
+msgstr "Переместить"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -153,6 +155,7 @@ msgid ""
 "Order of importance                 of this job title in the list of job "
 "title of the linked partner"
 msgstr ""
+"Порядок важности этой должности в списке должностей связанного партнера"
 
 #. module: base_contact
 #: constraint:ir.ui.view:0
@@ -216,7 +219,7 @@ msgstr ""
 #: field:base.contact.installer,config_logo:0
 #: field:res.partner.contact,photo:0
 msgid "Image"
-msgstr ""
+msgstr "Изображение"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
@@ -226,7 +229,7 @@ msgstr "Прошлые"
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_address
 msgid "Partner Addresses"
-msgstr ""
+msgstr "Адреса партнера"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
@@ -236,7 +239,7 @@ msgstr "Последовательность контакта"
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "Search Contact"
-msgstr ""
+msgstr "Искать контакт"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
@@ -254,6 +257,8 @@ msgid ""
 "Due to changes in Address and Partner's relation, some of the details from "
 "address are needed to be migrated into contact information."
 msgstr ""
+"В связи с изменениями в отношениях адресов и партнеров, некоторые данные из "
+"адреса необходимо перенести в контакт."
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_addresses0
@@ -263,12 +268,12 @@ msgstr "Рабочие и дополнительные адреса."
 #. module: base_contact
 #: help:res.partner.job,address_id:0
 msgid "Address which is linked to the Partner"
-msgstr ""
+msgstr "Адрес который связан с партнером"
 
 #. module: base_contact
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Ошибка ! Нельзя создать зацикленные меню."
 
 #. module: base_contact
 #: constraint:ir.model:0
@@ -291,12 +296,12 @@ msgstr "Сайт"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Otherwise these details will not be visible from address/contact."
-msgstr ""
+msgstr "Иначе эти подробности не будут видны в адресе/контакте."
 
 #. module: base_contact
 #: field:base.contact.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Настройка выполняется"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
@@ -315,6 +320,8 @@ msgid ""
 "If the active field is set to true,                 it will allow you to "
 "hide the partner contact without removing it."
 msgstr ""
+"если поле \"Активно\" установлено в \"истина\", то это позволит вам скрыть "
+"контакт партнера без его удаления."
 
 #. module: base_contact
 #: view:res.partner.job:0
@@ -329,7 +336,7 @@ msgstr "Телефон"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Do you want to migrate your Address data in Contact Data?"
-msgstr ""
+msgstr "Вы хотите перенести данные вашего адреса в данные контакта ?"
 
 #. module: base_contact
 #: field:res.partner.contact,active:0
@@ -379,7 +386,7 @@ msgstr "Основной"
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Photo"
-msgstr ""
+msgstr "Фото"
 
 #. module: base_contact
 #: field:res.partner.contact,birthdate:0
@@ -389,7 +396,7 @@ msgstr "Дата рождения"
 #. module: base_contact
 #: help:base.contact.installer,migrate:0
 msgid "If you select this, all addresses will be migrated."
-msgstr ""
+msgstr "Если вы выберете это, все адреса будут перенесены."
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
@@ -446,12 +453,12 @@ msgstr "Национальность"
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
 msgid "Open Jobs"
-msgstr ""
+msgstr "Открытые вакансии"
 
 #. module: base_contact
 #: field:base.contact.installer,name:0
 msgid "Name"
-msgstr ""
+msgstr "Имя"
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
@@ -461,12 +468,12 @@ msgstr "Основной работодатель"
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
 msgid "Address Migration"
-msgstr ""
+msgstr "Перенос адресов"
 
 #. module: base_contact
 #: view:res.partner:0
 msgid "Postal Address"
-msgstr ""
+msgstr "Почтовый адрес"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_addresses0
@@ -489,7 +496,7 @@ msgstr "Дата начала"
 msgid ""
 "Order of                     importance of this address in the list of "
 "addresses of the linked contact"
-msgstr ""
+msgstr "Порядок важности этого адреса в списке адресов связанного контакта"
 
 #~ msgid "General Information"
 #~ msgstr "Общая информация"
diff --git a/addons/base_iban/i18n/et.po b/addons/base_iban/i18n/et.po
index 2c83f61c59c..83b3ba6c13d 100644
--- a/addons/base_iban/i18n/et.po
+++ b/addons/base_iban/i18n/et.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 16:41+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-26 17:25+0000\n"
+"Last-Translator: Jalakas <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Invalid XML for View Architecture!"
 msgstr "Vigane XML vaate arhitektuurile!"
 
+#. module: base_iban
+#: model:ir.module.module,shortdesc:base_iban.module_meta_information
+msgid "Create IBAN bank accounts"
+msgstr "Loo IBAN pangakontosid"
+
+#. module: base_iban
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr "Objekti nimi peab algama x_ ja ei tohi sisaldada erimärke!"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:0
+#, python-format
+msgid ""
+"The IBAN does not seems to be correct. You should have entered something "
+"like this %s"
+msgstr ""
+"IBAN ei tundu olevat õige. Sul peaks olema sisestatud midagi sellist %s"
+
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
 msgid "zip"
@@ -31,6 +51,11 @@ msgstr "zip"
 msgid "International Bank Account Number"
 msgstr "Rahvusvaheline konto number (IBAN)"
 
+#. module: base_iban
+#: model:ir.model,name:base_iban.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Pangakontod"
+
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
 msgid "country_id"
@@ -47,7 +72,12 @@ msgid "iban"
 msgstr "iban"
 
 #. module: base_iban
-#: model:ir.module.module,shortdesc:base_iban.module_meta_information
+#: code:addons/base_iban/base_iban.py:0
+#, python-format
+msgid "The IBAN is invalid, It should begin with the country code"
+msgstr "IBAN on vigane. See peaks algama riigi koodiga"
+
+#. module: base_iban
 #: field:res.partner.bank,iban:0
 msgid "IBAN"
 msgstr "IBAN"
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index 8ed8df84629..54a2a285cd9 100644
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/i18n/ru.po
@@ -6,159 +6,238 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-27 11:05+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-26 17:44+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
-#: wizard_field:base_setup.base_setup,company,city:0
-#: wizard_field:base_setup.base_setup,init,city:0
-#: wizard_field:base_setup.base_setup,update,city:0
+#: field:base.setup.company,city:0
 msgid "City"
 msgstr "Город"
 
 #. module: base_setup
-#: wizard_view:base_setup.base_setup,finish:0
+#: constraint:ir.model:0
 msgid ""
-"You can start configuring the system or connect directly to the database "
-"using the default setup."
+"The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"Вы можете начать настройку системы или соединиться непосредственно с базой "
-"данных, используя настройки по умолчанию."
+"Название объекта должно начинаться с x_ и не должно содержать специальных "
+"символов !"
 
 #. module: base_setup
-#: wizard_field:base_setup.base_setup,company,zip:0
-#: wizard_field:base_setup.base_setup,init,zip:0
-#: wizard_field:base_setup.base_setup,update,zip:0
-msgid "Zip code"
-msgstr "Почтовый индекс"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Недопустимое имя модели в определении действия."
 
 #. module: base_setup
-#: wizard_view:base_setup.base_setup,init:0
-msgid "Select a Profile"
-msgstr "Выберите профайл."
+#: field:base.setup.installer,account_voucher:0
+msgid "Invoicing"
+msgstr "Выставление счетов"
 
 #. module: base_setup
-#: wizard_view:base_setup.base_setup,company:0
-msgid "Report header"
-msgstr "Заголовок отчета"
-
-#. module: base_setup
-#: wizard_button:base_setup.base_setup,finish,config:0
-msgid "Start Configuration"
-msgstr "Начать настройку"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,init:0
-msgid ""
-"You'll be able to install more modules later through the Administration menu."
-msgstr ""
-"Вы можете установить больше модулей позднее при помощи меню "
-"Администрирования."
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,init:0
-msgid ""
-"A profile sets a pre-selection of modules for specific needs. These profiles "
-"have been setup to help you discover the different aspects of OpenERP. This "
-"is just an overview, we have 300+ available modules."
-msgstr ""
-"Профайл устанавливает заранее выбранные модули для определенных целей. Эти "
-"профайлы были настроены, чтобы помочь вам ознакомиться с различными "
-"аспектами OpenERP. Это просто обзор, имеется  более 300 доступных модулей."
-
-#. module: base_setup
-#: wizard_button:base_setup.base_setup,company,update:0
-#: wizard_button:base_setup.base_setup,init,company:0
-msgid "Next"
-msgstr "Далее"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,email:0
-#: wizard_field:base_setup.base_setup,init,email:0
-#: wizard_field:base_setup.base_setup,update,email:0
-msgid "E-mail"
-msgstr "Эл.почта"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,state_id:0
-#: wizard_field:base_setup.base_setup,init,state_id:0
-#: wizard_field:base_setup.base_setup,update,state_id:0
-msgid "State"
-msgstr "Область/штат"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,finish:0
-msgid "Your new database is now fully installed."
-msgstr "Теперь новая база данных полностью установлена."
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,profile:0
-#: wizard_field:base_setup.base_setup,init,profile:0
-#: wizard_field:base_setup.base_setup,update,profile:0
-msgid "Profile"
-msgstr "Профайл"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,rml_footer1:0
-#: wizard_field:base_setup.base_setup,init,rml_footer1:0
-#: wizard_field:base_setup.base_setup,update,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Нижний колонтитул отчета 1"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,rml_footer2:0
-#: wizard_field:base_setup.base_setup,init,rml_footer2:0
-#: wizard_field:base_setup.base_setup,update,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Нижний колонитул отчета 2"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,company:0
-msgid "General Information"
-msgstr "Общая информация"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,street2:0
-#: wizard_field:base_setup.base_setup,init,street2:0
-#: wizard_field:base_setup.base_setup,update,street2:0
-msgid "Street2"
-msgstr "Улица (2-я строка)"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,company:0
-msgid "Report Information"
-msgstr "Информация об отчетах"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,phone:0
-#: wizard_field:base_setup.base_setup,init,phone:0
-#: wizard_field:base_setup.base_setup,update,phone:0
-msgid "Phone"
-msgstr "Телефон"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,company:0
-msgid "Define Main Company"
-msgstr "Задать головную компанию"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,name:0
-#: wizard_field:base_setup.base_setup,init,name:0
-#: wizard_field:base_setup.base_setup,update,name:0
+#: field:base.setup.company,name:0
 msgid "Company Name"
 msgstr "Название компании"
 
 #. module: base_setup
-#: help:base_setup.base_setup,company,rml_footer2:0
-#: help:base_setup.base_setup,init,rml_footer2:0
-#: help:base_setup.base_setup,update,rml_footer2:0
+#: field:base.setup.company,email:0
+msgid "E-mail"
+msgstr "Эл.почта"
+
+#. module: base_setup
+#: field:base.setup.company,account_no:0
+msgid "Bank Account No"
+msgstr "Банковский счет №"
+
+#. module: base_setup
+#: field:base.setup.installer,profile_tools:0
+msgid "Extra Tools"
+msgstr "Доп. инструменты"
+
+#. module: base_setup
+#: field:base.setup.company,rml_footer1:0
+msgid "Report Footer 1"
+msgstr "Нижний колонтитул отчета 1"
+
+#. module: base_setup
+#: help:base.setup.installer,mrp:0
+msgid ""
+"Helps you manage your manufacturing processes and generate reports on those "
+"processes."
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,marketing:0
+msgid "Helps you manage your marketing campaigns step by step."
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "Your database is now created."
+msgstr "Ваша база создана."
+
+#. module: base_setup
+#: field:base.setup.installer,point_of_sale:0
+msgid "Point of Sales"
+msgstr "Кассовый терминал"
+
+#. module: base_setup
+#: field:base.setup.installer,association:0
+msgid "Associations"
+msgstr "Ассоциации"
+
+#. module: base_setup
+#: help:base.setup.installer,account_accountant:0
+msgid ""
+"Helps you handle your accounting needs, if you are not an accountant, we "
+"suggest you to install only the Invoicing "
+msgstr ""
+"Помогает обрабатывать бухгалтерский учет, если вы не бухгалтер, мы советуем "
+"вам установить только выставление счетов "
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid ""
+"You can start configuring the system or connect directly to the database as "
+"an administrator."
+msgstr "Вы можете начать настройку системы или войти как администратор."
+
+#. module: base_setup
+#: field:base.setup.company,progress:0
+#: field:base.setup.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Настройка производится"
+
+#. module: base_setup
+#: field:base.setup.company,rml_footer2:0
+msgid "Report Footer 2"
+msgstr "Нижний колонитул отчета 2"
+
+#. module: base_setup
+#: field:base.setup.company,currency:0
+#: model:ir.model,name:base_setup.model_res_currency
+msgid "Currency"
+msgstr "Валюта"
+
+#. module: base_setup
+#: field:base.setup.company,state_id:0
+msgid "Fed. State"
+msgstr "Штат"
+
+#. module: base_setup
+#: field:base.setup.installer,marketing:0
+msgid "Marketing"
+msgstr "Маркетинг"
+
+#. module: base_setup
+#: field:base.setup.company,company_id:0
+msgid "Company"
+msgstr "Компания"
+
+#. module: base_setup
+#: field:base.setup.installer,sale:0
+msgid "Sales Management"
+msgstr "Управление продажами"
+
+#. module: base_setup
+#: help:base.setup.installer,profile_tools:0
+msgid ""
+"Lets you install various interesting but non-essential tools like Survey, "
+"Lunch and Ideas box."
+msgstr ""
+"Позволяет установить интересные, но не обязательные инструменты: Обзор, Ланч "
+"и Коробка идей."
+
+#. module: base_setup
+#: field:base.setup.installer,report_designer:0
+msgid "Advanced Reporting"
+msgstr "Расширенные отчеты"
+
+#. module: base_setup
+#: field:base.setup.company,phone:0
+msgid "Phone"
+msgstr "Телефон"
+
+#. module: base_setup
+#: view:base.setup.company:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.installer:0
+msgid "title"
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "Use Directly"
+msgstr "Использовать непосредственно"
+
+#. module: base_setup
+#: field:base.setup.installer,knowledge:0
+msgid "Knowledge Management"
+msgstr "Управление базой знаний"
+
+#. module: base_setup
+#: help:base.setup.installer,product_expiry:0
+msgid ""
+"Installs a preselected set of OpenERP applications which will help you "
+"manage your industry."
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,point_of_sale:0
+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_setup
+#: help:base.setup.installer,hr:0
+msgid ""
+"Helps you manage your human resources by encoding your employees structure, "
+"generating work sheets, tracking attendance and more."
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,account_voucher:0
+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_setup
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Неправильный XML для просмотра архитектуры!"
+
+#. module: base_setup
+#: field:base.setup.installer,hr:0
+msgid "Human Resources"
+msgstr "Отдел кадров"
+
+#. module: base_setup
+#: help:base.setup.installer,purchase:0
+msgid ""
+"Helps you manage your purchase-related processes such as requests for "
+"quotations, supplier invoices, etc..."
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.company,rml_footer2:0
 msgid ""
 "This sentence will appear at the bottom of your reports.\n"
 "We suggest you to put bank information here:\n"
@@ -169,54 +248,106 @@ msgstr ""
 "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
 
 #. module: base_setup
-#: wizard_field:base_setup.base_setup,company,country_id:0
-#: wizard_field:base_setup.base_setup,init,country_id:0
-#: wizard_field:base_setup.base_setup,update,country_id:0
+#: field:base.setup.company,street2:0
+msgid "Street 2"
+msgstr "Улица 2"
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_base_setup_installer
+msgid "base.setup.installer"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.company,country_id:0
 msgid "Country"
 msgstr "Страна"
 
 #. module: base_setup
-#: wizard_view:base_setup.base_setup,company:0
-#: wizard_view:base_setup.base_setup,finish:0
-#: wizard_view:base_setup.base_setup,init:0
-#: wizard_view:base_setup.base_setup,update:0
-#: model:ir.actions.wizard,name:base_setup.action_wizard_setup
-#: model:ir.actions.wizard,name:base_setup.wizard_base_setup
+#: model:ir.actions.act_window,name:base_setup.action_base_setup
 msgid "Setup"
 msgstr "Установка"
 
 #. module: base_setup
-#: help:base_setup.base_setup,company,rml_footer1:0
-#: help:base_setup.base_setup,init,rml_footer1:0
-#: help:base_setup.base_setup,update,rml_footer1:0
-msgid ""
-"This sentence will appear at the bottom of your reports.\n"
-"We suggest you to write legal sentences here:\n"
-"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
+#: field:base.setup.installer,account_accountant:0
+msgid "Accounting & Finance"
+msgstr "Бухгалтерия и Финансы"
+
+#. module: base_setup
+#: field:base.setup.installer,auction:0
+msgid "Auction Houses"
 msgstr ""
-"Это предложение появится внизу ваших отчетов.\n"
-"Рекомендуем поместить здесь юридическую информацию:\n"
-"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 
 #. module: base_setup
-#: wizard_view:base_setup.base_setup,update:0
-msgid "Summary"
-msgstr "Обзор"
+#: field:base.setup.company,zip:0
+msgid "Zip Code"
+msgstr "Индекс"
 
 #. module: base_setup
-#: wizard_button:base_setup.base_setup,update,finish:0
-msgid "Install"
-msgstr "Установить"
+#: view:base.setup.config:0
+msgid "Start Configuration"
+msgstr "Начать настройку"
 
 #. module: base_setup
-#: wizard_view:base_setup.base_setup,finish:0
-msgid "Installation Done"
-msgstr "Установка завершена"
+#: help:base.setup.installer,knowledge:0
+msgid ""
+"Lets you install addons geared towards sharing knowledge with and between "
+"your employees."
+msgstr ""
 
 #. module: base_setup
-#: help:base_setup.base_setup,company,rml_header1:0
-#: help:base_setup.base_setup,init,rml_header1:0
-#: help:base_setup.base_setup,update,rml_header1:0
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Company Configuration"
+msgstr "Настройка компании"
+
+#. module: base_setup
+#: field:base.setup.company,logo:0
+msgid "Logo"
+msgstr "Логотип"
+
+#. module: base_setup
+#: field:base.setup.installer,purchase:0
+msgid "Purchase Management"
+msgstr "Управление закупками"
+
+#. module: base_setup
+#: help:base.setup.installer,sale:0
+msgid "Helps you handle your quotations, sale orders and invoicing."
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.installer,stock:0
+msgid "Warehouse Management"
+msgstr "Управление складом"
+
+#. module: base_setup
+#: field:base.setup.installer,project:0
+msgid "Project Management"
+msgstr "Управление проектами"
+
+#. module: base_setup
+#: field:base.setup.config,installed_users:0
+msgid "Installed Users"
+msgstr "Установленные пользователи"
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "New Database"
+msgstr "Новая база"
+
+#. module: base_setup
+#: field:base.setup.installer,crm:0
+msgid "Customer Relationship Management"
+msgstr "Управление отношениями с заказчиками"
+
+#. module: base_setup
+#: help:base.setup.installer,auction:0
+msgid ""
+"Installs a preselected set of OpenERP applications selected to help you "
+"manage your auctions as well as the business processes around them."
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.company,rml_header1:0
 msgid ""
 "This sentence will appear at the top right corner of your reports.\n"
 "We suggest you to put a slogan here:\n"
@@ -227,47 +358,99 @@ msgstr ""
 "\"Решения для бизнеса с открытым исходным кодом\"."
 
 #. module: base_setup
-#: wizard_field:base_setup.base_setup,company,rml_header1:0
-#: wizard_field:base_setup.base_setup,init,rml_header1:0
-#: wizard_field:base_setup.base_setup,update,rml_header1:0
+#: help:base.setup.installer,report_designer:0
+msgid ""
+"Lets you install various tools to simplify and enhance OpenERP's report "
+"creation."
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.company,rml_header1:0
 msgid "Report Header"
 msgstr "Заголовок отчета"
 
 #. module: base_setup
-#: wizard_view:base_setup.base_setup,company:0
+#: view:base.setup.config:0
+msgid "Information about your new database"
+msgstr "Информация о вашей новой базе"
+
+#. module: base_setup
+#: field:base.setup.company,config_logo:0
+#: field:base.setup.config,config_logo:0
+#: field:base.setup.installer,config_logo:0
+msgid "Image"
+msgstr "Картинка"
+
+#. module: base_setup
+#: field:base.setup.installer,product_expiry:0
+msgid "Food Industry"
+msgstr "Пищевая индустрия"
+
+#. module: base_setup
+#: field:base.setup.installer,mrp:0
+msgid "Manufacturing"
+msgstr "Производство"
+
+#. module: base_setup
+#: view:base.setup.company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
 msgstr "Ваш логотип - используйте размер примерно 450x150 пикселей"
 
 #. module: base_setup
-#: wizard_field:base_setup.base_setup,company,currency:0
-#: wizard_field:base_setup.base_setup,init,currency:0
-#: wizard_field:base_setup.base_setup,update,currency:0
-msgid "Currency"
-msgstr "Валюта"
+#: help:base.setup.company,rml_footer1:0
+msgid ""
+"This sentence will appear at the bottom of your reports.\n"
+"We suggest you to write legal sentences here:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
+msgstr ""
+"Это предложение появится внизу ваших отчетов.\n"
+"Рекомендуем поместить здесь юридическую информацию:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 
 #. module: base_setup
-#: wizard_field:base_setup.base_setup,company,street:0
-#: wizard_field:base_setup.base_setup,init,street:0
-#: wizard_field:base_setup.base_setup,update,street:0
+#: field:base.setup.company,website:0
+msgid "Company Website"
+msgstr "Сайт компании"
+
+#. module: base_setup
+#: view:base.setup.installer:0
+msgid "Install Specific Industry Applications"
+msgstr "Установить конкретные промышленные приложения"
+
+#. module: base_setup
+#: field:base.setup.company,street:0
 msgid "Street"
 msgstr "Улица"
 
 #. module: base_setup
-#: wizard_button:base_setup.base_setup,finish,menu:0
-msgid "Use Directly"
-msgstr "Использовать непосредственно"
+#: model:ir.model,name:base_setup.model_base_setup_company
+msgid "base.setup.company"
+msgstr ""
 
 #. module: base_setup
-#: wizard_button:base_setup.base_setup,init,menu:0
-msgid "Cancel"
-msgstr "Отмена"
+#: help:base.setup.company,website:0
+msgid "Example: http://openerp.com"
+msgstr "Пример: http://openerp.com"
 
 #. module: base_setup
-#: wizard_field:base_setup.base_setup,company,logo:0
-#: wizard_field:base_setup.base_setup,init,logo:0
-#: wizard_field:base_setup.base_setup,update,logo:0
-msgid "Logo"
-msgstr "Логотип"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
+msgid "Install Applications"
+msgstr "Установить приложения"
+
+#. module: base_setup
+#: help:base.setup.installer,crm:0
+msgid ""
+"Helps you track and manage relations with customers such as leads, requests "
+"or issues. Can automatically send reminders, escalate requests or trigger "
+"business-specific actions based on standard events."
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,stock:0
+msgid ""
+"Helps you manage your inventory and main stock operations: delivery orders, "
+"receptions, etc."
+msgstr ""
 
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
@@ -275,7 +458,89 @@ msgid "Base Setup"
 msgstr "Базовая настройка"
 
 #. module: base_setup
-#: wizard_button:base_setup.base_setup,company,init:0
-#: wizard_button:base_setup.base_setup,update,company:0
-msgid "Previous"
-msgstr "Назад"
+#: help:base.setup.installer,association:0
+msgid ""
+"Installs a preselected set of OpenERP applications which will help you "
+"manage your association more efficiently."
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_base_setup_config
+msgid "base.setup.config"
+msgstr ""
+
+#. module: base_setup
+#: code:addons/base_setup/__init__.py:0
+#, python-format
+msgid "The following users have been installed : \n"
+msgstr "Были введены следующие пользователи: \n"
+
+#~ msgid ""
+#~ "You can start configuring the system or connect directly to the database "
+#~ "using the default setup."
+#~ msgstr ""
+#~ "Вы можете начать настройку системы или соединиться непосредственно с базой "
+#~ "данных, используя настройки по умолчанию."
+
+#~ msgid "Zip code"
+#~ msgstr "Почтовый индекс"
+
+#~ msgid "Select a Profile"
+#~ msgstr "Выберите профайл."
+
+#~ msgid "Report header"
+#~ msgstr "Заголовок отчета"
+
+#~ msgid ""
+#~ "You'll be able to install more modules later through the Administration menu."
+#~ msgstr ""
+#~ "Вы можете установить больше модулей позднее при помощи меню "
+#~ "Администрирования."
+
+#~ msgid ""
+#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
+#~ "have been setup to help you discover the different aspects of OpenERP. This "
+#~ "is just an overview, we have 300+ available modules."
+#~ msgstr ""
+#~ "Профайл устанавливает заранее выбранные модули для определенных целей. Эти "
+#~ "профайлы были настроены, чтобы помочь вам ознакомиться с различными "
+#~ "аспектами OpenERP. Это просто обзор, имеется  более 300 доступных модулей."
+
+#~ msgid "Next"
+#~ msgstr "Далее"
+
+#~ msgid "Your new database is now fully installed."
+#~ msgstr "Теперь новая база данных полностью установлена."
+
+#~ msgid "Profile"
+#~ msgstr "Профайл"
+
+#~ msgid "Street2"
+#~ msgstr "Улица (2-я строка)"
+
+#~ msgid "Define Main Company"
+#~ msgstr "Задать головную компанию"
+
+#~ msgid "Summary"
+#~ msgstr "Обзор"
+
+#~ msgid "Install"
+#~ msgstr "Установить"
+
+#~ msgid "Installation Done"
+#~ msgstr "Установка завершена"
+
+#~ msgid "Cancel"
+#~ msgstr "Отмена"
+
+#~ msgid "Previous"
+#~ msgstr "Назад"
+
+#~ msgid "General Information"
+#~ msgstr "Общая информация"
+
+#~ msgid "Report Information"
+#~ msgstr "Информация об отчетах"
+
+#~ msgid "State"
+#~ msgstr "Область/штат"
diff --git a/addons/base_vat/i18n/ru.po b/addons/base_vat/i18n/ru.po
index f2bf161ed7d..6aef4c89a0d 100644
--- a/addons/base_vat/i18n/ru.po
+++ b/addons/base_vat/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-25 19:14+0000\n"
+"PO-Revision-Date: 2010-10-26 17:10+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
@@ -54,6 +54,7 @@ msgid ""
 "Check this box if the partner is subjected to the VAT. It will be used for "
 "the VAT legal statement."
 msgstr ""
+"Отметьте, если партнер -плательщик НДС. Используется для заявления НДС."
 
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_partner
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index 991a614c00e..93fafb6aaea 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-25 13:14+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-26 09:02+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index 967d7359bc8..2383ec59e8c 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-25 18:27+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-10-26 08:36+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm_profiling/i18n/ru.po b/addons/crm_profiling/i18n/ru.po
index 5b4e1007cbb..6e9f50c9ff1 100644
--- a/addons/crm_profiling/i18n/ru.po
+++ b/addons/crm_profiling/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-25 19:14+0000\n"
+"PO-Revision-Date: 2010-10-26 08:33+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index 141027c0126..1a9f04db159 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-25 19:23+0000\n"
+"PO-Revision-Date: 2010-10-26 08:44+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/hr/i18n/mn.po b/addons/hr/i18n/mn.po
index eb74694a641..e5f65db8bc2 100644
--- a/addons/hr/i18n/mn.po
+++ b/addons/hr/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-20 07:16+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-27 01:32+0000\n"
+"Last-Translator: badralkh <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-21 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -26,22 +26,22 @@ msgstr "Openerp хэрэглэгч"
 #: view:hr.job:0
 #: field:hr.job,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "Шаардлагууд"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You can not create recursive departments."
-msgstr "Алдаа!"
+msgstr "Алдаа! Рекурс хэлтсүүдийг үүсгэж болохгүй"
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr ""
+msgstr "Ажилтны мэдээлэл руу шилжих"
 
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr "Даатгалын дугаар"
+msgstr ""
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
@@ -57,12 +57,12 @@ msgstr "Хүний нөөц"
 #: view:hr.employee:0
 #: view:hr.job:0
 msgid "Group By..."
-msgstr ""
+msgstr "Бүлэглэх..."
 
 #. module: hr
 #: field:hr.employee,work_email:0
 msgid "Work E-mail"
-msgstr ""
+msgstr "Ажлын Э-мэйл"
 
 #. module: hr
 #: constraint:ir.actions.act_window:0
@@ -81,27 +81,27 @@ msgstr "Хэлтэс"
 #. module: hr
 #: help:hr.installer,hr_attendance:0
 msgid "Simplifies the management of employee's attendances."
-msgstr ""
+msgstr "Ажилтны ирц хөтлөлтийг хялбарчилж өгдөг"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Mark as Old"
-msgstr ""
+msgstr "Хуучин болгон тэмдэглэх"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Jobs"
-msgstr ""
+msgstr "Ажлын байр"
 
 #. module: hr
 #: view:hr.job:0
 msgid "In Recruitment"
-msgstr ""
+msgstr "Хүний нөөцийн бүрдүүлэлтэд"
 
 #. module: hr
 #: view:hr.installer:0
 msgid "title"
-msgstr ""
+msgstr "гарчиг"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -114,22 +114,22 @@ msgstr "Компани"
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Expected in Recruitment"
-msgstr ""
+msgstr "Хүний нөөцийн бүрдүүлэлтээр хүлээгдсэн"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Holidays"
-msgstr ""
+msgstr "Амралт, чөлөө"
 
 #. module: hr
 #: help:hr.installer,hr_holidays:0
 msgid "Tracks employee leaves, allocation requests and planning."
-msgstr ""
+msgstr "Ажилтны амралт, чөлөө, түүний хуваарилалтын хүсэлтийг хянах"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_employee_marital_status
 msgid "Employee Marital Status"
-msgstr ""
+msgstr "Ажилчдын гэрлэлтийн байдал"
 
 #. module: hr
 #: help:hr.employee,partner_id:0
@@ -137,42 +137,44 @@ msgid ""
 "Partner that is related to the current employee. Accounting transaction will "
 "be written on this partner belongs to employee."
 msgstr ""
+"Одоогийн ажилтантай холбоотой харилцагч. Санхүү бүртгэлийн транзакц тухайн "
+"ажилтанд хамаарах харилцагчид хийгдэх болно."
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Link a user to an employee"
-msgstr ""
+msgstr "Хэрэглэгчид ажилтныг харгалзуул"
 
 #. module: hr
 #: field:hr.installer,hr_contract:0
 msgid "Employee's Contracts"
-msgstr ""
+msgstr "Ажилчдын хөдөлмөрийн гэрээ"
 
 #. module: hr
 #: help:hr.installer,hr_payroll:0
 msgid "Generic Payroll system."
-msgstr ""
+msgstr "Цалингийн үндсэн систем"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "My Departments Employee"
-msgstr ""
+msgstr "Манай хэлтсийн ажилчид"
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "Алдаа! Ажилтан нь менежер байх хэлтсийг сонгож болохгүй."
 
 #. module: hr
 #: help:hr.employee,passport_id:0
 msgid "Employee Passport Information"
-msgstr ""
+msgstr "Ажилтны пасспортын мэдээлэл"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Position"
-msgstr ""
+msgstr "Албан тушаал"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
@@ -185,22 +187,24 @@ msgid ""
 "The Related user field on the Employee form allows to link the OpenERP user "
 "(and her rights) to the employee."
 msgstr ""
+"Ажилтан маягтын холбоотой хэрэглэх талбар нь OpenERP хэрэглэгчийн ажилтантай "
+"холбодог"
 
 #. module: hr
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Recruitement"
-msgstr ""
+msgstr "Хүний нөөцийн бүрдүүлэлтэд"
 
 #. module: hr
 #: field:hr.employee,identification_id:0
 msgid "Identification No"
-msgstr ""
+msgstr "Ялгах дугаар"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "No of Employee"
-msgstr ""
+msgstr "Ажилтны тоо"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -212,16 +216,17 @@ msgstr "эм"
 msgid ""
 "Tracks and helps employees encode and validate timesheets and attendances."
 msgstr ""
+"Ажилчдыг ирц ба цаг бүртгэлийг бүртгэж, батламжлах үйлдлийг зохицуулна"
 
 #. module: hr
 #: field:hr.installer,hr_evaluation:0
 msgid "Periodic Evaluations"
-msgstr ""
+msgstr "Үечилсэн үнэлгээ"
 
 #. module: hr
 #: field:hr.installer,hr_timesheet_sheet:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Цаг бүртгэл"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
@@ -231,12 +236,12 @@ msgstr "Ажилчдын бүтэц"
 #. module: hr
 #: view:hr.employee:0
 msgid "Social IDs"
-msgstr "Нийтийн Дугаар"
+msgstr "Бүртгэлийн дугаарууд"
 
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employee with that job."
-msgstr ""
+msgstr "Энэ албан тушаал дах ажилтны тоо"
 
 #. module: hr
 #: field:hr.employee,work_phone:0
@@ -246,14 +251,14 @@ msgstr "Ажлын утас"
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
-msgstr "Жижиг зэрэглэл"
+msgstr "Хүү зэрэглэл"
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,description:0
 #: model:ir.model,name:hr.model_hr_job
 msgid "Job Description"
-msgstr ""
+msgstr "Ажлын байрны тодорхойлолт"
 
 #. module: hr
 #: field:hr.employee,work_location:0
@@ -263,7 +268,7 @@ msgstr "Ажлын байршил"
 #. module: hr
 #: field:hr.employee,passport_id:0
 msgid "Passport"
-msgstr ""
+msgstr "Пасспорт"
 
 #. module: hr
 #: view:hr.employee:0
@@ -276,7 +281,7 @@ msgstr "Ажилтан"
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr ""
+msgstr "Бусад мэдээлэл"
 
 #. module: hr
 #: field:hr.employee,address_id:0
@@ -286,12 +291,12 @@ msgstr "Ажлын хаяг"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
-msgstr ""
+msgstr "Хүний нөөцийн модулийн тохиргоо"
 
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
-msgstr ""
+msgstr "Төрсөн огноо"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
@@ -306,14 +311,14 @@ msgstr ""
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr
 msgid "Human Resources Dashboard"
-msgstr ""
+msgstr "Хүний нөөцийн хянах самбар"
 
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,job_id:0
 #: view:hr.job:0
 msgid "Job"
-msgstr ""
+msgstr "Ажлын байр"
 
 #. module: hr
 #: view:hr.department:0
@@ -329,32 +334,32 @@ msgstr "Тохиргоо"
 #. module: hr
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "Зэрэглэл"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Expected Employees"
-msgstr ""
+msgstr "Нийт орон тоо"
 
 #. module: hr
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Архитектур алдаатай!"
+msgstr "Харагдацын архитектурын xml алдаатай !"
 
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
-msgstr ""
+msgstr "Нийгмийн даатгалын дугаар"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
-msgstr "Харилцагчийн зэрэглэл"
+msgstr "Харьяалагдах зэрэглэл"
 
 #. module: hr
 #: constraint:hr.employee.category:0
 msgid "Error ! You cannot create recursive Categories."
-msgstr ""
+msgstr "Алдаа ! Рекурс зэрэглэлийг үүсгэж болохгүй."
 
 #. module: hr
 #: view:hr.department:0
@@ -368,12 +373,12 @@ msgstr "Хэлтсүүд"
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr "Ажилтны гэрээ"
+msgstr "Ажилтны хөдөлмөрийн гэрээ"
 
 #. module: hr
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Өөрийн хянах самбар"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -395,12 +400,12 @@ msgstr "Ажилтны зэрэглэл"
 #. module: hr
 #: field:hr.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Зураг"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract"
-msgstr ""
+msgstr "Ажилтны хөдөлмөрийн гэрээ"
 
 #. module: hr
 #: help:hr.installer,hr_evaluation:0
@@ -408,32 +413,34 @@ msgid ""
 "Lets you create and manage the periodic evaluation and performance review of "
 "employees."
 msgstr ""
+"Ажилтны бүтээмжийн стандарт, үечилсэн үнэлгээг хөтлөх, үүсгэх боломжийг "
+"олгоно."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
 msgid "hr.department"
-msgstr "Хүний нөөцийн хэлтэс"
+msgstr ""
 
 #. module: hr
 #: help:hr.employee,parent_id:0
 msgid "It is linked with manager of Department"
-msgstr ""
+msgstr "Энэ нь хэлтсийн менежертэй холбоотой байна"
 
 #. module: hr
 #: field:hr.installer,hr_recruitment:0
 msgid "Recruitment Process"
-msgstr ""
+msgstr "Нөөцийн бүрдүүлэлтийн үйл ажиллагаа"
 
 #. module: hr
 #: field:hr.employee,category_ids:0
 #: field:hr.employee.category,name:0
 msgid "Category"
-msgstr "Ангилал"
+msgstr "Зэрэглэл"
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr ""
+msgstr "банк дах ажилтны цалингийн данс"
 
 #. module: hr
 #: field:hr.department,note:0
@@ -448,22 +455,22 @@ msgstr "Гэрээний мэдээлэл"
 #. module: hr
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Алдаа! Рекурс цэс үүсгэж болохгүй"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
 msgid "HR Manager Dashboard"
-msgstr ""
+msgstr "Хүний нөөцийн менежерийн хянах самбар"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Status"
-msgstr "Байдал"
+msgstr "Үндсэн төлөв"
 
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Тохиргооны явц"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -474,12 +481,12 @@ msgstr "Зэрэглэлийн бүтэц"
 #. module: hr
 #: field:hr.employee,partner_id:0
 msgid "unknown"
-msgstr ""
+msgstr "Үл мэдэгдэх"
 
 #. module: hr
 #: field:hr.installer,hr_holidays:0
 msgid "Holidays / Leaves Management"
-msgstr ""
+msgstr "Амралт, чөлөө / Амралт, чөлөөний удирдлага"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
@@ -494,7 +501,7 @@ msgstr "Идэвхитэй"
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr "Алдаа!"
+msgstr "Алдаа! Ажилтны рекурс мод үүсгэж болохгүй"
 
 #. module: hr
 #: view:hr.department:0
@@ -506,28 +513,28 @@ msgstr "Компаниуд"
 msgid ""
 "In the Employee form, there are different kind of information like Contact "
 "information."
-msgstr ""
+msgstr "Ажилтны маягт дээр холбоо барих хаяг шиг янз бүрийн мэдээлэл бий."
 
 #. module: hr
 #: help:hr.job,expected_employees:0
 msgid "Required number of Employees in total for that job."
-msgstr ""
+msgstr "Энэ ажлын байрт харгалзах нийт ажилтны тоо шаардагдаж байна"
 
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Old"
-msgstr ""
+msgstr "Хуучин"
 
 #. module: hr
 #: field:hr.employee.marital.status,description:0
 msgid "Status Description"
-msgstr ""
+msgstr "Гэрлэлтийн байдлын тайлбар"
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
 msgid "State"
-msgstr ""
+msgstr "Төлөв"
 
 #. module: hr
 #: field:hr.employee,marital:0
@@ -541,27 +548,27 @@ msgstr "Гэрлэлтийн байдал"
 #. module: hr
 #: help:hr.installer,hr_recruitment:0
 msgid "Helps you manage and streamline your recruitment process."
-msgstr ""
+msgstr "Хүний нөөцийн бүрдүүлэлтийн үйл ажиллагааг удирдахад тусална"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee form and structure"
-msgstr ""
+msgstr "Ажилтны маягт, бүтэц"
 
 #. module: hr
 #: field:hr.employee,photo:0
 msgid "Photo"
-msgstr ""
+msgstr "Зураг"
 
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "Хэрэглэгч"
 
 #. module: hr
 #: field:hr.installer,hr_payroll_account:0
 msgid "Payroll Accounting"
-msgstr ""
+msgstr "Цалингийн санхүү бүртгэл"
 
 #. module: hr
 #: view:hr.employee:0
@@ -579,7 +586,7 @@ msgstr ""
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "Одоогийн ажилбар"
 
 #. module: hr
 #: help:hr.installer,hr_expense:0
@@ -587,6 +594,8 @@ msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
 msgstr ""
+"Зардал нь төсөлтэй холбоотой бол ажилтны зардалыг зохицуулах, хянаж "
+"үйлчлүүлэгчид автоматаар мэдэгдэх боломжтой"
 
 #. module: hr
 #: view:hr.job:0
@@ -612,34 +621,35 @@ msgstr "Гэрийн хаяг"
 #: field:hr.installer,hr_attendance:0
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendances"
-msgstr ""
+msgstr "Ирцүүд"
 
 #. module: hr
 #: view:hr.employee.marital.status:0
 #: view:hr.job:0
 msgid "Description"
-msgstr ""
+msgstr "Тайлбар"
 
 #. module: hr
 #: help:hr.installer,hr_contract:0
 msgid "Extends employee profiles to help manage their contracts."
 msgstr ""
+"Хөдөлмөрийн гэрээг зохицуулах зорилгоор ажилтны мэдээллийг өргөтгөдөг"
 
 #. module: hr
 #: field:hr.installer,hr_payroll:0
 msgid "Payroll"
-msgstr ""
+msgstr "Цалингийн цэс"
 
 #. module: hr
 #: field:hr.job,name:0
 msgid "Job Name"
-msgstr ""
+msgstr "Ажлын байрны нэр"
 
 #. module: hr
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Position"
-msgstr ""
+msgstr "Нээлттэй"
 
 #. module: hr
 #: view:hr.department:0
@@ -649,7 +659,7 @@ msgstr "Хэлтэс"
 #. module: hr
 #: field:hr.employee,country_id:0
 msgid "Nationality"
-msgstr "Яс үндэс"
+msgstr "Үндэстэн"
 
 #. module: hr
 #: view:hr.department:0
@@ -661,17 +671,17 @@ msgstr "Тэмдэглэл"
 #. module: hr
 #: model:ir.model,name:hr.model_hr_installer
 msgid "hr.installer"
-msgstr ""
+msgstr "ХН-ийн модулийг суулгах"
 
 #. module: hr
 #: view:board.board:0
 msgid "HR Manager Board"
-msgstr ""
+msgstr "Хүний нөөцийн менежерийн самбар"
 
 #. module: hr
 #: field:hr.employee,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Нөөц"
 
 #. module: hr
 #: field:hr.department,complete_name:0
@@ -698,7 +708,7 @@ msgstr "Ажилчид"
 #. module: hr
 #: field:hr.employee,bank_account_id:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Банк дах данс"
 
 #. module: hr
 #: field:hr.department,name:0
@@ -708,34 +718,34 @@ msgstr "Хэлтэсийн нэр"
 #. module: hr
 #: help:hr.employee,ssnid:0
 msgid "Social Security Number"
-msgstr ""
+msgstr "Регистрийн дугаар"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
 msgid "Creation of a OpenERP user"
-msgstr ""
+msgstr "OpenERP хэрэглэгчийг үүсгэх"
 
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
-msgstr "Жижиг хэлтэс"
+msgstr "Хүү хэлтэсүүд"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_job
 #: model:ir.ui.menu,name:hr.menu_hr_job
 msgid "Job Positions"
-msgstr ""
+msgstr "Ажлын байрууд"
 
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,coach_id:0
 msgid "Coach"
-msgstr ""
+msgstr "Дадлагажуулагч"
 
 #. module: hr
 #: field:hr.installer,hr_expense:0
 msgid "Expenses"
-msgstr ""
+msgstr "Зардал"
 
 #. module: hr
 #: view:hr.department:0
@@ -748,7 +758,7 @@ msgstr "Менежер"
 #. module: hr
 #: help:hr.installer,hr_payroll_account:0
 msgid "Generic Payroll system Integrated with Accountings."
-msgstr ""
+msgstr "Санхүү бүртгэлтэй нэгдмэл цалингийн ерөнхий систем"
 
 #. module: hr
 #: field:hr.employee,child_ids:0
diff --git a/addons/hr/i18n/pl.po b/addons/hr/i18n/pl.po
index e836bbf5090..59101a8859c 100644
--- a/addons/hr/i18n/pl.po
+++ b/addons/hr/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-25 18:28+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-10-26 08:16+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/pt.po b/addons/hr/i18n/pt.po
index 5189bcfa822..469046dfdf8 100644
--- a/addons/hr/i18n/pt.po
+++ b/addons/hr/i18n/pt.po
@@ -6,121 +6,204 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 04:57+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-26 13:57+0000\n"
+"Last-Translator: Carlos Almeida <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
-#: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Openerp user"
 msgstr "Utilizador Open ERP"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.edit_workgroup
-#: model:ir.ui.menu,name:hr.menu_edit_workgroup
-msgid "Working Time Categories"
-msgstr "Categorias de tempos de trabalhos"
+#: view:hr.job:0
+#: field:hr.job,requirements:0
+msgid "Requirements"
+msgstr "Requisitos"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You can not create recursive departments."
 msgstr "Erro! Não podes criar departamentos recursivos."
 
+#. module: hr
+#: model:process.transition,name:hr.process_transition_contactofemployee0
+msgid "Link the employee to information"
+msgstr "Associar o empregado à informação"
+
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr "Nº SIN"
+msgstr "Nº SS"
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
+#: model:ir.ui.menu,name:hr.menu_hr_deshboard
+#: model:ir.ui.menu,name:hr.menu_hr_main
+#: model:ir.ui.menu,name:hr.menu_hr_management
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr "Recursos humanos"
-
-#. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Sunday"
-msgstr "Domingo"
-
-#. module: hr
-#: view:res.users:0
-msgid "Parents"
-msgstr "Ascendentes"
-
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da acção"
-
-#. module: hr
-#: view:hr.department:0
-msgid "Department"
-msgstr "Departamento"
-
-#. module: hr
-#: model:process.transition,name:hr.process_transition_contactofemployee0
-msgid "Contact  of employee"
-msgstr "Contracto do empregado"
-
-#. module: hr
-#: field:hr.employee,work_email:0
-msgid "Work Email"
-msgstr "Email Profissional"
-
-#. module: hr
-#: field:hr.timesheet.group,name:0
-msgid "Group name"
-msgstr "Nome do grupo"
-
-#. module: hr
-#: field:hr.department,company_id:0
-#: field:hr.employee,company_id:0
-msgid "Company"
-msgstr "Empresa"
-
-#. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Friday"
-msgstr "Sexta-feira"
-
-#. module: hr
-#: field:hr.department,parent_id:0
-msgid "Parent Department"
-msgstr "Departamento ascendente"
+msgstr "Recursos Humanos"
 
 #. module: hr
 #: view:hr.department:0
 #: view:hr.employee:0
-#: field:hr.employee,notes:0
-msgid "Notes"
-msgstr "Notas"
+#: view:hr.job:0
+msgid "Group By..."
+msgstr "Agrupar Por..."
 
 #. module: hr
-#: field:hr.timesheet,hour_from:0
-msgid "Work from"
-msgstr "Trabalhar de"
+#: field:hr.employee,work_email:0
+msgid "Work E-mail"
+msgstr "E-mail Trabalho"
+
+#. module: hr
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nome de módulo inválido na definição da acção"
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,department_id:0
+#: view:hr.job:0
+#: field:hr.job,department_id:0
+#: view:res.users:0
+msgid "Department"
+msgstr "Departamento"
+
+#. module: hr
+#: help:hr.installer,hr_attendance:0
+msgid "Simplifies the management of employee's attendances."
+msgstr "Simplifica a gestão das assiduidades dos empregados"
+
+#. module: hr
+#: view:hr.job:0
+msgid "Mark as Old"
+msgstr "Marcar como antigo"
+
+#. module: hr
+#: view:hr.job:0
+msgid "Jobs"
+msgstr "Cargo"
+
+#. module: hr
+#: view:hr.job:0
+msgid "In Recruitment"
+msgstr "Em Recrutamento"
+
+#. module: hr
+#: view:hr.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: hr
+#: field:hr.department,company_id:0
+#: view:hr.employee:0
+#: view:hr.job:0
+#: field:hr.job,company_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Expected in Recruitment"
+msgstr "Espera-se em Recrutamento"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
+msgid "Holidays"
+msgstr "Férias"
+
+#. module: hr
+#: help:hr.installer,hr_holidays:0
+msgid "Tracks employee leaves, allocation requests and planning."
+msgstr ""
+"Regista faltas dos empregados, requisições de colocações e planeamento"
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_employee_marital_status
+msgid "Employee Marital Status"
+msgstr "Estado Cívil do Empregado"
+
+#. module: hr
+#: help:hr.employee,partner_id:0
+msgid ""
+"Partner that is related to the current employee. Accounting transaction will "
+"be written on this partner belongs to employee."
+msgstr ""
+"O parceiro que está relacionado com o empregado actual. A transacção "
+"contabilística a escrever neste parceiro pertence ao empregado."
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_employeeuser0
+msgid "Link a user to an employee"
+msgstr "Associar um utilizador a um empregado"
+
+#. module: hr
+#: field:hr.installer,hr_contract:0
+msgid "Employee's Contracts"
+msgstr "Contratos do Empregado"
+
+#. module: hr
+#: help:hr.installer,hr_payroll:0
+msgid "Generic Payroll system."
+msgstr "Sistema de Processamento de Salários Genérico"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "My Departments Employee"
+msgstr "Meus Empregados por Departementos"
+
+#. module: hr
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+"Erro ! Não pode seleccionar um departamento cujo empregado é o gestor."
+
+#. module: hr
+#: help:hr.employee,passport_id:0
+msgid "Employee Passport Information"
+msgstr "Informação do Passaporte do Empregado"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Position"
+msgstr "Posto"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
-msgstr "Hierarquia dos empregados"
+msgstr "Hierarquia de Empregados"
 
 #. module: hr
-#: model:ir.ui.menu,name:hr.menu_hr_configuration
-msgid "Configuration"
-msgstr "Configuração"
+#: model:process.transition,note:hr.process_transition_employeeuser0
+msgid ""
+"The Related user field on the Employee form allows to link the OpenERP user "
+"(and her rights) to the employee."
+msgstr ""
 
 #. module: hr
-#: selection:hr.employee,marital:0
-msgid "Unmaried"
-msgstr "Não casado"
+#: view:hr.job:0
+#: selection:hr.job,state:0
+msgid "In Recruitement"
+msgstr "Em Recrutamento"
+
+#. module: hr
+#: field:hr.employee,identification_id:0
+msgid "Identification No"
+msgstr "Não"
+
+#. module: hr
+#: field:hr.job,no_of_employee:0
+msgid "No of Employee"
+msgstr "Nº de Empregados"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -128,53 +211,90 @@ msgid "Female"
 msgstr "Feminino"
 
 #. module: hr
-#: view:hr.timesheet.group:0
-msgid "Working Time Category"
-msgstr "Categoria do tempo de trabalho"
+#: help:hr.installer,hr_timesheet_sheet:0
+msgid ""
+"Tracks and helps employees encode and validate timesheets and attendances."
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_evaluation:0
+msgid "Periodic Evaluations"
+msgstr "Avaliações Periódicas"
+
+#. module: hr
+#: field:hr.installer,hr_timesheet_sheet:0
+msgid "Timesheets"
+msgstr "Folhas de Presença"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
-#: model:ir.ui.menu,name:hr.menu_open_view_employee_tree
 msgid "Employees Structure"
-msgstr "Estrutura dos empregados"
+msgstr "Estrutura de Empregados"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Social IDs"
 msgstr "IDs Sociais"
 
+#. module: hr
+#: help:hr.job,no_of_employee:0
+msgid "Number of employee with that job."
+msgstr "Número de empregados com esse cargo"
+
 #. module: hr
 #: field:hr.employee,work_phone:0
 msgid "Work Phone"
-msgstr "Telefone do trabalho"
+msgstr "Telefone do Trabalho"
 
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
 msgstr "Categorias descendentes"
 
+#. module: hr
+#: view:hr.job:0
+#: field:hr.job,description:0
+#: model:ir.model,name:hr.model_hr_job
+msgid "Job Description"
+msgstr "Descrição do Cargo"
+
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
-msgstr "Localização do escritório"
+msgstr "Localização do Escritório"
+
+#. module: hr
+#: field:hr.employee,passport_id:0
+msgid "Passport"
+msgstr "Passaporte"
 
 #. module: hr
 #: view:hr.employee:0
-#: field:hr.employee,name:0
+#: view:hr.job:0
 #: model:ir.model,name:hr.model_hr_employee
 #: model:process.node,name:hr.process_node_employee0
 msgid "Employee"
 msgstr "Empregado"
 
 #. module: hr
-#: field:hr.timesheet.group,manager:0
-msgid "Workgroup manager"
-msgstr "Gerente do grupo de trabalho"
+#: model:process.node,note:hr.process_node_employeecontact0
+msgid "Other information"
+msgstr "Outra Informação"
 
 #. module: hr
-#: field:hr.employee,child_ids:0
-msgid "Subordinates"
-msgstr "Subordinados"
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Endereço de trabalho"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action_hr_installer
+msgid "Human Resources Application Configuration"
+msgstr "Configuração da Aplicação de Gestão de Recursos Humanos"
+
+#. module: hr
+#: field:hr.employee,birthday:0
+msgid "Date of Birth"
+msgstr "Data de Nascimento"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
@@ -182,19 +302,42 @@ msgid "Reporting"
 msgstr "Relatório"
 
 #. module: hr
+#: model:ir.model,name:hr.model_ir_actions_act_window
+msgid "ir.actions.act_window"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr
+msgid "Human Resources Dashboard"
+msgstr "Painel de Recursos Humanos"
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,job_id:0
+#: view:hr.job:0
+msgid "Job"
+msgstr "Cargo"
+
+#. module: hr
+#: view:hr.department:0
 #: field:hr.department,member_ids:0
 msgid "Members"
 msgstr "Membros"
 
 #. module: hr
-#: field:hr.employee,ssnid:0
-msgid "SSN No"
-msgstr "Nº SSN"
+#: model:ir.ui.menu,name:hr.menu_hr_configuration
+msgid "Configuration"
+msgstr "Configuração"
 
 #. module: hr
-#: model:process.transition,note:hr.process_transition_contactofemployee0
-msgid "Fill up contact information"
-msgstr "Preencha as informações de contacto"
+#: view:hr.employee:0
+msgid "Categories"
+msgstr "Categorias"
+
+#. module: hr
+#: field:hr.job,expected_employees:0
+msgid "Expected Employees"
+msgstr "Empregados Esperados"
 
 #. module: hr
 #: constraint:ir.ui.view:0
@@ -202,20 +345,26 @@ msgid "Invalid XML for View Architecture!"
 msgstr "XML inválido para a arquitectura de vista"
 
 #. module: hr
-#: selection:hr.employee,marital:0
-msgid "Divorced"
-msgstr "Divorciado"
+#: help:hr.employee,sinid:0
+msgid "Social Insurance Number"
+msgstr "Número da Segurança Social"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
-msgstr "Categoria ascendente"
+msgstr "Categoria Pai"
 
 #. module: hr
+#: constraint:hr.employee.category:0
+msgid "Error ! You cannot create recursive Categories."
+msgstr "Erro! Não pode criar categorias recursivas."
+
+#. module: hr
+#: view:hr.department:0
 #: model:ir.actions.act_window,name:hr.open_module_tree_department
-#: model:ir.actions.act_window,name:hr.open_module_tree_department_tree
-#: model:ir.ui.menu,name:hr.menu_department_def
-#: model:ir.ui.menu,name:hr.menu_department_tree
+#: model:ir.ui.menu,name:hr.menu_hr_department_tree
+#: view:res.users:0
+#: field:res.users,context_department_id:0
 msgid "Departments"
 msgstr "Departamentos"
 
@@ -225,14 +374,9 @@ msgid "Employee Contact"
 msgstr "Contacto do empregado"
 
 #. module: hr
-#: selection:hr.employee,marital:0
-msgid "Maried"
-msgstr "Casado"
-
-#. module: hr
-#: field:hr.timesheet,tgroup_id:0
-msgid "Employee's timesheet group"
-msgstr "Grupo dos horários do empregado"
+#: view:board.board:0
+msgid "My Board"
+msgstr "Meu Painel"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -240,20 +384,35 @@ msgid "Male"
 msgstr "Masculino"
 
 #. module: hr
-#: model:process.transition,note:hr.process_transition_employeeuser0
-msgid "Create openerp user"
-msgstr "Criar um utilizador openerp"
+#: model:ir.actions.act_window,name:hr.open_view_categ_form
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
+msgid "Categories of Employee"
+msgstr "Categoria dos Empregados"
 
 #. module: hr
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr "Categoria do empregado"
+msgstr "Categoria do Empregado"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Tuesday"
-msgstr "Terça-feira"
+#: field:hr.installer,config_logo:0
+msgid "Image"
+msgstr "Imagem"
+
+#. module: hr
+#: model:process.process,name:hr.process_process_employeecontractprocess0
+msgid "Employee Contract"
+msgstr "Contrato do Empregado"
+
+#. module: hr
+#: help:hr.installer,hr_evaluation:0
+msgid ""
+"Lets you create and manage the periodic evaluation and performance review of "
+"employees."
+msgstr ""
+"Permite-lhe criar e gerir a avaliação periódica e de desempenho dos seus "
+"empregados."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
@@ -261,16 +420,26 @@ msgid "hr.department"
 msgstr "Departamento RH"
 
 #. module: hr
-#: field:hr.employee,user_id:0
-msgid "Related User"
-msgstr "Utilizador relacionado"
+#: help:hr.employee,parent_id:0
+msgid "It is linked with manager of Department"
+msgstr "Está associado com o gestor do departamento"
 
 #. module: hr
-#: field:hr.employee,category_id:0
+#: field:hr.installer,hr_recruitment:0
+msgid "Recruitment Process"
+msgstr "Processo de Recrutamento"
+
+#. module: hr
+#: field:hr.employee,category_ids:0
 #: field:hr.employee.category,name:0
 msgid "Category"
 msgstr "Categoria"
 
+#. module: hr
+#: help:hr.employee,bank_account_id:0
+msgid "Employee bank salary account"
+msgstr "Conta bancária do mepregado"
+
 #. module: hr
 #: field:hr.department,note:0
 msgid "Note"
@@ -282,14 +451,24 @@ msgid "Contact Information"
 msgstr "Informações de contacto"
 
 #. module: hr
-#: view:hr.employee:0
-msgid "Status"
-msgstr "Status"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Erro! Não pode criar menus recursivos."
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Monday"
-msgstr "Segunda-feira"
+#: model:ir.actions.act_window,name:hr.open_board_hr_manager
+msgid "HR Manager Dashboard"
+msgstr "Painel do Gestor de RH"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: hr
+#: field:hr.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progresso da Configuração"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -298,17 +477,22 @@ msgid "Categories structure"
 msgstr "Estrutura das categorias"
 
 #. module: hr
-#: field:hr.timesheet,dayofweek:0
-msgid "Day of week"
-msgstr "Dia da semana"
+#: field:hr.employee,partner_id:0
+msgid "unknown"
+msgstr "desconhecido"
 
 #. module: hr
-#: field:hr.employee,birthday:0
-msgid "Birthday"
-msgstr "Data de nascimento"
+#: field:hr.installer,hr_holidays:0
+msgid "Holidays / Leaves Management"
+msgstr "Gestão das Férias/Faltas"
 
 #. module: hr
-#: field:hr.employee,active:0
+#: field:hr.employee,ssnid:0
+msgid "SSN No"
+msgstr "Nº Segurança Social"
+
+#. module: hr
+#: view:hr.employee:0
 msgid "Active"
 msgstr "Activo"
 
@@ -317,66 +501,79 @@ msgstr "Activo"
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Erro ! Não pode criar uma hierarquia recursiva de empregados."
 
-#. module: hr
-#: model:process.process,name:hr.process_process_employeecontractprocess0
-msgid "Employee Contract Process"
-msgstr "Processo de contracto do empregado"
-
-#. module: hr
-#: model:process.node,note:hr.process_node_openerpuser0
-msgid "Create OpenERP User"
-msgstr "Criar um utilizador OpenERP"
-
-#. module: hr
-#: model:process.node,note:hr.process_node_employee0
-msgid "Employee Complete Form"
-msgstr "Formulário completo do empregado"
-
 #. module: hr
 #: view:hr.department:0
 msgid "Companies"
 msgstr "Empresas"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Wednesday"
-msgstr "Quarta-feira"
+#: model:process.transition,note:hr.process_transition_contactofemployee0
+msgid ""
+"In the Employee form, there are different kind of information like Contact "
+"information."
+msgstr ""
+"No formulário de empregado, tem diversos tipos de informação, como os "
+"contactos dos mesmos"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_view_categ_form
-#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
-msgid "Categories of Employee"
-msgstr "Categoria dos empregados"
+#: help:hr.job,expected_employees:0
+msgid "Required number of Employees in total for that job."
+msgstr "Número de empregados necessários para o cargo"
 
 #. module: hr
-#: field:hr.timesheet,date_from:0
-msgid "Starting date"
-msgstr "Data de inicio"
+#: selection:hr.job,state:0
+msgid "Old"
+msgstr "Antigo"
 
 #. module: hr
-#: field:res.users,parent_id:0
-msgid "Parent Users"
-msgstr "Utilizadores ascendentes"
+#: field:hr.employee.marital.status,description:0
+msgid "Status Description"
+msgstr "Descrição do Estado"
 
 #. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Endereço de trabalho"
+#: view:hr.job:0
+#: field:hr.job,state:0
+msgid "State"
+msgstr "Estado"
 
 #. module: hr
 #: field:hr.employee,marital:0
+#: view:hr.employee.marital.status:0
+#: field:hr.employee.marital.status,name:0
+#: model:ir.actions.act_window,name:hr.action_hr_marital_status
+#: model:ir.ui.menu,name:hr.hr_menu_marital_status
 msgid "Marital Status"
-msgstr "Estado civil"
+msgstr "Estado Cívil"
 
 #. module: hr
-#: model:ir.model,name:hr.model_hr_timesheet
-msgid "Timesheet Line"
-msgstr "Linha de horário"
+#: help:hr.installer,hr_recruitment:0
+msgid "Helps you manage and streamline your recruitment process."
+msgstr "Ajuda-o a gerir e organizar o processo de recrutamento"
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employee0
+msgid "Employee form and structure"
+msgstr "Formulário e estrutura do Empregado"
+
+#. module: hr
+#: field:hr.employee,photo:0
+msgid "Photo"
+msgstr "Fotografia"
+
+#. module: hr
+#: model:ir.model,name:hr.model_res_users
+msgid "res.users"
+msgstr "Utilizadores"
+
+#. module: hr
+#: field:hr.installer,hr_payroll_account:0
+msgid "Payroll Accounting"
+msgstr "Contabilidade do Processamento de Salários"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Personal Information"
-msgstr "Informação pessoal"
+msgstr "Informação Pessoal"
 
 #. module: hr
 #: constraint:ir.model:0
@@ -386,41 +583,76 @@ msgstr ""
 "O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
 
 #. module: hr
-#: view:hr.timesheet:0
-#: field:hr.timesheet.group,timesheet_id:0
-#: model:ir.model,name:hr.model_hr_timesheet_group
-msgid "Working Time"
-msgstr "Tempo de trabalho"
+#: view:res.users:0
+msgid "Current Activity"
+msgstr "Actividade Actual"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Thursday"
-msgstr "Quinta-feira"
+#: help:hr.installer,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+"Regista e processa as despesas dos empregados, e pode ainda automaticamente "
+"facturar os clientes se as despesas estão relacionadas com algum projecto"
 
 #. module: hr
-#: field:hr.timesheet,hour_to:0
-msgid "Work to"
-msgstr "Trabalhar para"
+#: view:hr.job:0
+msgid "Current"
+msgstr "Actual"
 
 #. module: hr
-#: selection:hr.employee,marital:0
-msgid "Other"
-msgstr "Outro"
+#: field:hr.department,parent_id:0
+msgid "Parent Department"
+msgstr "Departamento Pai"
 
 #. module: hr
 #: view:hr.employee.category:0
 msgid "Employees Categories"
-msgstr "Categorias dos empregados"
+msgstr "Categorias de Empredados"
 
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
-msgstr "Endereço de residência"
+msgstr "Endereço de Casa"
+
+#. module: hr
+#: field:hr.installer,hr_attendance:0
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
+msgid "Attendances"
+msgstr "Assiduidades"
+
+#. module: hr
+#: view:hr.employee.marital.status:0
+#: view:hr.job:0
+msgid "Description"
+msgstr "Descrição"
+
+#. module: hr
+#: help:hr.installer,hr_contract:0
+msgid "Extends employee profiles to help manage their contracts."
+msgstr "Extende perfis de empregados para ajudar a gerir os seus contratos"
+
+#. module: hr
+#: field:hr.installer,hr_payroll:0
+msgid "Payroll"
+msgstr "Processamento de Salários"
+
+#. module: hr
+#: field:hr.job,name:0
+msgid "Job Name"
+msgstr "Nome do Cargo"
+
+#. module: hr
+#: view:hr.job:0
+#: selection:hr.job,state:0
+msgid "In Position"
+msgstr "Em Posição"
 
 #. module: hr
 #: view:hr.department:0
 msgid "department"
-msgstr "Departamento"
+msgstr "departamento"
 
 #. module: hr
 #: field:hr.employee,country_id:0
@@ -428,66 +660,219 @@ msgid "Nationality"
 msgstr "Nacionalidade"
 
 #. module: hr
-#: field:hr.employee,otherid:0
-msgid "Other ID"
-msgstr "Outra Identificação"
+#: view:hr.department:0
+#: view:hr.employee:0
+#: field:hr.employee,notes:0
+msgid "Notes"
+msgstr "Notas"
 
 #. module: hr
-#: field:hr.timesheet,name:0
+#: model:ir.model,name:hr.model_hr_installer
+msgid "hr.installer"
+msgstr "hr.installer"
+
+#. module: hr
+#: view:board.board:0
+msgid "HR Manager Board"
+msgstr "Painel do Gestor de RH"
+
+#. module: hr
+#: field:hr.employee,resource_id:0
+msgid "Resource"
+msgstr "Recurso"
+
+#. module: hr
+#: field:hr.department,complete_name:0
+#: field:hr.employee.category,complete_name:0
 msgid "Name"
 msgstr "Nome"
 
 #. module: hr
 #: field:hr.employee,gender:0
 msgid "Gender"
-msgstr "Sexo"
+msgstr "Género"
 
 #. module: hr
 #: view:hr.employee:0
+#: field:hr.job,employee_ids:0
+#: model:ir.actions.act_window,name:hr.hr_employee_normal_action_tree
 #: model:ir.actions.act_window,name:hr.open_view_employee_list
-#: model:ir.ui.menu,name:hr.menu_open_view_employee_list
+#: model:ir.actions.act_window,name:hr.open_view_employee_list_my
+#: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_configuration_form
 msgid "Employees"
 msgstr "Empregados"
 
+#. module: hr
+#: field:hr.employee,bank_account_id:0
+msgid "Bank Account"
+msgstr "Conta Bancária"
+
 #. module: hr
 #: field:hr.department,name:0
 msgid "Department Name"
 msgstr "Nome do Departamento"
 
+#. module: hr
+#: help:hr.employee,ssnid:0
+msgid "Social Security Number"
+msgstr "Número da Segurança Social"
+
+#. module: hr
+#: model:process.node,note:hr.process_node_openerpuser0
+msgid "Creation of a OpenERP user"
+msgstr "Criação de um utilizador OpenERP"
+
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Departamentos descendentes"
 
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action_hr_job
+#: model:ir.ui.menu,name:hr.menu_hr_job
+msgid "Job Positions"
+msgstr "Cargos"
+
 #. module: hr
 #: view:hr.employee:0
-msgid "Job Information"
-msgstr "Informações do trabalho"
+#: field:hr.employee,coach_id:0
+msgid "Coach"
+msgstr "Treinador"
 
 #. module: hr
-#: model:process.node,note:hr.process_node_employeecontact0
-msgid "Fill up employee's contact information"
-msgstr "Preencha as informações de contacto do empregado"
+#: field:hr.installer,hr_expense:0
+msgid "Expenses"
+msgstr "Despesas"
 
 #. module: hr
+#: view:hr.department:0
 #: field:hr.department,manager_id:0
+#: view:hr.employee:0
 #: field:hr.employee,parent_id:0
 msgid "Manager"
 msgstr "Gestor"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_view_employee_list_my
-#: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
-msgid "All Employees"
-msgstr "Todos os empregados"
+#: help:hr.installer,hr_payroll_account:0
+msgid "Generic Payroll system Integrated with Accountings."
+msgstr "Sistema de Processamento de Salários Integrado com a Contabilidade"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Saturday"
-msgstr "Sábado"
+#: field:hr.employee,child_ids:0
+msgid "Subordinates"
+msgstr "Subordinados"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_view_employee_new
-#: model:ir.ui.menu,name:hr.menu_open_view_employee_new
-msgid "New Employee"
-msgstr "Novo Empregado"
+#~ msgid "Working Time Categories"
+#~ msgstr "Categorias de tempos de trabalhos"
+
+#~ msgid "Sunday"
+#~ msgstr "Domingo"
+
+#~ msgid "Contact  of employee"
+#~ msgstr "Contracto do empregado"
+
+#~ msgid "Work Email"
+#~ msgstr "Email Profissional"
+
+#~ msgid "Group name"
+#~ msgstr "Nome do grupo"
+
+#~ msgid "Friday"
+#~ msgstr "Sexta-feira"
+
+#~ msgid "Work from"
+#~ msgstr "Trabalhar de"
+
+#~ msgid "Unmaried"
+#~ msgstr "Não casado"
+
+#~ msgid "Working Time Category"
+#~ msgstr "Categoria do tempo de trabalho"
+
+#~ msgid "Workgroup manager"
+#~ msgstr "Gerente do grupo de trabalho"
+
+#~ msgid "Fill up contact information"
+#~ msgstr "Preencha as informações de contacto"
+
+#~ msgid "Divorced"
+#~ msgstr "Divorciado"
+
+#~ msgid "Maried"
+#~ msgstr "Casado"
+
+#~ msgid "Employee's timesheet group"
+#~ msgstr "Grupo dos horários do empregado"
+
+#~ msgid "Create openerp user"
+#~ msgstr "Criar um utilizador openerp"
+
+#~ msgid "Tuesday"
+#~ msgstr "Terça-feira"
+
+#~ msgid "Related User"
+#~ msgstr "Utilizador relacionado"
+
+#~ msgid "Monday"
+#~ msgstr "Segunda-feira"
+
+#~ msgid "Day of week"
+#~ msgstr "Dia da semana"
+
+#~ msgid "Create OpenERP User"
+#~ msgstr "Criar um utilizador OpenERP"
+
+#~ msgid "Employee Complete Form"
+#~ msgstr "Formulário completo do empregado"
+
+#~ msgid "Wednesday"
+#~ msgstr "Quarta-feira"
+
+#~ msgid "Starting date"
+#~ msgstr "Data de inicio"
+
+#~ msgid "Timesheet Line"
+#~ msgstr "Linha de horário"
+
+#~ msgid "Working Time"
+#~ msgstr "Tempo de trabalho"
+
+#~ msgid "Thursday"
+#~ msgstr "Quinta-feira"
+
+#~ msgid "Work to"
+#~ msgstr "Trabalhar para"
+
+#~ msgid "Other"
+#~ msgstr "Outro"
+
+#~ msgid "Other ID"
+#~ msgstr "Outra Identificação"
+
+#~ msgid "Job Information"
+#~ msgstr "Informações do trabalho"
+
+#~ msgid "Fill up employee's contact information"
+#~ msgstr "Preencha as informações de contacto do empregado"
+
+#~ msgid "All Employees"
+#~ msgstr "Todos os empregados"
+
+#~ msgid "Saturday"
+#~ msgstr "Sábado"
+
+#~ msgid "New Employee"
+#~ msgstr "Novo Empregado"
+
+#~ msgid "Parent Users"
+#~ msgstr "Utilizadores ascendentes"
+
+#~ msgid "Parents"
+#~ msgstr "Ascendentes"
+
+#~ msgid "Birthday"
+#~ msgstr "Data de nascimento"
+
+#~ msgid "Employee Contract Process"
+#~ msgstr "Processo de contracto do empregado"
diff --git a/addons/hr_attendance/i18n/mn.po b/addons/hr_attendance/i18n/mn.po
index 187dcbfbfa4..d198e3257a8 100644
--- a/addons/hr_attendance/i18n/mn.po
+++ b/addons/hr_attendance/i18n/mn.po
@@ -7,22 +7,413 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 09:01+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-27 02:49+0000\n"
+"Last-Translator: badralkh <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: hr_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
+msgid "Time Tracking"
+msgstr "Ирц, цагийн хяналт"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Group By..."
+msgstr "Бүлэглэвэл..."
+
+#. module: hr_attendance
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Today"
+msgstr "Өнөөдөр"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+"Өөр үйлдлээс өмнөх огноо байна ( %s)  !\n"
+"Администраторт хэлж ирцүүдийг засуулна уу."
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "March"
+msgstr "3 сар"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid ""
+"You did not sign out the last time. Please enter the date and time you "
+"signed out."
+msgstr ""
+"Та сүүлийн удаа системээс гарахдаа гарах үйлдлийг хийгээгүй байна. Системээс "
+"гарсан огноо, цагаа оруулна уу!"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Total period:"
+msgstr "Нийт мөчлөг"
+
+#. module: hr_attendance
+#: field:hr.action.reason,name:0
+msgid "Reason"
+msgstr "Шалтгаан"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Print Attendance Report Error"
+msgstr "Алдаатай ирцийн тайланг хэвлэх"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#, python-format
+msgid "The sign-out date must be in the past"
+msgstr "Системээс гарсан огноо нь өнгөрсөн огноо байх ёстой"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Signed"
+msgstr "Нэвтэрсэн огноо"
+
+#. module: hr_attendance
+#: view:hr.action.reason:0
+msgid "Attendance reasons"
+msgstr "Ирцийн шалтгаанууд"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+#: field:hr.attendance,day:0
+msgid "Day"
+msgstr "Өдөр"
+
+#. module: hr_attendance
+#: selection:hr.employee,state:0
+msgid "Present"
+msgstr "Байна"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_sign_in_out_ask
+msgid "Ask for Sign In Out"
+msgstr "Системд нэвтрэх, гарахыг хүсэх"
+
+#. module: hr_attendance
+#: field:hr.attendance,action_desc:0
+#: model:ir.model,name:hr_attendance.model_hr_action_reason
+msgid "Action Reason"
+msgstr "Ирцийн үйлдэл"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid "Ok"
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.action.reason:0
+msgid "Define attendance reason"
+msgstr "Ирцийн үйлдлийг тодорхойлох"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
+msgid "Attendances By Month"
+msgstr "Сарын ирц"
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,name:0
+#: field:hr.sign.in.out.ask,name:0
+msgid "Employees name"
+msgstr "Ажилтны нэр"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
+#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason
+msgid "Attendance Reasons"
+msgstr "Ирцийн үйлдлүүд"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#, python-format
+msgid "UserError"
+msgstr "Хэрэглэгчийн Алдаа"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,end_date:0
+#: field:hr.attendance.week,end_date:0
+msgid "Ending Date"
+msgstr "Дуусах огноо"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Employee attendance"
+msgstr "Ажилтаны ирц"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid "Warning"
+msgstr "Анхааруулга"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#, python-format
+msgid "The Sign-in date must be in the past"
+msgstr "Системд нэвтэрсэн огноо нь өнгөрсөн огноо байх ёстой"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#, python-format
+msgid "A sign-in must be right after a sign-out !"
+msgstr "Системд нэвтэрсэн үйлдэл системээс гарсны яг ард нь байна."
+
 #. module: hr_attendance
 #: field:hr.employee,state:0
 #: model:ir.model,name:hr_attendance.model_hr_attendance
 msgid "Attendance"
 msgstr "Ирц"
 
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid "You are now ready to sign in or out of the attendance follow up"
+msgstr "Ирцийн зөв дарааллын дагуу нэврэх буюу гарахад бэлэн боллоо"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,max_delay:0
+msgid "Max. Delay (Min)"
+msgstr "Хамгийн их саатал (Хамгийн бага)"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+#: view:hr.attendance.month:0
+msgid "Print"
+msgstr "Хэвлэх"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Hr Attendance Search"
+msgstr "Ирцээс хайх"
+
+#. module: hr_attendance
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
+"Алдаа: орсон (эсвэл гарсан) бүртгэлийн араас гарсан (эсвэл орсон) бүртгэл "
+"хийгдэх ёстой."
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "July"
+msgstr "7 сар"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_error
+#: model:ir.actions.report.xml,name:hr_attendance.attendance_error_report
+msgid "Attendance Error Report"
+msgstr "Ирцийн алдаатай мэдээлэл"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,init_date:0
+#: field:hr.attendance.week,init_date:0
+msgid "Starting Date"
+msgstr "Эхлэл Огноо"
+
+#. module: hr_attendance
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Харагдах архитектурт нийцэхгүй XML!"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Min Delay"
+msgstr "Хамгийн бага саатал"
+
+#. module: hr_attendance
+#: selection:hr.attendance,action:0
+#: view:hr.employee:0
+msgid "Sign In"
+msgstr "Нэвтрэх"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Operation"
+msgstr "Үйл ажиллагаа"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No Data Available"
+msgstr "Өгөгдөл байхгүй байна"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "September"
+msgstr "9 сар"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "December"
+msgstr "12 сар"
+
+#. module: hr_attendance
+#: field:hr.attendance.month,month:0
+msgid "Month"
+msgstr "Сар"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid ""
+"(*) A negative delay means that the employee worked more than encoded."
+msgstr "Сөрөг саатал нь ажилтан бүртгэсэнээсээ их ажилласан гэсэн үг."
+
+#. module: hr_attendance
+#: help:hr.attendance,action_desc:0
+msgid ""
+"Specifies the reason for Signing In/Signing Out in case of extra hours."
+msgstr "Системд нэвтэрсэн/ системээс гарсан ирцийн үйлдлийг тодорхойлно."
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_month
+msgid "Print Monthly Attendance Report"
+msgstr "Сарын ирцийн тайланг хэвлэх"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_sign_in_out
+msgid "Sign In Sign Out"
+msgstr ""
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#: view:hr.sign.in.out:0
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_sigh_in_out
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_sigh_in_out
+#, python-format
+msgid "Sign in / Sign out"
+msgstr "Нэвтрэх / Гарах"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
+msgstr "Системээс гарах хүсэлт"
+
+#. module: hr_attendance
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Алдаа! Рекурс цэсийг үүсгэж болохгүй."
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "August"
+msgstr "8 сар"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#, python-format
+msgid "A sign-out must be right after a sign-in !"
+msgstr "Системээс гарах нь системд нэвтрэх үйлдлийн яг ард нь байна."
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "June"
+msgstr "6 сар"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_error
+msgid "Print Error Attendance Report"
+msgstr "Алдаатай ирцийн тайланг хэвлэх"
+
+#. module: hr_attendance
+#: model:ir.module.module,shortdesc:hr_attendance.module_meta_information
+msgid "Attendances Of Employees"
+msgstr "Ажилчдын ирц"
+
+#. module: hr_attendance
+#: field:hr.attendance,name:0
+msgid "Date"
+msgstr "Огноо"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "November"
+msgstr "11 сар"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "October"
+msgstr "10 сар"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "My Attendances"
+msgstr "Өөрийн ирц"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "January"
+msgstr "1 сар"
+
+#. module: hr_attendance
+#: selection:hr.action.reason,action_type:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Sign in"
+msgstr "Нэвтрэх"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Analysis Information"
+msgstr "Мэдээлэлд шинжилгээ хийх"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid "Sign-Out Entry must follow Sign-In."
+msgstr "Системээс гарсан бүртгэлийг системд нэвтэрсэн бүртгэл дагалдана"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Attendance Errors"
+msgstr "Ирцийн алдаанууд"
+
+#. module: hr_attendance
+#: field:hr.attendance,action:0
+#: selection:hr.attendance,action:0
+msgid "Action"
+msgstr "Үйлдэл"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
+msgstr "Таны сонголтод таарах бичлэг олдсонгүй"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_week
+msgid "Print Week Attendance Report"
+msgstr "Долоо хоногийн ирцийн тайлан"
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,emp_id:0
+#: field:hr.sign.in.out.ask,emp_id:0
+msgid "Empoyee ID"
+msgstr "Ажилтны дугаар"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+#: view:hr.attendance.month:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
 #. module: hr_attendance
 #: constraint:ir.model:0
 msgid ""
@@ -32,263 +423,51 @@ msgstr ""
 "болохгүй!"
 
 #. module: hr_attendance
-#: wizard_view:hr.si_so,init:0
-#: wizard_view:hr.si_so,si_ask_so:0
-#: wizard_view:hr.si_so,so_ask_si:0
-#: model:ir.actions.wizard,name:hr_attendance.si_so
-#: model:ir.ui.menu,name:hr_attendance.menu_si_so
-msgid "Sign in / Sign out"
-msgstr "Нэвтрэх / Гарах"
+#: help:hr.action.reason,name:0
+msgid "Specifies the reason for Signing In/Signing Out."
+msgstr "Системд нэвтэрсэн, системээс гарсан ирцийн үйлдлийг тодорхойлдог"
 
 #. module: hr_attendance
-#: rml:report.hr.timesheet.attendance.error:0
+#: report:report.hr.timesheet.attendance.error:0
 msgid ""
 "(*) A positive delay means that the employee worked less than recorded."
 msgstr ""
 "(*) Эерэг саатал нь ажилтан тэмдэглэснээс бага ажилласан гэсэн утга болно."
 
 #. module: hr_attendance
-#: view:hr.attendance:0
-msgid "Employee attendances"
-msgstr "Ажилчдын ирц"
-
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Харагдах архитектурт нийцэхгүй XML!"
-
-#. module: hr_attendance
-#: wizard_view:hr.si_so,init:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr "Ирцийн зөв дарааллын дагуу нэврэх буюу гарахад бэлэн боллоо"
+#: view:hr.attendance.month:0
+msgid "Print Attendance Report Monthly"
+msgstr "Сар бүрийн ирцийн тайланг хэвлэх"
 
 #. module: hr_attendance
 #: selection:hr.action.reason,action_type:0
-#: wizard_button:hr.si_so,init,so_test:0
-#: wizard_button:hr.si_so,so_ask_si,so:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
 msgid "Sign out"
 msgstr "Гарах"
 
 #. module: hr_attendance
-#: rml:report.hr.timesheet.attendance.error:0
+#: report:report.hr.timesheet.attendance.error:0
 msgid "Delay"
-msgstr "Зогсолт"
+msgstr "Саатал"
 
 #. module: hr_attendance
-#: wizard_field:hr.si_so,init,name:0
-#: wizard_field:hr.si_so,si_ask_so,name:0
-#: wizard_field:hr.si_so,so_ask_si,name:0
-msgid "Employee's name"
-msgstr "Ажилтны нэр"
-
-#. module: hr_attendance
-#: wizard_button:hr.attendance.print_month,init,print:0
-#: wizard_button:hr.attendance.print_week,init,print:0
-msgid "Print Timesheet"
-msgstr "Хуваарь хэвлэх"
-
-#. module: hr_attendance
-#: model:ir.actions.wizard,name:hr_attendance.wizard_attendance_error
-msgid "Print Attendance Error Report"
-msgstr "Ирцийн алдаатай мэдээлэл хэвлэх"
-
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
-#. module: hr_attendance
-#: model:ir.actions.wizard,name:hr_attendance.print_week
-msgid "Print Timesheet by week"
-msgstr "Долоо хоногийн хуваарь хэвлэх"
-
-#. module: hr_attendance
-#: field:hr.attendance,employee_id:0
+#: view:hr.attendance:0
+#: model:ir.model,name:hr_attendance.model_hr_employee
 msgid "Employee"
 msgstr "Ажилтан"
 
 #. module: hr_attendance
-#: wizard_view:hr.attendance.print_week,init:0
-#: wizard_view:hr.attendance.report,init:0
-msgid "Select a time span"
-msgstr "Цагийн интервал сонгох"
+#: view:hr.sign.in.out.ask:0
+#: field:hr.sign.in.out.ask,last_time:0
+msgid "Your last sign out"
+msgstr "Сүүлд та системээс гарсан үйлдэл"
 
 #. module: hr_attendance
-#: rml:report.hr.timesheet.attendance.error:0
+#: report:report.hr.timesheet.attendance.error:0
 msgid "Date Recorded"
 msgstr "Бичигдсэн огноо"
 
-#. module: hr_attendance
-#: selection:hr.attendance,action:0
-#: view:hr.employee:0
-msgid "Sign In"
-msgstr "Нэвтрэх"
-
-#. module: hr_attendance
-#: rml:report.hr.timesheet.attendance.error:0
-msgid "Total period:"
-msgstr "Нийт мөчлөг"
-
-#. module: hr_attendance
-#: field:hr.attendance,action_desc:0
-#: model:ir.model,name:hr_attendance.model_hr_action_reason
-msgid "Action reason"
-msgstr "Үйл ажиллагааны шалтгаан"
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "March"
-msgstr "3 сар"
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "August"
-msgstr "8 сар"
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "May"
-msgstr "5 сар"
-
-#. module: hr_attendance
-#: wizard_field:hr.si_so,so_ask_si,last_time:0
-msgid "Your last sign in"
-msgstr "Таны сүүлийн нэвтрэлт"
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "June"
-msgstr "6 сар"
-
-#. module: hr_attendance
-#: model:ir.actions.wizard,name:hr_attendance.print_month
-msgid "Print Timesheet by month"
-msgstr "Сарын хуваарь хэвлэх"
-
-#. module: hr_attendance
-#: selection:hr.attendance,action:0
-#: view:hr.employee:0
-msgid "Sign Out"
-msgstr "Гарах"
-
-#. module: hr_attendance
-#: model:ir.module.module,shortdesc:hr_attendance.module_meta_information
-msgid "Attendances Of Employees"
-msgstr "Ажилчдын ирц"
-
-#. module: hr_attendance
-#: field:hr.action.reason,name:0
-msgid "Reason"
-msgstr "Шалтгаан"
-
-#. module: hr_attendance
-#: constraint:hr.attendance:0
-msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-msgstr ""
-"Алдаа: орсон (эсвэл гарсан) бүртгэлийн араас гарсан (эсвэл орсон) бүртгэл "
-"хийгдэх ёстой."
-
-#. module: hr_attendance
-#: rml:report.hr.timesheet.attendance.error:0
-msgid "Date Signed"
-msgstr "Нэвтэрсэн огноо"
-
-#. module: hr_attendance
-#: field:hr.attendance,name:0
-msgid "Date"
-msgstr "Огноо"
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "July"
-msgstr "7 сар"
-
-#. module: hr_attendance
-#: wizard_view:hr.si_so,si_ask_so:0
-msgid ""
-"You did not signed out the last time. Please enter the date and time you "
-"signed out."
-msgstr ""
-"Та сүүлд гарсан бүртгэлээ хийгээгүй байна. Гарсан огноогоо оруулна уу."
-
-#. module: hr_attendance
-#: view:hr.action.reason:0
-msgid "Attendance reasons"
-msgstr "Ирцийн шалтгаанууд"
-
-#. module: hr_attendance
-#: wizard_field:hr.attendance.print_week,init,init_date:0
-#: wizard_field:hr.attendance.report,init,init_date:0
-msgid "Starting Date"
-msgstr "Эхлэл Огноо"
-
-#. module: hr_attendance
-#: selection:hr.employee,state:0
-msgid "Present"
-msgstr "Байна"
-
-#. module: hr_attendance
-#: selection:hr.employee,state:0
-msgid "Absent"
-msgstr "Тасалсан"
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "February"
-msgstr "2 сар"
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "October"
-msgstr "10 сар"
-
-#. module: hr_attendance
-#: wizard_field:hr.si_so,si_ask_so,last_time:0
-msgid "Your last sign out"
-msgstr "Таны сүүлийн нэвтрэлт"
-
-#. module: hr_attendance
-#: rml:report.hr.timesheet.attendance.error:0
-msgid "Min Delay"
-msgstr "Хамгийн бага зогсолт"
-
-#. module: hr_attendance
-#: field:hr.action.reason,action_type:0
-msgid "Action's type"
-msgstr "Үйл ажиллагааны төрөл"
-
-#. module: hr_attendance
-#: view:hr.action.reason:0
-msgid "Define attendance reason"
-msgstr "Ирцийн шалтгаан тодорхойлох"
-
-#. module: hr_attendance
-#: selection:hr.action.reason,action_type:0
-#: wizard_button:hr.si_so,init,si_test:0
-#: wizard_button:hr.si_so,si_ask_so,si:0
-msgid "Sign in"
-msgstr "Нэвтрэх"
-
-#. module: hr_attendance
-#: wizard_view:hr.attendance.report,init:0
-msgid "Analysis Information"
-msgstr "Мэдээлэлд шинжилгээ хийх"
-
-#. module: hr_attendance
-#: wizard_field:hr.si_so,init,state:0
-msgid "Current state"
-msgstr "Одоогийн байдал"
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "January"
-msgstr "1 сар"
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "April"
-msgstr "4 сар"
-
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance
@@ -297,111 +476,125 @@ msgid "Attendances"
 msgstr "Ирцүүд"
 
 #. module: hr_attendance
-#: rml:report.hr.timesheet.attendance.error:0
-msgid "Attendance Errors"
-msgstr "Ирцийн алдаанууд"
+#: selection:hr.attendance.month,month:0
+msgid "May"
+msgstr "5 сар"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "Your last sign in"
+msgstr "Таны сүүлийн нэвтрэлт"
 
 #. module: hr_attendance
-#: field:hr.attendance,action:0
 #: selection:hr.attendance,action:0
-msgid "Action"
-msgstr "Үйл ажиллагаа"
+#: view:hr.employee:0
+msgid "Sign Out"
+msgstr "Гарах"
 
 #. module: hr_attendance
-#: wizard_button:hr.attendance.report,init,print:0
-msgid "Print Attendance Report"
-msgstr "Ирцийн мэдээлэл хэвлэх"
+#: field:hr.attendance,employee_id:0
+msgid "Employee's Name"
+msgstr "Ажилтны нэр"
 
 #. module: hr_attendance
-#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
-#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason
-msgid "Attendance Reasons"
-msgstr "Ирцийн шалтгаан"
+#: selection:hr.employee,state:0
+msgid "Absent"
+msgstr "Байхгүй байгаа"
 
 #. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "November"
-msgstr "11 сар"
+#: selection:hr.attendance.month,month:0
+msgid "February"
+msgstr "2 сар"
 
 #. module: hr_attendance
-#: wizard_view:hr.attendance.report,init:0
-msgid "Bellow this delay, the error is considered to be voluntary"
-msgstr ""
-
-#. module: hr_attendance
-#: wizard_field:hr.attendance.report,init,max_delay:0
-msgid "Max. Delay (Min)"
-msgstr "Хамгийн их зогсолт(Хамгийн бага)"
-
-#. module: hr_attendance
-#: wizard_view:hr.attendance.print_week,init:0
-msgid "Select a starting and a end date"
-msgstr "Эхлэх болон дуусах огноо сонгох"
-
-#. module: hr_attendance
-#: wizard_field:hr.attendance.print_week,init,end_date:0
-#: wizard_field:hr.attendance.report,init,end_date:0
-msgid "Ending Date"
-msgstr "Дуусах огноо"
-
-#. module: hr_attendance
-#: wizard_view:hr.si_so,so_ask_si:0
-msgid ""
-"You did not signed in the last time. Please enter the date and time you "
-"signed in."
-msgstr "Та сүүлийн цагт нэвтэрсэнгүй. Нэвтэрсэн огноо болон цагаа оруулна уу"
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "September"
-msgstr "9 сар"
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "December"
-msgstr "12 сар"
+#: field:hr.action.reason,action_type:0
+msgid "Action's type"
+msgstr "Үйлдлийн төрөл"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
-msgid "Employee attendance"
-msgstr "Ажилтаны ирц"
+msgid "Employee attendances"
+msgstr "Ажилчдын ирц"
 
 #. module: hr_attendance
-#: wizard_view:hr.attendance.print_month,init:0
-msgid "Select a month"
-msgstr "Сар сонгох"
+#: field:hr.sign.in.out,state:0
+msgid "Current state"
+msgstr "Одоогийн төлөв"
 
 #. module: hr_attendance
-#: wizard_field:hr.attendance.print_month,init,month:0
-msgid "Month"
-msgstr "Сар"
+#: selection:hr.attendance.month,month:0
+msgid "April"
+msgstr "4 сар"
 
 #. module: hr_attendance
-#: model:ir.module.module,description:hr_attendance.module_meta_information
-msgid "This module aims to manage employee's attendances."
-msgstr "Модулийн зорилго нь ажилчдын ирцийг зохицуулах"
+#: view:hr.attendance.error:0
+msgid "Bellow this delay, the error is considered to be voluntary"
+msgstr "Саатал нь үүнээс бага бол, энэ алдааг анзаарахгүй гэж үзнэ"
 
 #. module: hr_attendance
-#: model:ir.actions.report.xml,name:hr_attendance.attendance_error_report
-msgid "Attendance Error Report"
-msgstr "Ирцийн алдаатай мэдээлэл"
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr "osv_memory обьект дүрмийг дэмждэггүй"
 
 #. module: hr_attendance
-#: wizard_field:hr.attendance.print_month,init,year:0
+#: view:hr.sign.in.out.ask:0
+msgid ""
+"You did not sign in the last time. Please enter the date and time you signed "
+"in."
+msgstr ""
+"Сүүлд таны системд нэвтэрсэн үйлдэл бүртгэгдсэнгүй. Системд нэвтэрсэн огноо, "
+"цагаа оруулна уу!"
+
+#. module: hr_attendance
+#: field:hr.attendance.month,year:0
 msgid "Year"
 msgstr "Жил"
 
 #. module: hr_attendance
-#: wizard_button:hr.attendance.print_month,init,end:0
-#: wizard_button:hr.attendance.print_week,init,end:0
-#: wizard_button:hr.attendance.report,init,end:0
-#: wizard_button:hr.si_so,init,end:0
-#: wizard_button:hr.si_so,si_ask_so,end:0
-#: wizard_button:hr.si_so,so_ask_si,end:0
-msgid "Cancel"
-msgstr "Цуцлах"
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.in.out.ask"
+msgstr "Нэвтрэх, гарахыг хүсэх"
 
-#. module: hr_attendance
-#: rml:report.hr.timesheet.attendance.error:0
-msgid "Operation"
-msgstr "Үйл ажиллагаа"
+#~ msgid "Employee's name"
+#~ msgstr "Ажилтны нэр"
+
+#~ msgid "Print Timesheet"
+#~ msgstr "Хуваарь хэвлэх"
+
+#~ msgid "Print Attendance Error Report"
+#~ msgstr "Ирцийн алдаатай мэдээлэл хэвлэх"
+
+#~ msgid "Print Timesheet by week"
+#~ msgstr "Долоо хоногийн хуваарь хэвлэх"
+
+#~ msgid "Select a time span"
+#~ msgstr "Цагийн интервал сонгох"
+
+#~ msgid "Action reason"
+#~ msgstr "Үйл ажиллагааны шалтгаан"
+
+#~ msgid "Print Timesheet by month"
+#~ msgstr "Сарын хуваарь хэвлэх"
+
+#~ msgid "Print Attendance Report"
+#~ msgstr "Ирцийн мэдээлэл хэвлэх"
+
+#~ msgid "Select a starting and a end date"
+#~ msgstr "Эхлэх болон дуусах огноо сонгох"
+
+#~ msgid ""
+#~ "You did not signed in the last time. Please enter the date and time you "
+#~ "signed in."
+#~ msgstr "Та сүүлийн цагт нэвтэрсэнгүй. Нэвтэрсэн огноо болон цагаа оруулна уу"
+
+#~ msgid "Select a month"
+#~ msgstr "Сар сонгох"
+
+#~ msgid "This module aims to manage employee's attendances."
+#~ msgstr "Модулийн зорилго нь ажилчдын ирцийг зохицуулах"
+
+#~ msgid ""
+#~ "You did not signed out the last time. Please enter the date and time you "
+#~ "signed out."
+#~ msgstr ""
+#~ "Та сүүлд гарсан бүртгэлээ хийгээгүй байна. Гарсан огноогоо оруулна уу."
diff --git a/addons/hr_attendance/i18n/pt.po b/addons/hr_attendance/i18n/pt.po
index 94ac70485c4..9d748367a16 100644
--- a/addons/hr_attendance/i18n/pt.po
+++ b/addons/hr_attendance/i18n/pt.po
@@ -6,22 +6,413 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:21+0000\n"
-"Last-Translator: Madalena_prime <madalena.barreto@prime.cv>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-26 19:53+0000\n"
+"Last-Translator: Carlos Almeida <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: hr_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
+msgid "Time Tracking"
+msgstr "Registo de Tempo"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Group By..."
+msgstr "Agrupar Por..."
+
+#. module: hr_attendance
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nome de módulo inválido na definição da acção"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Today"
+msgstr "Hoje"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+"Você tentou %s com uma data anterior a outro evento!\n"
+"Contacte o administrador para corrigir as assiduidade."
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "March"
+msgstr "Março"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid ""
+"You did not sign out the last time. Please enter the date and time you "
+"signed out."
+msgstr ""
+"Você não registou a saída da última vez. Por favor indique a hora em que "
+"saiu."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Total period:"
+msgstr "Período total:"
+
+#. module: hr_attendance
+#: field:hr.action.reason,name:0
+msgid "Reason"
+msgstr "Motivo"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Print Attendance Report Error"
+msgstr "Imprimir Relatório de Desvios de Assiduidade"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#, python-format
+msgid "The sign-out date must be in the past"
+msgstr "A data de saída tem de ser passada"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Signed"
+msgstr "Data de Assinatura"
+
+#. module: hr_attendance
+#: view:hr.action.reason:0
+msgid "Attendance reasons"
+msgstr "Tipos de Registo Entrada/Saída"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+#: field:hr.attendance,day:0
+msgid "Day"
+msgstr "Dia"
+
+#. module: hr_attendance
+#: selection:hr.employee,state:0
+msgid "Present"
+msgstr "Presente"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_sign_in_out_ask
+msgid "Ask for Sign In Out"
+msgstr "Perguntar por Entradas e Saídas"
+
+#. module: hr_attendance
+#: field:hr.attendance,action_desc:0
+#: model:ir.model,name:hr_attendance.model_hr_action_reason
+msgid "Action Reason"
+msgstr "Razão da Acção"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid "Ok"
+msgstr "Ok"
+
+#. module: hr_attendance
+#: view:hr.action.reason:0
+msgid "Define attendance reason"
+msgstr "Definir tipo de entradas e saídas"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
+msgid "Attendances By Month"
+msgstr "Assiduidades por Mês"
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,name:0
+#: field:hr.sign.in.out.ask,name:0
+msgid "Employees name"
+msgstr "Nomes de Empregados"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
+#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason
+msgid "Attendance Reasons"
+msgstr "Tipos de Entradas e Saídas"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#, python-format
+msgid "UserError"
+msgstr "Erro de Utilizador"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,end_date:0
+#: field:hr.attendance.week,end_date:0
+msgid "Ending Date"
+msgstr "Data de Fim"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Employee attendance"
+msgstr "Assiduidade do Empregado"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#, python-format
+msgid "The Sign-in date must be in the past"
+msgstr "A data de entrada deve estar no passado"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#, python-format
+msgid "A sign-in must be right after a sign-out !"
+msgstr "A entrada deve estar depois da saída !"
+
 #. module: hr_attendance
 #: field:hr.employee,state:0
 #: model:ir.model,name:hr_attendance.model_hr_attendance
 msgid "Attendance"
 msgstr "Assiduidade"
 
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid "You are now ready to sign in or out of the attendance follow up"
+msgstr "Você já pode registar entradas ou saídas do registo de assiduidade"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,max_delay:0
+msgid "Max. Delay (Min)"
+msgstr "Máx. Atraso (Min)"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+#: view:hr.attendance.month:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Hr Attendance Search"
+msgstr "Procura de Assiduidades RH"
+
+#. module: hr_attendance
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr "Erro: Entrada (Saída) deve ser seguida de Saída (Entrada)"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "July"
+msgstr "Julho"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_error
+#: model:ir.actions.report.xml,name:hr_attendance.attendance_error_report
+msgid "Attendance Error Report"
+msgstr "Relatório de Desvios de Assiduidades"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,init_date:0
+#: field:hr.attendance.week,init_date:0
+msgid "Starting Date"
+msgstr "Data Inicial"
+
+#. module: hr_attendance
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML inválido para a arquitectura de vista"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Min Delay"
+msgstr "Atraso mínimo"
+
+#. module: hr_attendance
+#: selection:hr.attendance,action:0
+#: view:hr.employee:0
+msgid "Sign In"
+msgstr "Entrar"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Operation"
+msgstr "Operação"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No Data Available"
+msgstr "Data Não Disponível"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "September"
+msgstr "Setembro"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "December"
+msgstr "Dezembro"
+
+#. module: hr_attendance
+#: field:hr.attendance.month,month:0
+msgid "Month"
+msgstr "Mês"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid ""
+"(*) A negative delay means that the employee worked more than encoded."
+msgstr ""
+"(*) Um atraso negativo indica que o empregado trabalhou mais horas que o "
+"previsto"
+
+#. module: hr_attendance
+#: help:hr.attendance,action_desc:0
+msgid ""
+"Specifies the reason for Signing In/Signing Out in case of extra hours."
+msgstr "Especifique as razões de Entrada/Saída no caso de horas extras."
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_month
+msgid "Print Monthly Attendance Report"
+msgstr "Imprimir Realtório Mensal de Assiduidades"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_sign_in_out
+msgid "Sign In Sign Out"
+msgstr "Entrada Saída"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#: view:hr.sign.in.out:0
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_sigh_in_out
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_sigh_in_out
+#, python-format
+msgid "Sign in / Sign out"
+msgstr "Entrada / Saída"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
+msgstr "hr.sign.out.ask"
+
+#. module: hr_attendance
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Erro ! Não pode criar menus recursivos"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#, python-format
+msgid "A sign-out must be right after a sign-in !"
+msgstr "O registo de uma saída deve ser depois de uma entrada!"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "June"
+msgstr "Junho"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_error
+msgid "Print Error Attendance Report"
+msgstr "Imprimir Relatório de Desvios de Assiduidade"
+
+#. module: hr_attendance
+#: model:ir.module.module,shortdesc:hr_attendance.module_meta_information
+msgid "Attendances Of Employees"
+msgstr "Assiduidades dos Empregados"
+
+#. module: hr_attendance
+#: field:hr.attendance,name:0
+msgid "Date"
+msgstr "Data"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "November"
+msgstr "Novembro"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "October"
+msgstr "Outubro"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "My Attendances"
+msgstr "A Minha Assiduidade"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "January"
+msgstr "Janeiro"
+
+#. module: hr_attendance
+#: selection:hr.action.reason,action_type:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Sign in"
+msgstr "Entrada"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Analysis Information"
+msgstr "Informação da Análise"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid "Sign-Out Entry must follow Sign-In."
+msgstr "Um registo de saída deve ser seguida de um de entrada."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Attendance Errors"
+msgstr "Desvios de Assiduidade"
+
+#. module: hr_attendance
+#: field:hr.attendance,action:0
+#: selection:hr.attendance,action:0
+msgid "Action"
+msgstr "Acção"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
+msgstr "Não foram encontrados registos para a sua selecção!"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_week
+msgid "Print Week Attendance Report"
+msgstr "Imprimir Relatório Semanal de Assiduidades"
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,emp_id:0
+#: field:hr.sign.in.out.ask,emp_id:0
+msgid "Empoyee ID"
+msgstr "ID do Empregado"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+#: view:hr.attendance.month:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Cancel"
+msgstr "Cancelar"
+
 #. module: hr_attendance
 #: constraint:ir.model:0
 msgid ""
@@ -30,16 +421,12 @@ msgstr ""
 "O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
 
 #. module: hr_attendance
-#: wizard_view:hr.si_so,init:0
-#: wizard_view:hr.si_so,si_ask_so:0
-#: wizard_view:hr.si_so,so_ask_si:0
-#: model:ir.actions.wizard,name:hr_attendance.si_so
-#: model:ir.ui.menu,name:hr_attendance.menu_si_so
-msgid "Sign in / Sign out"
-msgstr "Entrar / Sair"
+#: help:hr.action.reason,name:0
+msgid "Specifies the reason for Signing In/Signing Out."
+msgstr "Especificar tipos de Entradas/Saídas"
 
 #. module: hr_attendance
-#: rml:report.hr.timesheet.attendance.error:0
+#: report:report.hr.timesheet.attendance.error:0
 msgid ""
 "(*) A positive delay means that the employee worked less than recorded."
 msgstr ""
@@ -47,122 +434,55 @@ msgstr ""
 "gravado"
 
 #. module: hr_attendance
-#: view:hr.attendance:0
-msgid "Employee attendances"
-msgstr "Presenças do empregado"
-
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura de vista"
-
-#. module: hr_attendance
-#: wizard_view:hr.si_so,init:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr "Você já pode registar ou sair do seguimento de presenças"
+#: view:hr.attendance.month:0
+msgid "Print Attendance Report Monthly"
+msgstr "Imprimir Relatório de Assiduidades Mensalmente"
 
 #. module: hr_attendance
 #: selection:hr.action.reason,action_type:0
-#: wizard_button:hr.si_so,init,so_test:0
-#: wizard_button:hr.si_so,so_ask_si,so:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
 msgid "Sign out"
 msgstr "Sair"
 
 #. module: hr_attendance
-#: rml:report.hr.timesheet.attendance.error:0
+#: report:report.hr.timesheet.attendance.error:0
 msgid "Delay"
 msgstr "Atraso"
 
 #. module: hr_attendance
-#: wizard_field:hr.si_so,init,name:0
-#: wizard_field:hr.si_so,si_ask_so,name:0
-#: wizard_field:hr.si_so,so_ask_si,name:0
-msgid "Employee's name"
-msgstr "Nome do empregado"
-
-#. module: hr_attendance
-#: wizard_button:hr.attendance.print_month,init,print:0
-#: wizard_button:hr.attendance.print_week,init,print:0
-msgid "Print Timesheet"
-msgstr ""
-
-#. module: hr_attendance
-#: model:ir.actions.wizard,name:hr_attendance.wizard_attendance_error
-msgid "Print Attendance Error Report"
-msgstr "Imprimir relatório de erro de presença"
-
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: hr_attendance
-#: model:ir.actions.wizard,name:hr_attendance.print_week
-msgid "Print Timesheet by week"
-msgstr ""
-
-#. module: hr_attendance
-#: field:hr.attendance,employee_id:0
+#: view:hr.attendance:0
+#: model:ir.model,name:hr_attendance.model_hr_employee
 msgid "Employee"
 msgstr "Empregado"
 
 #. module: hr_attendance
-#: wizard_view:hr.attendance.print_week,init:0
-#: wizard_view:hr.attendance.report,init:0
-msgid "Select a time span"
-msgstr ""
+#: view:hr.sign.in.out.ask:0
+#: field:hr.sign.in.out.ask,last_time:0
+msgid "Your last sign out"
+msgstr "A sua última saída"
 
 #. module: hr_attendance
-#: rml:report.hr.timesheet.attendance.error:0
+#: report:report.hr.timesheet.attendance.error:0
 msgid "Date Recorded"
-msgstr "Data gravado"
+msgstr "Data de Registo"
 
 #. module: hr_attendance
-#: selection:hr.attendance,action:0
-#: view:hr.employee:0
-msgid "Sign In"
-msgstr "Entrar"
+#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance
+msgid "Attendances"
+msgstr "Assiduidades"
 
 #. module: hr_attendance
-#: rml:report.hr.timesheet.attendance.error:0
-msgid "Total period:"
-msgstr "Período total:"
-
-#. module: hr_attendance
-#: field:hr.attendance,action_desc:0
-#: model:ir.model,name:hr_attendance.model_hr_action_reason
-msgid "Action reason"
-msgstr "Motivo da acção"
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "March"
-msgstr ""
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "August"
-msgstr ""
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
+#: selection:hr.attendance.month,month:0
 msgid "May"
-msgstr ""
+msgstr "Maio"
 
 #. module: hr_attendance
-#: wizard_field:hr.si_so,so_ask_si,last_time:0
+#: view:hr.sign.in.out.ask:0
 msgid "Your last sign in"
-msgstr "A sua ultima entrada"
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "June"
-msgstr ""
-
-#. module: hr_attendance
-#: model:ir.actions.wizard,name:hr_attendance.print_month
-msgid "Print Timesheet by month"
-msgstr ""
+msgstr "A Sua Última Entrada"
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0
@@ -171,237 +491,88 @@ msgid "Sign Out"
 msgstr "Sair"
 
 #. module: hr_attendance
-#: model:ir.module.module,shortdesc:hr_attendance.module_meta_information
-msgid "Attendances Of Employees"
-msgstr ""
-
-#. module: hr_attendance
-#: field:hr.action.reason,name:0
-msgid "Reason"
-msgstr "Motivo"
-
-#. module: hr_attendance
-#: constraint:hr.attendance:0
-msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-msgstr ""
-
-#. module: hr_attendance
-#: rml:report.hr.timesheet.attendance.error:0
-msgid "Date Signed"
-msgstr "Data de assinatura"
-
-#. module: hr_attendance
-#: field:hr.attendance,name:0
-msgid "Date"
-msgstr "Data"
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "July"
-msgstr ""
-
-#. module: hr_attendance
-#: wizard_view:hr.si_so,si_ask_so:0
-msgid ""
-"You did not signed out the last time. Please enter the date and time you "
-"signed out."
-msgstr ""
-"Você não  se registou da última vez. Por favor insira a data e a hora da "
-"última vez que fez o registo."
-
-#. module: hr_attendance
-#: view:hr.action.reason:0
-msgid "Attendance reasons"
-msgstr "Rasões de presença"
-
-#. module: hr_attendance
-#: wizard_field:hr.attendance.print_week,init,init_date:0
-#: wizard_field:hr.attendance.report,init,init_date:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: hr_attendance
-#: selection:hr.employee,state:0
-msgid "Present"
-msgstr "Presente"
+#: field:hr.attendance,employee_id:0
+msgid "Employee's Name"
+msgstr "Nome do Empregado"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
 msgid "Absent"
-msgstr "Ausente"
+msgstr "Falta"
 
 #. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
+#: selection:hr.attendance.month,month:0
 msgid "February"
-msgstr ""
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "October"
-msgstr ""
-
-#. module: hr_attendance
-#: wizard_field:hr.si_so,si_ask_so,last_time:0
-msgid "Your last sign out"
-msgstr "A sua ultima saída"
-
-#. module: hr_attendance
-#: rml:report.hr.timesheet.attendance.error:0
-msgid "Min Delay"
-msgstr "Atraso mínimo"
+msgstr "Fevereiro"
 
 #. module: hr_attendance
 #: field:hr.action.reason,action_type:0
 msgid "Action's type"
-msgstr "Tipo da acção"
-
-#. module: hr_attendance
-#: view:hr.action.reason:0
-msgid "Define attendance reason"
-msgstr "Definir rasões de presença"
-
-#. module: hr_attendance
-#: selection:hr.action.reason,action_type:0
-#: wizard_button:hr.si_so,init,si_test:0
-#: wizard_button:hr.si_so,si_ask_so,si:0
-msgid "Sign in"
-msgstr "Entrar"
-
-#. module: hr_attendance
-#: wizard_view:hr.attendance.report,init:0
-msgid "Analysis Information"
-msgstr ""
-
-#. module: hr_attendance
-#: wizard_field:hr.si_so,init,state:0
-msgid "Current state"
-msgstr "Estado actual"
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "January"
-msgstr ""
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "April"
-msgstr ""
-
-#. module: hr_attendance
-#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance
-#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance
-#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance
-msgid "Attendances"
-msgstr "Presenças"
-
-#. module: hr_attendance
-#: rml:report.hr.timesheet.attendance.error:0
-msgid "Attendance Errors"
-msgstr "Erros de presenças"
-
-#. module: hr_attendance
-#: field:hr.attendance,action:0
-#: selection:hr.attendance,action:0
-msgid "Action"
-msgstr "Acção"
-
-#. module: hr_attendance
-#: wizard_button:hr.attendance.report,init,print:0
-msgid "Print Attendance Report"
-msgstr ""
-
-#. module: hr_attendance
-#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
-#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason
-msgid "Attendance Reasons"
-msgstr "Rasões de presença"
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "November"
-msgstr ""
-
-#. module: hr_attendance
-#: wizard_view:hr.attendance.report,init:0
-msgid "Bellow this delay, the error is considered to be voluntary"
-msgstr ""
-
-#. module: hr_attendance
-#: wizard_field:hr.attendance.report,init,max_delay:0
-msgid "Max. Delay (Min)"
-msgstr ""
-
-#. module: hr_attendance
-#: wizard_view:hr.attendance.print_week,init:0
-msgid "Select a starting and a end date"
-msgstr ""
-
-#. module: hr_attendance
-#: wizard_field:hr.attendance.print_week,init,end_date:0
-#: wizard_field:hr.attendance.report,init,end_date:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: hr_attendance
-#: wizard_view:hr.si_so,so_ask_si:0
-msgid ""
-"You did not signed in the last time. Please enter the date and time you "
-"signed in."
-msgstr ""
-"Você não registou-se  na última vez. Por favor insira a data da ultima vez "
-"que fez o registo."
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "September"
-msgstr ""
-
-#. module: hr_attendance
-#: selection:hr.attendance.print_month,init,month:0
-msgid "December"
-msgstr ""
+msgstr "Tipo da Acção"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
-msgid "Employee attendance"
-msgstr "Presença do empregado"
+msgid "Employee attendances"
+msgstr "Assiduidade do Empregado"
 
 #. module: hr_attendance
-#: wizard_view:hr.attendance.print_month,init:0
-msgid "Select a month"
+#: field:hr.sign.in.out,state:0
+msgid "Current state"
+msgstr "Estado Actual"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Bellow this delay, the error is considered to be voluntary"
+msgstr "Abaixo deste atraso, o erro é considerado como sendo voluntário"
+
+#. module: hr_attendance
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr "O objecto osv_memory não suporta regras!"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid ""
+"You did not sign in the last time. Please enter the date and time you signed "
+"in."
 msgstr ""
+"Você não registou a entrada. Por favor registe a data e hora da última "
+"entrada agora."
 
 #. module: hr_attendance
-#: wizard_field:hr.attendance.print_month,init,month:0
-msgid "Month"
-msgstr ""
-
-#. module: hr_attendance
-#: model:ir.module.module,description:hr_attendance.module_meta_information
-msgid "This module aims to manage employee's attendances."
-msgstr ""
-
-#. module: hr_attendance
-#: model:ir.actions.report.xml,name:hr_attendance.attendance_error_report
-msgid "Attendance Error Report"
-msgstr "Relatório de erro das presenças"
-
-#. module: hr_attendance
-#: wizard_field:hr.attendance.print_month,init,year:0
+#: field:hr.attendance.month,year:0
 msgid "Year"
-msgstr ""
+msgstr "Ano"
 
 #. module: hr_attendance
-#: wizard_button:hr.attendance.print_month,init,end:0
-#: wizard_button:hr.attendance.print_week,init,end:0
-#: wizard_button:hr.attendance.report,init,end:0
-#: wizard_button:hr.si_so,init,end:0
-#: wizard_button:hr.si_so,si_ask_so,end:0
-#: wizard_button:hr.si_so,so_ask_si,end:0
-msgid "Cancel"
-msgstr "Cancelar"
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.in.out.ask"
+msgstr "hr.sign.in.out.ask"
 
-#. module: hr_attendance
-#: rml:report.hr.timesheet.attendance.error:0
-msgid "Operation"
-msgstr "Operação"
+#~ msgid "Employee's name"
+#~ msgstr "Nome do empregado"
+
+#~ msgid "Print Attendance Error Report"
+#~ msgstr "Imprimir relatório de erro de presença"
+
+#~ msgid "Action reason"
+#~ msgstr "Motivo da acção"
+
+#~ msgid ""
+#~ "You did not signed out the last time. Please enter the date and time you "
+#~ "signed out."
+#~ msgstr ""
+#~ "Você não  se registou da última vez. Por favor insira a data e a hora da "
+#~ "última vez que fez o registo."
+
+#~ msgid ""
+#~ "You did not signed in the last time. Please enter the date and time you "
+#~ "signed in."
+#~ msgstr ""
+#~ "Você não registou-se  na última vez. Por favor insira a data da ultima vez "
+#~ "que fez o registo."
diff --git a/addons/hr_contract/i18n/mn.po b/addons/hr_contract/i18n/mn.po
index e8cde50a39c..d9245da73ad 100644
--- a/addons/hr_contract/i18n/mn.po
+++ b/addons/hr_contract/i18n/mn.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 10:58+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-27 03:20+0000\n"
+"Last-Translator: badralkh <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -27,6 +27,11 @@ msgstr "Цаг тутмын үнэ тооцоолол"
 msgid "Gross"
 msgstr "Бааз"
 
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Trial Period"
+msgstr "Туршилтын хугацаа"
+
 #. module: hr_contract
 #: constraint:ir.model:0
 msgid ""
@@ -36,40 +41,81 @@ msgstr ""
 "болохгүй!"
 
 #. module: hr_contract
-#: view:hr.contract:0
 #: view:hr.employee:0
-msgid "Generalities"
-msgstr "Ерөнхий"
+msgid "Calculations"
+msgstr "Тооцоолол"
 
 #. module: hr_contract
-#: field:hr.employee,children:0
-msgid "Number of children"
-msgstr "Хүүхдийн тоо"
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "Цэвэр"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Medical Examination"
+msgstr "Эрүүл мэндийн үзлэг"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle:0
+msgid "Company Vehicle"
+msgstr "Компанийн тээврийн хэрэгсэл"
+
+#. module: hr_contract
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr "Хэлтэс"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Miscellaneous"
+msgstr "Бусад"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Current"
+msgstr "Одоогийн"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,factor_type:0
 msgid "Factor for hour cost"
 msgstr "Цагийн өртөгийн фактор"
 
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Function Arguments"
+msgstr "Функцийн хувьсагчууд"
+
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Wage Types"
 msgstr "Цалингийн төрлүүд"
 
 #. module: hr_contract
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Алдаа! Рекурс цэсийг үүсгэж болохгүй"
 
 #. module: hr_contract
+#: selection:hr.contract.wage.type,type:0
+msgid "Basic"
+msgstr "Үндсэн"
+
+#. module: hr_contract
+#: view:hr.contract:0
 #: field:hr.contract,employee_id:0
+#: model:ir.model,name:hr_contract.model_hr_employee
 msgid "Employee"
 msgstr "Ажилтан"
 
 #. module: hr_contract
-#: selection:hr.contract.wage.type,type:0
-msgid "Net"
-msgstr "Цэвэр"
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
+msgstr "Туршилтын үе эхлэх огноо"
+
+#. module: hr_contract
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -82,42 +128,71 @@ msgid "Hours in the period"
 msgstr "Хугацааны мөчлөг"
 
 #. module: hr_contract
-#: field:hr.contract,function:0
+#: view:hr.employee:0
 msgid "Function"
 msgstr "Үүрэг"
 
 #. module: hr_contract
-#: field:hr.employee,marital_status:0
-#: view:hr.employee.marital.status:0
-#: field:hr.employee.marital.status,name:0
-#: model:ir.actions.act_window,name:hr_contract.action_hr_marital_status
-#: model:ir.ui.menu,name:hr_contract.hr_menu_marital_status
-msgid "Marital Status"
-msgstr "Гэрлэлтийн байдал"
+#: view:hr.employee:0
+msgid "Description"
+msgstr "Тайлбар"
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Miscelleanous"
-msgstr "Бусад"
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Цалин"
+
+#. module: hr_contract
+#: field:hr.employee,place_of_birth:0
+msgid "Place of Birth"
+msgstr "Төрсөн газар"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: view:hr.employee:0
 #: field:hr.employee,contract_ids:0
+#: model:ir.actions.act_window,name:hr_contract.act_hr_employee_2_hr_contract
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract
 msgid "Contracts"
 msgstr "Гэрээнүүд"
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,type:0
-msgid "Type"
-msgstr "Төрөл"
+#: field:hr.employee,manager:0
+msgid "Is a Manager"
+msgstr "Менежер эсэх"
 
 #. module: hr_contract
-#: field:hr.contract,wage_type_id:0
-#: view:hr.contract.wage.type:0
-#: model:ir.model,name:hr_contract.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr "Цалингийн төрөл"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
+msgstr "Ажлын цагийн хуваарь"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Job"
+msgstr "Ажлын байр"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: view:hr.employee:0
+msgid "Passport"
+msgstr "Пасспорт"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Search Contract"
+msgstr "Гэрээг хайх"
+
+#. module: hr_contract
+#: help:hr.employee,contract_id:0
+msgid "Latest contract of the employee"
+msgstr "Ажилтны одоогийн хөдөлмөрийн гэрээ"
+
+#. module: hr_contract
+#: field:hr.contract,advantages_net:0
+msgid "Deductions"
+msgstr "Суутгал"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type.period,name:0
@@ -125,29 +200,44 @@ msgid "Period Name"
 msgstr "Мөчлөгийн нэр"
 
 #. module: hr_contract
-#: model:ir.model,name:hr_contract.model_hr_employee_marital_status
-msgid "Employee Marital Status"
-msgstr "Ажилчдын гэрлэлтийн байдал"
+#: view:hr.contract:0
+#: field:hr.contract,advantages:0
+#: view:hr.employee:0
+msgid "Advantages"
+msgstr "Давуу тал"
 
 #. module: hr_contract
-#: field:hr.employee,medic_exam:0
-msgid "Medical examination date"
-msgstr "Эмнэлэгийн үзлэгийн огноо"
+#: view:hr.contract:0
+#: view:hr.employee:0
+msgid "Valid for"
+msgstr "Хүчинтэй хугацаа дуусах огноо"
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,name:0
-msgid "Wage Type Name"
-msgstr "Цалингийн төрлийн нэр"
+#: view:hr.contract:0
+#: view:hr.employee:0
+msgid "Work Permit"
+msgstr "Ажлын зөвшөөрөл"
 
 #. module: hr_contract
-#: field:hr.contract,working_hours_per_day:0
-msgid "Working hours per day"
-msgstr "Өдөрт дунджаар ажиллах хугацаа"
+#: field:hr.employee,children:0
+msgid "Number of Children"
+msgstr "Хүүхдийн тоо"
+
+#. module: hr_contract
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_type
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_type
+msgid "Contract Types"
+msgstr "Гэрээний төрлүүд"
+
+#. module: hr_contract
+#: view:hr.contract.wage.type:0
+msgid "Search Wage Type"
+msgstr "Цалин төрлийг хайх"
 
 #. module: hr_contract
 #: view:hr.employee:0
-msgid "Salary"
-msgstr "Цалин"
+msgid "Payslip Line"
+msgstr "Цалингийн хуудасны мөр"
 
 #. module: hr_contract
 #: field:hr.contract,date_end:0
@@ -159,6 +249,16 @@ msgstr "Дуусах огноо"
 msgid "Invalid XML for View Architecture!"
 msgstr "Дэлгэцийн XML алдаатай!"
 
+#. module: hr_contract
+#: field:hr.contract,name:0
+msgid "Contract Reference"
+msgstr "Гэрээний нэр"
+
+#. module: hr_contract
+#: help:hr.employee,vehicle_distance:0
+msgid "In kilometers"
+msgstr "Километрээр"
+
 #. module: hr_contract
 #: view:hr.contract:0
 #: field:hr.contract,notes:0
@@ -166,65 +266,126 @@ msgstr "Дэлгэцийн XML алдаатай!"
 msgid "Notes"
 msgstr "Тэмдэглэл"
 
+#. module: hr_contract
+#: field:hr.contract,wage_type_id:0
+#: view:hr.contract.wage.type:0
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type
+#: model:ir.model,name:hr_contract.model_hr_contract_wage_type
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type
+msgid "Wage Type"
+msgstr "Цалингийн төрөл"
+
 #. module: hr_contract
 #: view:hr.contract:0
-#: view:hr.employee:0
-#: model:ir.actions.act_window,name:hr_contract.action_hr_contract
+#: field:hr.employee,contract_id:0
 #: model:ir.model,name:hr_contract.model_hr_contract
-#: model:ir.ui.menu,name:hr_contract.hr_menu_contract
 #: model:ir.ui.menu,name:hr_contract.next_id_56
 msgid "Contract"
 msgstr "Гэрээ"
 
 #. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,type_id:0
 #: view:hr.contract.type:0
+#: field:hr.contract.type,name:0
+#: model:ir.model,name:hr_contract.model_hr_contract_type
 msgid "Contract Type"
 msgstr "Гэрээний төрөл"
 
+#. module: hr_contract
+#: view:hr.contract.wage.type.period:0
+msgid "Search Wage Period"
+msgstr "Цалийн мөчлөгийг хайх"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Salary Computation"
+msgstr "Цалингийн тооцоолол"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Job Info"
+msgstr "Ажлын байрны мэдээлэл"
+
 #. module: hr_contract
 #: field:hr.contract.wage.type,period_id:0
+#: view:hr.contract.wage.type.period:0
 #: model:ir.model,name:hr_contract.model_hr_contract_wage_type_period
 msgid "Wage Period"
 msgstr "Цалингийн мөчлөг"
 
 #. module: hr_contract
-#: field:hr.employee,audiens_num:0
-msgid "AUDIENS Number"
-msgstr "AUDIENS дугаар"
+#: field:hr.contract,job_id:0
+msgid "Job Title"
+msgstr "Албан тушаал"
 
 #. module: hr_contract
-#: view:hr.contract:0
-msgid "Remuneration"
-msgstr "Нөхөн олговор"
-
-#. module: hr_contract
-#: field:hr.contract,name:0
-msgid "Contract Name"
-msgstr "Гэрээний нэр"
-
-#. module: hr_contract
-#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type
-#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type
-msgid "Contract Wage Type"
-msgstr "Гэрээн дахь цалингийн төрөл"
-
-#. module: hr_contract
-#: field:hr.employee,place_of_birth:0
-msgid "Place of Birth"
-msgstr "Төрсөн газар"
-
-#. module: hr_contract
-#: field:hr.employee,manager:0
-msgid "Manager"
-msgstr "Менежер"
-
-#. module: hr_contract
-#: view:hr.contract.wage.type.period:0
 #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period
 #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type_period
 msgid "Wage period"
 msgstr "Цалингийн мөчлөг"
 
+#. module: hr_contract
+#: field:hr.employee,vehicle_distance:0
+msgid "Home-Work Distance"
+msgstr "Гэрээс ажил хүртэлх зай"
+
+#. module: hr_contract
+#: field:hr.contract,date_start:0
+msgid "Start Date"
+msgstr "Эхлэх огноо"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Company contribution"
+msgstr "Ажил олгогчийн төлөх шимтгэл"
+
+#. module: hr_contract
+#: field:hr.contract.wage.type,type:0
+msgid "Type"
+msgstr "Төрөл"
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_end:0
+msgid "Trial End Date"
+msgstr "Туршилт хугацаа дуусах огноо"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
+msgstr "Бүлэглэвэл..."
+
+#. module: hr_contract
+#: view:hr.contract.wage.type:0
+msgid "Period"
+msgstr "Мөчлөг"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Overpassed"
+msgstr "Хугацаа нь өнгөрсөн"
+
+#. module: hr_contract
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "Цалингийн төрлийн нэр"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Employee specific allowances and deductions"
+msgstr "Ажилтанд бүрт онцлог олголт, суутгалууд"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Contract Details"
+msgstr "Гэрээний дэлгэрэнгүй"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Salary Structure"
+msgstr "Цалингийн шатлал"
+
 #. module: hr_contract
 #: help:hr.contract.wage.type,factor_type:0
 #: help:hr.contract.wage.type.period,factor_days:0
@@ -236,22 +397,77 @@ msgstr ""
 "тооцоход хэрэглэгдэнэ"
 
 #. module: hr_contract
-#: field:hr.contract,wage:0
-msgid "Wage"
-msgstr "Цалин"
-
-#. module: hr_contract
-#: field:hr.contract,date_start:0
-msgid "Start Date"
-msgstr "Эхлэх огноо"
-
-#. module: hr_contract
-#: field:hr.employee.marital.status,description:0
-msgid "Status Description"
-msgstr "Статусын тайлбар"
+#: view:hr.employee:0
+msgid "Personal Info"
+msgstr "Хувийн мэдээлэл"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: view:hr.employee:0
-msgid "Contract Duration"
-msgstr "Гэрээний үргэлжлэх хугацаа"
+msgid "Duration"
+msgstr "Үргэлжлэх хугацаа"
+
+#. module: hr_contract
+#: field:hr.employee,medic_exam:0
+msgid "Medical Examination Date"
+msgstr "Эмнэлгийн үзлэгийн огноо"
+
+#. module: hr_contract
+#: field:hr.contract,advantages_gross:0
+msgid "Allowances"
+msgstr "Олголтууд"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Main Data"
+msgstr "Үндсэн мэдээлэл"
+
+#. module: hr_contract
+#: view:hr.contract.type:0
+msgid "Search Contract Type"
+msgstr "Гэрээний төрлийг хайх"
+
+#~ msgid "Generalities"
+#~ msgstr "Ерөнхий"
+
+#~ msgid "Number of children"
+#~ msgstr "Хүүхдийн тоо"
+
+#~ msgid "Marital Status"
+#~ msgstr "Гэрлэлтийн байдал"
+
+#~ msgid "Miscelleanous"
+#~ msgstr "Бусад"
+
+#~ msgid "Employee Marital Status"
+#~ msgstr "Ажилчдын гэрлэлтийн байдал"
+
+#~ msgid "Medical examination date"
+#~ msgstr "Эмнэлэгийн үзлэгийн огноо"
+
+#~ msgid "Working hours per day"
+#~ msgstr "Өдөрт дунджаар ажиллах хугацаа"
+
+#~ msgid "Salary"
+#~ msgstr "Цалин"
+
+#~ msgid "AUDIENS Number"
+#~ msgstr "AUDIENS дугаар"
+
+#~ msgid "Remuneration"
+#~ msgstr "Нөхөн олговор"
+
+#~ msgid "Contract Name"
+#~ msgstr "Гэрээний нэр"
+
+#~ msgid "Contract Wage Type"
+#~ msgstr "Гэрээн дахь цалингийн төрөл"
+
+#~ msgid "Manager"
+#~ msgstr "Менежер"
+
+#~ msgid "Status Description"
+#~ msgstr "Статусын тайлбар"
+
+#~ msgid "Contract Duration"
+#~ msgstr "Гэрээний үргэлжлэх хугацаа"
diff --git a/addons/hr_expense/i18n/mn.po b/addons/hr_expense/i18n/mn.po
index 4a5d88dad9d..01fa2207f15 100644
--- a/addons/hr_expense/i18n/mn.po
+++ b/addons/hr_expense/i18n/mn.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-05 07:25+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-27 02:54+0000\n"
+"Last-Translator: badralkh <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
@@ -33,10 +33,21 @@ msgid "The accoutant reimburse the expenses"
 msgstr "Зардлуудыг нөхөн төлөх данс"
 
 #. module: hr_expense
-#: model:ir.actions.act_window,name:hr_expense.expense_all_confirm
-#: model:ir.ui.menu,name:hr_expense.menu_expense_all_confirm
-msgid "Expenses waiting validation"
-msgstr "Батлахыг хүлээж буй зардлууд"
+#: field:hr.expense.expense,date_confirm:0
+#: field:hr.expense.report,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Баталсаг огноо"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: view:hr.expense.report:0
+msgid "Group By..."
+msgstr "Бүлэглэвэл..."
+
+#. module: hr_expense
+#: model:product.template,name:hr_expense.product_product_expense_air_product_template
+msgid "Air Ticket"
+msgstr "Онгоцны тийз"
 
 #. module: hr_expense
 #: constraint:ir.actions.act_window:0
@@ -44,14 +55,34 @@ msgid "Invalid model name in the action definition."
 msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
 
 #. module: hr_expense
-#: field:hr.expense.expense,date_confirm:0
-msgid "Date Confirmed"
-msgstr "Баталсан огноо"
+#: view:hr.expense.expense:0
+#: field:hr.expense.expense,department_id:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,department_id:0
+msgid "Department"
+msgstr "Хэлтэс"
 
 #. module: hr_expense
-#: selection:hr.expense.expense,state:0
-msgid "Waiting confirmation"
-msgstr "Батлахыг хүлээх"
+#: view:hr.expense.report:0
+msgid "Extended filters..."
+msgstr "Нэмэлт шүүлтүүр"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "March"
+msgstr "3 сар"
+
+#. module: hr_expense
+#: field:hr.expense.report,invoiced:0
+msgid "# of Invoiced Lines"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.expense,company_id:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,company_id:0
+msgid "Company"
+msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -59,18 +90,18 @@ msgid "Set to Draft"
 msgstr "Ноороглох"
 
 #. module: hr_expense
-#: model:ir.actions.act_window,name:hr_expense.expense_my_confirm
-#: model:ir.ui.menu,name:hr_expense.menu_expense_my_confirm
-msgid "My expenses waiting validation"
-msgstr "Батлахыг хүлээж буй миний зардлууд"
+#: view:hr.expense.expense:0
+msgid "To Pay"
+msgstr ""
 
 #. module: hr_expense
-#: model:ir.actions.act_window,name:hr_expense.expense_all
-#: model:ir.ui.menu,name:hr_expense.menu_expense_all
-msgid "All expenses"
-msgstr "Бүх зардлууд"
+#: model:ir.model,name:hr_expense.model_hr_expense_report
+msgid "Expenses Statistics"
+msgstr ""
 
 #. module: hr_expense
+#: selection:hr.expense.expense,state:0
+#: view:hr.expense.report:0
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
 msgstr "Зөвшөөрсөн"
@@ -81,10 +112,11 @@ msgid "UoM"
 msgstr "Хэмжих нэгж"
 
 #. module: hr_expense
-#: view:hr.expense.expense:0
-#: model:process.transition.action,name:hr_expense.process_transition_action_refuse0
-msgid "Refuse"
-msgstr "Татгалзах"
+#: help:hr.expense.expense,date_valid:0
+msgid ""
+"Date of the acceptation of the sheet expense. It's filled when the button "
+"Accept is pressed."
+msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -92,7 +124,12 @@ msgid "Notes"
 msgstr "Тэмдэглэл"
 
 #. module: hr_expense
-#: selection:hr.expense.expense,state:0
+#: field:hr.expense.expense,invoice_id:0
+msgid "Employee's Invoice"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.report,state:0
 msgid "Cancelled"
 msgstr "Цуцлагдсан"
 
@@ -102,39 +139,65 @@ msgid "Validation"
 msgstr "Батлах"
 
 #. module: hr_expense
-#: help:product.product,hr_expense_ok:0
-msgid ""
-"Determine if the product can be visible in the list of product within a "
-"selection from an HR expense sheet line."
-msgstr ""
+#: selection:hr.expense.report,state:0
+msgid "Waiting confirmation"
+msgstr "Батлахыг хүлээх"
 
 #. module: hr_expense
-#: selection:hr.expense.expense,state:0
+#: selection:hr.expense.report,state:0
 msgid "Accepted"
 msgstr "Зөвшөөрсөн"
 
 #. module: hr_expense
-#: rml:hr.expense:0
+#: view:hr.expense.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: hr_expense
+#: report:hr.expense:0
 #: field:hr.expense.expense,ref:0
 #: field:hr.expense.line,ref:0
 msgid "Reference"
 msgstr "Лавлах"
 
 #. module: hr_expense
-#: rml:hr.expense:0
+#: report:hr.expense:0
 msgid "Certified honest and conform,"
 msgstr ""
 
 #. module: hr_expense
-#: model:ir.actions.report.xml,name:hr_expense.hr_expenses
-msgid "Print HR expenses"
-msgstr "Зардлуудыг хэвлэх"
+#: help:hr.expense.expense,date_confirm:0
+msgid ""
+"Date of the confirmation of the sheet expense. It's filled when the button "
+"Confirm is pressed."
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: field:hr.expense.report,nbr:0
+msgid "# of Lines"
+msgstr ""
 
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_refuseexpense0
 msgid "Refuse expense"
 msgstr "Зардлыг хүлээн зөвшөөрөхгүй"
 
+#. module: hr_expense
+#: model:product.template,name:hr_expense.product_product_expense_car_product_template
+msgid "Car Travel"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Total Invoiced Lines"
+msgstr ""
+
 #. module: hr_expense
 #: view:hr.expense.expense:0
 #: model:process.transition.action,name:hr_expense.process_transition_action_confirm0
@@ -146,35 +209,61 @@ msgstr "Батлах"
 msgid "The accoutant validates the sheet"
 msgstr "Нягтлан энэ шийтийг батална."
 
+#. module: hr_expense
+#: field:hr.expense.report,delay_valid:0
+msgid "Delay to Valid"
+msgstr ""
+
+#. module: hr_expense
+#: help:hr.expense.line,sequence:0
+msgid "Gives the sequence order when displaying a list of expense lines."
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:0
+#, python-format
+msgid ""
+"Please configure Default Expanse account for Product purchase, "
+"`property_account_expense_categ`"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.line,analytic_account:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,analytic_account:0
 msgid "Analytic account"
 msgstr "Аналитик данс"
 
 #. module: hr_expense
-#: model:process.node,name:hr_expense.process_node_supplierinvoice0
-#: model:process.transition,name:hr_expense.process_transition_approveinvoice0
-msgid "Supplier Invoice"
-msgstr "Нийлүүлэгчийн нэхэмжлэл"
+#: field:hr.expense.report,date:0
+msgid "Date "
+msgstr ""
 
 #. module: hr_expense
 #: field:hr.expense.expense,state:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,state:0
 msgid "State"
 msgstr "Төлөв"
 
 #. module: hr_expense
-#: rml:hr.expense:0
+#: report:hr.expense:0
+#: view:hr.expense.expense:0
 #: field:hr.expense.expense,employee_id:0
+#: view:hr.expense.report:0
 msgid "Employee"
 msgstr "Ажилтан"
 
 #. module: hr_expense
-#: rml:hr.expense:0
+#: report:hr.expense:0
+#: field:hr.expense.report,product_qty:0
 msgid "Qty"
 msgstr "Тоо хэмжээ"
 
 #. module: hr_expense
-#: rml:hr.expense:0
+#: report:hr.expense:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,price_total:0
 msgid "Total Price"
 msgstr "Нийт үнэ"
 
@@ -184,11 +273,27 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Зарим үнүүдийг харилцагч дахин нэхэмжилж магадгүй"
 
 #. module: hr_expense
-#: model:ir.actions.act_window,name:hr_expense.expense_my
-#: model:ir.ui.menu,name:hr_expense.menu_expense_my
+#: code:addons/hr_expense/hr_expense.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: hr_expense
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_expense.action_my_expense
 msgid "My Expenses"
 msgstr "Миний зардлууд"
 
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.report.xml,name:hr_expense.hr_expenses
+msgid "HR expenses"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,id:0
 msgid "Sheet ID"
@@ -201,14 +306,20 @@ msgstr "Нөхөн төлөх зардал"
 
 #. module: hr_expense
 #: field:hr.expense.expense,journal_id:0
+#: field:hr.expense.report,journal_id:0
 msgid "Force Journal"
 msgstr "Хүчинтэй журнал"
 
 #. module: hr_expense
-#: model:ir.actions.act_window,name:hr_expense.expense_my_new
-#: model:ir.ui.menu,name:hr_expense.menu_expense_my_new
-msgid "New Expenses Sheet"
-msgstr "Шинэ зардлын хуудас"
+#: view:hr.expense.report:0
+#: field:hr.expense.report,no_of_products:0
+msgid "# of Products"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_reimburseexpense0
@@ -226,8 +337,33 @@ msgid "Invalid XML for View Architecture!"
 msgstr "Дэлгэцийн XML алдаатай!"
 
 #. module: hr_expense
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.expense,date_valid:0
+#: field:hr.expense.report,date_valid:0
+msgid "Validation Date"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_report_all
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_report_all
+msgid "Expenses Analysis"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
 #: field:hr.expense.line,expense_id:0
 #: model:ir.model,name:hr_expense.model_hr_expense_expense
+#: model:process.process,name:hr_expense.process_process_expenseprocess0
 msgid "Expense"
 msgstr "Зардал"
 
@@ -238,11 +374,45 @@ msgstr "Зардал"
 msgid "Expense Lines"
 msgstr "Зардлын мөрүүд"
 
+#. module: hr_expense
+#: field:hr.expense.report,delay_confirm:0
+msgid "Delay to Confirm"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,month:0
+msgid "Month"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,currency_id:0
+#: field:hr.expense.report,currency_id:0
 msgid "Currency"
 msgstr "Валют"
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:0
+#, python-format
+msgid "The employee must have a working address"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.expense,state:0
+msgid "Waiting Approval"
+msgstr ""
+
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_draftexpenses0
 msgid "Employee encode all his expenses"
@@ -250,11 +420,30 @@ msgstr "Ажилчдын бүх зардлыг шифрлэх"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: view:hr.expense.report:0
+#: selection:hr.expense.report,state:0
 msgid "Invoiced"
 msgstr "Нэхэмжилсэн"
 
+#. module: hr_expense
+#: field:product.product,hr_expense_ok:0
+msgid "Can Constitute an Expense"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: hr_expense
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
+#: selection:hr.expense.report,state:0
 msgid "Reimbursed"
 msgstr "Нөхөн төлөлт"
 
@@ -269,17 +458,16 @@ msgid "Create Customer invoice"
 msgstr "Хэрэглэгчийн нэхэмжлэл үүсгэх"
 
 #. module: hr_expense
+#: view:hr.expense.expense:0
 #: selection:hr.expense.expense,state:0
+#: selection:hr.expense.report,state:0
 msgid "Draft"
 msgstr "Ноорог"
 
 #. module: hr_expense
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
 msgstr ""
-"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-"болохгүй!"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -291,48 +479,74 @@ msgstr "Дансны өгөгдөл"
 msgid "Expense is approved."
 msgstr "Зөвшөөрсөн зардлууд"
 
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_approved0
+msgid "The direct manager approves the sheet"
+msgstr "Менежерийн зөвшөөрлийн хуудас"
+
 #. module: hr_expense
 #: field:hr.expense.expense,amount:0
 msgid "Total Amount"
 msgstr "Нийт хэмжээ"
 
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "June"
+msgstr ""
+
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_draftexpenses0
 msgid "Draft Expenses"
 msgstr "Ноорог зардлууд"
 
 #. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Customer Project"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
 #: field:hr.expense.expense,user_id:0
 msgid "User"
 msgstr "Хэрэглэгч"
 
 #. module: hr_expense
-#: rml:hr.expense:0
+#: report:hr.expense:0
 #: field:hr.expense.expense,date:0
 #: field:hr.expense.line,date_value:0
 msgid "Date"
 msgstr "Огноо"
 
 #. module: hr_expense
-#: rml:hr.expense:0
+#: selection:hr.expense.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_expense
+#: report:hr.expense:0
 msgid "Total:"
 msgstr "Нийт:"
 
 #. module: hr_expense
-#: rml:hr.expense:0
+#: selection:hr.expense.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_expense
+#: report:hr.expense:0
 msgid "HR Expenses"
 msgstr "Хүний нөөцийн зардалууд"
 
-#. module: hr_expense
-#: field:hr.expense.expense,date_valid:0
-msgid "Date Validated"
-msgstr "Батлагдсан огноо"
-
-#. module: hr_expense
-#: field:hr.expense.expense,account_move_id:0
-msgid "Account Move"
-msgstr "Данс шилжүүлэх"
-
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_confirmedexpenses0
 msgid "The employee validates his expense sheet"
@@ -343,22 +557,27 @@ msgstr "Ажилтаны зардлын хуудсыг  хүчинтэйд то
 msgid "The direct manager refuses the sheet.Reset as draft."
 msgstr "Менежер хүлээн зөвшөөрөөгүй зардлыг ноороглож дахин засах"
 
+#. module: hr_expense
+#: model:process.node,name:hr_expense.process_node_supplierinvoice0
+#: model:process.transition,name:hr_expense.process_transition_approveinvoice0
+msgid "Supplier Invoice"
+msgstr "Нийлүүлэгчийн нэхэмжлэл"
+
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Expenses Sheet"
 msgstr "Зардлын хуудас"
 
 #. module: hr_expense
-#: model:ir.actions.act_window,name:hr_expense.expense_all_invoiced
-#: model:ir.ui.menu,name:hr_expense.menu_expense_all_invoiced
-msgid "Expenses waiting payment"
-msgstr "Хүлээлтийн зардлын төлбөр"
+#: view:hr.expense.report:0
+msgid "Waiting"
+msgstr ""
 
 #. module: hr_expense
-#: model:ir.actions.act_window,name:hr_expense.expense_my_draft
-#: model:ir.ui.menu,name:hr_expense.menu_expense_my_draft
-msgid "My Draft expenses"
-msgstr "Миний ноорог зардлууд"
+#: view:hr.expense.report:0
+#: field:hr.expense.report,day:0
+msgid "Day"
+msgstr ""
 
 #. module: hr_expense
 #: model:ir.module.module,shortdesc:hr_expense.module_meta_information
@@ -367,15 +586,15 @@ msgstr "Хүний нөөцийн зардлын мөр"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
-#: field:hr.expense.expense,invoice_id:0
-#: model:process.transition.action,name:hr_expense.process_transition_action_supplierinvoice0
-msgid "Invoice"
-msgstr "Нэхэмжлэл"
+msgid "References"
+msgstr ""
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
-msgid "Cancel"
-msgstr "Цуцлах"
+#: field:hr.expense.report,invoice_id:0
+#: model:process.transition.action,name:hr_expense.process_transition_action_supplierinvoice0
+msgid "Invoice"
+msgstr "Нэхэмжлэл"
 
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_reimbursereinvoice0
@@ -383,9 +602,18 @@ msgid "Reinvoice"
 msgstr "Дахин нэхэмжлэх"
 
 #. module: hr_expense
-#: model:process.process,name:hr_expense.process_process_expenseprocess0
-msgid "Expense Process"
-msgstr "Урсгал зардал"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_expense.action_employee_expense
+msgid "All Employee Expenses"
+msgstr ""
+
+#. module: hr_expense
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+"болохгүй!"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -393,10 +621,15 @@ msgid "Other Info"
 msgstr "Бусад мэдээлэл"
 
 #. module: hr_expense
-#: model:ir.actions.act_window,name:hr_expense.expense_all_draft
-#: model:ir.ui.menu,name:hr_expense.menu_expense_all_draft
-msgid "Draft expenses"
-msgstr "Ноорог зардлууд"
+#: help:hr.expense.expense,journal_id:0
+msgid "The journal used when the expense is invoiced"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: model:process.transition.action,name:hr_expense.process_transition_action_refuse0
+msgid "Refuse"
+msgstr "Татгалзах"
 
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_confirmexpense0
@@ -409,13 +642,12 @@ msgid "Approve expense"
 msgstr "Зардлыг зөвшөөрөх"
 
 #. module: hr_expense
-#: view:hr.expense.expense:0
 #: model:process.transition.action,name:hr_expense.process_transition_action_accept0
 msgid "Accept"
 msgstr "Зөвшөөрөх"
 
 #. module: hr_expense
-#: rml:hr.expense:0
+#: report:hr.expense:0
 msgid "This document must be dated and signed for reimbursement"
 msgstr ""
 "Энэ бичиг баримтанд нь  огноо болон нөхөн төлөлтийн гарын үсэг  зурагдсан "
@@ -427,32 +659,35 @@ msgid "Expense is refused."
 msgstr "Зардал хүлээн зөвшөөрөгдсөнгүй."
 
 #. module: hr_expense
-#: rml:hr.expense:0
+#: report:hr.expense:0
 #: field:hr.expense.line,unit_amount:0
 msgid "Unit Price"
 msgstr "Нэгжийн үнэ"
 
-#. module: hr_expense
-#: model:ir.actions.act_window,name:hr_expense.expense_all_valid
-#: model:ir.ui.menu,name:hr_expense.menu_expense_all_valid
-msgid "Expenses waiting invoice"
-msgstr "Зардлын нэхэмжлэл хүлээх"
-
 #. module: hr_expense
 #: field:hr.expense.line,product_id:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,product_id:0
+#: model:ir.model,name:hr_expense.model_product_product
 msgid "Product"
 msgstr "Бүтээгдэхүүн"
 
 #. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Expenses of My Department"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: field:hr.expense.expense,name:0
 #: field:hr.expense.line,description:0
 msgid "Description"
 msgstr "Тайлбар"
 
 #. module: hr_expense
-#: view:hr.expense.expense:0
-#: field:hr.expense.expense,name:0
-msgid "Expense Sheet"
-msgstr "Зардлын хуудас"
+#: selection:hr.expense.report,month:0
+msgid "May"
+msgstr ""
 
 #. module: hr_expense
 #: field:hr.expense.line,unit_quantity:0
@@ -460,39 +695,57 @@ msgid "Quantities"
 msgstr "Тоо хэмжээ"
 
 #. module: hr_expense
+#: field:hr.expense.report,no_of_account:0
+msgid "# of Accounts"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.expense,state:0
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
 msgstr "Гологдсон"
 
 #. module: hr_expense
-#: field:product.product,hr_expense_ok:0
-msgid "Can be Expensed"
-msgstr "Зарлага болгох"
-
-#. module: hr_expense
-#: rml:hr.expense:0
+#: report:hr.expense:0
 msgid "Ref."
 msgstr "реф."
 
+#. module: hr_expense
+#: field:hr.expense.report,employee_id:0
+msgid "Employee's Name"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "This Month"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.expense,user_valid:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,user_id:0
 msgid "Validation User"
 msgstr "Хэрэглэгч батлах"
 
 #. module: hr_expense
-#: rml:hr.expense:0
+#: report:hr.expense:0
 msgid "(Date and signature)"
 msgstr "Огноо болон гарын үсэг"
 
 #. module: hr_expense
-#: rml:hr.expense:0
+#: selection:hr.expense.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: hr_expense
+#: report:hr.expense:0
 msgid "Name"
 msgstr "Нэр"
 
 #. module: hr_expense
-#: field:hr.expense.line,name:0
-msgid "Short Description"
-msgstr "Богино тайлбар"
+#: field:hr.expense.expense,account_move_id:0
+msgid "Ledger Posting"
+msgstr ""
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_approveinvoice0
@@ -500,9 +753,46 @@ msgid "Creates supplier invoice."
 msgstr "Нийлүүлэгчийн нэхэмжлэл бүрдүүлэлт"
 
 #. module: hr_expense
-#: model:process.node,note:hr_expense.process_node_approved0
-msgid "The direct manager approves the sheet"
-msgstr "Менежерийн зөвшөөрлийн хуудас"
+#: model:product.template,name:hr_expense.product_product_expense_hotel_product_template
+msgid "Hotel Accommodation"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.line,name:0
+msgid "Expense Note"
+msgstr ""
+
+#. module: hr_expense
+#: help:hr.expense.expense,state:0
+msgid ""
+"When the expense request is created the state is 'Draft'.\n"
+" It is confirmed by the user and request is sent to admin, the state is "
+"'Waiting Confirmation'.            \n"
+"If the admin accepts it, the state is 'Accepted'.\n"
+" If an invoice is made for the expense request, the state is 'Invoiced'.\n"
+" If the expense is paid to user, the state is 'Reimbursed'."
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Approve"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.line:0
+#: field:hr.expense.line,total_amount:0
+msgid "Total"
+msgstr "Нийт"
+
+#. module: hr_expense
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
 
 #. module: hr_expense
 #: field:hr.expense.line,sequence:0
@@ -516,16 +806,87 @@ msgstr "Батлагдсан зардал"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
+#: model:ir.actions.act_window,name:hr_expense.expense_all
+#: model:ir.ui.menu,name:hr_expense.menu_expense_all
 #: model:ir.ui.menu,name:hr_expense.next_id_49
 msgid "Expenses"
 msgstr "Зардлууд"
 
 #. module: hr_expense
-#: field:hr.expense.line,total_amount:0
-msgid "Total"
-msgstr "Нийт"
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: field:hr.expense.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "To Approve"
+msgstr ""
+
+#. module: hr_expense
+#: help:product.product,hr_expense_ok:0
+msgid ""
+"Determines if the product can be visible in the list of product within a "
+"selection from an HR expense sheet line."
+msgstr ""
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_reinvoicing0
 msgid "Reinvoicing"
 msgstr "Дахин нэхэмжлэх"
+
+#~ msgid "Expenses waiting validation"
+#~ msgstr "Батлахыг хүлээж буй зардлууд"
+
+#~ msgid "Date Confirmed"
+#~ msgstr "Баталсан огноо"
+
+#~ msgid "My expenses waiting validation"
+#~ msgstr "Батлахыг хүлээж буй миний зардлууд"
+
+#~ msgid "All expenses"
+#~ msgstr "Бүх зардлууд"
+
+#~ msgid "Print HR expenses"
+#~ msgstr "Зардлуудыг хэвлэх"
+
+#~ msgid "New Expenses Sheet"
+#~ msgstr "Шинэ зардлын хуудас"
+
+#~ msgid "Date Validated"
+#~ msgstr "Батлагдсан огноо"
+
+#~ msgid "Account Move"
+#~ msgstr "Данс шилжүүлэх"
+
+#~ msgid "Expenses waiting payment"
+#~ msgstr "Хүлээлтийн зардлын төлбөр"
+
+#~ msgid "My Draft expenses"
+#~ msgstr "Миний ноорог зардлууд"
+
+#~ msgid "Cancel"
+#~ msgstr "Цуцлах"
+
+#~ msgid "Draft expenses"
+#~ msgstr "Ноорог зардлууд"
+
+#~ msgid "Expenses waiting invoice"
+#~ msgstr "Зардлын нэхэмжлэл хүлээх"
+
+#~ msgid "Expense Sheet"
+#~ msgstr "Зардлын хуудас"
+
+#~ msgid "Can be Expensed"
+#~ msgstr "Зарлага болгох"
+
+#~ msgid "Short Description"
+#~ msgstr "Богино тайлбар"
+
+#~ msgid "Expense Process"
+#~ msgstr "Урсгал зардал"
diff --git a/addons/hr_holidays/i18n/mn.po b/addons/hr_holidays/i18n/mn.po
index 168d69d6e7b..8679e63e7a0 100644
--- a/addons/hr_holidays/i18n/mn.po
+++ b/addons/hr_holidays/i18n/mn.po
@@ -7,384 +7,324 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-01 06:54+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-27 04:32+0000\n"
+"Last-Translator: badralkh <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
-msgid "New Holidays Request"
-msgstr ""
+#: selection:hr.holidays.status,color_name:0
+msgid "Blue"
+msgstr "Цэнхэр"
 
 #. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_action_all_holiday
-msgid "All Holidays Requests"
-msgstr ""
+#: view:hr.holidays:0
+#: field:hr.holidays,allocation_type:0
+#: field:hr.holidays,holiday_type:0
+msgid "Allocation Type"
+msgstr "Хуваарилах төрөл"
+
+#. module: hr_holidays
+#: selection:hr.holidays,state:0
+msgid "Waiting Second Approval"
+msgstr "2 дох зөвшөөрлийг хүлээж байна"
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+#: field:available.holidays.report,taken_leaves:0
+msgid "Taken Leaves"
+msgstr "Авсан амралт, чөлөө"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,remaining_leaves:0
+msgid "Maximum Leaves Allowed - Leaves Already Taken"
+msgstr "Зөвшөөрсөн амралт, чөлөөний дээд хэмжээ - Хэдийн авсан амралт, чөлөө"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Leaves Management"
+msgstr "Амралт, чөлөөний удирдлага"
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+#: view:hr.holidays:0
+msgid "Group By..."
+msgstr "Бүлэглэвэл..."
 
 #. module: hr_holidays
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Үйлдлийн тодорхойлолт дээрх модел буруу байна"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting
-msgid "Requests Awaiting for Validation"
-msgstr ""
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
+msgid "Sick Leave"
+msgstr "Өвчний улмаас ирээгүй"
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Blue"
-msgstr ""
+#: view:available.holidays.report:0
+#: field:available.holidays.report,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
+msgid "Department"
+msgstr "Хэлтэс"
+
+#. module: hr_holidays
+#: selection:available.holidays.report,state:0
+#: selection:hr.holidays,state:0
+msgid "Refused"
+msgstr "Татгалзах"
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
+msgstr "Хуваарилсан амралт, чөлөө"
+
+#. module: hr_holidays
+#: selection:hr.holidays,allocation_type:0
+msgid "Company Allocation"
+msgstr "Компаниар хуваарилах"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Brown"
-msgstr ""
-
-#. module: hr_holidays
-#: xsl:holidays.summary:0
-msgid "of the"
-msgstr ""
-
-#. module: hr_holidays
-#: xsl:holidays.summary:0
-msgid "Off-Days' Summary"
-msgstr ""
+msgstr "Хүрэн"
 
 #. module: hr_holidays
+#: view:available.holidays.report:0
 #: view:hr.holidays:0
-#: model:process.transition,name:hr_holidays.process_transition_employeeholidays0
-msgid "Employee Holidays"
+msgid "Remaining Days"
+msgstr "Үлдсэн хоног"
+
+#. module: hr_holidays
+#: selection:available.holidays.report,month:0
+msgid "March"
+msgstr "3 сар"
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee"
+msgstr "Ажилтнаар"
+
+#. module: hr_holidays
+#: help:hr.holidays,employee_id:0
+msgid ""
+"Leave Manager can let this field empty if this leave request/allocation is "
+"for every employee"
 msgstr ""
+"Амралт/амралтын хуваарилахыг хүсэх нь ажилтан бүрийн хувьд байвал амралт, "
+"чөлөөг зөвшөөрөгч нь энэ талбарын хоосон үлдээж болно."
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+msgid "Leave Days"
+msgstr "Амралт, чөлөөтэй өдрүүд"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Ноорог болгох"
 
 #. module: hr_holidays
-#: model:ir.model,name:hr_holidays.model_hr_holidays
-#: model:process.node,name:hr_holidays.process_node_holidays0
+#: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_reporting_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
 msgid "Holidays"
-msgstr ""
+msgstr "Амралт, чөлөө"
 
 #. module: hr_holidays
-#: xsl:holidays.summary:0
-msgid "to"
-msgstr ""
+#: field:available.holidays.report,category_id:0
+msgid "Category's Name"
+msgstr "Зэрэглэлтийн нэр"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Cyan"
-msgstr ""
+msgstr "Цайвар цэнхэр ногоон"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Green"
-msgstr ""
+msgstr "Цайвар ногоон"
 
 #. module: hr_holidays
-#: model:process.transition,name:hr_holidays.process_transition_employeedeclaration0
-msgid "Employee Declaration"
-msgstr ""
+#: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
+msgid "Summary Of Leaves"
+msgstr "Амралт, чөлөөний товчоо"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
-#: model:process.transition.action,name:hr_holidays.process_transition_action_validate0
-msgid "Validate"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.transition,name:hr_holidays.process_transition_refusedrequest0
-msgid "Refused Request"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.node,name:hr_holidays.process_node_approved0
 msgid "Approved"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.summary.employee,init,holiday_type:0
-msgid "Both"
-msgstr ""
+msgstr "Зөвшөөрсөн"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Refuse"
+msgstr "Татгалзар"
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+#: view:hr.holidays:0
+msgid "Leaves"
+msgstr "Чөлөө, амралтууд"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays
+msgid "Leave"
+msgstr "Амралт, чөлөө"
+
+#. module: hr_holidays
+#: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
+msgid "Remaining leaves"
+msgstr "Үлдсэн амралт, чөлөө"
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
+msgid "Leaves by Department"
+msgstr "Хэлтсийн амралт, чөлөө"
+
+#. module: hr_holidays
+#: selection:available.holidays.report,state:0
+#: selection:hr.holidays,state:0
+msgid "Cancelled"
+msgstr "Цуцлагдсан"
+
+#. module: hr_holidays
+#: help:hr.holidays,type:0
+msgid ""
+"Choose 'Leave Request' if someone wants to take an off-day. \n"
+"Choose 'Allocation Request' if you want to increase the number of leaves "
+"available for someone"
+msgstr ""
+"Амралт эсвэ ажлаас чөлөө авах бол 'Амралт, чөлөө хүсэх'-ийг, амралт, чөлөө "
+"авах боломжтой хоног хуваарилуулахын тулд 'Амралт, чөлөөг хуваарилах' -ыг "
+"сонгоно уу."
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid "Warning !"
 msgstr ""
 
 #. module: hr_holidays
-#: wizard_button:hr.holidays.summary,notify,end:0
-#: wizard_button:hr.holidays.summary.employee,notify,end:0
-msgid "Ok"
-msgstr ""
+#: field:hr.holidays.status,color_name:0
+msgid "Color in Report"
+msgstr "Тайлан дээрх өнгө"
 
 #. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday
-msgid "My Holidays Requests"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays,notes:0
-msgid "Notes"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status:0
-#: field:hr.holidays.log,holiday_status:0
-msgid "Holiday's Status"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.transition,note:hr_holidays.process_transition_refusedrequest0
-msgid "Request is refused."
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
-msgid "Holidays Management"
-msgstr ""
-
-#. module: hr_holidays
-#: xsl:holidays.summary:0
-msgid "Analyze from"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
-msgid "Summary Of Holidays"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.node,note:hr_holidays.process_node_calendar0
-msgid "The holiday is set in the calendar"
-msgstr ""
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
+msgid "HR Holidays Summary Report By Employee"
+msgstr "Ажилтнаар ангилсан амралт, чөлөөний товчоо"
 
 #. module: hr_holidays
+#: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
-msgid "Holiday status"
-msgstr ""
-
-#. module: hr_holidays
+#: field:hr.holidays.status,name:0
+#: field:hr.holidays.summary.dept,holiday_type:0
+#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
-msgid "Holidays Status"
-msgstr ""
+#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
+msgid "Leave Type"
+msgstr "Амралт, чөлөөний төрөл"
 
 #. module: hr_holidays
-#: field:hr.holidays,date_to:0
-msgid "Vacation end day"
-msgstr ""
+#: view:available.holidays.report:0
+msgid "Validation User"
+msgstr "Батламжилсан хэрэглэгч"
 
 #. module: hr_holidays
-#: model:process.node,note:hr_holidays.process_node_legaldeclaration0
-msgid "Legal Declaration Document to declare new employee"
-msgstr ""
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid "Warning!"
+msgstr "Анхааруулга!"
+
+#. module: hr_holidays
+#: selection:available.holidays.report,state:0
+#: selection:hr.holidays,state:0
+msgid "Draft"
+msgstr "Ноорог"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Magenta"
-msgstr ""
+msgstr "Аналин улаан"
 
 #. module: hr_holidays
-#: model:ir.model,name:hr_holidays.model_hr_holidays_per_user
-msgid "Holidays Per User"
+#: help:hr.holidays,state:0
+msgid ""
+"When the holiday request is created the state is 'Draft'.\n"
+" It is confirmed by the user and request is sent to admin, the state is "
+"'Waiting Approval'.            If the admin accepts it, the state is "
+"'Approved'. If it is refused, the state is 'Refused'."
 msgstr ""
+"Амралт, чөлөөний хүсэлтийг 'Ноорог' төлөвтэйгөөр үүсгэсэн үед:\n"
+"Хэрэглэгч хүсэлтийг баталмагц  администратор руу 'Зөвшөөрөхийг хүлээж "
+"байгаа' төлөвтэйгөөр илгээгдэнэ. Администратор зөвшөөрмөгц 'Зөвшөөрсөн' "
+"төлөвтэй болно. Харин татгалзвал 'Татгалзсан'  төлөвт шилжинэ."
 
 #. module: hr_holidays
-#: view:hr.holidays.status:0
-msgid "Define holiday status"
-msgstr ""
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:0
+#, python-format
+msgid "You have to select at least 1 Department. And try again"
+msgstr "Та цөөндөө 1 хэлтэс сонгох хэрэгтэй. Дахин оролдоно уу."
 
 #. module: hr_holidays
-#: selection:hr.holidays.summary,init,holiday_type:0
-#: selection:hr.holidays.summary.employee,init,holiday_type:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Баталсан"
 
 #. module: hr_holidays
-#: wizard_field:hr.holidays.summary,init,date_from:0
-#: wizard_field:hr.holidays.summary.employee,init,date_from:0
+#: field:hr.holidays.summary.dept,date_from:0
+#: field:hr.holidays.summary.employee,date_from:0
 msgid "From"
+msgstr "Хэзээнээс"
+
+#. module: hr_holidays
+#: help:hr.holidays,allocation_type:0
+msgid ""
+"This field is only for informative purposes, to depict if the leave "
+"request/allocation comes from an employee or from the company"
 msgstr ""
+"1 ажилтнаас эсвэл тухайн компаниас энэ амралт, чөлөө буюу түүний "
+"хуваарилалтыг хүсэх хүсэлт ирснийг дүрслэх зорилготой мэдээллийн чанартай "
+"талбар юм"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-#: model:process.transition.action,name:hr_holidays.process_transition_action_confirm0
 msgid "Confirm"
-msgstr ""
+msgstr "Батлах"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_waiting
-#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_waiting
-msgid "My Awaiting Confirmation Holidays Requests"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays,user_id:0
-msgid "Employee_id"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.node,note:hr_holidays.process_node_holidaysdefinition0
-msgid "Encoding of annual available holidays."
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays,employee_id:0
-#: field:hr.holidays.log,employee_id:0
-msgid "Employee"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays,state:0
-msgid "Waiting Validation"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.transition,note:hr_holidays.process_transition_employeeholidays0
-msgid "Employee get holidays"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Wheat"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays.log,nb_holidays:0
-msgid "Number of Holidays Requested"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
-msgid "My Holiday Requests"
-msgstr ""
-
-#. module: hr_holidays
-#: view:hr.holidays:0
-msgid "Number of Days"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays.status,name:0
-#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
-#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
-msgid "Holiday Status"
-msgstr ""
-
-#. module: hr_holidays
-#: wizard_view:hr.holidays.summary,init:0
-#: wizard_view:hr.holidays.summary.employee,init:0
-msgid "Report Options"
-msgstr ""
-
-#. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.node,note:hr_holidays.process_node_approved0
-msgid "His manager approves the request"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.transition,note:hr_holidays.process_transition_holidaysdefrequest0
-msgid "If holidays available, employee can take it and fill it."
-msgstr ""
-
-#. module: hr_holidays
-#: wizard_view:hr.holidays.summary.employee,notify:0
-msgid "You have to select at least 1 Employee. Try again."
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_validate
-msgid "My Validated Holidays Requests"
-msgstr ""
-
-#. module: hr_holidays
-#: wizard_field:hr.holidays.summary.employee,init,emp:0
-msgid "Employee(s)"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays,number_of_days:0
-msgid "Number of Days in this Holiday Request"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user
-#: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user
-msgid "Holidays Per Employee"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays.status,limit:0
-msgid "Allow to override Limit"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays.log,holiday_user_id:0
-msgid "Holidays user"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Lavender"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.model,name:hr_holidays.model_hr_holidays_log
-msgid "hr.holidays.log"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.actions.wizard,name:hr_holidays.wizard_holidays_summary
-msgid "Print Summary of Employee's Holidays"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.node,name:hr_holidays.process_node_calendar0
-msgid "Calendar"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays,date_from:0
-msgid "Vacation start day"
-msgstr ""
+#: model:ir.model,name:hr_holidays.model_available_holidays_report
+msgid "available.holidays.report"
+msgstr "Амралт, чөлөөний боломж тайлан"
 
 #. module: hr_holidays
 #: model:ir.module.module,description:hr_holidays.module_meta_information
 msgid ""
-"Human Ressources: Holidays tracking and workflow\n"
-"\n"
-"    This module allows you to manage holidays and holidays requests. For "
-"each employee, you can also define a number of available holidays per "
-"holiday status.\n"
+"Human Resources: Holidays tracking and workflow\n"
 "\n"
+"    This module allows you to manage leaves and leaves' requests.\n"
+"    Implements a dashboard for human resource management that includes.\n"
+"        * My Leaves\n"
+"        * My Expenses\n"
 "    Note that:\n"
 "    - A synchronisation with an internal agenda (use of the CRM module) is "
 "possible: in order to automatically create a case when an holiday request is "
 "accepted, you have to link the holidays status to a case section. You can "
 "set up this info and your colour preferences in\n"
 "                HR / Configuration / Holidays Status\n"
-"    - An employee can make a negative holiday request (holiday request of -2 "
-"days for example), this is considered by the system as an ask for more off-"
-"days. It will increase his total of that holiday status available (if the "
+"    - An employee can make an ask for more off-days by making a new "
+"Allocation It will increase his total of that leave type available (if the "
 "request is accepted).\n"
 "    - There are two ways to print the employee's holidays:\n"
 "        * The first will allow to choose employees by department and is used "
@@ -398,26 +338,227 @@ msgid ""
 "                'Print Summary of Employee's Holidays'\n"
 "    - The wizard allows you to choose if you want to print either the "
 "Confirmed & Validated holidays or only the Validated ones. These states must "
-"be set up by a user from the group 'HR' and with the role 'holidays'. You "
-"can define these features in the security tab from the user data in\n"
+"be set up by a user from the group 'HR'. You can define these features in "
+"the security tab from the user data in\n"
 "                Administration / Users / Users\n"
-"            for example, you maybe will do it for the user 'admin'.\n"
+"            for example, you maybe will do it for the user 'admin'\n"
+"            .\n"
+msgstr ""
+"Хүний нөөц: Амралт, чөлөөний хяналт ба ажлын урсгал\n"
+"          Энэ модуль нь амралт чөлөөний хүсэлтийг зохицуулах болмжийг "
+"олгоно.\n"
+"          ХН-ийн хянах самбарт\n"
+"               Өөрийн амралт,чөлөө\n"
+"               Өөрийн зардал\n"
+"          Тэмдэглэл \n"
+"                CRM модулийн дотоод сануулга ирэхэд амралт, чөлөөг "
+"зөвшөөрдөг байхын тулд амралт, чөлөөний төрөлд тохиолдлын хэсгийг "
+"харгалзуулсан байх хэрэгтэй.\n"
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+#: field:available.holidays.report,remaining_leave:0
+#: field:hr.holidays.status,remaining_leaves:0
+msgid "Remaining Leaves"
+msgstr "Үлдсэн амралт, чөлөө"
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+#: field:available.holidays.report,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
+msgid "State"
+msgstr "Төлөв"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
+msgid "Total holidays by type"
+msgstr "Төрлөөр ангилсан амралт, чөлөө"
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
+#: field:hr.holidays.remaining.leaves.user,name:0
+msgid "Employee"
+msgstr "Ажилтан"
+
+#. module: hr_holidays
+#: selection:available.holidays.report,state:0
+msgid "Waiting Validation"
+msgstr "Батламжлах хүлээгдэж байна"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "General"
+msgstr "Ерөнхий"
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+#: view:hr.holidays:0
+msgid "Type"
+msgstr "Төрөл"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Red"
+msgstr "Улаан"
+
+#. module: hr_holidays
+#: view:hr.holidays.remaining.leaves.user:0
+msgid "Leaves by Type"
+msgstr "Төрлөөр ангилсан амралт, чөлөө"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Цайвар улбар шар"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Wheat"
 msgstr ""
 
 #. module: hr_holidays
-#: wizard_view:hr.holidays.summary,notify:0
-#: wizard_view:hr.holidays.summary.employee,notify:0
-msgid "Notification"
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
+#: field:hr.holidays,number_of_days_temp:0
+msgid "Number of Days"
+msgstr "Хоногийн тоо"
+
+#. module: hr_holidays
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
+msgstr "Ажилтны зэрэглэл"
+
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Remaining Leave by Type and User"
+msgstr "Төрөл ба хэрэглэгчээр ангилсан үлдсэн амралт, чөлөө"
+
+#. module: hr_holidays
+#: selection:available.holidays.report,month:0
+msgid "July"
+msgstr "7 сар"
+
+#. module: hr_holidays
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Харагдацын архитетурын xml буруу"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,double_validation:0
+msgid ""
+"If its True then its Allocation/Request have to be validated by second "
+"validator"
 msgstr ""
 
 #. module: hr_holidays
-#: model:process.node,note:hr_holidays.process_node_holidaysrequest0
-msgid "Employee fills in a request for holidays"
+#: selection:hr.holidays,state:0
+msgid "Waiting Approval"
 msgstr ""
 
 #. module: hr_holidays
-#: model:process.transition,note:hr_holidays.process_transition_setholiday0
-msgid "Holiday is set in the calendar."
+#: field:hr.holidays.summary.employee,emp:0
+msgid "Employee(s)"
+msgstr ""
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+msgid " Month "
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,categ_id:0
+msgid ""
+"If you link this type of leave with a category in the CRM, it will "
+"synchronize each leave asked with a case in this category, to display it in "
+"the company shared calendar for example."
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,manager_id2:0
+msgid ""
+"This area is automaticly filled by the user who validate the leave with "
+"second level (If Leave type need second validation)"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:available.holidays.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:available.holidays.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_remaining_leaves_empoloyee_all
+msgid "Remaining Leaves by User"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Lavender"
+msgstr ""
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+#: field:available.holidays.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
+msgid "Leave Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,limit:0
+msgid "Allow to Override Limit"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.employee:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
+msgid "Employee's Holidays"
+msgstr ""
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+#: field:hr.holidays,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,max_leaves:0
+msgid ""
+"This value is given by the sum of all holidays requests with a positive "
+"value."
+msgstr ""
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+msgid "Available Holidays"
+msgstr ""
+
+#. module: hr_holidays
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
+msgid "All Employee Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid "No user related to the selected employee."
 msgstr ""
 
 #. module: hr_holidays
@@ -426,9 +567,9 @@ msgid "Light Coral"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_available
-#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_available
-msgid "My Available Holidays"
+#: view:hr.holidays.summary.dept:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
+msgid "Holidays by Department"
 msgstr ""
 
 #. module: hr_holidays
@@ -437,23 +578,46 @@ msgid "Black"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_refuse
-msgid "My Refused Holidays Requests"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
 msgstr ""
 
 #. module: hr_holidays
-#: model:process.transition,name:hr_holidays.process_transition_setholiday0
-msgid "Set Holiday"
+#: field:resource.calendar.leaves,holiday_id:0
+msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_draft
-msgid "My Draft Holidays Requests"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Leaves Allowed"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,state:0
-msgid "Status"
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for %s while available leaves are less than asked "
+"leaves.' %(record.category_id.name)))\n"
+"                nb = -(record.number_of_days_temp)\n"
+"            else:\n"
+"                nb = record.number_of_days_temp\n"
+"\n"
+"            if record.holiday_type == 'employee' and record.employee_id:\n"
+"                user_id = record.employee_id.user_id and "
+"record.employee_id.user_id.id or uid\n"
+"\n"
+"            self.write(cr, uid, [record.id], {'state':'confirm', "
+"'number_of_days': nb, 'user_id': user_id })\n"
+"        return True\n"
+"\n"
+"    def holidays_refuse(self, cr, uid, ids, *args):\n"
+"        vals = {'state': 'refuse'}\n"
+"        ids2 = self.pool.get('hr.employee"
+msgstr ""
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+msgid " Year "
 msgstr ""
 
 #. module: hr_holidays
@@ -462,53 +626,31 @@ msgid "Ivory"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday
-msgid "My Holidays Request"
+#: selection:available.holidays.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays.status,color_name:0
-msgid "Color of the status"
+#: selection:available.holidays.report,month:0
+msgid "June"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.summary,init,holiday_type:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Both Validated and Confirmed"
 msgstr ""
 
 #. module: hr_holidays
-#: xsl:holidays.summary:0
-msgid "holidays."
+#: field:hr.holidays.status,leaves_taken:0
+msgid "Leaves Already Taken"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays,state:0
-msgid "draft"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0
-msgid "Document for employee"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays.log,date:0
-msgid "Date"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays.status,section_id:0
-msgid "Section"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays,manager_id:0
-msgid "Holiday manager"
+#: field:available.holidays.report,user_id:0
+#: field:hr.holidays,user_id:0
+#: field:hr.holidays.remaining.leaves.user,user_id:0
+msgid "User"
 msgstr ""
 
 #. module: hr_holidays
@@ -517,52 +659,144 @@ msgid "Active"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_draft
-msgid "My Holidays Request Draft"
+#: field:hr.holidays,date_from:0
+msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
-#: model:process.transition,name:hr_holidays.process_transition_approvedrequest0
-msgid "Approved Request"
+#: selection:available.holidays.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: hr_holidays
-#: model:process.node,name:hr_holidays.process_node_holidaysrequest0
-msgid "Holidays Request"
+#: view:available.holidays.report:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_action_holiday_waiting
-msgid "Holidays Requests Awaiting for Validation"
+#: selection:available.holidays.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:available.holidays.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays,allocation_type:0
+msgid "Employee Request"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id:0
+msgid "First Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
+msgid "Casual Leave"
+msgstr ""
+
+#. module: hr_holidays
+#: field:available.holidays.report,date:0
+msgid "Date"
 msgstr ""
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "General"
+msgid "Extended options..."
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for %s while available leaves are less than asked "
+"leaves.' %(record.employee_id.name)))\n"
+"                nb = -(record.number_of_days_temp)\n"
+"            elif record.holiday_type == 'category' and record.type == "
+"'remove':\n"
+"                if record.category_id and not "
+"record.holiday_status_id.limit:\n"
+"                    leaves_rest = self.pool.get('hr.holidays.status"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Blue"
+msgstr ""
+
+#. module: hr_holidays
+#: constraint:hr.holidays:0
+msgid ""
+"Start date should not be larger than end date!\n"
+"Number of Days should be greater than 1!"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,type:0
+msgid "Request Type"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the leave "
+"type without removing it."
+msgstr ""
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+#: field:available.holidays.report,day:0
+msgid "Day"
 msgstr ""
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-#: selection:hr.holidays,state:0
-#: wizard_button:hr.holidays.summary,init,end:0
-#: wizard_button:hr.holidays.summary.employee,init,end:0
+#: field:hr.holidays,notes:0
+msgid "Reasons"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
+msgid "Leaves Analysis"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr ""
 
 #. module: hr_holidays
-#: model:process.transition,name:hr_holidays.process_transition_holidaysdefrequest0
-msgid "Holidays def Request"
+#: help:hr.holidays.status,color_name:0
+msgid ""
+"This color will be used in the leaves summary located in Reporting\\Leaves "
+"by Departement"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.summary,init,holiday_type:0
-#: selection:hr.holidays.summary.employee,init,holiday_type:0
+#: view:available.holidays.report:0
+#: selection:available.holidays.report,state:0
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_refuse
-msgid "My Holidays Request Refused"
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
+msgid "Allocation Request"
 msgstr ""
 
 #. module: hr_holidays
@@ -572,67 +806,132 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: wizard_button:hr.holidays.summary,init,checkdept:0
-#: wizard_button:hr.holidays.summary.employee,init,checkemp:0
+#: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
+msgid "Leave Detail"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,double_validation:0
+msgid "Apply Double Validation"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,holiday_status_id:0
+msgid " Leave Type"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.wizard,name:hr_holidays.holidays_summary
-#: model:ir.ui.menu,name:hr_holidays.menu_holidays_summary
-msgid "Print Summary of Holidays"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: wizard_field:hr.holidays.summary,init,depts:0
+#: view:board.board:0
+msgid "My Leaves by Type"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,depts:0
 msgid "Department(s)"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
+msgid "Leave Request"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,name:0
 msgid "Description"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays,state:0
-#: model:process.node,name:hr_holidays.process_node_refused0
-msgid "Refused"
+#: selection:available.holidays.report,month:0
+msgid "May"
 msgstr ""
 
 #. module: hr_holidays
-#: model:process.transition,note:hr_holidays.process_transition_approvedrequest0
-msgid "Request is approved."
+#: field:hr.holidays.status,categ_id:0
+msgid "Meeting Category"
 msgstr ""
 
 #. module: hr_holidays
-#: model:process.node,name:hr_holidays.process_node_holidaysdefinition0
-msgid "Holidays Definition"
+#: help:hr.holidays,holiday_type:0
+msgid ""
+"By Employee: Allocation/Request for individual Employee, By Employee "
+"Category: Allocation/Request for group of employees in category"
 msgstr ""
 
 #. module: hr_holidays
-#: wizard_field:hr.holidays.summary,init,holiday_type:0
-#: wizard_field:hr.holidays.summary.employee,init,holiday_type:0
+#: view:hr.holidays:0
+msgid "Search Leave"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Holiday Type"
 msgstr ""
 
+#. module: hr_holidays
+#: field:available.holidays.report,employee_id:0
+msgid "Employee's Name"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
+msgid "Leaves by Month"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "This Month"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id2:0
+msgid "Second Approval"
+msgstr ""
+
 #. module: hr_holidays
 #: field:hr.holidays,case_id:0
 msgid "Case"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,holiday_user_id:0
-msgid "Holiday per user"
+#: field:hr.holidays,date_to:0
+msgid "End Date"
 msgstr ""
 
 #. module: hr_holidays
-#: model:process.node,note:hr_holidays.process_node_holidays0
-msgid "Encode number of available holidays"
+#: selection:available.holidays.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: hr_holidays
-#: model:process.node,name:hr_holidays.process_node_legaldeclaration0
-msgid "Secretariat Social"
+#: help:hr.holidays.status,limit:0
+msgid ""
+"If you tick this checkbox, the system will allow, for this section, the "
+"employees to take more leaves than the available ones."
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,leaves_taken:0
+msgid ""
+"This value is given by the sum of all holidays requests with a negative "
+"value."
 msgstr ""
 
 #. module: hr_holidays
@@ -641,8 +940,8 @@ msgid "Violet"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Red"
+#: selection:available.holidays.report,month:0
+msgid "April"
 msgstr ""
 
 #. module: hr_holidays
@@ -651,23 +950,34 @@ msgid "Human Resources: Holidays management"
 msgstr ""
 
 #. module: hr_holidays
-#: model:process.process,name:hr_holidays.process_process_holidaysprocess0
-msgid "Holidays Process"
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
+msgid "HR Holidays Summary Report By Department"
 msgstr ""
 
 #. module: hr_holidays
-#: wizard_view:hr.holidays.summary,notify:0
-msgid "You have to select at least 1 Department. Try again."
+#: help:hr.holidays,manager_id:0
+msgid "This area is automaticly filled by the user who validate the leave"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_validate
-msgid "My Holidays Request Validated"
+#: view:hr.holidays:0
+msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays.log,holiday_req_id:0
-msgid "Holiday Request ID"
+#: field:hr.holidays,linked_request_ids:0
+msgid "Linked Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
+msgid "Allocation Requests"
 msgstr ""
 
 #. module: hr_holidays
@@ -681,6 +991,41 @@ msgid "Light Pink"
 msgstr ""
 
 #. module: hr_holidays
-#: model:process.node,note:hr_holidays.process_node_refused0
-msgid "His manager refuses the request"
+#: view:hr.holidays:0
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid "Wrong leave definition."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Confirm"
+msgstr ""
+
+#. module: hr_holidays
+#: view:available.holidays.report:0
+#: field:available.holidays.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Approve"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You Cannot Validate leaves while available leaves are less than asked leaves."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/pl.po b/addons/hr_holidays/i18n/pl.po
index 8cae0019919..00a0814f9b9 100644
--- a/addons/hr_holidays/i18n/pl.po
+++ b/addons/hr_holidays/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-25 18:31+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-10-26 08:09+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index f168537a53c..338a7ba1561 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-25 18:33+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-10-26 08:13+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/multi_company/i18n/ru.po b/addons/multi_company/i18n/ru.po
index 42219bae639..396b6716db6 100644
--- a/addons/multi_company/i18n/ru.po
+++ b/addons/multi_company/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-25 16:09+0000\n"
+"PO-Revision-Date: 2010-10-26 08:32+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po
index 2f6beee3ed3..7a4ea638677 100644
--- a/addons/procurement/i18n/ru.po
+++ b/addons/procurement/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-25 17:08+0000\n"
+"PO-Revision-Date: 2010-10-26 08:01+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index d1923a96bf4..3992fb4f2b0 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-25 19:07+0000\n"
+"PO-Revision-Date: 2010-10-26 08:48+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po
index 094da93b301..55dabfd1a68 100644
--- a/addons/purchase/i18n/fr.po
+++ b/addons/purchase/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 10:08+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-10-26 11:23+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -584,7 +584,7 @@ msgstr "Créer la facture à partir de la liste de colisage"
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
-msgstr ""
+msgstr "Date a laquelle ce document a été créé"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -594,7 +594,7 @@ msgstr "Livraisons & Factures"
 #. module: purchase
 #: field:purchase.order,date_order:0
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
 #. module: purchase
 #: help:purchase.order,origin:0
@@ -661,7 +661,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "History"
-msgstr ""
+msgstr "Historique"
 
 #. module: purchase
 #: field:purchase.order,state:0
@@ -692,7 +692,7 @@ msgstr "Position Fiscale"
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Request for Quotation N°"
-msgstr ""
+msgstr "Demande de devis N°"
 
 #. module: purchase
 #: field:purchase.order,invoice_id:0
@@ -824,7 +824,7 @@ msgstr "UdM produit"
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
-msgstr ""
+msgstr "Réservation"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_confirmpurchaseorder0
@@ -912,7 +912,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "Mouvements de stock"
 
 #. module: purchase
 #: selection:report.purchase.order.category,state:0
@@ -924,13 +924,13 @@ msgstr ""
 #: field:report.purchase.order.category,price_total:0
 #: field:report.purchase.order.product,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Prix total"
 
 #. module: purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Devis"
 
 #. module: purchase
 #: selection:report.purchase.order.category,state:0
@@ -942,10 +942,10 @@ msgstr ""
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "In progress"
-msgstr ""
+msgstr "En cours"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:0
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
-msgstr ""
+msgstr "Impossible de supprimer des bons de commande dans l'état %s !"
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index 5fb2e4bb73e..36f6a06e7ee 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-25 17:14+0000\n"
+"PO-Revision-Date: 2010-10-26 07:57+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/sale_analytic_plans/i18n/ru.po b/addons/sale_analytic_plans/i18n/ru.po
index bb879b36db9..14c8c6a2a0c 100644
--- a/addons/sale_analytic_plans/i18n/ru.po
+++ b/addons/sale_analytic_plans/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-25 17:14+0000\n"
+"PO-Revision-Date: 2010-10-26 08:55+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_crm/i18n/ru.po b/addons/sale_crm/i18n/ru.po
index 6585d3294e4..139b68e75c7 100644
--- a/addons/sale_crm/i18n/ru.po
+++ b/addons/sale_crm/i18n/ru.po
@@ -6,40 +6,78 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-30 06:39+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-26 11:20+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-01 08:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
-#: model:process.transition,name:sale_crm.process_transition_crmopportunityquotation
-msgid "Crm opportunity quotation"
-msgstr "CRM предложение цен в сделках"
+#: field:crm.make.sale,partner_id:0
+msgid "Customer"
+msgstr "Покупатель"
 
 #. module: sale_crm
-#: model:process.transition,name:sale_crm.process_transition_opportunityanalytic0
-msgid "Opportunity Analytic"
-msgstr "Аналитика по сделкам"
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Название объекта должно начинаться с x_ и не должно содержать специальных "
+"символов !"
 
 #. module: sale_crm
-#: help:crm.case.make_order,init,partner_id:0
-msgid "Use this partner if there is no partner on the case"
-msgstr "Использовать этого партнера, если нет партнера в вопросе."
+#: view:account.invoice.report:0
+#: view:board.board:0
+msgid "Monthly Turnover"
+msgstr "Ежемесячный оборот"
 
 #. module: sale_crm
-#: wizard_button:sale_crm.make_case,init,create:0
-msgid "Create"
-msgstr "Создать"
+#: view:crm.make.sale:0
+msgid "Convert to Quotation"
+msgstr "Преобразовать в предложение"
 
 #. module: sale_crm
-#: selection:crm.case.make_order,init,picking_policy:0
-msgid "All at once"
-msgstr "Все сразу"
+#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#, python-format
+msgid "is converted to Quotation."
+msgstr "преобразовано в предложение."
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#, python-format
+msgid "Data Insufficient!"
+msgstr "Недостаточно данных!"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#, python-format
+msgid "Customer has no addresses defined!"
+msgstr "Не определен адрес заказчика!"
+
+#. module: sale_crm
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Недопустимое имя модели в определении действия."
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "_Create"
+msgstr "_Создать"
+
+#. module: sale_crm
+#: help:crm.make.sale,close:0
+msgid ""
+"Check this to close the opportunity after having created the sale order."
+msgstr "Отметьте для закрытия предложения после создания заказа на продажу."
+
+#. module: sale_crm
+#: view:crm.lead:0
+msgid "Convert to Quote"
+msgstr "Превратить в предложение цен"
 
 #. module: sale_crm
 #: constraint:ir.ui.view:0
@@ -47,161 +85,152 @@ msgid "Invalid XML for View Architecture!"
 msgstr "Неправильный XML для просмотра архитектуры!"
 
 #. module: sale_crm
-#: model:process.transition,note:sale_crm.process_transition_crmopportunityquotation
-msgid "Opportunity goes into the quotation"
-msgstr "Сделка переходит в предложение цен"
+#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#, python-format
+msgid "Converted to Sales Quotation(id: %s)."
+msgstr "Преобразовано в коммерческое предложение(id: %s)."
 
 #. module: sale_crm
-#: model:process.node,name:sale_crm.process_node_contractanalytic0
-msgid "Analytic account"
-msgstr "Счет аналитики"
+#: model:ir.model,name:sale_crm.model_crm_make_sale
+msgid "Make sale"
+msgstr "Продать"
 
 #. module: sale_crm
-#: model:process.node,note:sale_crm.process_node_crmquotation0
-msgid "Convert opportunity to quotation"
-msgstr "Превратить сделку в предложение цен"
+#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#, python-format
+msgid "Opportunity "
+msgstr "Сделка "
 
 #. module: sale_crm
-#: wizard_field:sale_crm.make_case,init,description:0
-msgid "Your action"
-msgstr "Ваши действия"
+#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#, python-format
+msgid "Opportunity: %s"
+msgstr "Сделка: %s"
 
 #. module: sale_crm
-#: wizard_field:crm.case.make_order,init,picking_policy:0
-msgid "Packing Policy"
-msgstr ""
-
-#. module: sale_crm
-#: wizard_button:crm.case.make_order,init,order:0
-msgid "Create Quote"
-msgstr "Создать предложение цен"
-
-#. module: sale_crm
-#: model:process.node,note:sale_crm.process_node_contractpricelist0
-msgid "Contract Volume (pricelist)"
-msgstr ""
-
-#. module: sale_crm
-#: model:process.node,name:sale_crm.process_node_crmopportunity0
-msgid "CRM Opportunity"
-msgstr "CRM сделка"
+#: model:ir.model,name:sale_crm.model_sale_order
+msgid "Sale Order"
+msgstr "Заказ на продажу"
 
 #. module: sale_crm
 #: model:ir.module.module,shortdesc:sale_crm.module_meta_information
-msgid "Sale CRM Stuff"
-msgstr ""
+msgid "Creates Sales order from Opportunity"
+msgstr "Создает заказ на продажу из сделки"
 
 #. module: sale_crm
-#: model:process.transition,note:sale_crm.process_transition_opportunityquotation0
-msgid "Opportunity convert into quotation"
-msgstr "Превратить сделку в предложение цен"
+#: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
+msgid "Quotations"
+msgstr "Предложения"
 
 #. module: sale_crm
-#: selection:crm.case.make_order,init,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Прямая доставка"
-
-#. module: sale_crm
-#: model:process.transition,name:sale_crm.process_transition_opportunityquotation0
-msgid "Opportunity Quotation"
-msgstr "Сделка - предложение цен"
-
-#. module: sale_crm
-#: model:process.node,name:sale_crm.process_node_crmquotation0
-msgid "Quotation"
-msgstr "Предложение цен"
-
-#. module: sale_crm
-#: view:crm.case:0
-#: wizard_view:crm.case.make_order,init:0
-msgid "Convert to Quote"
-msgstr "Превратить в предложение цен"
-
-#. module: sale_crm
-#: help:crm.case.make_order,init,close:0
-msgid "Check this to close the case after having created the sale order."
-msgstr ""
-"Отметьте, если хотите закрыть вопрос после создания заказа на продажу."
-
-#. module: sale_crm
-#: wizard_field:crm.case.make_order,init,partner_id:0
-msgid "Customer"
-msgstr "Покупатель"
-
-#. module: sale_crm
-#: model:process.transition,note:sale_crm.process_transition_opportunitypricelist0
-msgid "Opporunity convert to the Pricelist"
-msgstr "Преобразовать сделку в прайс-лист"
-
-#. module: sale_crm
-#: wizard_field:sale_crm.make_case,init,user:0
-msgid "User Responsible"
-msgstr "Ответственный пользователь"
-
-#. module: sale_crm
-#: model:process.node,note:sale_crm.process_node_contractanalytic0
-msgid "Reflect the contract made with customer"
-msgstr ""
-
-#. module: sale_crm
-#: wizard_field:crm.case.make_order,init,products:0
-msgid "Products"
-msgstr "Продукция"
-
-#. module: sale_crm
-#: wizard_field:crm.case.make_order,init,close:0
-msgid "Close Case"
-msgstr "Закрыть вопрос"
-
-#. module: sale_crm
-#: model:ir.actions.wizard,name:sale_crm.sale_crm_make_case_wizard
-#: wizard_view:sale_crm.make_case,init:0
-msgid "Make Case"
-msgstr "Сделать Вопрос"
-
-#. module: sale_crm
-#: wizard_field:crm.case.make_order,init,shop_id:0
+#: field:crm.make.sale,shop_id:0
 msgid "Shop"
 msgstr "Магазин"
 
 #. module: sale_crm
-#: model:process.node,note:sale_crm.process_node_crmopportunity0
-msgid "The CRM Opportunity can lead to a quotation."
-msgstr "CRM Сделка может привести к предложению цен"
+#: view:board.board:0
+msgid "My Quotations"
+msgstr "Мои предложения"
 
 #. module: sale_crm
-#: model:process.transition,name:sale_crm.process_transition_opportunitypricelist0
-msgid "Opportunity Pricelist"
-msgstr "Прайс-лист сделки"
+#: field:crm.make.sale,close:0
+msgid "Close Opportunity"
+msgstr "Закрыть предложение"
 
 #. module: sale_crm
-#: model:process.node,name:sale_crm.process_node_contractpricelist0
-msgid "Contract Pricelist"
-msgstr "Прайс-лист договора"
+#: view:sale.order:0
+#: field:sale.order,section_id:0
+msgid "Sales Team"
+msgstr "Отдел продаж"
 
 #. module: sale_crm
-#: wizard_field:sale_crm.make_case,init,name:0
-msgid "Case Description"
-msgstr "Описание вопроса"
-
-#. module: sale_crm
-#: wizard_field:crm.case.make_order,init,analytic_account:0
-#: model:process.transition,note:sale_crm.process_transition_opportunityanalytic0
-msgid "Analytic Account"
-msgstr "Счет аналитического учета"
-
-#. module: sale_crm
-#: model:ir.actions.wizard,name:sale_crm.sale_crm_wizard
+#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
 msgid "Make Quotation"
 msgstr "Сделать предложение цен"
 
 #. module: sale_crm
-#: wizard_button:crm.case.make_order,init,end:0
-#: wizard_button:sale_crm.make_case,init,end:0
+#: view:crm.make.sale:0
 msgid "Cancel"
 msgstr "Отмена"
 
-#. module: sale_crm
-#: wizard_field:sale_crm.make_case,init,section:0
-msgid "Case Section"
-msgstr "Секция вопроса"
+#~ msgid "Create"
+#~ msgstr "Создать"
+
+#~ msgid "Analytic account"
+#~ msgstr "Счет аналитики"
+
+#~ msgid "Your action"
+#~ msgstr "Ваши действия"
+
+#~ msgid "User Responsible"
+#~ msgstr "Ответственный пользователь"
+
+#~ msgid "Products"
+#~ msgstr "Продукция"
+
+#~ msgid "All at once"
+#~ msgstr "Все сразу"
+
+#~ msgid "Direct Delivery"
+#~ msgstr "Прямая доставка"
+
+#~ msgid "Analytic Account"
+#~ msgstr "Счет аналитического учета"
+
+#~ msgid "Case Section"
+#~ msgstr "Секция вопроса"
+
+#~ msgid "Case Description"
+#~ msgstr "Описание вопроса"
+
+#~ msgid "Opportunity Pricelist"
+#~ msgstr "Прайс-лист сделки"
+
+#~ msgid "Opportunity Analytic"
+#~ msgstr "Аналитика по сделкам"
+
+#~ msgid "CRM Opportunity"
+#~ msgstr "CRM сделка"
+
+#~ msgid "Close Case"
+#~ msgstr "Закрыть вопрос"
+
+#~ msgid "Check this to close the case after having created the sale order."
+#~ msgstr ""
+#~ "Отметьте, если хотите закрыть вопрос после создания заказа на продажу."
+
+#~ msgid "Use this partner if there is no partner on the case"
+#~ msgstr "Использовать этого партнера, если нет партнера в вопросе."
+
+#~ msgid "Opporunity convert to the Pricelist"
+#~ msgstr "Преобразовать сделку в прайс-лист"
+
+#~ msgid "Contract Pricelist"
+#~ msgstr "Прайс-лист договора"
+
+#~ msgid "Make Case"
+#~ msgstr "Сделать Вопрос"
+
+#~ msgid "Crm opportunity quotation"
+#~ msgstr "CRM предложение цен в сделках"
+
+#~ msgid "The CRM Opportunity can lead to a quotation."
+#~ msgstr "CRM Сделка может привести к предложению цен"
+
+#~ msgid "Opportunity Quotation"
+#~ msgstr "Сделка - предложение цен"
+
+#~ msgid "Quotation"
+#~ msgstr "Предложение цен"
+
+#~ msgid "Opportunity convert into quotation"
+#~ msgstr "Превратить сделку в предложение цен"
+
+#~ msgid "Create Quote"
+#~ msgstr "Создать предложение цен"
+
+#~ msgid "Convert opportunity to quotation"
+#~ msgstr "Превратить сделку в предложение цен"
+
+#~ msgid "Opportunity goes into the quotation"
+#~ msgstr "Сделка переходит в предложение цен"
diff --git a/addons/sale_journal/i18n/ru.po b/addons/sale_journal/i18n/ru.po
index 8efa5e4ff40..ae41f7827ba 100644
--- a/addons/sale_journal/i18n/ru.po
+++ b/addons/sale_journal/i18n/ru.po
@@ -6,131 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 06:02+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-26 11:39+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
-#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_journal_sale_stats
-msgid "Monthly sales"
-msgstr "Продажи в месяце"
-
-#. module: sale_journal
-#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_assigned
-#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_assigned
-msgid "Assigned packing"
-msgstr ""
-
-#. module: sale_journal
-#: selection:sale_journal.invoice.type.stats,state:0
-#: selection:sale_journal.picking.stats,state:0
-msgid "assigned"
-msgstr "назначено"
-
-#. module: sale_journal
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
-
-#. module: sale_journal
-#: selection:sale_journal.sale.stats,state:0
-msgid "Waiting Schedule"
-msgstr "В ожидании расписания"
-
-#. module: sale_journal
-#: selection:sale_journal.invoice.type.stats,invoice_state:0
-msgid "to be invoiced"
-msgstr "выставить счет"
-
-#. module: sale_journal
-#: model:ir.model,name:sale_journal.model_sale_journal_sale_journal
-#: view:sale_journal.sale.journal:0
-#: field:stock.picking,sale_journal_id:0
-msgid "Sale Journal"
-msgstr "Журнал продаж"
-
-#. module: sale_journal
-#: field:sale_journal.sale.journal,sale_stats_ids:0
-msgid "Sale Stats"
-msgstr ""
-
-#. module: sale_journal
-#: selection:sale_journal.invoice.type.stats,state:0
-#: selection:sale_journal.picking.stats,state:0
-msgid "waiting"
-msgstr "ожидание"
-
-#. module: sale_journal
-#: view:sale_journal.picking.journal:0
-#: view:sale_journal.sale.journal:0
-msgid "Set to Draft"
-msgstr "Установить в 'Черновик'"
-
-#. module: sale_journal
-#: field:sale_journal.picking.journal,date:0
-#: field:sale_journal.sale.journal,date:0
-msgid "Journal date"
-msgstr "Дата журнала"
-
-#. module: sale_journal
-#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice_method
-#: model:ir.ui.menu,name:sale_journal.menu_invoice_type_picking_stats_open_all
-#: model:ir.ui.menu,name:sale_journal.menu_invoice_type_picking_stats_open_menu
-msgid "Packing by Invoice Method"
-msgstr ""
-
-#. module: sale_journal
-#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking
-msgid "Packing Journals"
-msgstr ""
-
-#. module: sale_journal
-#: view:sale_journal.picking.journal:0
-#: view:sale_journal.sale.journal:0
-msgid "Notes"
-msgstr "Примечания"
-
-#. module: sale_journal
-#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_tree_my
-msgid "My open journals"
-msgstr "Мои открытые книги"
-
-#. module: sale_journal
-#: field:sale_journal.invoice.type.stats,count:0
-#: field:sale_journal.picking.stats,count:0
-#: field:sale_journal.sale.stats,count:0
-msgid "# of Lines"
-msgstr "Кол-во позиций"
-
-#. module: sale_journal
-#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal_all
-#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales_all_open
-msgid "All Open Journals"
-msgstr "Все открытые книги"
-
-#. module: sale_journal
-#: model:ir.module.module,shortdesc:sale_journal.module_meta_information
-msgid "Managing sales and deliveries by journal"
-msgstr ""
-
-#. module: sale_journal
-#: selection:sale_journal.invoice.type.stats,state:0
-#: selection:sale_journal.picking.stats,state:0
-msgid "done"
-msgstr "завершено"
-
-#. module: sale_journal
-#: field:sale_journal.invoice.type.stats,price_average:0
-#: field:sale_journal.picking.stats,price_average:0
-#: field:sale_journal.sale.stats,price_average:0
-msgid "Average Price"
-msgstr "Средняя цена"
+#: field:sale_journal.invoice.type,note:0
+msgid "Note"
+msgstr "Примечание"
 
 #. module: sale_journal
 #: constraint:ir.ui.view:0
@@ -138,262 +27,9 @@ msgid "Invalid XML for View Architecture!"
 msgstr "Неправильный XML для просмотра архитектуры!"
 
 #. module: sale_journal
-#: selection:sale_journal.invoice.type,invoicing_method:0
-msgid "Grouped"
-msgstr "Сгруппировано"
-
-#. module: sale_journal
-#: field:sale_journal.invoice.type.stats,state:0
-#: field:sale_journal.picking.stats,state:0
-#: field:sale_journal.sale.journal,state:0
-msgid "State"
-msgstr "Состояние"
-
-#. module: sale_journal
-#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting_all
-#: model:ir.ui.menu,name:sale_journal.menu_definition_report_sales_all_month
-msgid "All Months"
-msgstr "Все месяцы"
-
-#. module: sale_journal
-#: field:sale_journal.invoice.type.stats,price_total:0
-#: field:sale_journal.picking.stats,price_total:0
-#: field:sale_journal.sale.stats,price_total:0
-msgid "Total Price"
-msgstr "Итоговая цена"
-
-#. module: sale_journal
-#: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal
-msgid "Packing journals"
-msgstr ""
-
-#. module: sale_journal
-#: model:ir.ui.menu,name:sale_journal.menu_definition_report_sales
-msgid "Reporting"
-msgstr "Отчетность"
-
-#. module: sale_journal
-#: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree_my
-msgid "My open packing journals"
-msgstr ""
-
-#. module: sale_journal
-#: model:ir.model,name:sale_journal.model_sale_journal_sale_stats
-msgid "Sales Orders by Journal"
-msgstr "Заказы по книгам"
-
-#. module: sale_journal
-#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_tree_all
-msgid "Open journals"
-msgstr ""
-
-#. module: sale_journal
-#: view:sale_journal.picking.journal:0
-msgid "Packing"
-msgstr "Упаковка"
-
-#. module: sale_journal
-#: help:res.partner,property_invoice_type:0
-msgid "The type of journal used for sales and packing."
-msgstr ""
-
-#. module: sale_journal
-#: selection:sale_journal.invoice.type.stats,invoice_state:0
-msgid "None"
-msgstr "Нет"
-
-#. module: sale_journal
-#: model:ir.actions.act_window,name:sale_journal.action_sale_sale_stats_open_menu_month
-msgid "Sales by journal (this month)"
-msgstr "Продажи по книгам (тек.м-ц)"
-
-#. module: sale_journal
-#: selection:sale_journal.sale.stats,state:0
-msgid "Manual in progress"
-msgstr "Выполняется вручную"
-
-#. module: sale_journal
-#: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree
-#: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree_all
-#: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_all
-#: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_month
-msgid "Packing by journal"
-msgstr ""
-
-#. module: sale_journal
-#: view:sale_journal.picking.journal:0
-msgid "Cancel Packing"
-msgstr ""
-
-#. module: sale_journal
-#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_confirmed
-#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_confirmed
-msgid "Confirmed packing"
-msgstr ""
-
-#. module: sale_journal
-#: selection:sale_journal.sale.stats,state:0
-msgid "In progress"
-msgstr "Выполняется"
-
-#. module: sale_journal
-#: view:sale_journal.picking.stats:0
-msgid "Packing by journals"
-msgstr ""
-
-#. module: sale_journal
-#: field:sale_journal.invoice.type.stats,name:0
-#: field:sale_journal.picking.stats,name:0
-#: field:sale_journal.sale.stats,name:0
-msgid "Month"
-msgstr "Месяц"
-
-#. module: sale_journal
-#: field:sale_journal.invoice.type.stats,invoice_state:0
-msgid "Invoice state"
-msgstr "Состояние счета"
-
-#. module: sale_journal
-#: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open_menu_all
-#: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open_menu_month
-#: view:sale_journal.invoice.type.stats:0
-msgid "Packing by invoice method"
-msgstr ""
-
-#. module: sale_journal
-#: field:sale_journal.sale.stats,state:0
-msgid "Order State"
-msgstr "Состояние заказа"
-
-#. module: sale_journal
-#: selection:sale_journal.sale.stats,state:0
-msgid "Shipping Exception"
-msgstr "Исключительная ситуация поставки"
-
-#. module: sale_journal
-#: field:sale_journal.invoice.type,note:0
-#: field:sale_journal.picking.journal,note:0
-#: field:sale_journal.sale.journal,note:0
-msgid "Note"
-msgstr "Примечание"
-
-#. module: sale_journal
-#: selection:sale_journal.picking.journal,state:0
-#: selection:sale_journal.sale.journal,state:0
-msgid "Draft"
-msgstr "Черновик"
-
-#. module: sale_journal
-#: selection:sale_journal.invoice.type.stats,state:0
-#: selection:sale_journal.picking.stats,state:0
-msgid "cancel"
-msgstr "отменить"
-
-#. module: sale_journal
-#: selection:sale_journal.sale.stats,state:0
-msgid "Invoice Exception"
-msgstr "Исключительная ситуация счета"
-
-#. module: sale_journal
-#: field:sale_journal.picking.journal,date_validation:0
-#: field:sale_journal.sale.journal,date_validation:0
-msgid "Validation date"
-msgstr "Дата проверки"
-
-#. module: sale_journal
-#: selection:sale_journal.invoice.type.stats,state:0
-#: selection:sale_journal.picking.stats,state:0
-msgid "draft"
-msgstr "черновик"
-
-#. module: sale_journal
-#: field:sale_journal.invoice.type,active:0
-msgid "Active"
-msgstr "Активен"
-
-#. module: sale_journal
-#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_draft
-msgid "Draft sales"
-msgstr "Неподтвержденные продажи"
-
-#. module: sale_journal
-#: selection:sale_journal.sale.stats,state:0
-msgid "Quotation"
-msgstr "Предложение"
-
-#. module: sale_journal
-#: model:ir.ui.menu,name:sale_journal.menu_definition_journal
-msgid "Sales Journals"
-msgstr "Книги продаж"
-
-#. module: sale_journal
-#: model:ir.actions.act_window,name:sale_journal.action_invoice_type_tree
-msgid "sale_journal.invoice.type.tree"
-msgstr ""
-
-#. module: sale_journal
-#: view:sale_journal.sale.journal:0
-msgid "Confirm Sales"
-msgstr "Подтвердить продажи"
-
-#. module: sale_journal
-#: field:sale_journal.picking.journal,date_created:0
-#: field:sale_journal.picking.journal,state:0
-#: field:sale_journal.sale.journal,date_created:0
-msgid "Creation date"
-msgstr "Дата создания"
-
-#. module: sale_journal
-#: field:res.partner,property_invoice_type:0
-msgid "Invoicing Method"
-msgstr ""
-
-#. module: sale_journal
-#: field:sale_journal.picking.journal,code:0
-#: field:sale_journal.sale.journal,code:0
-msgid "Code"
-msgstr "Код"
-
-#. module: sale_journal
-#: view:sale_journal.picking.journal:0
-#: view:sale_journal.sale.journal:0
-msgid "Open Journal"
-msgstr "Открыть журнал"
-
-#. module: sale_journal
-#: view:sale_journal.sale.journal:0
-msgid "Sales"
-msgstr "Продажи"
-
-#. module: sale_journal
-#: model:ir.model,name:sale_journal.model_sale_journal_picking_journal
-#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting
-#: view:sale_journal.picking.journal:0
-msgid "Packing Journal"
-msgstr ""
-
-#. module: sale_journal
-#: selection:sale_journal.picking.journal,state:0
-#: selection:sale_journal.sale.journal,state:0
-#: selection:sale_journal.sale.stats,state:0
-msgid "Done"
-msgstr "Выполнено"
-
-#. module: sale_journal
-#: selection:sale_journal.sale.stats,state:0
-msgid "Cancel"
-msgstr "Отмена"
-
-#. module: sale_journal
-#: field:sale_journal.picking.journal,picking_stats_ids:0
-msgid "Journal Stats"
-msgstr "Состояния книги"
-
-#. module: sale_journal
-#: selection:sale_journal.picking.journal,state:0
-#: selection:sale_journal.sale.journal,state:0
-msgid "Open"
-msgstr "Открыть"
+#: model:ir.model,name:sale_journal.model_sale_order
+msgid "Sale Order"
+msgstr "Заказ на продажу"
 
 #. module: sale_journal
 #: constraint:ir.model:0
@@ -403,32 +39,57 @@ msgstr ""
 "Название объекта должно начинаться с x_  и не должно содержать специальных "
 "символов !"
 
+#. module: sale_journal
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Недопустимое имя модели в определении действия."
+
 #. module: sale_journal
 #: view:res.partner:0
 msgid "Sales & Purchases"
 msgstr "Продажи и закупки"
 
 #. module: sale_journal
-#: field:sale_journal.picking.journal,user_id:0
-#: field:sale_journal.sale.journal,user_id:0
-msgid "Responsible"
-msgstr "Ответственный"
+#: model:ir.module.module,shortdesc:sale_journal.module_meta_information
+msgid "Managing sales and deliveries by journal"
+msgstr "Управление продажами и доставками по журналам"
 
 #. module: sale_journal
-#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal_my
-#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales_my_open
-msgid "My Open Journals"
-msgstr "Мои открытые книги"
+#: field:res.partner,property_invoice_type:0
+msgid "Invoicing Method"
+msgstr "Метод выставления счета"
 
 #. module: sale_journal
-#: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open
-msgid "Statistics on packing to invoice"
-msgstr ""
+#: help:res.partner,property_invoice_type:0
+msgid "The type of journal used for sales and picking."
+msgstr "Тип журнала для продаж и комплектации."
 
 #. module: sale_journal
-#: view:sale_journal.sale.journal:0
-msgid "Cancel Sales"
-msgstr "Отменить продажи"
+#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
+#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
+#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
+msgid "Invoice Types"
+msgstr "Типы счетов"
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Non grouped"
+msgstr "Не сгруппировано"
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Grouped"
+msgstr "Сгруппировано"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,invoicing_method:0
+msgid "Invoicing method"
+msgstr "Метод выставления счета"
+
+#. module: sale_journal
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Ошибка ! Нельзя создать зацикленные меню."
 
 #. module: sale_journal
 #: field:sale.order,invoice_type_id:0
@@ -439,116 +100,200 @@ msgid "Invoice Type"
 msgstr "Тип счета"
 
 #. module: sale_journal
-#: selection:sale_journal.invoice.type.stats,invoice_state:0
-msgid "invoiced"
-msgstr "счет выставлен"
+#: field:sale_journal.invoice.type,active:0
+msgid "Active"
+msgstr "Активен"
 
 #. module: sale_journal
-#: selection:sale_journal.invoice.type.stats,state:0
-#: selection:sale_journal.picking.stats,state:0
-msgid "confirmed"
-msgstr "подтверждено"
+#: model:ir.model,name:sale_journal.model_res_partner
+msgid "Partner"
+msgstr "Партнер"
 
 #. module: sale_journal
-#: model:ir.model,name:sale_journal.model_sale_journal_picking_stats
-msgid "Packing lists by Journal"
+#: model:ir.model,name:sale_journal.model_stock_picking
+msgid "Picking List"
+msgstr "Комплектовочный лист"
+
+#. module: sale_journal
+#: view:sale_journal.invoice.type:0
+msgid "Notes"
+msgstr "Примечания"
+
+#. module: sale_journal
+#: help:sale_journal.invoice.type,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the invoice "
+"type without removing it."
 msgstr ""
+"если поле \"Активно\" установлено в \"истина\", то это позволит вам скрыть "
+"тип счета без его удаления."
 
 #. module: sale_journal
-#: field:sale_journal.invoice.type.stats,quantity:0
-#: field:sale_journal.picking.stats,quantity:0
-#: field:sale_journal.sale.stats,quantity:0
-msgid "Quantities"
-msgstr "Количество"
+#: view:res.partner:0
+msgid "Invoicing"
+msgstr "Выставление счета"
 
-#. module: sale_journal
-#: field:sale.order,journal_id:0
-#: view:sale_journal.picking.journal:0
-#: field:sale_journal.picking.journal,name:0
-#: field:sale_journal.picking.stats,journal_id:0
-#: view:sale_journal.sale.journal:0
-#: field:sale_journal.sale.journal,name:0
-#: field:sale_journal.sale.stats,journal_id:0
-#: field:stock.picking,journal_id:0
-msgid "Journal"
-msgstr "Книга"
+#~ msgid "Monthly sales"
+#~ msgstr "Продажи в месяце"
 
-#. module: sale_journal
-#: field:sale_journal.invoice.type,invoicing_method:0
-#: field:sale_journal.invoice.type.stats,invoice_type_id:0
-msgid "Invoicing method"
-msgstr ""
+#~ msgid "assigned"
+#~ msgstr "назначено"
 
-#. module: sale_journal
-#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting_this
-#: model:ir.ui.menu,name:sale_journal.menu_definition_report_sales_this_month
-msgid "This Month"
-msgstr "Данный месяц"
+#~ msgid "Waiting Schedule"
+#~ msgstr "В ожидании расписания"
 
-#. module: sale_journal
-#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales
-#: model:ir.ui.menu,name:sale_journal.menu_sale_sale_stats_open_all
-#: model:ir.ui.menu,name:sale_journal.menu_sale_sale_stats_open_menu
-#: view:sale_journal.sale.stats:0
-msgid "Sales by Journal"
-msgstr "Продажи по книгам"
+#~ msgid "to be invoiced"
+#~ msgstr "выставить счет"
 
-#. module: sale_journal
-#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
-msgid "Invoicing Methods"
-msgstr ""
+#~ msgid "Sale Journal"
+#~ msgstr "Журнал продаж"
 
-#. module: sale_journal
-#: selection:sale_journal.invoice.type,invoicing_method:0
-msgid "Non grouped"
-msgstr "Не сгруппировано"
+#~ msgid "waiting"
+#~ msgstr "ожидание"
 
-#. module: sale_journal
-#: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_open
-msgid "Packing to invoice"
-msgstr ""
+#~ msgid "Set to Draft"
+#~ msgstr "Установить в 'Черновик'"
 
-#. module: sale_journal
-#: view:sale_journal.picking.journal:0
-#: view:sale_journal.sale.journal:0
-msgid "Journal Information"
-msgstr ""
+#~ msgid "Journal date"
+#~ msgstr "Дата журнала"
 
-#. module: sale_journal
-#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type_stats
-msgid "Stats on packing by invoice method"
-msgstr ""
+#~ msgid "My open journals"
+#~ msgstr "Мои открытые книги"
 
-#. module: sale_journal
-#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
-msgid "Invoice Types"
-msgstr "Типы счетов"
+#~ msgid "# of Lines"
+#~ msgstr "Кол-во позиций"
 
-#. module: sale_journal
-#: view:sale_journal.picking.journal:0
-#: view:sale_journal.sale.journal:0
-msgid "States"
-msgstr "Cостояния"
+#~ msgid "All Open Journals"
+#~ msgstr "Все открытые книги"
 
-#. module: sale_journal
-#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal
-#: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_all
-#: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_menu
-msgid "Packing by Journal"
-msgstr ""
+#~ msgid "done"
+#~ msgstr "завершено"
 
-#. module: sale_journal
-#: view:sale_journal.picking.journal:0
-#: view:sale_journal.sale.journal:0
-msgid "Close Journal"
-msgstr ""
+#~ msgid "Average Price"
+#~ msgstr "Средняя цена"
 
-#. module: sale_journal
-#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice
-msgid "Packing to Invoice"
-msgstr ""
+#~ msgid "State"
+#~ msgstr "Состояние"
 
-#. module: sale_journal
-#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_approved
-msgid "Approved sales"
-msgstr "Утвержденные продажи"
+#~ msgid "All Months"
+#~ msgstr "Все месяцы"
+
+#~ msgid "Total Price"
+#~ msgstr "Итоговая цена"
+
+#~ msgid "Reporting"
+#~ msgstr "Отчетность"
+
+#~ msgid "Sales Orders by Journal"
+#~ msgstr "Заказы по книгам"
+
+#~ msgid "None"
+#~ msgstr "Нет"
+
+#~ msgid "Sales by journal (this month)"
+#~ msgstr "Продажи по книгам (тек.м-ц)"
+
+#~ msgid "Manual in progress"
+#~ msgstr "Выполняется вручную"
+
+#~ msgid "In progress"
+#~ msgstr "Выполняется"
+
+#~ msgid "Month"
+#~ msgstr "Месяц"
+
+#~ msgid "Invoice state"
+#~ msgstr "Состояние счета"
+
+#~ msgid "Order State"
+#~ msgstr "Состояние заказа"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "Исключительная ситуация поставки"
+
+#~ msgid "Draft"
+#~ msgstr "Черновик"
+
+#~ msgid "cancel"
+#~ msgstr "отменить"
+
+#~ msgid "Invoice Exception"
+#~ msgstr "Исключительная ситуация счета"
+
+#~ msgid "Validation date"
+#~ msgstr "Дата проверки"
+
+#~ msgid "draft"
+#~ msgstr "черновик"
+
+#~ msgid "Draft sales"
+#~ msgstr "Неподтвержденные продажи"
+
+#~ msgid "Quotation"
+#~ msgstr "Предложение"
+
+#~ msgid "Sales Journals"
+#~ msgstr "Книги продаж"
+
+#~ msgid "Confirm Sales"
+#~ msgstr "Подтвердить продажи"
+
+#~ msgid "Creation date"
+#~ msgstr "Дата создания"
+
+#~ msgid "Code"
+#~ msgstr "Код"
+
+#~ msgid "Sales"
+#~ msgstr "Продажи"
+
+#~ msgid "Done"
+#~ msgstr "Выполнено"
+
+#~ msgid "Cancel"
+#~ msgstr "Отмена"
+
+#~ msgid "Journal Stats"
+#~ msgstr "Состояния книги"
+
+#~ msgid "Open"
+#~ msgstr "Открыть"
+
+#~ msgid "Responsible"
+#~ msgstr "Ответственный"
+
+#~ msgid "My Open Journals"
+#~ msgstr "Мои открытые книги"
+
+#~ msgid "Cancel Sales"
+#~ msgstr "Отменить продажи"
+
+#~ msgid "invoiced"
+#~ msgstr "счет выставлен"
+
+#~ msgid "confirmed"
+#~ msgstr "подтверждено"
+
+#~ msgid "Quantities"
+#~ msgstr "Количество"
+
+#~ msgid "Journal"
+#~ msgstr "Книга"
+
+#~ msgid "This Month"
+#~ msgstr "Данный месяц"
+
+#~ msgid "Sales by Journal"
+#~ msgstr "Продажи по книгам"
+
+#~ msgid "States"
+#~ msgstr "Cостояния"
+
+#~ msgid "Approved sales"
+#~ msgstr "Утвержденные продажи"
+
+#~ msgid "Packing"
+#~ msgstr "Упаковка"
+
+#~ msgid "Open Journal"
+#~ msgstr "Открыть журнал"
diff --git a/addons/sale_layout/i18n/ru.po b/addons/sale_layout/i18n/ru.po
new file mode 100644
index 00000000000..bb913f22a5f
--- /dev/null
+++ b/addons/sale_layout/i18n/ru.po
@@ -0,0 +1,281 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-10-18 17:47+0000\n"
+"PO-Revision-Date: 2010-10-26 11:55+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"Language-Team: Russian <ru@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr "Подитог"
+
+#. module: sale_layout
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Название объекта должно начинаться с x_ и не должно содержать специальных "
+"символов !"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr "Примечания"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Unit Price"
+msgstr "Цена единицы"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Order N°"
+msgstr "Заказ №"
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr "Позиции заказа"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Layout Type"
+msgstr "Тип макета"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order_line
+msgid "Sale Order Line"
+msgstr "Позиция заказа на продажу"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Seq."
+msgstr "Посл."
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr "Продукция"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Description"
+msgstr "Описание"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Manual Description"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Our Salesman"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Automatic Declaration"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr "Позиции счета"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quantity"
+msgstr "Количество"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation N°"
+msgstr "Предложение №"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "VAT"
+msgstr "НДС"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr "Сделать счет"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr "Свойства"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Invoice address :"
+msgstr "Адрес счета:"
+
+#. module: sale_layout
+#: model:ir.module.module,shortdesc:sale_layout.module_meta_information
+msgid "Sale Order Layout"
+msgstr "Шаблон заказа на продажу"
+
+#. module: sale_layout
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Неправильный XML для просмотра архитектуры!"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order
+msgid "Sale Order"
+msgstr "Заказ на продажу"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr "Разделитель страниц"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr "Примечания"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Date Ordered"
+msgstr "Дата заказа"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Shipping address :"
+msgstr "Адрес доставки:"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes"
+msgstr "Налоги"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Net Total :"
+msgstr "Чисный итог:"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Tel. :"
+msgstr "Тел. :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Total :"
+msgstr "Всего:"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Payment Terms"
+msgstr "Условия оплаты"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr "История"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr "Позиции заказа на продажу"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr "Разделитель"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Your Reference"
+msgstr "Ваша ссылка"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr "Позиции заказа на продажу"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr "Кол-во"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr "Состояния"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "TVA :"
+msgstr "НДС:"
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr "Заказ по шаблону"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Доп. инфо."
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr "Ед. изм."
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Fax :"
+msgstr "Факс:"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Позиция заказа"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Price"
+msgstr "Цена"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes :"
+msgstr "Налоги:"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Перемещения ТМЦ"
diff --git a/addons/sale_margin/i18n/ru.po b/addons/sale_margin/i18n/ru.po
index abad08b62ea..bad98199feb 100644
--- a/addons/sale_margin/i18n/ru.po
+++ b/addons/sale_margin/i18n/ru.po
@@ -7,30 +7,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-11-25 14:28+0000\n"
-"PO-Revision-Date: 2010-07-10 21:13+0000\n"
-"Last-Translator: Pomazan Bogdan <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:47+0000\n"
+"PO-Revision-Date: 2010-10-26 11:32+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_margin
-#: selection:report.account.invoice,type:0
-#: selection:report.account.invoice.category,type:0
-#: selection:report.account.invoice.partner,type:0
-#: selection:report.account.invoice.partner.product,type:0
-#: selection:report.account.invoice.product,type:0
-#: selection:stock.invoice_onshipping,init,type:0
-msgid "Customer Refund"
-msgstr "Возврат денег клиенту"
+#: view:report.account.invoice.product:0
+msgid "Category"
+msgstr "Категория"
 
 #. module: sale_margin
-#: model:ir.model,name:sale_margin.model_report_account_invoice_product
-msgid "report.account.invoice.product"
-msgstr ""
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Refund"
+msgstr "Возврат денег клиенту"
 
 #. module: sale_margin
 #: constraint:ir.model:0
@@ -41,51 +36,32 @@ msgstr ""
 "символов !"
 
 #. module: sale_margin
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_product
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_product
-msgid "Invoices by Product"
-msgstr ""
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Недопустимое имя модели в определении действия."
 
 #. module: sale_margin
-#: selection:report.account.invoice,type:0
-#: selection:report.account.invoice.category,type:0
-#: selection:report.account.invoice.partner,type:0
-#: selection:report.account.invoice.partner.product,type:0
 #: selection:report.account.invoice.product,type:0
-#: selection:stock.invoice_onshipping,init,type:0
 msgid "Customer Invoice"
 msgstr "Счета клиентам"
 
 #. module: sale_margin
-#: wizard_view:stock.invoice_onshipping,init:0
-msgid "Create invoices"
-msgstr "Создать счета"
+#: selection:report.account.invoice.product,month:0
+msgid "February"
+msgstr "Февраль"
 
 #. module: sale_margin
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра структуры!"
+#: view:report.account.invoice.product:0
+msgid "Current"
+msgstr "Текущий"
 
 #. module: sale_margin
-#: model:ir.model,name:sale_margin.model_report_account_invoice_partner_product
-msgid "report.account.invoice.partner.product"
-msgstr ""
+#: view:report.account.invoice.product:0
+msgid "Group By..."
+msgstr "Объединять по..."
 
 #. module: sale_margin
-#: selection:report.account.invoice,type:0
-#: selection:report.account.invoice.category,type:0
-#: selection:report.account.invoice.partner,type:0
-#: selection:report.account.invoice.partner.product,type:0
-#: selection:report.account.invoice.product,type:0
-#: selection:stock.invoice_onshipping,init,type:0
-msgid "Supplier Invoice"
-msgstr "Счета поставщиков"
-
-#. module: sale_margin
-#: field:report.account.invoice,state:0
-#: field:report.account.invoice.category,state:0
-#: field:report.account.invoice.partner,state:0
-#: field:report.account.invoice.partner.product,state:0
+#: view:report.account.invoice.product:0
 #: field:report.account.invoice.product,state:0
 msgid "State"
 msgstr "Состояние"
@@ -96,192 +72,203 @@ msgid "Create Invoice"
 msgstr "Создать счет"
 
 #. module: sale_margin
-#: selection:report.account.invoice,state:0
-#: selection:report.account.invoice.category,state:0
-#: selection:report.account.invoice.partner,state:0
-#: selection:report.account.invoice.partner.product,state:0
+#: view:report.account.invoice.product:0
 #: selection:report.account.invoice.product,state:0
 msgid "Draft"
 msgstr "Черновик"
 
 #. module: sale_margin
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
-
-#. module: sale_margin
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_month_product
-msgid "All Months"
-msgstr "Все месяцы"
-
-#. module: sale_margin
-#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_product_tree
-#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_product_tree_all
-msgid "report.account.invoice.partner.product.tree"
-msgstr ""
-
-#. module: sale_margin
-#: field:report.account.invoice,type:0
-#: field:report.account.invoice.category,type:0
-#: field:report.account.invoice.partner,type:0
-#: field:report.account.invoice.partner.product,type:0
-#: field:report.account.invoice.product,type:0
-#: wizard_field:stock.invoice_onshipping,init,type:0
-msgid "Type"
-msgstr "Тип"
-
-#. module: sale_margin
-#: wizard_field:stock.invoice_onshipping,init,journal_id:0
-msgid "Destination Journal"
-msgstr ""
-
-#. module: sale_margin
-#: view:stock.picking:0
-msgid "Supplier Invoices"
-msgstr "Счета поставщиков"
-
-#. module: sale_margin
-#: field:report.account.invoice.partner.product,product_id:0
-#: field:report.account.invoice.product,product_id:0
-msgid "Product"
-msgstr "Продукция"
-
-#. module: sale_margin
-#: view:report.account.invoice.partner:0
-msgid "Invoices by partner"
-msgstr ""
-
-#. module: sale_margin
-#: view:report.account.invoice.category:0
-msgid "Invoices by category"
-msgstr ""
-
-#. module: sale_margin
-#: selection:report.account.invoice,state:0
-#: selection:report.account.invoice.category,state:0
-#: selection:report.account.invoice.partner,state:0
-#: selection:report.account.invoice.partner.product,state:0
 #: selection:report.account.invoice.product,state:0
 msgid "Paid"
 msgstr "Оплачено"
 
 #. module: sale_margin
-#: model:ir.actions.wizard,name:sale_margin.wizard_picking_invoice_create
-#: wizard_button:stock.invoice_onshipping,init,create_invoice:0
-msgid "Create invoice"
-msgstr "Создать счет"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Ошибка ! Нельзя создать зацикленные меню."
 
 #. module: sale_margin
-#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_category_tree
-#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_category_tree_all
-msgid "report.account.invoice.category.tree"
-msgstr ""
+#: model:ir.model,name:sale_margin.model_stock_picking
+msgid "Picking List"
+msgstr "Комплектовочный лист"
 
 #. module: sale_margin
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_partner_product
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_partner_product
-msgid "Invoices by Partner and Product"
-msgstr ""
+#: field:report.account.invoice.product,type:0
+msgid "Type"
+msgstr "Тип"
 
 #. module: sale_margin
-#: model:ir.model,name:sale_margin.model_report_account_invoice_category
-msgid "report.account.invoice.category"
-msgstr ""
+#: model:ir.model,name:sale_margin.model_sale_order_line
+msgid "Sale Order Line"
+msgstr "Позиция заказа на продажу"
 
 #. module: sale_margin
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_this_month_product
+#: model:ir.model,name:sale_margin.model_report_account_invoice_product
+msgid "Invoice Statistics"
+msgstr "Статистика по счетам"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,product_id:0
+msgid "Product"
+msgstr "Продукция"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoice by Partner"
+msgstr "Счет по партнеру"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "August"
+msgstr "Август"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: selection:report.account.invoice.product,state:0
+msgid "Pro-forma"
+msgstr "Проформа"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "May"
+msgstr "Май"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "June"
+msgstr "Июнь"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Date Invoiced"
+msgstr "Дата выставления счета"
+
+#. module: sale_margin
+#: model:ir.module.module,shortdesc:sale_margin.module_meta_information
+msgid "Margins in Sales Order"
+msgstr "Наценки в заказах на продажу"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Search Margin"
+msgstr "Искать наценку"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "This Year"
+msgstr "Этот год"
+
+#. module: sale_margin
+#: field:report.account.invoice.product,date:0
+msgid "Date"
+msgstr "Дата"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "July"
+msgstr "Июль"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Extended Filters..."
+msgstr "Расширенные фильтры..."
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
 msgid "This Month"
 msgstr "Этот месяц"
 
 #. module: sale_margin
-#: field:report.account.invoice.category,categ_id:0
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,day:0
+msgid "Day"
+msgstr "День"
+
+#. module: sale_margin
+#: field:report.account.invoice.product,categ_id:0
 msgid "Categories"
 msgstr "Категории"
 
+#. module: sale_margin
+#: help:sale.order,margin:0
+msgid ""
+"It gives profitability by calculating the difference between the Unit Price "
+"and Cost Price"
+msgstr ""
+"Дает рентабельность, вычисляется разница между ценой продажи и закупки."
+
 #. module: sale_margin
 #: field:account.invoice.line,cost_price:0
-#: field:report.account.invoice,cost_price:0
-#: field:report.account.invoice.category,cost_price:0
-#: field:report.account.invoice.partner,cost_price:0
-#: field:report.account.invoice.partner.product,cost_price:0
 #: field:report.account.invoice.product,cost_price:0
 #: field:sale.order.line,purchase_price:0
 msgid "Cost Price"
 msgstr "Себестоимость"
 
 #. module: sale_margin
-#: wizard_field:stock.invoice_onshipping,init,group:0
-msgid "Group by partner"
-msgstr "Группировать по партнерам"
+#: selection:report.account.invoice.product,month:0
+msgid "October"
+msgstr "Октябрь"
 
 #. module: sale_margin
-#: model:ir.model,name:sale_margin.model_report_account_invoice_partner
-msgid "report.account.invoice.partner"
-msgstr ""
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,year:0
+msgid "Year"
+msgstr "Год"
 
 #. module: sale_margin
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_partner
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_partner
-msgid "Invoices by Partner"
-msgstr ""
+#: selection:report.account.invoice.product,month:0
+msgid "January"
+msgstr "Январь"
 
 #. module: sale_margin
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_category
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_category
-msgid "Invoices by Category"
-msgstr ""
+#: model:ir.model,name:sale_margin.model_sale_order
+msgid "Sale Order"
+msgstr "Заказ на продажу"
 
 #. module: sale_margin
-#: view:report.account.invoice.partner.product:0
-msgid "Invoices by partner and product"
-msgstr ""
+#: selection:report.account.invoice.product,month:0
+msgid "September"
+msgstr "Сентябрь"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "April"
+msgstr "Апрель"
 
 #. module: sale_margin
-#: field:report.account.invoice,amount:0
-#: field:report.account.invoice.category,amount:0
-#: field:report.account.invoice.partner,amount:0
-#: field:report.account.invoice.partner.product,amount:0
 #: field:report.account.invoice.product,amount:0
 msgid "Amount"
 msgstr "Количество"
 
 #. module: sale_margin
-#: wizard_field:stock.invoice_onshipping,init,invoice_date:0
-msgid "Invoiced date"
-msgstr ""
-
-#. module: sale_margin
-#: selection:report.account.invoice,type:0
-#: selection:report.account.invoice.category,type:0
-#: selection:report.account.invoice.partner,type:0
-#: selection:report.account.invoice.partner.product,type:0
 #: selection:report.account.invoice.product,type:0
-#: selection:stock.invoice_onshipping,init,type:0
 msgid "Supplier Refund"
 msgstr "Возврат средств от поставщика"
 
 #. module: sale_margin
-#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_tree
-#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_tree_all
-msgid "report.account.invoice.partner.tree"
-msgstr ""
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Неправильный XML для просмотра структуры!"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "March"
+msgstr "Март"
 
 #. module: sale_margin
-#: field:report.account.invoice,margin:0
-#: field:report.account.invoice.category,margin:0
-#: field:report.account.invoice.partner,margin:0
-#: field:report.account.invoice.partner.product,margin:0
 #: field:report.account.invoice.product,margin:0
 #: field:sale.order,margin:0
 #: field:sale.order.line,margin:0
 msgid "Margin"
-msgstr "Отступ"
+msgstr "Наценка"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "November"
+msgstr "Ноябрь"
 
 #. module: sale_margin
-#: field:report.account.invoice,quantity:0
-#: field:report.account.invoice.category,quantity:0
-#: field:report.account.invoice.partner,quantity:0
-#: field:report.account.invoice.partner.product,quantity:0
 #: field:report.account.invoice.product,quantity:0
 msgid "Quantity"
 msgstr "Количество"
@@ -289,87 +276,89 @@ msgstr "Количество"
 #. module: sale_margin
 #: view:report.account.invoice.product:0
 msgid "Invoices by product"
-msgstr ""
+msgstr "Счета по продукции"
 
 #. module: sale_margin
-#: model:ir.module.module,shortdesc:sale_margin.module_meta_information
-msgid "Margins in Sale Orders"
-msgstr ""
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Invoice"
+msgstr "Счета поставщиков"
 
 #. module: sale_margin
-#: model:ir.model,name:sale_margin.model_report_account_invoice
-msgid "report.account.invoice"
-msgstr ""
-
-#. module: sale_margin
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_invoices
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_invoices
-#: view:report.account.invoice:0
-#: view:stock.picking:0
 #: field:stock.picking,invoice_ids:0
 msgid "Invoices"
-msgstr "Счета-фактуры"
+msgstr "Счета"
 
 #. module: sale_margin
-#: selection:report.account.invoice,state:0
-#: selection:report.account.invoice.category,state:0
-#: selection:report.account.invoice.partner,state:0
-#: selection:report.account.invoice.partner.product,state:0
-#: selection:report.account.invoice.product,state:0
-msgid "Pro-forma"
-msgstr "Проформа"
+#: selection:report.account.invoice.product,month:0
+msgid "December"
+msgstr "Декабрь"
 
 #. module: sale_margin
-#: field:report.account.invoice,name:0
-#: field:report.account.invoice.category,name:0
-#: field:report.account.invoice.partner,name:0
-#: field:report.account.invoice.partner.product,name:0
-#: field:report.account.invoice.product,name:0
+#: model:ir.model,name:sale_margin.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Позиция счета"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,month:0
 msgid "Month"
 msgstr "Месяц"
 
 #. module: sale_margin
-#: selection:report.account.invoice,state:0
-#: selection:report.account.invoice.category,state:0
-#: selection:report.account.invoice.partner,state:0
-#: selection:report.account.invoice.partner.product,state:0
 #: selection:report.account.invoice.product,state:0
 msgid "Canceled"
 msgstr "Отменено"
 
 #. module: sale_margin
 #: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice Report"
+msgstr "Отчет по счету"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Done"
+msgstr "Сделано"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_reoirt
 msgid "Invoice"
 msgstr "Счет"
 
 #. module: sale_margin
-#: wizard_button:stock.invoice_onshipping,init,end:0
-msgid "Cancel"
-msgstr "Отмена"
+#: view:stock.picking:0
+msgid "Customer Invoices"
+msgstr "Счета заказчика"
 
 #. module: sale_margin
-#: field:report.account.invoice.partner,partner_id:0
-#: field:report.account.invoice.partner.product,partner_id:0
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,partner_id:0
 msgid "Partner"
 msgstr "Партнер"
 
 #. module: sale_margin
-#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_tree
-#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_tree_all
-msgid "report.account.invoice.tree"
-msgstr ""
-
-#. module: sale_margin
-#: selection:report.account.invoice,state:0
-#: selection:report.account.invoice.category,state:0
-#: selection:report.account.invoice.partner,state:0
-#: selection:report.account.invoice.partner.product,state:0
 #: selection:report.account.invoice.product,state:0
 msgid "Open"
 msgstr "Открыть"
 
 #. module: sale_margin
-#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_product_tree
-#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_product_tree_all
-msgid "report.account.invoice.product.tree"
-msgstr ""
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_report
+msgid "Invoice Analysis"
+msgstr "Анализ счета"
+
+#~ msgid "Create invoices"
+#~ msgstr "Создать счета"
+
+#~ msgid "All Months"
+#~ msgstr "Все месяцы"
+
+#~ msgid "Supplier Invoices"
+#~ msgstr "Счета поставщиков"
+
+#~ msgid "Create invoice"
+#~ msgstr "Создать счет"
+
+#~ msgid "Group by partner"
+#~ msgstr "Группировать по партнерам"
+
+#~ msgid "Cancel"
+#~ msgstr "Отмена"
diff --git a/addons/sale_mrp/i18n/ru.po b/addons/sale_mrp/i18n/ru.po
index 9707875b254..01899682ff7 100644
--- a/addons/sale_mrp/i18n/ru.po
+++ b/addons/sale_mrp/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-10-25 14:22+0000\n"
+"PO-Revision-Date: 2010-10-26 11:44+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_mrp
@@ -43,7 +43,7 @@ msgstr ""
 #. module: sale_mrp
 #: field:mrp.production,sale_name:0
 msgid "Sale Name"
-msgstr ""
+msgstr "Название продажи"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
@@ -53,9 +53,9 @@ msgstr "Производственный заказ"
 #. module: sale_mrp
 #: field:mrp.production,sale_ref:0
 msgid "Sale Reference"
-msgstr ""
+msgstr "Ссылка на продажу"
 
 #. module: sale_mrp
 #: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
 msgid "Sales and MRP Management"
-msgstr ""
+msgstr "Управление продажами и план. произв. рес."
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index eef65412222..b2c82948d8a 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-10-25 07:16+0000\n"
+"PO-Revision-Date: 2010-10-26 05:28+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -319,7 +319,7 @@ msgstr "Партия изделий"
 #. module: stock
 #: help:stock.incoterms,code:0
 msgid "Code for Incoterms"
-msgstr ""
+msgstr "Код ИНКОТЕРМС"
 
 #. module: stock
 #: field:stock.tracking,move_ids:0
diff --git a/addons/wiki_faq/i18n/ru.po b/addons/wiki_faq/i18n/ru.po
index c09bb83408c..c27b7e82540 100644
--- a/addons/wiki_faq/i18n/ru.po
+++ b/addons/wiki_faq/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-10-25 13:55+0000\n"
+"PO-Revision-Date: 2010-10-26 08:56+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_faq

From c6df9c4b1dff3ea33cba2a233df39fd5861d2e3e Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Wed, 27 Oct 2010 12:06:05 +0200
Subject: [PATCH 34/38] [FIX] deadline_change.yml : fix date format deadline

bzr revid: tfr@openerp.com-20101027100605-b6xsqvwfvvgbt3x3
---
 addons/project_retro_planning/test/deadline_change.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_retro_planning/test/deadline_change.yml b/addons/project_retro_planning/test/deadline_change.yml
index 3e778916792..012bc62a4eb 100644
--- a/addons/project_retro_planning/test/deadline_change.yml
+++ b/addons/project_retro_planning/test/deadline_change.yml
@@ -10,7 +10,7 @@
   Create task 'Plan all projects'
 - 
   !record {model: project.task, id: project_task_planallprojects0}:
-    date_deadline: '2010-06-07'
+    date_deadline: '2010-06-07 12:00:00'
     date_end: '2010-06-04 14:00:00'
     date_start: '2010-06-01 17:25:32'
     name: Plan all projects

From 8cebff4d9f0ed6a07d1942d3b7f0777c9b8192f2 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 27 Oct 2010 15:36:24 +0530
Subject: [PATCH 35/38] [FIX] stock_invoice_directly: fixed yml issue

bzr revid: hmo@tinyerp.com-20101027100624-4c14kfvzrwxmp7j0
---
 .../test/stock_invoice_directly.yml                  | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/addons/stock_invoice_directly/test/stock_invoice_directly.yml b/addons/stock_invoice_directly/test/stock_invoice_directly.yml
index 4a0708b84d9..b5ecb83caf2 100644
--- a/addons/stock_invoice_directly/test/stock_invoice_directly.yml
+++ b/addons/stock_invoice_directly/test/stock_invoice_directly.yml
@@ -60,16 +60,12 @@
            }
      pick_obj.do_partial(cr, uid, [ref('stock_picking_out0')], partial_datas, context=context)
 - 
-  As the Invoice state of the picking order is To be invoiced. I create a record for create invoice.
-- 
-  !record {model: stock.invoice.onshipping, id: stock_invoice_onshipping_0}:
-    invoice_date: '2010-08-04'
-    journal_id: account.bank_journal
-- 
-  I create a Customer invoice for my outgoing picking order.
+  As the Invoice state of the picking order is To be invoiced. I create invoice for my outgoing picking order.
 - 
   !python {model: stock.invoice.onshipping}: |
-    self.create_invoice(cr, uid, [ref("stock_invoice_onshipping_0")], {"lang": "en_US", 
+    wiz_id = self.create(cr, uid, {'invoice_date': '2010-08-04', 'journal_id': ref('account.bank_journal')},
+      {'active_ids': [ref("stock_picking_out0")]})
+    self.create_invoice(cr, uid, [wiz_id], {"lang": "en_US", 
       "search_default_available": 1, "tz": False, "active_model": "stock.picking",
       "contact_display": "partner", "active_ids": [ref("stock_picking_out0")], "active_id": ref("stock_picking_out0")})
 -

From abc40474e03ee0f6f1a855ecd461a7561adfe579 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 27 Oct 2010 16:02:08 +0530
Subject: [PATCH 36/38] [FIX] account: fixed yml issue of account cash
 statement

bzr revid: hmo@tinyerp.com-20101027103208-xvtzje41n2rb5kl1
---
 addons/account/account_cash_statement.py       | 4 ++--
 addons/account/test/account_cash_statement.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 07767328a55..818bfef978e 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -328,8 +328,8 @@ class account_cash_statement(osv.osv):
         statement_pool = self.pool.get('account.bank.statement')
         for statement in statement_pool.browse(cr, uid, ids, context=context):
             vals = {}
-
-            if not self._user_allow(cr, uid, statement.id, context=context):
+            force_allow = context.get('force_allow',False)
+            if not force_allow and not self._user_allow(cr, uid, statement.id, context=context):
                 raise osv.except_osv(_('Error !'), _('User %s does not have rights to access %s journal !' % (statement.user_id.name, statement.journal_id.name)))
 
             if statement.name and statement.name == '/':
diff --git a/addons/account/test/account_cash_statement.yml b/addons/account/test/account_cash_statement.yml
index 03d0d54db83..67e6d4d2607 100644
--- a/addons/account/test/account_cash_statement.yml
+++ b/addons/account/test/account_cash_statement.yml
@@ -26,7 +26,7 @@
   I clicked on Open CashBox button to open the cashbox
 -
  !python {model: account.bank.statement}: |
-    self.button_open(cr, uid, [ref("account_bank_statement_1")], {"lang": "en_US", "tz": False, "active_model": "account.bank.statement", "active_ids": [ref("account_bank_statement_1")], "active_id": ref("account_bank_statement_1"), })
+    self.button_open(cr, uid, [ref("account_bank_statement_1")], {"force_allow":True, "lang": "en_US", "tz": False, "active_model": "account.bank.statement", "active_ids": [ref("account_bank_statement_1")], "active_id": ref("account_bank_statement_1"), })
 
 -
   I check that now bank statement is in the "Open" state

From a91878d868070be7f707c86de524b9283c86c61b Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 27 Oct 2010 17:07:15 +0530
Subject: [PATCH 37/38] [FIX] project: fixed yml issue

bzr revid: hmo@tinyerp.com-20101027113715-b6973r91ravjljjg
---
 addons/project/test/test_project.yml          | 10 +--
 addons/project_caldav/project_caldav.py       |  1 +
 .../test/deadline_change.yml                  |  2 +-
 addons/project_timesheet/project_timesheet.py | 68 +++++++++----------
 4 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/addons/project/test/test_project.yml b/addons/project/test/test_project.yml
index d417debac8c..bca3bcbff41 100644
--- a/addons/project/test/test_project.yml
+++ b/addons/project/test/test_project.yml
@@ -134,7 +134,7 @@
 -
   Make a work task entry 'Training on OpenERP modules, models and classes' of 10 hours
 -
-  !record {model: project.task, id: project_task_technicaltraining0}:
+  !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
     work_ids:
       - date: '2010-05-31 15:04:22'
         hours: 10.0
@@ -149,7 +149,7 @@
 -
   Make a work task entry 'Training on OpenERP xml views' of 10 hours
 -
-  !record {model: project.task, id: project_task_technicaltraining0}:
+  !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
     work_ids:
       - date: '2010-06-01 15:04:46'
         hours: 10.0
@@ -164,7 +164,7 @@
 -
   Make a work task entry 'Training on workflows' of 10 hours
 -
-  !record {model: project.task, id: project_task_technicaltraining0}:
+  !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
     work_ids:
       - date: '2010-06-02 15:05:24'
         hours: 10.0
@@ -200,7 +200,7 @@
 -
   Make a work task entry 'Training on reports and wizards' of 10 hours
 -
-  !record {model: project.task, id: project_task_technicaltraining0}:
+  !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
     work_ids:
       - date: '2010-05-31 15:08:40'
         hours: 10.0
@@ -251,7 +251,7 @@
 -
   Make a work task entry 'Training on yml' of 5 hours
 -
-  !record {model: project.task, id: project_task_technicaltraining0}:
+  !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
     work_ids:
       - date: '2010-05-31 16:55:27'
         hours: 5.0
diff --git a/addons/project_caldav/project_caldav.py b/addons/project_caldav/project_caldav.py
index ea6c02bc2cb..fb2d62a9684 100644
--- a/addons/project_caldav/project_caldav.py
+++ b/addons/project_caldav/project_caldav.py
@@ -32,6 +32,7 @@ class project_task(osv.osv):
         # force inherit from project.project_task so that 
         # calendar.todo.active is masked oute
         'active': base_project_task._columns['active'],
+        'date_deadline': base_project_task._columns['date_deadline'],
         'write_date': fields.datetime('Write Date'),
         'create_date': fields.datetime('Create Date', readonly=True),
         'attendee_ids': fields.many2many('calendar.attendee', \
diff --git a/addons/project_retro_planning/test/deadline_change.yml b/addons/project_retro_planning/test/deadline_change.yml
index 012bc62a4eb..3e778916792 100644
--- a/addons/project_retro_planning/test/deadline_change.yml
+++ b/addons/project_retro_planning/test/deadline_change.yml
@@ -10,7 +10,7 @@
   Create task 'Plan all projects'
 - 
   !record {model: project.task, id: project_task_planallprojects0}:
-    date_deadline: '2010-06-07 12:00:00'
+    date_deadline: '2010-06-07'
     date_end: '2010-06-04 14:00:00'
     date_start: '2010-06-01 17:25:32'
     name: Plan all projects
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 601fbfa578b..42104fcddc1 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -80,42 +80,42 @@ class project_work(osv.osv):
         
         vals_line = {}
         context = kwargs.get('context', {})
+        if not context.get('no_analytic_entry',False):
+            obj_task = task_obj.browse(cr, uid, vals['task_id'])
+            result = self.get_user_related_details(cr, uid, vals.get('user_id', uid))
+            vals_line['name'] = '%s: %s' % (tools.ustr(obj_task.name), tools.ustr(vals['name']) or '/')
+            vals_line['user_id'] = vals['user_id']
+            vals_line['product_id'] = result['product_id']
+            vals_line['date'] = vals['date'][:10]
+            
+            #calculate quantity based on employee's product's uom 
+            vals_line['unit_amount'] = vals['hours']
 
-        obj_task = task_obj.browse(cr, uid, vals['task_id'])
-        result = self.get_user_related_details(cr, uid, vals.get('user_id', uid))
-        vals_line['name'] = '%s: %s' % (tools.ustr(obj_task.name), tools.ustr(vals['name']) or '/')
-        vals_line['user_id'] = vals['user_id']
-        vals_line['product_id'] = result['product_id']
-        vals_line['date'] = vals['date'][:10]
-        
-        #calculate quantity based on employee's product's uom 
-        vals_line['unit_amount'] = vals['hours']
+            default_uom = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id
+            if result['product_uom_id'] != default_uom:
+                vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, default_uom, vals['hours'], result['product_uom_id'])
+            acc_id = obj_task.project_id and obj_task.project_id.analytic_account_id.id or False
+            if acc_id:
+                vals_line['account_id'] = acc_id
+                res = obj_timesheet.on_change_account_id(cr, uid, False, acc_id)
+                if res.get('value'):
+                    vals_line.update(res['value'])
+                vals_line['general_account_id'] = result['general_account_id']
+                vals_line['journal_id'] = result['journal_id']
+                vals_line['amount'] = 0.0
+                vals_line['product_uom_id'] = result['product_uom_id']
+                amount = vals_line['unit_amount']
+                prod_id = vals_line['product_id']
+                unit = False
+                timeline_id = obj_timesheet.create(cr, uid, vals=vals_line, context=context)
 
-        default_uom = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id
-        if result['product_uom_id'] != default_uom:
-            vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, default_uom, vals['hours'], result['product_uom_id'])
-        acc_id = obj_task.project_id and obj_task.project_id.analytic_account_id.id or False
-        if acc_id:
-            vals_line['account_id'] = acc_id
-            res = obj_timesheet.on_change_account_id(cr, uid, False, acc_id)
-            if res.get('value'):
-                vals_line.update(res['value'])
-            vals_line['general_account_id'] = result['general_account_id']
-            vals_line['journal_id'] = result['journal_id']
-            vals_line['amount'] = 0.0
-            vals_line['product_uom_id'] = result['product_uom_id']
-            amount = vals_line['unit_amount']
-            prod_id = vals_line['product_id']
-            unit = False
-            timeline_id = obj_timesheet.create(cr, uid, vals=vals_line, context=context)
-
-            # Compute based on pricetype
-            amount_unit = obj_timesheet.on_change_unit_amount(cr, uid, timeline_id,
-                prod_id, amount, False, unit, context=context)
-            if amount_unit and 'amount' in amount_unit.get('value',{}):
-                updv = { 'amount': amount_unit['value']['amount'] }
-                obj_timesheet.write(cr, uid, [timeline_id], updv, context=context)
-            vals['hr_analytic_timesheet_id'] = timeline_id
+                # Compute based on pricetype
+                amount_unit = obj_timesheet.on_change_unit_amount(cr, uid, timeline_id,
+                    prod_id, amount, False, unit, context=context)
+                if amount_unit and 'amount' in amount_unit.get('value',{}):
+                    updv = { 'amount': amount_unit['value']['amount'] }
+                    obj_timesheet.write(cr, uid, [timeline_id], updv, context=context)
+                vals['hr_analytic_timesheet_id'] = timeline_id
         return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
 
     def write(self, cr, uid, ids, vals, context=None):

From d6ba50f38617151a43dacf7b630c48f51938b6e8 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 27 Oct 2010 19:05:24 +0530
Subject: [PATCH 38/38] [FIX]: Fixed translation of warning messages

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

bzr revid: rpa@tinyerp.com-20101027133524-2mijip7zskzwevnh
---
 addons/account/account_cash_statement.py      |  4 +-
 addons/account/i18n/account.pot               |  7 +++
 addons/auction/i18n/auction.pot               | 49 +++++++++++++++++++
 .../wizard/auction_catalog_flagey_report.py   |  3 +-
 .../auction/wizard/auction_lots_buyer_map.py  |  2 +-
 .../auction/wizard/auction_lots_numerotate.py |  6 +--
 addons/auction/wizard/auction_pay_buy.py      |  4 +-
 addons/base_calendar/base_calendar.py         |  4 +-
 addons/base_calendar/i18n/base_calendar.pot   | 18 +++++++
 addons/caldav/calendar.py                     |  3 +-
 addons/caldav/i18n/caldav.pot                 | 12 +++++
 .../document_webdav/i18n/document_webdav.pot  | 11 +++++
 addons/document_webdav/webdav.py              |  4 +-
 addons/l10n_ch/i18n/l10n_ch.pot               | 11 +++++
 addons/l10n_ch/wizard/create_dta.py           |  6 +--
 .../i18n/marketing_campaign.pot               | 12 +++++
 .../marketing_campaign/marketing_campaign.py  |  2 +-
 addons/point_of_sale/i18n/point_of_sale.pot   |  7 +++
 addons/point_of_sale/wizard/pos_discount.py   |  2 +-
 .../i18n/purchase_requisition.pot             | 11 +++++
 .../wizard/purchase_requisition_partner.py    |  3 +-
 addons/stock/i18n/stock.pot                   |  7 +++
 addons/stock/wizard/stock_fill_inventory.py   |  2 +-
 23 files changed, 168 insertions(+), 22 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 818bfef978e..7cd084eb7f9 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -241,14 +241,14 @@ class account_cash_statement(osv.osv):
 
     def create(self, cr, uid, vals, context=None):
         if 'journal_id' not in vals:
-            raise osv.except_osv('Error', _('You cannot create a bank or cash register without a journal!'))
+            raise osv.except_osv(_('Error'), _('You cannot create a bank or cash register without a journal!'))
         sql = [
                 ('journal_id', '=', vals.get('journal_id', False)),
                 ('state', '=', 'open')
         ]
         open_jrnl = self.search(cr, uid, sql)
         if open_jrnl:
-            raise osv.except_osv('Error', _('You can not have two open register for the same journal'))
+            raise osv.except_osv(_('Error'), _('You can not have two open register for the same journal'))
 
         if self.pool.get('account.journal').browse(cr, uid, vals['journal_id']).type == 'cash':
             open_close = self._get_cash_open_close_box_lines(cr, uid, context)
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index c2a022403a1..45725e1bc84 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -5617,6 +5617,7 @@ msgstr ""
 #: code:addons/account/invoice.py:0
 #: code:addons/account/wizard/account_invoice_refund.py:0
 #: code:addons/account/wizard/account_use_model.py:0
+#: code:addons/account/account_cash_statement.py:0
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -6138,6 +6139,12 @@ msgstr ""
 msgid "You can not have two open register for the same journal"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_cash_statement.py:0
+#, python-format
+msgid "You cannot create a bank or cash register without a journal!"
+msgstr ""
+
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  day of the month= -1"
diff --git a/addons/auction/i18n/auction.pot b/addons/auction/i18n/auction.pot
index 8c8e0dc2a96..2027ab85202 100644
--- a/addons/auction/i18n/auction.pot
+++ b/addons/auction/i18n/auction.pot
@@ -307,6 +307,54 @@ msgstr ""
 msgid "The Buyer \"%s\" has no Invoice Address."
 msgstr ""
 
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:0
+#, python-format
+msgid "Payment aborted !"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:0
+#, python-format
+msgid "You should pay all the total: "%.2f" are missing to accomplish the payment."
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:0
+#, python-format
+msgid "No Lots belong to this Auction Date"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_numerotate.py:0
+#, python-format
+msgid "This record does not exist !"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_numerotate.py:0
+#, python-format
+msgid "This lot does not exist !"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:0
+#, python-format
+msgid "No buyer is set for this lot."
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:0
+#, python-format
+msgid "No auction date for "%s": Please set one."
+msgstr ""
+
 #. module: auction
 #: view:auction.dates:0
 msgid "Commissions"
@@ -659,6 +707,7 @@ msgstr ""
 
 #. module: auction
 #: code:addons/auction/wizard/auction_lots_invoice.py:0
+#: code:addons/auction/wizard/auction_lots_numerotate.py:0
 #, python-format
 msgid "UserError"
 msgstr ""
diff --git a/addons/auction/wizard/auction_catalog_flagey_report.py b/addons/auction/wizard/auction_catalog_flagey_report.py
index 97440a6680c..b5bff2d2858 100644
--- a/addons/auction/wizard/auction_catalog_flagey_report.py
+++ b/addons/auction/wizard/auction_catalog_flagey_report.py
@@ -21,6 +21,7 @@
 
 from osv import osv, fields
 import netsvc
+from tools.translate import _
 
 class auction_catalog_flagey(osv.osv_memory):
     _name = 'auction.catalog.flagey'
@@ -57,7 +58,7 @@ class auction_catalog_flagey(osv.osv_memory):
         v_ids = lots_obj.browse(cr, uid, v_lots)
         for ab in v_ids:
             if not ab.auction_id :
-                raise osv.except_osv('Error!','No Lots belong to this Auction Date')
+                raise osv.except_osv(_('Error!'), _('No Lots belong to this Auction Date'))
         pass
     
     def print_report(self, cr, uid, ids, context):
diff --git a/addons/auction/wizard/auction_lots_buyer_map.py b/addons/auction/wizard/auction_lots_buyer_map.py
index 23279942965..98d26b83b4f 100644
--- a/addons/auction/wizard/auction_lots_buyer_map.py
+++ b/addons/auction/wizard/auction_lots_buyer_map.py
@@ -67,7 +67,7 @@ class wiz_auc_lots_buyer_map(osv.osv_memory):
         lots_obj = self.pool.get('auction.lots')
         for rec in lots_obj.browse(cr, uid, ids, context):
             if (len(ids)==1) and (not rec.ach_uid and not rec.ach_login):
-                raise osv.except_osv('Error', 'No buyer is set for this lot.')
+                raise osv.except_osv(_('Error'), _('No buyer is set for this lot.'))
             if not rec.ach_uid and rec.ach_login:
                 return {'ach_login': rec.ach_login}
         return {}
diff --git a/addons/auction/wizard/auction_lots_numerotate.py b/addons/auction/wizard/auction_lots_numerotate.py
index b464ba49a28..9c41d1d4f70 100644
--- a/addons/auction/wizard/auction_lots_numerotate.py
+++ b/addons/auction/wizard/auction_lots_numerotate.py
@@ -99,7 +99,7 @@ class auction_lots_numerotate_per_lot(osv.osv_memory):
                                       ('lot_num','=',int(datas['lot_num']))])
         found = [r for r in res if r in record_ids]
         if len(found)==0:
-            raise osv.except_osv('UserError', 'This record does not exist !')
+            raise osv.except_osv(_('UserError'), _('This record does not exist !'))
         lots_obj.write(cr, uid, found, {'obj_num':int(datas['obj_num'])} )
         view_id = data_obj._get_id(cr, uid, 'auction', 'view_auction_numerotate')
         if view_id:
@@ -125,7 +125,7 @@ class auction_lots_numerotate_per_lot(osv.osv_memory):
                                         ('lot_num','=',int(datas['lot_num']))])
         found = [r for r in res if r in record_ids]
         if len(found)==0:
-            raise osv.except_osv('UserError', 'This record does not exist !')
+            raise osv.except_osv(_('UserError'), _('This record does not exist !'))
         lots_datas = lots_obj.read(cr, uid, found,
                                    ['obj_num', 'name', 'lot_est1', 
                                    'lot_est2', 'obj_desc'])
@@ -141,7 +141,7 @@ class auction_lots_numerotate_per_lot(osv.osv_memory):
                                                     ('lot_num','=',int(datas['lot_num']))])
         found = [r for r in res if r in record_ids]
         if len(found)==0:
-            raise osv.except_osv('Error', 'This lot does not exist !')
+            raise osv.except_osv(_('Error'), _('This lot does not exist !'))
         view_id = data_obj._get_id(cr, uid, 'auction', 'view_auction_lots_numerotate_second')
         if view_id:
             res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py
index 108ed00eddc..bf6a85cf74b 100644
--- a/addons/auction/wizard/auction_pay_buy.py
+++ b/addons/auction/wizard/auction_pay_buy.py
@@ -76,14 +76,14 @@ class auction_pay_buy(osv.osv_memory):
         for datas in self.read(cr, uid, ids):
             if not abs(datas['total'] - (datas['amount'] + datas['amount2'] + datas['amount3'])) <0.01:
                 rest = datas['total'] - (datas['amount'] + datas['amount2'] + datas['amount3'])
-                raise osv.except_osv('Payment aborted !', 'You should pay all the total: "%.2f" are missing to accomplish the payment.' %(round(rest, 2)))
+                raise osv.except_osv(_('Payment aborted !'), _('You should pay all the total: "%.2f" are missing to accomplish the payment.') %(round(rest, 2)))
     
             lots = lot_obj.browse(cr, uid, context['active_ids'], context)
             for lot in lots:
                 if datas['buyer_id']:
                     lot_obj.write(cr, uid, [lot.id], {'ach_uid': datas['buyer_id']})
                 if not lot.auction_id:
-                    raise osv.except_osv('Error !', 'No auction date for "%s": Please set one.'%(lot.name))
+                    raise osv.except_osv(_('Error!'), _('No auction date for "%s": Please set one.') % (lot.name))
                 lot_obj.write(cr, uid, [lot.id], {'is_ok':True})
     
             for st, stamount in [('statement_id1', 'amount'), ('statement_id2', 'amount2'), ('statement_id3', 'amount3')]:
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index dfbdc745613..9d07d52175f 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1089,9 +1089,9 @@ class calendar_event(osv.osv):
                     cr.execute("UPDATE %s set exrule=Null where id=%%s" % self._table,( event,))
                 elif datas.get('rrule_type') == 'custom':
                     if datas.get('interval', 0) < 0:
-                        raise osv.except_osv('Warning!', 'Interval can not be Negative')
+                        raise osv.except_osv(_('Warning!'), _('Interval can not be Negative'))
                     if datas.get('count', 0) < 0:
-                        raise osv.except_osv('Warning!', 'Count can not be Negative')
+                        raise osv.except_osv(_('Warning!'), _('Count can not be Negative'))
                     rrule_custom = self.compute_rule_string(cr, uid, datas, \
                                                          context=context)
                     result[event] = rrule_custom
diff --git a/addons/base_calendar/i18n/base_calendar.pot b/addons/base_calendar/i18n/base_calendar.pot
index cc3cdac7741..6ae7cb39df1 100644
--- a/addons/base_calendar/i18n/base_calendar.pot
+++ b/addons/base_calendar/i18n/base_calendar.pot
@@ -146,6 +146,24 @@ msgstr ""
 msgid "Warning !"
 msgstr ""
 
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Interval can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Count can not be Negative"
+msgstr ""
+
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index ccc4bf39fac..6090389d134 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -38,8 +38,7 @@ from tools.safe_eval import safe_eval as eval
 try:
     import vobject
 except ImportError:
-    raise osv.except_osv('vobject Import Error!','Please install python-vobject \
-                     from http://vobject.skyhouseconsulting.com/')
+    raise osv.except_osv(_('vobject Import Error!'), _('Please install python-vobject from http://vobject.skyhouseconsulting.com/'))
 
 # O-1  Optional and can come only once
 # O-n  Optional and can come more than once
diff --git a/addons/caldav/i18n/caldav.pot b/addons/caldav/i18n/caldav.pot
index f199107103a..c6b5b3d731d 100644
--- a/addons/caldav/i18n/caldav.pot
+++ b/addons/caldav/i18n/caldav.pot
@@ -61,6 +61,18 @@ msgstr ""
 msgid "Warning !"
 msgstr ""
 
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "vobject Import Error!"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Please install python-vobject from http://vobject.skyhouseconsulting.com/"
+msgstr ""
+
 #. module: caldav
 #: field:basic.calendar,has_webcal:0
 msgid "WebCal"
diff --git a/addons/document_webdav/i18n/document_webdav.pot b/addons/document_webdav/i18n/document_webdav.pot
index 49267f83709..5feb668045a 100644
--- a/addons/document_webdav/i18n/document_webdav.pot
+++ b/addons/document_webdav/i18n/document_webdav.pot
@@ -123,3 +123,14 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:0
+#, python-format
+msgid "PyWebDAV Import Error!"
+msgstr ""
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:0
+#, python-format
+msgid "Please install PyWebDAV from http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-0.9.4.tar.gz&can=2&q=/"
+msgstr ""
diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index bb2b8caf470..302d8c2a8a7 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -27,14 +27,14 @@ from xml.dom.minicompat import StringTypes
 import urlparse
 import urllib
 from osv import osv
+from tools.translate import _
 
 try:
     from DAV import utils
     from DAV.propfind import PROPFIND
     from DAV.report import REPORT
 except ImportError:
-    raise osv.except_osv('PyWebDAV Import Error!','Please install PyWebDAV \
-from http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-0.9.4.tar.gz&can=2&q=/')
+    raise osv.except_osv(_('PyWebDAV Import Error!'), _('Please install PyWebDAV from http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-0.9.4.tar.gz&can=2&q=/'))
 
 import tools
 
diff --git a/addons/l10n_ch/i18n/l10n_ch.pot b/addons/l10n_ch/i18n/l10n_ch.pot
index 15f56be2508..447fbf7296e 100644
--- a/addons/l10n_ch/i18n/l10n_ch.pot
+++ b/addons/l10n_ch/i18n/l10n_ch.pot
@@ -190,6 +190,17 @@ msgid "Your bank BVR number should be of the form 0X-XXX-X!\n' \\n"
 "                            'information for the invoice:\n%s"
 msgstr ""
 
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "No address defined \n' \\n"
+"                    'for the partner: ' + pline.partner_id.name + '\n' \\n"
+"                    'on line: ' + pline.name))\n"
+"\n"
+"        if pline.order_id.date_scheduled:\n"
+"            date_value = datetime.strptime(pline.order_id.date_scheduled, '%Y-%m-%d"
+msgstr ""
+
 #. module: l10n_ch
 #: view:bvr.invoices.report:0
 #: view:bvr.report:0
diff --git a/addons/l10n_ch/wizard/create_dta.py b/addons/l10n_ch/wizard/create_dta.py
index 5de49008ae2..98db2c6f426 100644
--- a/addons/l10n_ch/wizard/create_dta.py
+++ b/addons/l10n_ch/wizard/create_dta.py
@@ -464,9 +464,9 @@ def _create_dta(obj, cr, uid, data, context=None):
             v['partner_city']= ''
             v['partner_zip']= ''
             v['partner_country']= ''
-            raise osv.except_osv('Error', 'No address defined \n' \
+            raise osv.except_osv(_('Error'), _('No address defined \n' \
                     'for the partner: ' + pline.partner_id.name + '\n' \
-                    'on line: ' + pline.name)
+                    'on line: ' + pline.name))
 
         if pline.order_id.date_scheduled:
             date_value = datetime.strptime(pline.order_id.date_scheduled, '%Y-%m-%d')
@@ -613,4 +613,4 @@ class create_dta_wizard(osv.osv_memory):
 
 create_dta_wizard()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/i18n/marketing_campaign.pot b/addons/marketing_campaign/i18n/marketing_campaign.pot
index 28c4e16b6e0..e2716ef0fd2 100644
--- a/addons/marketing_campaign/i18n/marketing_campaign.pot
+++ b/addons/marketing_campaign/i18n/marketing_campaign.pot
@@ -31,6 +31,18 @@ msgstr ""
 msgid "The current step for this item has no email or report to preview."
 msgstr ""
 
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Operation not supported"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Sorry, campaign duplication is not supported at the moment."
+msgstr ""
+
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:0
 #, python-format
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index bdfe825781c..7d88425c13f 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -205,7 +205,7 @@ Normal - the campaign runs normally and automatically sends all emails and repor
 
     # prevent duplication until the server properly duplicates several levels of nested o2m
     def copy(self, cr, uid, id, default=None, context=None):
-        raise osv.except_osv("Operation not supported", "Sorry, campaign duplication is not supported at the moment.")
+        raise osv.except_osv(_("Operation not supported"), _("Sorry, campaign duplication is not supported at the moment."))
 
 marketing_campaign()
 
diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot
index e68356fca46..f6dcd701f7c 100644
--- a/addons/point_of_sale/i18n/point_of_sale.pot
+++ b/addons/point_of_sale/i18n/point_of_sale.pot
@@ -306,6 +306,12 @@ msgstr ""
 msgid "No valid pricelist line found !"
 msgstr ""
 
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_discount.py:0
+#, python-format
+msgid "No Order Lines"
+msgstr ""
+
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.lines:0
@@ -1754,6 +1760,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_payment.py:0
+#: code:addons/point_of_sale/wizard/pos_discount.py:0
 #, python-format
 msgid "Error!"
 msgstr ""
diff --git a/addons/point_of_sale/wizard/pos_discount.py b/addons/point_of_sale/wizard/pos_discount.py
index d92a545a4ab..27bbd980dd6 100644
--- a/addons/point_of_sale/wizard/pos_discount.py
+++ b/addons/point_of_sale/wizard/pos_discount.py
@@ -49,7 +49,7 @@ class pos_discount(osv.osv_memory):
         record_id = context and context.get('active_id', False) or False
         order = self.pool.get('pos.order').browse(cr, uid, record_id, context=context)
         if not order.lines:
-                raise osv.except_osv('Error!','No Order Lines ')
+                raise osv.except_osv(_('Error!'), _('No Order Lines'))
         True
     def apply_discount(self, cr, uid, ids, context=None):
         """
diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot
index 4e1962aca32..7af2d513cfc 100644
--- a/addons/purchase_requisition/i18n/purchase_requisition.pot
+++ b/addons/purchase_requisition/i18n/purchase_requisition.pot
@@ -378,3 +378,14 @@ msgstr ""
 msgid "Purchase Orders"
 msgstr ""
 
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
+#, python-format
+msgid "No Product in Tender"
+msgstr ""
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index ad2478cb7a5..a5a291b545d 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -24,6 +24,7 @@ from datetime import datetime
 from dateutil.relativedelta import relativedelta
 from osv import fields, osv
 from osv.orm import browse_record, browse_null
+from tools.translate import _
 
 class purchase_requisition_partner(osv.osv_memory):
     _name = "purchase.requisition.partner"
@@ -38,7 +39,7 @@ class purchase_requisition_partner(osv.osv_memory):
         record_id = context and context.get('active_id', False) or False
         tender = self.pool.get('purchase.requisition').browse(cr, uid, record_id)
         if not tender.line_ids:
-            raise osv.except_osv('Error!','No Product in Tender')
+            raise osv.except_osv(_('Error!'), _('No Product in Tender'))
         True
 
     def onchange_partner_id(self, cr, uid, ids, partner_id):
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index 621528f9013..f38624efd12 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -3379,10 +3379,17 @@ msgstr ""
 #: code:addons/stock/product.py:0
 #: code:addons/stock/stock.py:0
 #: code:addons/stock/wizard/stock_splitinto.py:0
+#: code:addons/stock/wizard/stock_fill_inventory.py:0
 #, python-format
 msgid "Error!"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:0
+#, python-format
+msgid "Stock Inventory is done"
+msgstr ""
+
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 599377fec1e..83bfdaf9a4c 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -45,7 +45,7 @@ class stock_fill_inventory(osv.osv_memory):
         if context.get('active_id', False):
             stock = self.pool.get('stock.inventory').browse(cr, uid, context.get('active_id', False))
             if stock.state=='done':
-                raise osv.except_osv('Error!','Stock Inventory is done')
+                raise osv.except_osv(_('Error!'), _('Stock Inventory is done'))
         True
 
     def fill_inventory(self, cr, uid, ids, context=None):