From 4ee77c60581e2928639cfb9ed82d31429b2e0f85 Mon Sep 17 00:00:00 2001
From: "Ravi Gadhia (OpenERP)" <rga@tinyerp.com>
Date: Thu, 11 Oct 2012 17:35:34 +0530
Subject: [PATCH 01/44] [FIX]: get context value in one2many

bzr revid: atp@tinyerp.com-20121011120534-bo57y7m667hshuz5
---
 addons/web/static/src/js/view_form.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index afb5e258c0b..02dd5b1e0c7 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3608,7 +3608,12 @@ instance.web.form.One2ManyDataSet = instance.web.BufferedDataSet.extend({
     get_context: function() {
         this.context = this.o2m.build_context([this.o2m.name]);
         return this.context;
-    }
+    },
+	default_get: function(fields, options) {
+		if(!options) options = {}
+		_.extend(options, {'context':this.get_context()})
+		return this._super(fields, options).then(this.on_default_get);
+	},
 });
 
 instance.web.form.One2ManyListView = instance.web.ListView.extend({

From 25ac221a0f6622a13d01d9b1ad14f4827adb2603 Mon Sep 17 00:00:00 2001
From: "RGA(OpenERP)" <>
Date: Fri, 12 Oct 2012 12:00:04 +0530
Subject: [PATCH 02/44] [IMP] improve code

bzr revid: rgaopenerp-20121012063004-cdgbq4w4pa1io9u2
---
 addons/web/static/src/js/view_form.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 02dd5b1e0c7..d9254d2d724 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3609,11 +3609,11 @@ instance.web.form.One2ManyDataSet = instance.web.BufferedDataSet.extend({
         this.context = this.o2m.build_context([this.o2m.name]);
         return this.context;
     },
-	default_get: function(fields, options) {
-		if(!options) options = {}
-		_.extend(options, {'context':this.get_context()})
-		return this._super(fields, options).then(this.on_default_get);
-	},
+    default_get: function(fields, options) {
+        options = options || {};
+        _.extend(options, {'context':this.get_context()});
+        return this._super(fields, options).then(this.on_default_get);
+    },
 });
 
 instance.web.form.One2ManyListView = instance.web.ListView.extend({

From 2776f5b7e691da63f0a373ebdf8305fd60b73bb6 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 08:51:43 +0200
Subject: [PATCH 03/44] [[FIX] country code not required

bzr revid: fp@tinyerp.com-20121026065143-bnwzfum1zp8p3wrv
---
 openerp/addons/base/res/res_country.py       | 2 +-
 openerp/addons/base/res/res_country_view.xml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/res/res_country.py b/openerp/addons/base/res/res_country.py
index 35fb2a29ea7..98a3b769a11 100644
--- a/openerp/addons/base/res/res_country.py
+++ b/openerp/addons/base/res/res_country.py
@@ -47,7 +47,7 @@ class Country(osv.osv):
             help='The full name of the country.', required=True, translate=True),
         'code': fields.char('Country Code', size=2,
             help='The ISO country code in two chars.\n'
-            'You can use this field for quick search.', required=True),
+            'You can use this field for quick search.'),
         'address_format': fields.text('Address Format', help="""You can state here the usual format to use for the \
 addresses belonging to this country.\n\nYou can use the python-style string patern with all the field of the address \
 (for example, use '%(street)s' to display the field 'street') plus
diff --git a/openerp/addons/base/res/res_country_view.xml b/openerp/addons/base/res/res_country_view.xml
index 47b665426f9..8f64d330440 100644
--- a/openerp/addons/base/res/res_country_view.xml
+++ b/openerp/addons/base/res/res_country_view.xml
@@ -31,8 +31,7 @@
                             <field name="code"/>
                         </group>
                     </group>
-                    <label for="address_format" string="Address Format"/>
-                    <field name="address_format" colspan="4" groups="base.group_no_one"/>
+                    <field name="address_format" groups="base.group_no_one" placeholder="Address format..."/>
                 </form>
             </field>
         </record>

From 8eb7e8ab6c17a20aef85594cac337329df43ae1e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 09:59:51 +0200
Subject: [PATCH 04/44] [MERGE] + improve hr_timesheet

bzr revid: fp@tinyerp.com-20121026075951-2hmaydu7skwhs5k2
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml       | 2 +-
 .../hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index f3e3af5f610..ac24cbcdc0c 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -324,7 +324,7 @@
                     <field name="employee_id"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
-                    <field name="department_id"/>
+                    <field name="department_id" invisible="1"/>
                     <field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/>
                     <field name="total_timesheet" widget="float_time"/>
                     <field name="total_difference" widget="float_time" groups="base.group_hr_attendance"/>
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
index c982a9bbd39..dfe89c87f70 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -5,7 +5,7 @@
         <field name="name">hr_timesheet_current_open.form</field>
         <field name="model">hr.timesheet.current.open</field>
         <field name="arch" type="xml">
-            <form string="My Current Timesheet" version="7.0">
+            <form string="My Timesheet" version="7.0">
                <group>
                     <separator string="It will open your current timesheet"/>
                </group>
@@ -19,7 +19,7 @@
     </record>
 
     <record id="action_hr_timesheet_current_open" model="ir.actions.act_window">
-        <field name="name">My Current Timesheet</field>
+        <field name="name">My Timesheet</field>
         <field name="res_model">hr.timesheet.current.open</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
@@ -28,7 +28,7 @@
         <field name="help">My Timesheet opens your timesheet so that you can book your activities into the system. From the same form, you can register your attendances (Sign In/Out) and describe the working hours made on the different projects. At the end of the period defined in the company, the timesheet is confirmed by the user and can be validated by his manager. If required, as defined on the project, you can generate the invoices based on the timesheet.</field>
     </record>
 
-    <menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="My Current Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/>
+    <menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="My Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/>
 
     </data>
 </openerp>

From 619390d23cd337721bbe67a316052e77ee843335 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 10:01:37 +0200
Subject: [PATCH 05/44] [IMP] timesheets

bzr revid: fp@tinyerp.com-20121026080137-bluybqibtsjgb25n
---
 addons/hr/res_config.py            | 2 +-
 addons/hr_attendance/res_config.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py
index 7ae28348045..96bb42d1d8a 100644
--- a/addons/hr/res_config.py
+++ b/addons/hr/res_config.py
@@ -28,7 +28,7 @@ class hr_config_settings(osv.osv_memory):
     _columns = {
         'module_hr_timesheet_sheet': fields.boolean('Allow timesheets validation by managers',
             help ="""This installs the module hr_timesheet_sheet."""),
-        'module_hr_attendance': fields.boolean('Track attendances',
+        'module_hr_attendance': fields.boolean('Install attendances feature',
             help ="""This installs the module hr_attendance."""),
         'module_hr_timesheet': fields.boolean('Manage timesheets',
             help ="""This installs the module hr_timesheet."""),
diff --git a/addons/hr_attendance/res_config.py b/addons/hr_attendance/res_config.py
index 0da2d183409..61e2f784a5a 100644
--- a/addons/hr_attendance/res_config.py
+++ b/addons/hr_attendance/res_config.py
@@ -25,7 +25,7 @@ class hr_attendance_config_settings(osv.osv_memory):
     _inherit = 'hr.config.settings'
 
     _columns = {
-        'group_hr_attendance': fields.boolean('Track attendances',
+        'group_hr_attendance': fields.boolean('Track attendances for all employees',
             implied_group='base.group_hr_attendance',
             help="Allocates attendance group to all users."),
     }

From f1c4b00a2926300f792a5229a591edc6dddc0d1f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 10:33:52 +0200
Subject: [PATCH 06/44] [IMP] add option in hr settings

bzr revid: fp@tinyerp.com-20121026083352-fkni5niw3a7t2m5s
---
 addons/hr/res_config.py       | 2 ++
 addons/hr/res_config_view.xml | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py
index 96bb42d1d8a..148499190fd 100644
--- a/addons/hr/res_config.py
+++ b/addons/hr/res_config.py
@@ -42,6 +42,8 @@ class hr_config_settings(osv.osv_memory):
             help ="""This installs the module hr_contract."""),
         'module_hr_evaluation': fields.boolean('Organize employees periodic evaluation',
             help ="""This installs the module hr_evaluation."""),
+        'module_account_analytic_analysis': fields.boolean('Allow invoicing based on timesheets (will install the sale application)',
+            help ="""This installs the module account_analytic_analysis, which will install sales management too."""),
         'module_hr_payroll': fields.boolean('Manage payroll',
             help ="""This installs the module hr_payroll."""),
     }
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index f370b26139d..632ceb56918 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -69,6 +69,10 @@
                                 <field name="module_hr_timesheet_sheet" class="oe_inline"/>
                                 <label for="module_hr_timesheet_sheet"/>
                             </div>
+                            <div name="account_analytic_analysis">
+                                <field name="module_account_analytic_analysis" class="oe_inline"/>
+                                <label for="module_account_analytic_analysis"/>
+                            </div>
                             <div name="hr_attendance">
                                 <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)" class="oe_inline"/>
                                 <label for="module_hr_attendance"/>

From 052dedaf2c7c8f5ac804714ba73abc74b6934a47 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 11:37:04 +0200
Subject: [PATCH 07/44] [IMP] restyled timesheets

bzr revid: fp@tinyerp.com-20121026093704-b5q54rwtrkx73igg
---
 .../static/src/css/Makefile                   |  3 +
 .../static/src/css/timesheet.css              | 91 ++++++++-----------
 .../static/src/css/timesheet.sass             | 49 ++++++++++
 .../static/src/xml/timesheet.xml              | 12 +--
 4 files changed, 95 insertions(+), 60 deletions(-)
 create mode 100644 addons/hr_timesheet_sheet/static/src/css/Makefile
 create mode 100644 addons/hr_timesheet_sheet/static/src/css/timesheet.sass

diff --git a/addons/hr_timesheet_sheet/static/src/css/Makefile b/addons/hr_timesheet_sheet/static/src/css/Makefile
new file mode 100644
index 00000000000..e60087d9b33
--- /dev/null
+++ b/addons/hr_timesheet_sheet/static/src/css/Makefile
@@ -0,0 +1,3 @@
+timesheet.css: timesheet.sass
+	sass -t expanded timesheet.sass timesheet.css
+
diff --git a/addons/hr_timesheet_sheet/static/src/css/timesheet.css b/addons/hr_timesheet_sheet/static/src/css/timesheet.css
index b486f76694d..f504a0f4f10 100644
--- a/addons/hr_timesheet_sheet/static/src/css/timesheet.css
+++ b/addons/hr_timesheet_sheet/static/src/css/timesheet.css
@@ -1,79 +1,62 @@
-
+@charset "utf-8";
+.openerp .oe_form_readonly .oe_timesheet_button_add {
+  display: none;
+}
 .openerp .oe_timesheet_weekly {
-    overflow-x: auto;
+  overflow-x: auto;
 }
-
 .openerp .oe_timesheet_weekly table {
-    width: 100%;
+  width: 100%;
 }
-
 .openerp .oe_timesheet_weekly td {
-    padding-top: 15px;
+  padding: 3px;
+  text-align: right;
 }
-
 .openerp .oe_timesheet_weekly th {
-    text-align: right;
-    color: #069;
-    font-family: 'Helvetica Neue', Arial, Verdana, 'Nimbus Sans L', sans-serif;
-    font-size: 10px;
+  text-align: center;
+  color: #006699;
+  font-family: "Helvetica Neue", Arial, Verdana, "Nimbus Sans L", sans-serif;
+  font-size: 10px;
+  background: #eeeeee;
+  min-width: 47px;
 }
-
-.openerp .oe_timesheet_weekly th.oe_timesheet_weekly_date_head {
-    width: 60px;
+.openerp .oe_timesheet_weekly .oe_timesheet_total {
+  background: #eeeeee;
 }
-
-.openerp .oe_timesheet_weekly td {
-    text-align: right;
-    vertical-align: middle;
-}
-
 .openerp .oe_timesheet_weekly .oe_timesheet_weekly_account {
-    text-align: left;
-    padding-right: 30px;
+  text-align: left;
+}
+.openerp .oe_timesheet_weekly .oe_timesheet_first_col {
+  min-width: 130px;
 }
-
 .openerp .oe_timesheet_weekly td input.oe_timesheet_weekly_input {
-    border: 1px solid #CCC;
-    padding: 5px 2px !important;
-    color: #666 !important;
-    font-size: 14px;
-    font-weight: bold;
-    width: 38px;
-    text-align: right;
-    min-width: 0 !important;
+  padding: 5px 2px !important;
+  width: 40px;
+  text-align: right;
+  min-width: 0 !important;
 }
-
-.openerp .oe_timesheet_weekly td .oe_timesheet_weekly_box {
-    padding: 5px 2px !important;
-    color: #666 !important;
-    font-size: 14px;
-    font-weight: bold;
-    width: 38px;
-    display: inline-block;
+.openerp .oe_timesheet_weekly td.oe_timesheet_total {
+  font-weight: bold;
+  padding: 5px 3px !important;
 }
-
 .openerp .oe_timesheet_weekly .oe_timesheet_weekly_adding_tot {
-    display: table;
-    width: 100%;
+  display: table;
+  width: 100%;
 }
-
 .openerp .oe_timesheet_weekly .oe_timesheet_weekly_adding {
-    display: table-cell;
-    text-align: left;
+  display: table-cell;
+  text-align: left;
 }
-
 .openerp .oe_timesheet_weekly .oe_timesheet_weekly_tottot {
-    display: table-cell;
+  display: table-cell;
 }
-
 .openerp .oe_timesheet_weekly .oe_timesheet_weekly_add_row td {
-    text-align: left;
+  text-align: left;
 }
-
 .openerp .oe_timesheet_weekly .oe_timesheet_weekly_add_row .oe_form_field_many2one {
-    display: inline-block;
-    width: 200px;
+  display: inline-block;
+  width: 200px;
 }
-
-.openerp .oe_timesheet_weekly_today {
+.openerp .oe_timesheet_weekly .oe_timesheet_weekly_today {
+  background: #ffddee;
 }
diff --git a/addons/hr_timesheet_sheet/static/src/css/timesheet.sass b/addons/hr_timesheet_sheet/static/src/css/timesheet.sass
new file mode 100644
index 00000000000..9c986517508
--- /dev/null
+++ b/addons/hr_timesheet_sheet/static/src/css/timesheet.sass
@@ -0,0 +1,49 @@
+@charset "utf-8"
+
+.openerp
+    .oe_form_readonly
+        .oe_timesheet_button_add
+            display: none
+    .oe_timesheet_weekly
+        overflow-x: auto
+        table
+            width: 100%
+        td
+            padding: 3px
+            text-align: right
+        th
+            text-align: center
+            color: #069
+            font-family: 'Helvetica Neue', Arial, Verdana, 'Nimbus Sans L', sans-serif
+            font-size: 10px
+            background: #eee
+            min-width: 47px
+        .oe_timesheet_total
+            background: #eee
+        .oe_timesheet_weekly_account
+            text-align: left
+        .oe_timesheet_first_col
+            min-width: 130px
+        td input.oe_timesheet_weekly_input
+            padding: 5px 2px !important
+            width: 40px
+            text-align: right
+            min-width: 0 !important
+        td.oe_timesheet_total
+            font-weight: bold
+            padding: 5px 3px !important
+        .oe_timesheet_weekly_adding_tot
+            display: table
+            width: 100%
+        .oe_timesheet_weekly_adding
+            display: table-cell
+            text-align: left
+        .oe_timesheet_weekly_tottot
+            display: table-cell
+        .oe_timesheet_weekly_add_row td
+            text-align: left
+        .oe_timesheet_weekly_add_row .oe_form_field_many2one
+            display: inline-block
+            width: 200px
+        .oe_timesheet_weekly_today
+            background: #fde
diff --git a/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml b/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
index 43c23951514..3bfca4c4aa2 100644
--- a/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
+++ b/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
@@ -5,7 +5,7 @@
         <div class="oe_timesheet_weekly">
             <table>
                 <tr>
-                    <th> </th>
+                    <th class="oe_timesheet_first_col"> </th>
                     <t t-foreach="widget.dates" t-as="date">
                         <th t-att-class="'oe_timesheet_weekly_date_head' + (Date.compare(date, Date.today()) === 0 ? ' oe_timesheet_weekly_today' : '')">
                             <t t-esc="date.toString('ddd')"/><br />
@@ -26,29 +26,29 @@
                             <t t-set="day_count" t-value="day_count + 1"/>
                         </td>
                     </t>
-                    <td t-att-data-account-total="account.account"> </td>
+                    <td t-att-data-account-total="account.account" class="oe_timesheet_total"> </td>
                 </tr>
                 <tr class="oe_timesheet_weekly_add_row" style="display: none">
                     <td t-att-colspan="widget.dates.length + 2">
                         <button class="oe_highlight">Add</button>
                     </td>
                 </tr>
-                <tr>
+                <tr class="oe_timesheet_total">
                     <td>
                         <div class="oe_timesheet_weekly_adding_tot">
-                            <div class="oe_timesheet_weekly_adding"><button class="oe_link">Add a Project</button></div>
+                            <div class="oe_timesheet_weekly_adding"><button class="oe_timesheet_button_add">Add a Line</button></div>
                             <div class="oe_timesheet_weekly_tottot"><span>Total</span></div>
                         </div>
                     </td>
                     <t t-set="day_count" t-value="0"/>
                     <t t-foreach="widget.dates" t-as="date">
-                        <td t-att-class="(Date.compare(date, Date.today()) === 0 ? 'oe_timesheet_weekly_today' : '')">
+                        <td class="oe_timesheet_total">
                             <span class="oe_timesheet_weekly_box" t-att-data-day-total="day_count">
                             </span>
                             <t t-set="day_count" t-value="day_count + 1"/>
                         </td>
                     </t>
-                    <td class="oe_timesheet_weekly_supertotal"> </td>
+                    <td class="oe_timesheet_weekly_supertotal oe_timesheet_total"> </td>
                 </tr>
             </table>
         </div>

From a76446b8c9f6a98a3d1aa985d9c0bc90ae092ac1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 11:43:38 +0200
Subject: [PATCH 08/44] [IMP] Timesheets renamed tabs

bzr revid: fp@tinyerp.com-20121026094338-dezvb3a11hqigch0
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index ac24cbcdc0c..a7e7bb6d097 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -98,11 +98,11 @@
                         </group>
                     </group>
                     <notebook>
-                        <page string="Weekly">
+                        <page string="Summary">
                             <widget type="weekly_timesheet">
                             </widget>
                         </page>
-                        <page string="Daily">
+                        <page string="Details">
                             <field context="{'user_id':user_id}" name="timesheet_ids" nolabel="1">
                                 <tree editable="top" string="Timesheet Activities">
                                     <field name="date"/>

From d87a8c05fd377e62ab5babaa61985845316efbcc Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 26 Oct 2012 11:54:36 +0200
Subject: [PATCH 09/44] [IMP] added some utils to qweb context

bzr revid: nicolas.vanhoren@openerp.com-20121026095436-3jyci78mgew9uz35
---
 addons/web/static/src/js/coresetup.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 1f1112df2f2..220b9b63d5c 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -530,7 +530,8 @@ instance.web.qweb.default_dict['__debug__'] = instance.session.debug; // Which o
 instance.web.qweb.debug = instance.session.debug;
 instance.web.qweb.default_dict = {
     '_' : _,
-    '_t' : instance.web._t
+    '_t' : instance.web._t,
+    'JSON': JSON,
 };
 instance.web.qweb.preprocess_node = function() {
     // Note that 'this' is the Qweb Node

From dbc1176d18e0b633c83312c39777984a97eb743c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 26 Oct 2012 11:55:11 +0200
Subject: [PATCH 10/44] [IMP] hr_timesheet_sheet: in web part, made the
 analytic account clickable

bzr revid: nicolas.vanhoren@openerp.com-20121026095511-d811qw4t6fognkep
---
 .../hr_timesheet_sheet/static/src/js/timesheet.js   | 13 +++++++++++++
 .../hr_timesheet_sheet/static/src/xml/timesheet.xml |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_sheet/static/src/js/timesheet.js b/addons/hr_timesheet_sheet/static/src/js/timesheet.js
index 7de235ec190..e64c4d602e8 100644
--- a/addons/hr_timesheet_sheet/static/src/js/timesheet.js
+++ b/addons/hr_timesheet_sheet/static/src/js/timesheet.js
@@ -4,6 +4,9 @@ openerp.hr_timesheet_sheet = function(instance) {
     var _t = instance.web._t;
 
     instance.hr_timesheet_sheet.WeeklyTimesheet = instance.web.form.FormWidget.extend(instance.web.form.ReinitializeWidgetMixin, {
+        events: {
+            "click .oe_timesheet_weekly_account a": "go_to",
+        },
         init: function() {
             this._super.apply(this, arguments);
             this.set({
@@ -26,6 +29,16 @@ openerp.hr_timesheet_sheet = function(instance) {
             this.render_drop = new instance.web.DropMisordered();
             this.description_line = _t("/");
         },
+        go_to: function(event) {
+            var id = JSON.parse($(event.target).data("id"));
+            this.do_action({
+                type: 'ir.actions.act_window',
+                res_model: "account.analytic.account",
+                res_id: id,
+                views: [[false, 'form']],
+                target: 'current'
+            });
+        },
         query_sheets: function() {
             var self = this;
             if (self.updating)
diff --git a/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml b/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
index 3bfca4c4aa2..f75342c958e 100644
--- a/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
+++ b/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
@@ -15,7 +15,7 @@
                     <th class="oe_timesheet_weekly_date_head">Total</th>
                 </tr>
                 <tr t-foreach="widget.accounts" t-as="account">
-                    <td class="oe_timesheet_weekly_account"><t t-esc="widget.account_names[account.account]"/></td>
+                    <td class="oe_timesheet_weekly_account"><a href="javascript:void(0)" t-att-data-id="JSON.stringify(account.account)"><t t-esc="widget.account_names[account.account]"/></a></td>
                     <t t-set="day_count" t-value="0"/>
                     <t t-foreach="account.days" t-as="day">
                         <td t-att-class="(Date.compare(day.day, Date.today()) === 0 ? 'oe_timesheet_weekly_today' : '')">

From f2c5b7f599a42983d77ffe3b072906720778a594 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 26 Oct 2012 12:00:11 +0200
Subject: [PATCH 11/44] [IMP] avoid propagation of context when clicking on a
 readonly m2o (could cause problems)

bzr revid: nicolas.vanhoren@openerp.com-20121026100011-inuk0tzz5cxw7dtr
---
 addons/web/static/src/js/view_form.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 67c5fa0292e..896ace2c683 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3110,7 +3110,6 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
                         type: 'ir.actions.act_window',
                         res_model: self.field.relation,
                         res_id: self.get("value"),
-                        context: self.build_context(),
                         views: [[false, 'form']],
                         target: 'current'
                     });

From 030ff3fd739c830924564ae6fb2788eab14c8a4a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 12:02:07 +0200
Subject: [PATCH 12/44] [IMP] timesheets imrpvoements

bzr revid: fp@tinyerp.com-20121026100207-yxbl87kx35to6blo
---
 .../hr_timesheet_sheet/static/src/css/timesheet.css  |  5 ++++-
 .../hr_timesheet_sheet/static/src/css/timesheet.sass |  7 +++++--
 .../hr_timesheet_sheet/static/src/xml/timesheet.xml  | 12 ++++++++++++
 .../wizard/hr_timesheet_current.py                   |  2 +-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/addons/hr_timesheet_sheet/static/src/css/timesheet.css b/addons/hr_timesheet_sheet/static/src/css/timesheet.css
index f504a0f4f10..36ea9a34db9 100644
--- a/addons/hr_timesheet_sheet/static/src/css/timesheet.css
+++ b/addons/hr_timesheet_sheet/static/src/css/timesheet.css
@@ -1,5 +1,8 @@
 @charset "utf-8";
-.openerp .oe_form_readonly .oe_timesheet_button_add {
+.openerp .oe_form_readonly .oe_timesheet_weekly .oe_timesheet_button_add {
+  display: none;
+}
+.openerp .oe_form_readonly .oe_timesheet_weekly div.oe_view_nocontent {
   display: none;
 }
 .openerp .oe_timesheet_weekly {
diff --git a/addons/hr_timesheet_sheet/static/src/css/timesheet.sass b/addons/hr_timesheet_sheet/static/src/css/timesheet.sass
index 9c986517508..5e04271037c 100644
--- a/addons/hr_timesheet_sheet/static/src/css/timesheet.sass
+++ b/addons/hr_timesheet_sheet/static/src/css/timesheet.sass
@@ -2,8 +2,11 @@
 
 .openerp
     .oe_form_readonly
-        .oe_timesheet_button_add
-            display: none
+        .oe_timesheet_weekly
+            .oe_timesheet_button_add
+                display: none
+            div.oe_view_nocontent
+                display: none
     .oe_timesheet_weekly
         overflow-x: auto
         table
diff --git a/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml b/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
index f75342c958e..667c7af23be 100644
--- a/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
+++ b/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
@@ -51,6 +51,18 @@
                     <td class="oe_timesheet_weekly_supertotal oe_timesheet_total"> </td>
                 </tr>
             </table>
+            <div t-if="widget.accounts.length == 0">
+                <div class="oe_view_nocontent">
+                    <p class="oe_view_nocontent_create">
+                        Click to add a project you worked on.
+                    </p><p>
+                        You will be able to register your working hours and
+                        activities on these projects. You can also click on a
+                        selected project/analytic account to setup the
+                        invoicing options.
+                    </p>
+                </div>
+            </div>
         </div>
     </t>
 </templates>
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
index 2af8792472e..652d5139288 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
@@ -36,7 +36,7 @@ class hr_timesheet_current_open(osv.osv_memory):
         user_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)], context=context)
         if not len(user_ids):
             raise osv.except_osv(_('Error!'), _('Please create an employee and associate it with this user.'))
-        ids = ts.search(cr, uid, [('user_id','=',uid),('state','=','draft'),('date_from','<=',time.strftime('%Y-%m-%d')), ('date_to','>=',time.strftime('%Y-%m-%d'))], context=context)
+        ids = ts.search(cr, uid, [('user_id','=',uid),('state','in',('draft','new')),('date_from','<=',time.strftime('%Y-%m-%d')), ('date_to','>=',time.strftime('%Y-%m-%d'))], context=context)
 
         if len(ids) > 1:
             view_type = 'tree,form'

From 0537147d95a1f7b795e6043c7dbdc774dd8dd1b2 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Fri, 26 Oct 2012 12:08:19 +0200
Subject: [PATCH 13/44] [IMP] expression.py: added tests for the in/not in
 operators involving a many2many.

bzr revid: vmt@openerp.com-20121026100819-b2o4q9a082um6p2m
---
 openerp/addons/base/tests/__init__.py        |  6 +-
 openerp/addons/base/tests/test_expression.py | 58 ++++++++++++++++++++
 2 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 openerp/addons/base/tests/test_expression.py

diff --git a/openerp/addons/base/tests/__init__.py b/openerp/addons/base/tests/__init__.py
index 42fef2eb39d..409f9928c6f 100644
--- a/openerp/addons/base/tests/__init__.py
+++ b/openerp/addons/base/tests/__init__.py
@@ -1,5 +1,7 @@
-import test_ir_values, test_base
+import test_base, test_expression, test_ir_values
 
 checks = [
-    test_ir_values, test_base
+    test_base,
+    test_expression,
+    test_ir_values,
 ]
diff --git a/openerp/addons/base/tests/test_expression.py b/openerp/addons/base/tests/test_expression.py
new file mode 100644
index 00000000000..0bdd4180c0b
--- /dev/null
+++ b/openerp/addons/base/tests/test_expression.py
@@ -0,0 +1,58 @@
+import unittest2
+
+import openerp.tests.common as common
+
+class test_expression(common.TransactionCase):
+
+    def test_00(self):
+
+        registry, cr, uid = self.registry, self.cr, self.uid
+
+        categories = registry('res.partner.category')
+        cat_a = categories.create(cr, uid, {'name': 'test_expression_category_A'})
+        cat_b = categories.create(cr, uid, {'name': 'test_expression_category_B'})
+
+        partners = registry('res.partner')
+        a = partners.create(cr, uid, {'name': 'test_expression_partner_A', 'category_id': [(6, 0, [cat_a])]})
+        b = partners.create(cr, uid, {'name': 'test_expression_partner_B', 'category_id': [(6, 0, [cat_b])]})
+        ab = partners.create(cr, uid, {'name': 'test_expression_partner_AB', 'category_id': [(6, 0, [cat_a, cat_b])]})
+        c = partners.create(cr, uid, {'name': 'test_expression_partner_C'})
+
+        with_a = partners.search(cr, uid, [('category_id', 'in', [cat_a])])
+        self.assertEqual(set([a, ab]), set(with_a), "Search for category_id in cat_a failed.")
+
+        with_b = partners.search(cr, uid, [('category_id', 'in', [cat_b])])
+        self.assertEqual(set([ab, b]), set(with_b), "Search for category_id in cat_b failed.")
+
+        with_a_or_b = partners.search(cr, uid, [('category_id', 'in', [cat_a, cat_b])])
+        self.assertEqual(set([ab, a, b]), set(with_a_or_b), "Search for category_id contains cat_a or cat_b failed.")
+
+        with_a_and_b = partners.search(cr, uid, [('category_id', 'in', [cat_a]), ('category_id', 'in', [cat_b])])
+        self.assertEqual(set([ab]), set(with_a_and_b), "Search for category_id contains cat_a and cat_b failed.")
+
+        # Note it is the same as with_a_or_b above.
+        with_a_or_with_b = partners.search(cr, uid, ['|', ('category_id', 'in', [cat_a]), ('category_id', 'in', [cat_b])])
+        self.assertEqual(set([ab, a, b]), set(with_a_or_with_b), "Search for category_id contains cat_a or contains cat_b failed.")
+
+        without_a_or_b = partners.search(cr, uid, [('category_id', 'not in', [cat_a, cat_b])])
+        self.assertTrue(all(i not in without_a_or_b for i in [a, b, ab]), "Search for category_id doesn't contain cat_a or cat_b failed (1).")
+        self.assertTrue(c in without_a_or_b, "Search for category_id doesn't contain cat_a or cat_b failed (2).")
+
+        without_a_and_without_b = partners.search(cr, uid, [('category_id', 'not in', [cat_a]), ('category_id', 'not in', [cat_b])])
+        self.assertTrue(all(i not in without_a_and_without_b for i in [a, b, ab]), "Search for category_id doesn't contain cat_a and cat_b failed (1).")
+        self.assertTrue(c in without_a_and_without_b, "Search for category_id doesn't contain cat_a and cat_b failed (2).")
+
+        without_a = partners.search(cr, uid, [('category_id', 'not in', [cat_a])])
+        self.assertTrue(a not in without_a, "Search for category_id doesn't contain cat_a failed (1).")
+        self.assertTrue(ab not in without_a, "Search for category_id doesn't contain cat_a failed (2).")
+        self.assertTrue(set([b, c]).issubset(set(without_a)), "Search for category_id doesn't contain cat_a failed (3).")
+
+        without_b = partners.search(cr, uid, [('category_id', 'not in', [cat_b])])
+        self.assertTrue(b not in without_b, "Search for category_id doesn't contain cat_b failed (1).")
+        self.assertTrue(ab not in without_b, "Search for category_id doesn't contain cat_b failed (2).")
+        self.assertTrue(set([a, c]).issubset(set(without_b)), "Search for category_id doesn't contain cat_b failed (3).")
+
+        # We can't express the following.
+        # with_any_other_than_a = ...
+        # self.assertTrue(ab in with_any_other_than_a, "Search for category_id with any other than cat_a failed.")
+

From 458f6de18480d7af72700752aea54f29da39b312 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 12:12:41 +0200
Subject: [PATCH 14/44] [IMP] typo

bzr revid: fp@tinyerp.com-20121026101241-d7j0vaujc73go3bf
---
 .../hr_timesheet_sheet/static/src/xml/timesheet.xml  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml b/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
index 667c7af23be..4390c7c6ed1 100644
--- a/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
+++ b/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
@@ -54,12 +54,16 @@
             <div t-if="widget.accounts.length == 0">
                 <div class="oe_view_nocontent">
                     <p class="oe_view_nocontent_create">
-                        Click to add a project you worked on.
+                        Click to add projects/analytic accounts you worked on.
                     </p><p>
                         You will be able to register your working hours and
-                        activities on these projects. You can also click on a
-                        selected project/analytic account to setup the
-                        invoicing options.
+                        activities.
+                    </p><p>
+                        By default, you record timesheets on analytic accounts.
+                        But if an analytic account represents a customer
+                        contract, you can change the type of the analytic
+                        account to 'Contract or Project' to setup the invoicing
+                        options.
                     </p>
                 </div>
             </div>

From 56c1a398a08cb74b8bf4e02e4f2894777a313516 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Fri, 26 Oct 2012 13:01:09 +0200
Subject: [PATCH 15/44] [IMP] expression.py: added comments to the in/not in
 many2many tests.

bzr revid: vmt@openerp.com-20121026110109-l212flw0p5cklc6p
---
 openerp/addons/base/tests/test_expression.py | 28 +++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/openerp/addons/base/tests/test_expression.py b/openerp/addons/base/tests/test_expression.py
index 0bdd4180c0b..5690cff443a 100644
--- a/openerp/addons/base/tests/test_expression.py
+++ b/openerp/addons/base/tests/test_expression.py
@@ -4,10 +4,12 @@ import openerp.tests.common as common
 
 class test_expression(common.TransactionCase):
 
-    def test_00(self):
+    def test_in_not_in_m2m(self):
 
         registry, cr, uid = self.registry, self.cr, self.uid
 
+        # Create 4 partners with no category, or one or two categories (out of two categories).
+
         categories = registry('res.partner.category')
         cat_a = categories.create(cr, uid, {'name': 'test_expression_category_A'})
         cat_b = categories.create(cr, uid, {'name': 'test_expression_category_B'})
@@ -18,41 +20,53 @@ class test_expression(common.TransactionCase):
         ab = partners.create(cr, uid, {'name': 'test_expression_partner_AB', 'category_id': [(6, 0, [cat_a, cat_b])]})
         c = partners.create(cr, uid, {'name': 'test_expression_partner_C'})
 
+        # The tests.
+
+        # On a one2many or many2many field, `in` should be read `contains` (and
+        # `not in` should be read `doesn't contain`.
+
         with_a = partners.search(cr, uid, [('category_id', 'in', [cat_a])])
         self.assertEqual(set([a, ab]), set(with_a), "Search for category_id in cat_a failed.")
 
         with_b = partners.search(cr, uid, [('category_id', 'in', [cat_b])])
         self.assertEqual(set([ab, b]), set(with_b), "Search for category_id in cat_b failed.")
 
+        # Partners with the category A or the category B.
         with_a_or_b = partners.search(cr, uid, [('category_id', 'in', [cat_a, cat_b])])
         self.assertEqual(set([ab, a, b]), set(with_a_or_b), "Search for category_id contains cat_a or cat_b failed.")
 
-        with_a_and_b = partners.search(cr, uid, [('category_id', 'in', [cat_a]), ('category_id', 'in', [cat_b])])
-        self.assertEqual(set([ab]), set(with_a_and_b), "Search for category_id contains cat_a and cat_b failed.")
-
-        # Note it is the same as with_a_or_b above.
+        # Show that `contains list` is really `contains element or contains element`.
         with_a_or_with_b = partners.search(cr, uid, ['|', ('category_id', 'in', [cat_a]), ('category_id', 'in', [cat_b])])
         self.assertEqual(set([ab, a, b]), set(with_a_or_with_b), "Search for category_id contains cat_a or contains cat_b failed.")
 
+        # If we change the OR in AND...
+        with_a_and_b = partners.search(cr, uid, [('category_id', 'in', [cat_a]), ('category_id', 'in', [cat_b])])
+        self.assertEqual(set([ab]), set(with_a_and_b), "Search for category_id contains cat_a and cat_b failed.")
+
+        # Partners without category A and without category B.
         without_a_or_b = partners.search(cr, uid, [('category_id', 'not in', [cat_a, cat_b])])
         self.assertTrue(all(i not in without_a_or_b for i in [a, b, ab]), "Search for category_id doesn't contain cat_a or cat_b failed (1).")
         self.assertTrue(c in without_a_or_b, "Search for category_id doesn't contain cat_a or cat_b failed (2).")
 
+        # Show that `doesn't contain list` is really `doesn't contain element and doesn't contain element`.
         without_a_and_without_b = partners.search(cr, uid, [('category_id', 'not in', [cat_a]), ('category_id', 'not in', [cat_b])])
         self.assertTrue(all(i not in without_a_and_without_b for i in [a, b, ab]), "Search for category_id doesn't contain cat_a and cat_b failed (1).")
         self.assertTrue(c in without_a_and_without_b, "Search for category_id doesn't contain cat_a and cat_b failed (2).")
 
+        # We can exclude any partner containing the category A.
         without_a = partners.search(cr, uid, [('category_id', 'not in', [cat_a])])
         self.assertTrue(a not in without_a, "Search for category_id doesn't contain cat_a failed (1).")
         self.assertTrue(ab not in without_a, "Search for category_id doesn't contain cat_a failed (2).")
         self.assertTrue(set([b, c]).issubset(set(without_a)), "Search for category_id doesn't contain cat_a failed (3).")
 
+        # (Obviously we can do the same for cateory B.)
         without_b = partners.search(cr, uid, [('category_id', 'not in', [cat_b])])
         self.assertTrue(b not in without_b, "Search for category_id doesn't contain cat_b failed (1).")
         self.assertTrue(ab not in without_b, "Search for category_id doesn't contain cat_b failed (2).")
         self.assertTrue(set([a, c]).issubset(set(without_b)), "Search for category_id doesn't contain cat_b failed (3).")
 
-        # We can't express the following.
+        # We can't express the following: Partners with a category different than A.
         # with_any_other_than_a = ...
-        # self.assertTrue(ab in with_any_other_than_a, "Search for category_id with any other than cat_a failed.")
+        # self.assertTrue(a not in with_any_other_than_a, "Search for category_id with any other than cat_a failed (1).")
+        # self.assertTrue(ab in with_any_other_than_a, "Search for category_id with any other than cat_a failed (2).")
 

From 08db8bbf0f015fd710e1ce79a55fb8faf143f6d5 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 15:05:05 +0200
Subject: [PATCH 16/44] [IMP] useability

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

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index c3aac6089f0..c18c4d89581 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1326,6 +1326,9 @@
 .openerp .oe_view_manager .oe_view_manager_body {
   height: inherit;
 }
+.openerp .oe_view_manager .oe_view_manager_body .oe_view_manager_view_list {
+  min-height: 132px;
+}
 .openerp .oe_view_manager .oe_view_manager_view_kanban {
   height: inherit;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index cf1cd38aad2..8b24e6112ae 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1070,6 +1070,8 @@ $sheet-max-width: 860px
     .oe_view_manager
         .oe_view_manager_body
             height: inherit
+            .oe_view_manager_view_list
+                min-height: 132px
         .oe_view_manager_view_kanban
             height: inherit
 

From a414040f8058ccc0c61312decfff12a19fc7ce56 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 16:37:41 +0200
Subject: [PATCH 17/44] [FIX] account visible when required

bzr revid: fp@tinyerp.com-20121026143741-8e46e34v2ngej39w
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 4 ++--
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 0441424cc33..bda9b9c2532 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -89,7 +89,7 @@
                         <page string="Sales Information">
                             <field name="line_cr_ids" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
                                 <tree string="Sales Lines" editable="bottom">
-                                    <field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection" groups="account.group_account_user"/>
+                                    <field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection"/>
                                     <field name="name"/>
                                     <field name="amount" sum="Total"/>
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
@@ -243,7 +243,7 @@
                         <page string="Bill Information">
                             <field name="line_dr_ids" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" context="{'journal_id':journal_id,'partner_id':partner_id}">
                                 <tree string="Expense Lines" editable="bottom">
-                                    <field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]" groups="account.group_account_user"/>
+                                    <field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"/>
                                     <field name="name"/>
                                     <field name="amount"/>
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index a7e7bb6d097..c41aae4c21f 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -108,7 +108,7 @@
                                     <field name="date"/>
                                     <field domain="[('type','in',['normal', 'contract']), ('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id, user_id)" context="{'default_use_timesheets': 1}"/>
                                     <field name="name"/>
-                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time" string="Hours"/>
+                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time" string="Hours" sum="Hours"/>
                                     <field name="to_invoice" widget="selection"/>
                                     <field invisible="1" name="journal_id"/>
                                     <field invisible="1" name="product_id" domain="[('type','=','service')]" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
@@ -153,9 +153,9 @@
                             <field name="period_ids">
                                 <tree colors="red:total_difference&lt;0.1;blue:total_difference&gt;=0.1" string="Period">
                                     <field name="name"/>
-                                    <field name="total_attendance" widget="float_time"/>
-                                    <field name="total_timesheet" widget="float_time"/>
-                                    <field name="total_difference" widget="float_time"/>
+                                    <field name="total_attendance" widget="float_time" sum="Attendances"/>
+                                    <field name="total_timesheet" widget="float_time" sum="Timesheets"/>
+                                    <field name="total_difference" widget="float_time" sum="Differences"/>
                                 </tree>
                             </field>
                         </page>

From 0e3f06bf4e51d304e7b40cd92d353ac9a9d03ba3 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 16:52:22 +0200
Subject: [PATCH 18/44] fix

bzr revid: fp@tinyerp.com-20121026145222-q3k000saytdg9u2s
---
 addons/web/static/src/css/base.css  | 3 ---
 addons/web/static/src/css/base.sass | 2 --
 2 files changed, 5 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index c18c4d89581..c3aac6089f0 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1326,9 +1326,6 @@
 .openerp .oe_view_manager .oe_view_manager_body {
   height: inherit;
 }
-.openerp .oe_view_manager .oe_view_manager_body .oe_view_manager_view_list {
-  min-height: 132px;
-}
 .openerp .oe_view_manager .oe_view_manager_view_kanban {
   height: inherit;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 8b24e6112ae..cf1cd38aad2 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1070,8 +1070,6 @@ $sheet-max-width: 860px
     .oe_view_manager
         .oe_view_manager_body
             height: inherit
-            .oe_view_manager_view_list
-                min-height: 132px
         .oe_view_manager_view_kanban
             height: inherit
 

From 00caf72c6c1d679935f4f1359eca83762f40adc4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 17:28:50 +0200
Subject: [PATCH 19/44] [IMP] CSS

bzr revid: fp@tinyerp.com-20121026152850-bevh0selibxvsixm
---
 addons/web/static/src/css/base.css  | 3 +++
 addons/web/static/src/css/base.sass | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index c3aac6089f0..cbbd8e37f6c 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2519,6 +2519,9 @@
 .openerp .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page, .openerp .oe_form_field_many2many > .oe_view_manager .oe_list_pager_single_page {
   display: none !important;
 }
+.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_view_list, .openerp .oe_form_field_many2many > .oe_view_manager .oe_view_manager_view_list {
+  min-height: 132px;
+}
 .openerp .oe_form_field_one2many .oe_form_field_one2many_list_row_add, .openerp .oe_form_field_many2many .oe_form_field_one2many_list_row_add {
   font-weight: bold;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index cf1cd38aad2..2ef9a8a451d 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1983,6 +1983,9 @@ $sheet-max-width: 860px
         > .oe_view_manager
             .oe_list_pager_single_page
                 display: none !important
+            .oe_view_manager_view_list
+                min-height: 132px
+
         .oe_form_field_one2many_list_row_add
             font-weight: bold
         .oe_list_content

From e6159de18f912832acffb3b5cf50537766e7df1c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 17:34:36 +0200
Subject: [PATCH 20/44] [IMP] useability

bzr revid: fp@tinyerp.com-20121026153436-v3y2i49iarpoknok
---
 addons/sale/sale.py                     | 2 +-
 addons/sale/sale_view.xml               | 5 +----
 addons/sale_margin/sale_margin_view.xml | 9 +++------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 9c7f07edb25..7c77e239abb 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -202,7 +202,7 @@ class sale_order(osv.osv):
   - With 'Before Delivery', a draft invoice is created, and it must be paid before delivery."""),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Pricelist for current sales order."),
         'currency_id': fields.related('pricelist_id', 'currency_id', type="many2one", relation="res.currency", readonly=True, required=True),
-        'project_id': fields.many2one('account.analytic.account', 'Contract/Analytic Account', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="The analytic account related to a sales order."),
+        'project_id': fields.many2one('account.analytic.account', 'Contract / Analytic', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="The analytic account related to a sales order."),
 
         'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}),
         'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', readonly=True, help="This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)."),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index a5d7b9d3af2..bdc687f6e87 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -286,11 +286,8 @@
                                 </div>
                                 <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator" widget='monetary' options="{'currency_field': 'currency_id'}"/>
                             </group>
-                            <group name="sale_margin_grp">
-                            </group>
                             <div class="oe_clear"/>
-                            <label for="note"/><br/>
-                            <field name="note" class="oe_inline"/>
+                            <field name="note" class="oe_inline" placeholder="Terms and conditions..."/>
                         </page>
                         <page string="Other Information" groups="base.group_user">
                             <group>
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index 6aa34bae26c..88647ea3c46 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -7,12 +7,9 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='sale_margin_grp']" position="inside">
-                <group>
-                    <label for="margin"/>
-                    <div>
-                        <field name="margin" widget='monetary' options="{'currency_field': 'currency_id'}"/>
-                    </div>
+            <xpath expr="//group[@name='sale_total']" position="after">
+                <group name="sale_margin_grp">
+                    <field name="margin" widget='monetary' options="{'currency_field': 'currency_id'}"/>
                 </group>
             </xpath>
         </field>

From 2aea3eae850f4f2cc1bf79df9318c78838bdbed0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 18:26:40 +0200
Subject: [PATCH 21/44] [IMP] notes

bzr revid: fp@tinyerp.com-20121026162640-0aury3pwyc5bo5nl
---
 addons/note/note_view.xml            |  2 +-
 addons/note/static/src/css/note.css  | 10 ++++++++++
 addons/note/static/src/css/note.sass | 24 ++++++++++++++++--------
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 2f85e832b7d..f99a028c4ab 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -117,7 +117,7 @@
                     <field name="tag_ids" widget="many2many_tags" class="oe_inline" placeholder="Tags"/>
                     <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/>
                 </header>
-                <field name="memo" widget="html"/><!-- editor_width="100%%" editor_height="60%%" -->
+                <field name="memo" widget="html" class="oe_memo" editor_height="450px" />
                 <div class="oe_chatter">
                     <field name="message_follower_ids" widget="mail_followers"/>
                     <field class="oe_chatter" name="message_ids" widget="mail_thread"/>
diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css
index d4b5f3d8d64..43bc455e04a 100644
--- a/addons/note/static/src/css/note.css
+++ b/addons/note/static/src/css/note.css
@@ -3,6 +3,16 @@
   text-decoration: line-through;
 }
 
+.openerp .oe_form .oe_form_field.oe_memo {
+  margin: 0 -16px 0 -16px;
+  padding: 0px;
+  width: 100%;
+  min-height: 200px;
+}
+.openerp .oe_form .oe_form_field.oe_memo .cleditorMain {
+  border: none;
+  padding: 0px;
+}
 .openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_0 {
   box-shadow: 0px 4px 9px rgba(48, 48, 48, 0.15);
 }
diff --git a/addons/note/static/src/css/note.sass b/addons/note/static/src/css/note.sass
index cc4e44f6765..ff39ce8708c 100644
--- a/addons/note/static/src/css/note.sass
+++ b/addons/note/static/src/css/note.sass
@@ -1,9 +1,5 @@
 @charset "utf-8"
 
-.oe_kanban_column
-  .note_text_line_through
-    text-decoration: line-through
-
 @mixin rotate($a)
   -webkit-transform: rotate($a) 
   -o-transform: rotate($a) 
@@ -15,8 +11,20 @@
   -ms-transition: $what $duration cubic-bezier(0.5,0,0.5,1)
   transition: $what $duration cubic-bezier(0.5,0,0.5,1)
 
+.oe_kanban_column
+  .note_text_line_through
+    text-decoration: line-through
 
 .openerp
+  .oe_form
+    .oe_form_field.oe_memo
+      margin: 0 -16px 0 -16px
+      padding: 0px
+      width: 100%
+      min-height: 200px
+      .cleditorMain
+        border: none
+        padding: 0px
   .oe_kanban_view.oe_notes
     .oe_kanban_card_fancy.oe_kanban_color_0
       box-shadow: 0px 4px 9px rgba(48,48,48,0.15)
@@ -39,7 +47,7 @@
     .oe_kanban_card_fancy.oe_kanban_color_9
       box-shadow: 0px 4px 9px rgba(102,0,116,0.15)
   .oe_kanban_record
-    .oe_kanban_card_fancy 
+    .oe_kanban_card_fancy
       text-shadow: none
       border-radius: 2px
       padding: 12px
@@ -48,9 +56,9 @@
       padding-bottom: 16px
       margin-bottom: 16px
       @include rotate(-2deg)
-      @include transition($what:all, $duration:300ms)
+      @include transition(all, 300ms)
   .oe_kanban_record:nth-of-type(even)
-    .oe_kanban_card_fancy 
+    .oe_kanban_card_fancy
       @include rotate(1deg)
   .oe_kanban_record:nth-of-type(3n)
     .oe_kanban_card_fancy 
@@ -87,7 +95,7 @@
         position: relative
         z-index: 5
         border-color: rgba(0,0,0,0.4)
-        @include transition($what:all, $duration:150ms)
+        @include transition(all, 150ms)
         -webkit-transform: rotate(0) !important
         -o-transform: rotate(0) !important
         -moz-transform: rotate(0) !important

From 71db67ef583595dd7fc891210afb0273cad4682d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 18:37:34 +0200
Subject: [PATCH 22/44] [IMP] notes

bzr revid: fp@tinyerp.com-20121026163734-ior9n3hz2dolabdx
---
 addons/base_calendar/crm_meeting_view.xml |  3 ---
 addons/note/note_view.xml                 | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 659145e7c16..5292ef3c3ed 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -328,9 +328,6 @@
         <field name="view_id" ref="view_crm_meeting_gantt"/>
     </record>
 
-    <menuitem id="menu_crm_meeting" parent="base.menu_sales" sequence="8"
-        name="Calendar" action="action_crm_meeting"/>
-
     <menuitem name="Calendar"
         id="mail_menu_calendar" parent="mail.mail_my_stuff"
         sequence="10" action="action_crm_meeting"/>
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index f99a028c4ab..68fd36669cc 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -176,6 +176,20 @@
       <field name="view_mode">kanban,tree,form</field>
       <field name="search_view_id" ref="view_note_note_filter"/>
       <field name="context">{'search_default_open_true':True}</field>
+      <field name="help" type="html">
+          <p class="oe_view_nocontent_create">
+            Click to add a personnal note.
+          </p><p>
+            Use notes to organize personnal tasks or notes. All
+            notes are private; no one else will be able to see them.  But
+            you can share some notes to other people by inviting followers
+            on the note. (very usefull for meeting minutes, especially if
+            you activate the pad feature for collaborative writings).
+          </p><p>
+            You can customize how you process your notes/tasks by adding,
+            removing or modifying columns.
+          </p>
+        </field>
     </record>
 
     <menuitem name="Notes" id="menu_note_notes" parent="mail.mail_my_stuff" sequence="20" action="note.action_note_note"/>

From 88110c04b22e0f9240db753e0a5917f29b8a21ee Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 18:43:11 +0200
Subject: [PATCH 23/44] [ADD] makefile

bzr revid: fp@tinyerp.com-20121026164311-ecvh9lqmjapzp6qw
---
 addons/note/static/src/css/Makefile | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 addons/note/static/src/css/Makefile

diff --git a/addons/note/static/src/css/Makefile b/addons/note/static/src/css/Makefile
new file mode 100644
index 00000000000..17bf009479e
--- /dev/null
+++ b/addons/note/static/src/css/Makefile
@@ -0,0 +1,3 @@
+note.css: note.sass
+	sass --trace -t expanded note.sass note.css
+

From 11a8170b560a91ff7de78b06405894ccf1f383b4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 18:43:27 +0200
Subject: [PATCH 24/44] [IMP] html fields with 100%

bzr revid: fp@tinyerp.com-20121026164327-xh3gwp96lpysq9hm
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 896ace2c683..92e636b2216 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2539,7 +2539,7 @@ instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instanc
         if (! this.get("effective_readonly")) {
             self._updating_editor = false;
             this.$textarea = this.$el.find('textarea');
-            var width = ((this.node.attrs || {}).editor_width || 468);
+            var width = ((this.node.attrs || {}).editor_width || '100%');
             var height = ((this.node.attrs || {}).editor_height || 250);
             this.$textarea.cleditor({
                 width:      width, // width not including margins, borders or padding

From 7744f311709bcb4056ce2198842e3b3a41946e23 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 18:53:10 +0200
Subject: [PATCH 25/44] [IMP] project kanban view

bzr revid: fp@tinyerp.com-20121026165310-bigia18opgsdd0lx
---
 addons/project/project_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0de5e1773b1..08ea2881d4d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -518,13 +518,13 @@
                                 <div><b><field name="name"/></b></div>
                                 <div>
                                     <field name="project_id"/><br/>
-                                    <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/><br/>
+                                    <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/><br t-if="record.description.value"/>
                                     <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
                                     <span t-attf-class="#{red || ''}"><i><field name="date_deadline"/></i></span>
                                 </div>
                                 <div class="oe_kanban_bottom_right">
-                                    <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="Ready to Pull" name="set_kanban_state_done" class="oe_kanban_status"> </a>
-                                    <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready to Pull" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
+                                    <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="In Progress" name="set_kanban_state_done" class="oe_kanban_status"> </a>
+                                    <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Stage Done" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
                                     <a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a>
                                     <a t-if="record.priority.raw_value == 1" type="object" string="Priority" name="set_normal_priority" class="oe_e oe_star_on">7</a>
                                     <a t-if="record.priority.raw_value != 1" type="object" string="Priority" name="set_high_priority" class="oe_e oe_star_off">7</a>

From b93a8573042cd7a00f22c0882c0683a1d40a9039 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 18:57:37 +0200
Subject: [PATCH 26/44] [FIX]

bzr revid: fp@tinyerp.com-20121026165737-ndqb9qzrur1szt2j
---
 addons/project_timesheet/project_timesheet_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index a4e2a38a3cc..1cb2a4b8702 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -15,7 +15,7 @@
                 </field>
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
                     <a t-if="record.use_timesheets.raw_value"
-                        name="open_timesheets" type="object"><field name="hours_quantity"/> Timesheets</a>
+                        name="open_timesheets" type="object"><field name="hours_quantity"/> Hours</a>
                 </xpath>
             </field>
         </record>

From 4ec467ff29e5fb5a6632aadf039f078b382d3513 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 18:58:39 +0200
Subject: [PATCH 27/44] [IMP] css

bzr revid: fp@tinyerp.com-20121026165839-79xay4e5rycdu6zp
---
 addons/web_kanban/static/src/css/kanban.css  | 1 +
 addons/web_kanban/static/src/css/kanban.sass | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 837d11949bc..669a5881e6e 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -284,6 +284,7 @@
 }
 .openerp .oe_kanban_view .oe_kanban_action_a {
   text-decoration: none;
+  margin-right: 10px;
 }
 .openerp .oe_kanban_view .oe_kanban_action_a:hover {
   text-decoration: none;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index aea5d6bc8c0..143e31ee480 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -271,6 +271,7 @@
         margin: 0
     .oe_kanban_action_a
         text-decoration: none
+        margin-right: 10px
         &:hover
             text-decoration: none
     .oe_kanban_table

From baac47b4730d3452b1dd2fb3ee83e344f9513925 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 19:09:04 +0200
Subject: [PATCH 28/44] fix

bzr revid: fp@tinyerp.com-20121026170904-uqvird49cqdykd2w
---
 addons/crm/__openerp__.py                |  1 -
 addons/crm/crm_meeting_shortcut_data.xml | 13 -------------
 2 files changed, 14 deletions(-)
 delete mode 100644 addons/crm/crm_meeting_shortcut_data.xml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 9a90a8022b6..03885f541d0 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -86,7 +86,6 @@ Dashboard for CRM will include:
         'crm_lead_menu.xml',
 
         'crm_meeting_menu.xml',
-        'crm_meeting_shortcut_data.xml',
 
         'crm_phonecall_view.xml',
         'crm_phonecall_menu.xml',
diff --git a/addons/crm/crm_meeting_shortcut_data.xml b/addons/crm/crm_meeting_shortcut_data.xml
deleted file mode 100644
index 45488da8a82..00000000000
--- a/addons/crm/crm_meeting_shortcut_data.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data noupdate="1">
-
-        <record id="ir_ui_view_sc_calendar0" model="ir.ui.view_sc">
-            <field name="name">Meetings</field>
-            <field name="resource">ir.ui.menu</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="res_id" ref="base_calendar.menu_crm_meeting"/>
-        </record>
-
-    </data>
-</openerp>

From f201ee21c5a461cbd93bee192952c89b561baf71 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 26 Oct 2012 19:17:01 +0200
Subject: [PATCH 29/44] [FIX] notes: spellchecking

bzr revid: odo@openerp.com-20121026171701-j5r9xc8kk6xwb1ad
---
 addons/note/note_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 68fd36669cc..5c3a77b7626 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -178,12 +178,12 @@
       <field name="context">{'search_default_open_true':True}</field>
       <field name="help" type="html">
           <p class="oe_view_nocontent_create">
-            Click to add a personnal note.
+            Click to add a personal note.
           </p><p>
-            Use notes to organize personnal tasks or notes. All
-            notes are private; no one else will be able to see them.  But
-            you can share some notes to other people by inviting followers
-            on the note. (very usefull for meeting minutes, especially if
+            Use notes to organize personal tasks or notes. All
+            notes are private; no one else will be able to see them. However
+            you can share some notes with other people by inviting followers
+            on the note. (Useful for meeting minutes, especially if
             you activate the pad feature for collaborative writings).
           </p><p>
             You can customize how you process your notes/tasks by adding,

From ff918d5b2f9a6cf6fecf48523e24b67ceecc1d6b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Fri, 26 Oct 2012 22:13:32 +0200
Subject: [PATCH 30/44] fix

bzr revid: fp@openerp.com-20121026201332-jiujrnnxkomm58zs
---
 addons/crm/crm_demo.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index dde3e63cc4a..203193dc3bc 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -6,13 +6,6 @@
             <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/>
         </record>
 
-        <record id="ir_ui_view_sc_calendar_demo" model="ir.ui.view_sc">
-            <field name="name">Meetings</field>
-            <field name="resource">ir.ui.menu</field>
-            <field name="user_id" ref="base.user_demo"/>
-            <field name="res_id" ref="base_calendar.menu_crm_meeting"/>
-        </record>
-
         <record model="crm.case.section" id="crm_case_section_1">
             <field name="name">Sales Marketing Department</field>
             <field name="code">SMD</field>

From 80fb0f7f8174493bcdad627f2449bbbde46c4781 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 27 Oct 2012 05:15:46 +0000
Subject: [PATCH 31/44] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121027045930-uze98btnynog2b5r
bzr revid: launchpad_translations_on_behalf_of_openerp-20121027051546-nvi5ltrk3o8s6j4z
---
 addons/account/i18n/ru.po    | 478 ++++++++++++++++++++---------------
 addons/board/i18n/ru.po      |  14 +-
 addons/mail/i18n/hu.po       |  63 +++--
 addons/mail/i18n/ru.po       | 154 ++++++-----
 addons/web/i18n/hu.po        |   8 +-
 addons/web_kanban/i18n/ru.po |  16 +-
 6 files changed, 422 insertions(+), 311 deletions(-)

diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index c194906a978..82c89ea48a1 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-08-17 11:07+0000\n"
+"PO-Revision-Date: 2012-10-26 09: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: 2012-08-28 06:12+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-27 04:59+0000\n"
+"X-Generator: Launchpad (build 16194)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -38,6 +38,8 @@ msgid ""
 "Determine the display order in the report 'Accounting \\ Reporting \\ "
 "Generic Reporting \\ Taxes \\ Taxes Report'"
 msgstr ""
+"Определяет порядок вывода в отчёте 'Учет \\ Отчётность \\ Общая отчётность \\"
+" Налоги \\ Отчёт по налогам'"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -81,7 +83,7 @@ msgstr "Определение наследников"
 #: code:addons/account/account_bank_statement.py:302
 #, python-format
 msgid "Journal item \"%s\" is not valid."
-msgstr ""
+msgstr "Недопустимый элемент журнала \"%s\""
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
@@ -118,6 +120,8 @@ msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
 msgstr ""
+"Ошибка настройки! Выбранная валюта должна соответствовать валюте счетов по "
+"умолчанию."
 
 #. module: account
 #: report:account.invoice:0
@@ -141,6 +145,7 @@ msgstr "Сверить"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Ссылка"
 
@@ -159,16 +164,16 @@ msgstr ""
 "не удаляя его."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Предупреждение!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
-msgstr ""
+msgstr "Смешанный журнал"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -229,7 +234,7 @@ msgstr ""
 "налога появился в счетах-фактурах"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "Счет '%s' оплачивается частично: %s%s из %s%s (%s%s остаток)"
@@ -245,7 +250,7 @@ msgid "Belgian Reports"
 msgstr "Бельгийские отчеты"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "В не можете добавить/исправить проводки в закрытом журнале"
@@ -293,10 +298,11 @@ msgid "St."
 msgstr "ул."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
+"Позиция счёта-фактуры счёта компании не соответствует компании счёта-фактуры."
 
 #. module: account
 #: field:account.journal.column,field:0
@@ -344,6 +350,9 @@ msgid ""
 "leave the automatic formatting, it will be computed based on the financial "
 "reports hierarchy (auto-computed field 'level')."
 msgstr ""
+"Здесь вы можете задать формат для вывода этой записи. Если вы оставите "
+"автоформатирование, оно будет вычислено на основе иерархии финансовых "
+"отчётов (автоподсчитанное поле 'уровень')."
 
 #. module: account
 #: view:account.installer:0
@@ -373,7 +382,7 @@ msgstr ""
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "Нельзя создать элемент журнала по счету с типом вид."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -547,7 +556,7 @@ msgstr "Название компании должно быть уникальн
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr ""
+msgstr "Возмещение по счёту-фактуре"
 
 #. module: account
 #: report:account.overdue:0
@@ -584,8 +593,10 @@ msgid "The accountant confirms the statement."
 msgstr "Бухгалтер подтверждает документ."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -625,7 +636,7 @@ msgstr "Последовательности"
 #: field:account.financial.report,account_report_id:0
 #: selection:account.financial.report,type:0
 msgid "Report Value"
-msgstr ""
+msgstr "Значение отчёта"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -643,10 +654,10 @@ msgid "Main Sequence must be different from current !"
 msgstr "Основная нумерация должна отличаться от текущей!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
-msgstr ""
+msgstr "Для заданной даты период не найден или найдено более одного периода."
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -654,7 +665,7 @@ msgid "Tax Code Amount"
 msgstr "Объем по коду налога"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "КнП"
@@ -681,8 +692,8 @@ msgid "Journal Period"
 msgstr "Период журнала"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -694,6 +705,8 @@ msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
+"Дата проводки в журнале не в определённом периоде! Вы должны сменить дату "
+"или удалить это ограничение из журнала."
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
@@ -728,7 +741,7 @@ msgstr "Журнал продаж в этом году"
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "Display children with hierarchy"
-msgstr ""
+msgstr "Показ подчинённость с иерархией"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -751,7 +764,7 @@ msgstr "Аналитические проводки по строкам"
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Method"
-msgstr ""
+msgstr "Способ возмещения"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:38
@@ -760,6 +773,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Вы можете изменить валюту только в черновике счета !"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Финансовый отчет"
@@ -775,12 +789,13 @@ msgstr "Финансовый отчет"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Тип"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -908,12 +923,13 @@ msgid "Create 3 Months Periods"
 msgstr "Создать квартальные периоды"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Срок"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -994,7 +1010,7 @@ msgstr ""
 "содержать базовую сумму (без налога)"
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -1027,10 +1043,10 @@ msgid "Code"
 msgstr "Код"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1094,7 +1110,7 @@ msgstr ""
 "информации о счете и его особенностях."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1142,7 +1158,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Банковский"
@@ -1239,7 +1255,7 @@ msgid "The move of this entry line."
 msgstr "Операция этой проводки"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1260,7 +1276,7 @@ msgid "Entry Label"
 msgstr "Метка проводки"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr "Вы не можете изменить/удалить журнал с записями за этот период !"
@@ -1345,14 +1361,15 @@ msgid "Taxes"
 msgstr "Налоги"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Выберите начало и окончание периода"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Прибыли и убытки"
 
@@ -1407,6 +1424,7 @@ msgid "Journal Items Analysis"
 msgstr "Анализ элементов журнала"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Контрагенты"
@@ -1431,8 +1449,10 @@ msgid "Central Journal"
 msgstr "Центральный журнал"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1666,6 +1686,7 @@ msgid "Separated Journal Sequences"
 msgstr "Раздельные нумерации журнала"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Ответственный"
@@ -1696,7 +1717,7 @@ msgid "Year Sum"
 msgstr "Годовая сумма"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1774,7 +1795,7 @@ msgid "Customer Ref:"
 msgstr "Ссылка на клиента:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "Пользователь %s не имеет прав доступа к журналу %s !"
@@ -1998,7 +2019,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a sale journal."
-msgstr ""
+msgstr "Элементы журнала аналитика связанные с журналом продаж"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -2103,7 +2124,7 @@ msgid "Pro-forma"
 msgstr "Проформа"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2133,7 +2154,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Искать шаблоны планов счетов"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2185,7 +2206,7 @@ msgid "Description"
 msgstr "Описание"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2204,7 +2225,7 @@ msgid "Income Account"
 msgstr "Cчёт доходов и расходов"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "Не определен журнал покупок / продаж."
@@ -2244,6 +2265,7 @@ msgstr "Шаблон продукта"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2253,6 +2275,7 @@ msgstr "Шаблон продукта"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2303,7 +2326,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2336,7 +2359,7 @@ msgid "Main Sequence"
 msgstr "Основная Последовательность"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2410,7 +2433,7 @@ msgid "Account Tax Code"
 msgstr "Код налогового счёта"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2502,7 +2525,7 @@ msgid "Account Model Entries"
 msgstr "Проводки модели счета"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "ЖР"
@@ -2567,7 +2590,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2599,7 +2621,7 @@ msgid "Accounts"
 msgstr "Счета"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Ошибка конфигурации!"
@@ -2721,6 +2743,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Баланс партнера по периодам"
@@ -2772,14 +2795,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Этот мастер создаст повторяющиеся бухгалтерские проводки"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Нумерация в журнале не определена !"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2886,7 +2909,7 @@ msgid "Base Code Amount"
 msgstr "Сумма по основному коду"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2899,7 +2922,7 @@ msgid "Default Sale Tax"
 msgstr "Налог с продаж по умолчанию"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "Счет  '%s' утвержден."
@@ -2939,7 +2962,7 @@ msgid "Fiscal Position"
 msgstr "Система налогообложения"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3093,7 +3116,7 @@ msgid "View"
 msgstr "Вид"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3287,7 +3310,7 @@ msgid "Starting Balance"
 msgstr "Начальный баланс"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Партнер не определен!"
@@ -3342,7 +3365,7 @@ msgid "Chart of Tax"
 msgstr "Диаграмма налогов"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3427,6 +3450,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3473,7 +3497,7 @@ msgid "Detail"
 msgstr "Подробности"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3488,9 +3512,16 @@ msgid "VAT :"
 msgstr "НДС:"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3512,7 +3543,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3539,6 +3570,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3566,10 +3598,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Дата"
 
@@ -3586,7 +3625,6 @@ msgstr "Не сверено"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3600,7 +3638,7 @@ msgid "Chart of Accounts Template"
 msgstr "Шаблон плана счетов"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3611,7 +3649,7 @@ msgstr ""
 "условии оплаты контрагента."
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Некоторые записи уже сверены!"
@@ -3642,6 +3680,8 @@ msgstr "Бюджеты"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Нет фильтров"
 
@@ -3725,7 +3765,7 @@ msgid "Analytic Items"
 msgstr "Элементы аналитики"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Невозможно изменить налог !"
@@ -3756,7 +3796,7 @@ msgid "Mapping"
 msgstr "Соответствие"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3770,6 +3810,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3783,7 +3824,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -4110,7 +4151,7 @@ msgid "Month"
 msgstr "Месяц"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4167,7 +4208,7 @@ msgid "Account Base Code"
 msgstr "Основной код счёта"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "Счет расходов не определен для этого товара: \"%s\" (id:%d)"
@@ -4376,7 +4417,7 @@ msgid "Allow Reconciliation"
 msgstr "Разрешить сверку"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4410,7 +4451,7 @@ msgid "Recurring Models"
 msgstr "Повторяющиеся модели"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4422,6 +4463,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Изменить"
 
@@ -4466,7 +4508,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4482,7 +4524,7 @@ msgid "Keep empty to use the income account"
 msgstr "Оставьте пустым для использования доходного счета"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4510,7 +4552,7 @@ msgstr "Отображение счета"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Заказчик"
@@ -4526,7 +4568,7 @@ msgid "Cancelled Invoice"
 msgstr "Отмененный счет"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4583,7 +4625,7 @@ msgid "Income Account on Product Template"
 msgstr "Счет доходов и расходов из шаблона ТМЦ"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4608,11 +4650,13 @@ msgstr "Новый учетный год"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Счета"
 
@@ -4749,26 +4793,24 @@ msgid "Journal Items"
 msgstr "Элементы журнала"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -4873,7 +4915,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4900,7 +4942,7 @@ msgid "Child Tax Accounts"
 msgstr "Счета субналогов"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Начало периода должно быть меньше, чем конец периода"
@@ -4921,6 +4963,7 @@ msgstr "Остаток по аналитике"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4964,6 +5007,8 @@ msgstr "Тип периода"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Платежи"
 
@@ -5037,7 +5082,7 @@ msgid "Line 1:"
 msgstr "Строка 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Ошибка целостности!"
@@ -5070,6 +5115,7 @@ msgstr "Результат сверки"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Балансовая ведомость"
@@ -5146,6 +5192,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5275,7 +5322,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Назначение"
 
@@ -5327,13 +5373,13 @@ msgid "End of Year Entries Journal"
 msgstr "Журнал проводок конца года"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5407,7 +5453,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5575,7 +5620,7 @@ msgid "Generate Opening Entries"
 msgstr "Генерировать открывающие проводки"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Уже сверено !"
@@ -5608,14 +5653,14 @@ msgid "Child Accounts"
 msgstr "Субсчета"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Списание"
@@ -5635,7 +5680,7 @@ msgstr "Доход"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Поставщик"
@@ -5665,7 +5710,7 @@ msgid "Account n°"
 msgstr "№ счета"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Свободная Ссылка"
@@ -5680,7 +5725,9 @@ msgstr "Оценка"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Счета дебиторской и кредиторской задолженности"
@@ -5784,7 +5831,7 @@ msgid "Filter by"
 msgstr "Фильтровать по"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5795,8 +5842,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Нельзя использовать неактивный счет !"
@@ -5837,8 +5884,8 @@ msgid "Number of Days"
 msgstr "Кол-во дней"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5900,7 +5947,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "не реализовано"
@@ -5939,6 +5986,8 @@ msgstr "Анализ проводок аналитики"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Прошлые"
 
@@ -6218,6 +6267,8 @@ msgstr "Процент"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Журнал и партнер"
 
@@ -6227,7 +6278,7 @@ msgid "Power"
 msgstr "Мощность"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6267,6 +6318,7 @@ msgid "Applicable Type"
 msgstr "Применимый тип"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Ссылка на счет"
@@ -6498,8 +6550,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Проводки: "
@@ -6515,7 +6567,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Нельзя создать перемещение между разными организациями"
@@ -6556,13 +6608,13 @@ msgstr "Состояние \"Черновик\""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Всего по дебету"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Проводка \"%s\" не верна !"
@@ -6636,25 +6688,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6686,8 +6739,8 @@ msgid "Printed"
 msgstr "Напечатан"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6746,7 +6799,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Вывести отчет по регистру с одним партнером на странице"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6906,7 +6959,7 @@ msgid "Total:"
 msgstr "Всего:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6944,7 +6997,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7012,14 +7065,14 @@ msgid "Source Document"
 msgstr "Документ-источник"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7119,8 +7172,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Вы уверены, что хотите открыть данный счет?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7133,7 +7186,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Бухгалтерские проводки"
@@ -7270,7 +7323,7 @@ msgstr ""
 "домена."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "Вы должны выбрать периоды принадлежащие одной компании."
@@ -7301,8 +7354,8 @@ msgid "Reporting"
 msgstr "Отчетность"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7393,7 +7446,7 @@ msgid "Sign on Reports"
 msgstr "Знак в отчётах"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7404,7 +7457,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7439,13 +7492,14 @@ msgid "Optional Information"
 msgstr "Доп. информация"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "Журнал должен иметь дебитовый и кредитовый счет по умолчанию"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7474,13 +7528,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Неверный счет !"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Журнал продаж"
@@ -7497,7 +7551,7 @@ msgid "Invoice Tax"
 msgstr "Налог по счету"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Нет номера части !"
@@ -7547,7 +7601,7 @@ msgstr "По"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7595,13 +7649,15 @@ msgstr "Май"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Кредиторская задолженность"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7645,7 +7701,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Наличные"
@@ -7657,15 +7713,15 @@ msgid "Account Destination"
 msgstr "Счет назначения"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7820,13 +7876,14 @@ msgstr "Фиксированный"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Warning !"
@@ -7878,7 +7935,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Выбрать валюту применяемую в счете"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7891,7 +7948,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Нельзя %s черновик/проформу/отмененный счет."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Нет позиций в счете !"
@@ -7966,7 +8023,7 @@ msgid "Deferral Method"
 msgstr "Метод отсрочки"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Счет '%s' оплачен."
@@ -8032,7 +8089,7 @@ msgid "Associated Partner"
 msgstr "Связанный контрагент"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Сначала вы должны выбрать партнера !"
@@ -8078,7 +8135,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8100,7 +8157,7 @@ msgid "Choose Fiscal Year"
 msgstr "Закрыть отчетный год"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Журнал возврата покупок"
@@ -8190,7 +8247,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Код расчета для цен с налогами"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8320,7 +8377,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8399,10 +8456,12 @@ msgstr "Журнал возвратов"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Фильтровать по"
 
@@ -8439,7 +8498,7 @@ msgid "The partner account used for this invoice."
 msgstr "Бух. счет партнера будет использоваться для этого счета."
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8462,7 +8521,7 @@ msgid "Payment Term Line"
 msgstr "Позиция условий оплаты"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Журнал покупок"
@@ -8548,7 +8607,7 @@ msgid "Unpaid Invoices"
 msgstr "Неоплаченные счета"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8654,7 +8713,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Оставьте пустым для всех открытых финансовых лет"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8668,7 +8727,7 @@ msgstr ""
 "Сумма выражается в дополнительный валюте, если эта проводка мульти-валютная."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8742,7 +8801,7 @@ msgid "Contact Address"
 msgstr "Адрес контакта"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8777,12 +8836,14 @@ msgstr "Договоры"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "неизвестен"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Журнал проводок открытия"
@@ -8804,7 +8865,7 @@ msgstr ""
 "прибылям и убыткам."
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8892,7 +8953,7 @@ msgid "Period from"
 msgstr "Период с"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Журнал возврата продаж"
@@ -8939,7 +9000,7 @@ msgid "Purchase Tax(%)"
 msgstr "Налог на покупку(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Пожалуйста, создайте позиции счета"
@@ -8955,7 +9016,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8987,8 +9048,6 @@ msgstr "Конец периода"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -9003,6 +9062,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9023,6 +9083,7 @@ msgstr "Начало периода"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Направление анализа"
 
@@ -9042,7 +9103,7 @@ msgstr "Вид журнала"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Всего кредит"
@@ -9107,6 +9168,7 @@ msgstr "Банковские выписки"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9182,7 +9244,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Вы должны выбрать счета для сверки"
@@ -9204,7 +9266,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -9226,7 +9287,7 @@ msgid "Move"
 msgstr "Операция"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9285,7 +9346,7 @@ msgid "Consolidated Children"
 msgstr "Субсчета"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9346,6 +9407,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9402,6 +9464,7 @@ msgstr "Проводка подписки"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9409,6 +9472,7 @@ msgstr "Проводка подписки"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9451,7 +9515,7 @@ msgid "Unreconciled"
 msgstr "Не сверенные"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Плохой итог !"
@@ -9510,7 +9574,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Неизвестная ошибка"
@@ -9549,6 +9613,7 @@ msgstr "Утвердить операцию по счету"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9650,9 +9715,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Периоды"
 
@@ -9817,6 +9884,7 @@ msgstr "Проведено"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9864,7 +9932,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Не определен счет доходов для ТМЦ: \"%s\" (id:%d)"
@@ -9900,6 +9968,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9920,6 +9989,7 @@ msgstr "Журнал: Все"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9934,7 +10004,9 @@ msgstr "Журнал: Все"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9944,6 +10016,8 @@ msgstr "Журнал: Все"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10103,6 +10177,7 @@ msgstr "Счет поставщика"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10136,6 +10211,8 @@ msgstr "Ошибка ! Нельзя создать рекурсивные шаб
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -10153,7 +10230,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Проводка уже сверена"
@@ -10189,8 +10266,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "С движением"
@@ -10313,8 +10392,8 @@ msgid "Statistic Reports"
 msgstr "Статистические отчеты"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Плохой счет!"
@@ -10340,7 +10419,7 @@ msgid "Accounts Mapping"
 msgstr "Отображение счетов"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Счет '%s' ожидает утверждения."
@@ -10530,6 +10609,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10608,6 +10688,8 @@ msgstr "Срок платежа"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Будущие"
 
diff --git a/addons/board/i18n/ru.po b/addons/board/i18n/ru.po
index 4b10359bca5..5734590526c 100644
--- a/addons/board/i18n/ru.po
+++ b/addons/board/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-10-30 10:01+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-10-26 09:05+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:20+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-27 04:59+0000\n"
+"X-Generator: Launchpad (build 16194)\n"
 
 #. module: board
 #: view:res.log.report:0
@@ -103,7 +103,7 @@ msgstr "Месячная активность на документ"
 #. module: board
 #: view:board.board:0
 msgid "Configuration Overview"
-msgstr ""
+msgstr "Обзор конфигурации"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_list_form
@@ -211,7 +211,7 @@ msgstr "Январь"
 #. module: board
 #: view:board.board:0
 msgid "Users"
-msgstr ""
+msgstr "Пользователи"
 
 #. module: board
 #: selection:res.log.report,month:0
@@ -262,7 +262,7 @@ msgstr "Модель"
 #. module: board
 #: model:ir.actions.act_window,name:board.board_homepage_action
 msgid "Home Page"
-msgstr ""
+msgstr "Домашняя страница"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_latest_activities_tree
diff --git a/addons/mail/i18n/hu.po b/addons/mail/i18n/hu.po
index 467485a589d..86e15e751b3 100644
--- a/addons/mail/i18n/hu.po
+++ b/addons/mail/i18n/hu.po
@@ -7,21 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2011-01-21 12:01+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
+"PO-Revision-Date: 2012-10-26 12:29+0000\n"
+"Last-Translator: Herczeg Péter <herczegp@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-27 04:59+0000\n"
+"X-Generator: Launchpad (build 16194)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
 #: field:mail.message.common,subtype:0
 msgid "Message Type"
-msgstr ""
+msgstr "Üzenettípus"
 
 #. module: mail
 #: help:mail.compose.message,auto_delete:0
@@ -31,7 +30,7 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0
 msgid "Open Related Document"
-msgstr ""
+msgstr "Kapcsolódó dokumentum megnyitása"
 
 #. module: mail
 #: view:mail.message:0
@@ -57,7 +56,7 @@ msgstr "Csoportosítás..."
 #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
 #: view:mail.compose.message:0
 msgid "Compose Email"
-msgstr ""
+msgstr "Email írás"
 
 #. module: mail
 #: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
@@ -68,7 +67,7 @@ msgstr ""
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Body"
-msgstr ""
+msgstr "Levéltörzs"
 
 #. module: mail
 #: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
@@ -85,7 +84,7 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Received"
-msgstr ""
+msgstr "Fogadott"
 
 #. module: mail
 #: view:mail.message:0
@@ -95,18 +94,18 @@ msgstr ""
 #. module: mail
 #: field:mail.message,mail_server_id:0
 msgid "Outgoing mail server"
-msgstr ""
+msgstr "Kimenő levelező szerver"
 
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Megszakítva"
 
 #. module: mail
 #: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
 #: field:mail.message.common,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Válaszcím"
 
 #. module: mail
 #: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
@@ -117,7 +116,7 @@ msgstr ""
 #. module: mail
 #: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Automatikus törlés"
 
 #. module: mail
 #: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
@@ -146,37 +145,37 @@ msgstr ""
 #: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
 #: field:mail.message.common,email_from:0
 msgid "From"
-msgstr ""
+msgstr "Feladó"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Email message"
-msgstr ""
+msgstr "Email üzenet"
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
-msgstr ""
+msgstr "Küldés"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Failed"
-msgstr ""
+msgstr "Sikertelen"
 
 #. module: mail
 #: view:mail.message:0 field:mail.message,state:0
 msgid "State"
-msgstr ""
+msgstr "Állapot"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Reply"
-msgstr ""
+msgstr "Válasz"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Sent"
-msgstr ""
+msgstr "Elküldött"
 
 #. module: mail
 #: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
@@ -189,7 +188,7 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0
 msgid "Recipients"
-msgstr ""
+msgstr "Címzettek"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
@@ -205,7 +204,7 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0
 msgid "Advanced"
-msgstr ""
+msgstr "Speciális"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:157
@@ -242,17 +241,17 @@ msgstr "Partner neve"
 #. module: mail
 #: view:mail.message:0
 msgid "Retry"
-msgstr ""
+msgstr "Újra"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Kimenő"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Send Now"
-msgstr ""
+msgstr "Küldés most"
 
 #. module: mail
 #: field:mail.message,partner_id:0
@@ -262,7 +261,7 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0
 msgid "User"
-msgstr ""
+msgstr "Felhasználó"
 
 #. module: mail
 #: field:mail.compose.message,date:0 field:mail.message,date:0
@@ -273,7 +272,7 @@ msgstr "Dátum"
 #. module: mail
 #: view:mail.message:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Kiterjesztett szűrők…"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
@@ -290,7 +289,7 @@ msgstr ""
 #. module: mail
 #: field:mail.message,original:0
 msgid "Original"
-msgstr ""
+msgstr "Eredeti"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:247 view:res.partner:0
@@ -341,12 +340,12 @@ msgstr ""
 #. module: mail
 #: view:mail.compose.message:0 view:mail.message:0
 msgid "Cancel"
-msgstr ""
+msgstr "Mégsem"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open"
-msgstr ""
+msgstr "Megnyitás"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:434
@@ -357,7 +356,7 @@ msgstr ""
 #. module: mail
 #: field:mail.message,user_id:0
 msgid "Related User"
-msgstr ""
+msgstr "Kapcsolódó felhasználó"
 
 #. module: mail
 #: help:mail.compose.message,headers:0 help:mail.message,headers:0
diff --git a/addons/mail/i18n/ru.po b/addons/mail/i18n/ru.po
index d85c3660ed3..61b01489c39 100644
--- a/addons/mail/i18n/ru.po
+++ b/addons/mail/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2011-01-25 08:25+0000\n"
-"Last-Translator: Alexey Y. Fedotov <Unknown>\n"
+"PO-Revision-Date: 2012-10-26 17:02+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-27 04:59+0000\n"
+"X-Generator: Launchpad (build 16194)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -26,12 +26,12 @@ msgstr ""
 #. module: mail
 #: help:mail.compose.message,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Не сохранять сообщения после отправки"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open Related Document"
-msgstr ""
+msgstr "Открыть связанный документ"
 
 #. module: mail
 #: view:mail.message:0
@@ -46,7 +46,7 @@ msgstr "Подробности сообщения"
 #. module: mail
 #: view:mail.thread:0
 msgid "Communication History"
-msgstr ""
+msgstr "История общения"
 
 #. module: mail
 #: view:mail.message:0
@@ -57,24 +57,24 @@ msgstr "Объеденить по..."
 #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
 #: view:mail.compose.message:0
 msgid "Compose Email"
-msgstr ""
+msgstr "Написать письмо"
 
 #. module: mail
 #: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
 #: help:mail.message.common,body_text:0
 msgid "Plain-text version of the message"
-msgstr ""
+msgstr "Простая текстовая версия сообщения"
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Body"
-msgstr ""
+msgstr "Содержимое"
 
 #. module: mail
 #: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
 #: help:mail.message.common,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Получатели сообщения"
 
 #. module: mail
 #: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
@@ -85,7 +85,7 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Received"
-msgstr ""
+msgstr "Получено"
 
 #. module: mail
 #: view:mail.message:0
@@ -95,40 +95,40 @@ msgstr "Цепочка"
 #. module: mail
 #: field:mail.message,mail_server_id:0
 msgid "Outgoing mail server"
-msgstr ""
+msgstr "Сервер исходящей почты"
 
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Отменено"
 
 #. module: mail
 #: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
 #: field:mail.message.common,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Адрес ответа"
 
 #. module: mail
 #: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
 #: help:mail.message.common,body_html:0
 msgid "Rich-text/HTML version of the message"
-msgstr ""
+msgstr "Форматный текст/HTML версия сообщения"
 
 #. module: mail
 #: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Авто удаление"
 
 #. module: mail
 #: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
 #: help:mail.message.common,email_bcc:0
 msgid "Blind carbon copy message recipients"
-msgstr ""
+msgstr "Получатели скрытой копии сообщения"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
-msgstr "Контрагент"
+msgstr "Партнёр"
 
 #. module: mail
 #: field:mail.compose.message,subject:0 field:mail.message,subject:0
@@ -140,7 +140,7 @@ msgstr "Тема"
 #: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
 msgid "On %(date)s, "
-msgstr ""
+msgstr "За %(date)s, "
 
 #. module: mail
 #: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
@@ -151,32 +151,32 @@ msgstr "От"
 #. module: mail
 #: view:mail.message:0
 msgid "Email message"
-msgstr ""
+msgstr "Сообщение эл. почты"
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
-msgstr ""
+msgstr "Отправить"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Failed"
-msgstr ""
+msgstr "Ошибка"
 
 #. module: mail
 #: view:mail.message:0 field:mail.message,state:0
 msgid "State"
-msgstr ""
+msgstr "Состояние"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Reply"
-msgstr ""
+msgstr "Ответить"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Sent"
-msgstr ""
+msgstr "Отправлено"
 
 #. module: mail
 #: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
@@ -185,11 +185,13 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Тип сообщения, обычно 'html' или 'простой', используемый для выбора "
+"содержимого соответственно простого текста или форматного текста"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Recipients"
-msgstr ""
+msgstr "Получатели"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
@@ -200,18 +202,18 @@ msgstr ""
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
 #: field:mail.message.common,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "ID связанного документа"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Advanced"
-msgstr ""
+msgstr "Дополнительно"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
 msgid "Re:"
-msgstr ""
+msgstr "Ответ:"
 
 #. module: mail
 #: field:mail.compose.message,model:0 field:mail.message,model:0
@@ -232,37 +234,37 @@ msgstr "Искать эл. почту"
 #. module: mail
 #: help:mail.message,original:0
 msgid "Original version of the message, as it was sent on the network"
-msgstr ""
+msgstr "Оригинальная версия сообщения, как было отправлено в сеть"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Partner Name"
-msgstr "Имя партнера"
+msgstr "Название партнера"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Retry"
-msgstr ""
+msgstr "Повторить"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Исходящее"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Send Now"
-msgstr ""
+msgstr "Отправить сейчас"
 
 #. module: mail
 #: field:mail.message,partner_id:0
 msgid "Related partner"
-msgstr ""
+msgstr "Связанный партнер"
 
 #. module: mail
 #: view:mail.message:0
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
 #. module: mail
 #: field:mail.compose.message,date:0 field:mail.message,date:0
@@ -273,13 +275,13 @@ msgstr "Дата"
 #. module: mail
 #: view:mail.message:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Расширенные фильтры..."
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "%(sender_name)s wrote:"
-msgstr ""
+msgstr "%(sender_name)s написал:"
 
 #. module: mail
 #: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
@@ -290,7 +292,7 @@ msgstr ""
 #. module: mail
 #: field:mail.message,original:0
 msgid "Original"
-msgstr ""
+msgstr "Оригинал"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:247 view:res.partner:0
@@ -302,13 +304,13 @@ msgstr "История"
 #: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
 #: field:mail.message.common,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "ID сообщения"
 
 #. module: mail
 #: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
 #: view:mail.message:0 field:mail.message,attachment_ids:0
 msgid "Attachments"
-msgstr "Прикрепленные файлы"
+msgstr "Вложения"
 
 #. module: mail
 #: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
@@ -325,7 +327,7 @@ msgstr " на "
 #. module: mail
 #: help:mail.message,auto_delete:0
 msgid "Permanently delete this email after sending it, to save space"
-msgstr ""
+msgstr "Навсегда удалить это письмо после отправки, для экономии места"
 
 #. module: mail
 #: field:mail.compose.message,references:0 field:mail.message,references:0
@@ -341,18 +343,18 @@ msgstr "Вывести текст"
 #. module: mail
 #: view:mail.compose.message:0 view:mail.message:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отмена"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open"
-msgstr ""
+msgstr "Открыть"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:434
 #, python-format
 msgid "[OpenERP-Forward-Failed] %s"
-msgstr ""
+msgstr "[OpenERP-Forward-Failed] %s"
 
 #. module: mail
 #: field:mail.message,user_id:0
@@ -366,11 +368,13 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"Полные заголовки сообщения, т.е. заголовки сессии SMTP (обычно доступные "
+"только во входящих сообщениях)"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Месяц создания"
 
 #. module: mail
 #: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
@@ -387,7 +391,7 @@ msgstr "Подробности"
 #: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
 #: view:mail.thread:0
 msgid "Email Threads"
-msgstr ""
+msgstr "Цепочки эл.писем"
 
 #. module: mail
 #: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
@@ -396,28 +400,30 @@ msgid ""
 "Message sender, taken from user preferences. If empty, this is not a mail "
 "but a message."
 msgstr ""
+"Отправитель сообщения, взятый из параметров пользователя. Если пусто, то это "
+"не почта, а сообщение."
 
 #. module: mail
 #: view:mail.message:0
 msgid "Body (Plain)"
-msgstr ""
+msgstr "Текст (простой)"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "You"
-msgstr ""
+msgstr "Вы"
 
 #. module: mail
 #: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
 #: help:mail.message.common,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "Уникальный идентификатор сообщения"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Body (Rich)"
-msgstr ""
+msgstr "Текст (форматный)"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:155
@@ -427,6 +433,9 @@ msgid ""
 " Subject: %s \n"
 "\t"
 msgstr ""
+"%s написал на %s: \n"
+" Тема: %s \n"
+"\t"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.act_res_partner_emails
@@ -456,53 +465,74 @@ msgstr "Скрытая копия"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message_common
 msgid "mail.message.common"
-msgstr ""
+msgstr "mail.message.common"
 
 #. module: mail
 #: help:mail.compose.message,references:0 help:mail.message,references:0
 #: help:mail.message.common,references:0
 msgid "Message references, such as identifiers of previous messages"
-msgstr ""
+msgstr "Ссылки сообщения, такие как идентификаторы предыдущих сообщений"
 
 #. module: mail
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
 
 #. module: mail
 #: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
 #: help:mail.message.common,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Получатели скрытой копии сообщения"
 
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Delivery Failed"
-msgstr ""
+msgstr "Доставка не удалась"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
 msgid "Email Message"
-msgstr ""
+msgstr "Сообщение эл.почты"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
 msgid "Email Thread"
-msgstr ""
+msgstr "Цепочка эл.почты"
 
 #. module: mail
 #: field:mail.compose.message,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Фильтры"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:220
 #, python-format
 msgid "Mail attachment"
-msgstr ""
+msgstr "Почтовое вложение"
 
 #. module: mail
 #: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
 #: help:mail.message.common,reply_to:0
 msgid "Preferred response address for the message"
-msgstr ""
+msgstr "Предпочтительный адрес ответа для сообщения"
+
+#~ msgid "Message type"
+#~ msgstr "Тип сообщения"
+
+#~ msgid "Text contents"
+#~ msgstr "Текстовое содержимое"
+
+#~ msgid "Related Document model"
+#~ msgstr "Модель связанного документа"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Мастер создания электронной почты"
+
+#~ msgid "Rich-text contents"
+#~ msgstr "Форматное текстовое сообщение"
+
+#~ msgid "Related user"
+#~ msgstr "Связанный пользователь"
+
+#~ msgid "Message headers"
+#~ msgstr "Заголовки сообщения"
diff --git a/addons/web/i18n/hu.po b/addons/web/i18n/hu.po
index 2e6f36cb2cf..cea5493c029 100644
--- a/addons/web/i18n/hu.po
+++ b/addons/web/i18n/hu.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-08-24 09:16+0000\n"
+"PO-Revision-Date: 2012-10-26 12:17+0000\n"
 "Last-Translator: Herczeg Péter <herczegp@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-27 05:15+0000\n"
+"X-Generator: Launchpad (build 16194)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
@@ -755,7 +755,7 @@ msgstr "Választani kell legalább egy rekordot!"
 #. openerp-web
 #: addons/web/static/src/js/views.js:875
 msgid "Uploading..."
-msgstr ""
+msgstr "Feltöltés"
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:885
diff --git a/addons/web_kanban/i18n/ru.po b/addons/web_kanban/i18n/ru.po
index f8e2f6454d6..a30f7c53997 100644
--- a/addons/web_kanban/i18n/ru.po
+++ b/addons/web_kanban/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-17 07:42+0000\n"
-"Last-Translator: Aleksei Motsik <Unknown>\n"
+"PO-Revision-Date: 2012-10-26 09:02+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-27 05:15+0000\n"
+"X-Generator: Launchpad (build 16194)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -35,7 +35,7 @@ msgstr "Вы действительно хотите удалить эту за
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:839
 msgid "Create: "
-msgstr ""
+msgstr "Создать: "
 
 #. openerp-web
 #: addons/web_kanban/static/src/xml/web_kanban.xml:41
@@ -50,17 +50,17 @@ msgstr "осталось)"
 #. openerp-web
 #: addons/web_kanban/static/src/xml/web_kanban.xml:71
 msgid "Add"
-msgstr ""
+msgstr "Добавить"
 
 #. openerp-web
 #: addons/web_kanban/static/src/xml/web_kanban.xml:71
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. openerp-web
 #: addons/web_kanban/static/src/xml/web_kanban.xml:72
 msgid "Cancel"
-msgstr ""
+msgstr "Отмена"
 
 #~ msgid "Create"
 #~ msgstr "Создать"

From 59dec931a2dbfb76279699f9a2488b9470598ccb Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 09:28:29 +0100
Subject: [PATCH 32/44] [IMP] useability of project and contracts

bzr revid: fp@openerp.com-20121028082829-ito7d71piwc4iael
---
 .../account_analytic_analysis_view.xml        | 72 ++++++++++---------
 .../static/src/css/analytic.css               |  6 +-
 .../static/src/css/analytic.sass              |  5 +-
 addons/analytic/analytic_view.xml             |  2 +-
 .../analytic_contract_hr_expense_view.xml     | 25 ++++---
 addons/project/project_view.xml               |  4 +-
 6 files changed, 68 insertions(+), 46 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index b1ef852f12f..7678dc59f75 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -30,18 +30,18 @@
                     <separator name="toinvoice" string="Invoicing"/>
                     <table class="oe_form_analytic_account">
                         <tr>
-                            <th class="oe_grey" width="160px"></th>
-                            <th class="oe_grey" width="25px"></th>
-                            <th class="oe_grey" width="100px"><label string="Expected"/></th>
-                            <th class="oe_grey" width="100px"><label string="Invoiced"/></th>
-                            <th class="oe_grey" width="100px"><label string="Remaining"/></th>
-                            <th class="oe_grey" width="100px"><label string="To Invoice"/></th>
+                            <th class="oe_timesheet_grey" width="160px"></th>
+                            <th class="oe_timesheet_grey" width="25px"></th>
+                            <th class="oe_timesheet_grey" width="100px"><label string="Expected"/></th>
+                            <th class="oe_timesheet_grey" width="100px"><label string="Invoiced"/></th>
+                            <th class="oe_timesheet_grey" width="100px"><label string="Remaining"/></th>
+                            <th class="oe_timesheet_grey" width="100px"><label string="To Invoice"/></th>
                             <th width="30px"></th>
                             <th></th>
                         </tr><tr>
-                            <td class="oe_grey">
+                            <td class="oe_timesheet_grey">
                                 <label for="fix_price_invoices"/>
-                            </td><td class="oe_grey">
+                            </td><td class="oe_timesheet_grey">
                                 <field name="fix_price_invoices" class="oe_inline"/>
                             </td><td>
                                 <field class="oe_inline" name="amount_max" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
@@ -51,23 +51,28 @@
                                 <field class="oe_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
                                 <field class="oe_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td><td>
-                                <button name="open_sale_order_lines"
-                                    class="oe_link oe_e"
-                                    string="/" type="object"
-                                    context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}"
-                                    attrs="{'invisible': [('fix_price_to_invoice','=',0)]}"/>
-                            </td><td>
+                            </td><td attrs="{'invisible': [('fix_price_invoices','=',False)]}" class="oe_timesheet_action">
+                                <span attrs="{'invisible': [('fix_price_to_invoice','=',0.0)]}" class="oe_grey">
+                                    <button name="open_sale_order_lines"
+                                        class="oe_link"
+                                        string="⇒ Invoice" type="object"
+                                        context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}"/>
+                                    or view
+                                </span>
+
+                                <span attrs="{'invisible': [('fix_price_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
+                                    No order to invoice, view
+                                </span>
                                 <button name="%(action_sales_order)d" string="Sale Orders"
                                     type="action"
                                     class="oe_link"
                                     context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}"
-                                    attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                    />
                             </td>
                         </tr><tr>
-                            <td class="oe_grey">
+                            <td class="oe_timesheet_grey">
                                 <label for="invoice_on_timesheets"/>
-                            </td><td class="oe_grey">
+                            </td><td class="oe_timesheet_grey">
                                 <field name="invoice_on_timesheets"/>
                             </td><td>
                                 <field class="oe_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
@@ -77,31 +82,34 @@
                                 <field class="oe_inline" name="remaining_hours_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
                                 <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td>
-                                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d"
-                                    type="action"
-                                    class="oe_link oe_e"
-                                    string="/"
-                                    attrs="{'invisible': [('ca_to_invoice','=',0.0)]}"/>
+                            </td><td class="oe_timesheet_action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
+                                <span attrs="{'invisible': [('ca_to_invoice','=',0.0)]}" class="oe_grey">
+                                    <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d"
+                                        type="action"
+                                        class="oe_link"
+                                        string="⇒ Invoice"/>
+                                    or view 
+                                </span>
+                                <div attrs="{'invisible': [('ca_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
+                                    No hours to invoice, create 
+                                </div>
 
-                            </td><td>
                                 <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d"
                                     string="Timesheets" type="action"
                                     class="oe_link"
-                                    attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"
                                     context="{'default_account_id': active_id,'search_default_account_id': active_id}"/>
                             </td>
                         </tr><tr name='total'>
-                            <th class="oe_grey">
+                            <th class="oe_timesheet_grey">
                                 <label string="Total"/>
-                            </th><td class="oe_grey">
-                            </td><td class="oe_grey">
+                            </th><td class="oe_timesheet_grey">
+                            </td><td class="oe_timesheet_grey">
                                 <field name="est_total" class="oe_inline" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td class="oe_grey">
+                            </td><td class="oe_timesheet_grey">
                                 <field name="invoiced_total" class="oe_inline"/>
-                            </td><td class="oe_grey">
+                            </td><td class="oe_timesheet_grey">
                                 <field name="remaining_total" class="oe_inline"/>
-                            </td><td class="oe_grey">
+                            </td><td class="oe_timesheet_grey">
                                 <field name="toinvoice_total" class="oe_inline"/>
                             </td><td>
                             </td>
diff --git a/addons/account_analytic_analysis/static/src/css/analytic.css b/addons/account_analytic_analysis/static/src/css/analytic.css
index c6513cc6321..f3e4785de9f 100644
--- a/addons/account_analytic_analysis/static/src/css/analytic.css
+++ b/addons/account_analytic_analysis/static/src/css/analytic.css
@@ -9,7 +9,11 @@
   float: right;
   width: auto !important;
 }
-.openerp .oe_form table.oe_form_analytic_account .oe_grey {
+.openerp .oe_form table.oe_form_analytic_account tr td.oe_timesheet_action {
+  width: 250px;
+  padding-left: 7px;
+}
+.openerp .oe_form table.oe_form_analytic_account .oe_timesheet_grey {
   background-color: #eeeeee;
   color: #404040;
 }
diff --git a/addons/account_analytic_analysis/static/src/css/analytic.sass b/addons/account_analytic_analysis/static/src/css/analytic.sass
index 1db81fb61b9..a7065e00f18 100644
--- a/addons/account_analytic_analysis/static/src/css/analytic.sass
+++ b/addons/account_analytic_analysis/static/src/css/analytic.sass
@@ -9,7 +9,10 @@
                 .oe_form_field_float
                     float: right
                     width: auto !important
-        .oe_grey
+            td.oe_timesheet_action
+                width: 250px
+                padding-left: 7px
+        .oe_timesheet_grey
             background-color: #eeeeee
             color: #404040
         
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 0bb009e72b0..4d3296866b4 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -21,7 +21,7 @@
 
                         <group name="main">
                             <group>
-                                <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','=','contract')]}"/>
+                                <field name="partner_id" on_change="on_change_partner_id(partner_id, name)"/>
                                 <field name="manager_id"/>
                                 <field name="code"/>
                                 <field name="currency_id" attrs="{'invisible': ['|',('type', '&lt;&gt;', 'view'), ('company_id', '&lt;&gt;', False)]}"/>
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
index 8d0f470df86..bef0321a7c1 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
@@ -9,9 +9,9 @@
             <field name="arch" type="xml">
                 <xpath expr='//tr[@name="total"]' position='before'>
                     <tr>
-                        <td class="oe_grey">
+                        <td class="oe_timesheet_grey">
                             <label for="charge_expenses"/>
-                        </td><td class="oe_grey">
+                        </td><td class="oe_timesheet_grey">
                             <field name="charge_expenses"/>
                         </td><td>
                             <field class="oe_form_inline" name="est_expenses" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
@@ -21,17 +21,22 @@
                             <field class="oe_form_inline" name="remaining_expense" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
                         </td><td>
                             <field class="oe_form_inline" name="expense_to_invoice" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                        </td><td>
-                            <button
-                                name="hr_to_invoice_expense"
-                                class="oe_link oe_e"
-                                string="/" type="object"
-                                attrs="{'invisible': [('expense_to_invoice','=',0)]}"/>
-                        </td><td>
+                        </td><td attrs="{'invisible': [('charge_expenses','=',False)]}" class="oe_timesheet_action">
+                            <span attrs="{'invisible': [('expense_to_invoice','=',0)]}" class="oe_grey">
+                                <button
+                                    name="hr_to_invoice_expense"
+                                    class="oe_link"
+                                    string="⇒ Invoice" type="object"
+                                    />
+                                of view
+                            </span>
+                            <span attrs="{'invisible': [('expense_to_invoice','&lt;&gt;',0)]}" class="oe_grey">
+                                None to invoice, create 
+                            </span>
                             <button
                                 name="open_hr_expense"
                                 class="oe_link"
-                                string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                                string="Expenses" type="object"/>
                         </td>
                     </tr>
                 </xpath>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 08ea2881d4d..c1d4b1d3d45 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -97,7 +97,9 @@
                         </group>
                         <group>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                            <field name="analytic_account_id" readonly="1" required="0" attrs="{'invisible': [('analytic_account_id','=',False)]}"/>
+                            <p colspan="2" attrs="{'invisible': [('analytic_account_id','=',False)]}">
+                                To invoice or setup invoicing and renewal options, go to the related contract: <field name="analytic_account_id" readonly="1" required="0" class="oe_inline"/>.
+                            </p>
                         </group>
                     </group>
                     <notebook>

From a1b8d8c72c371827fd1d13d298f5669badd7406c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 09:35:08 +0100
Subject: [PATCH 33/44] [IMP] clean project css

bzr revid: fp@openerp.com-20121028083508-dxuik2l81dwoxii8
---
 addons/project/project_view.xml             | 2 +-
 addons/project_issue/project_issue_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c1d4b1d3d45..897a462a3aa 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -239,7 +239,7 @@
 
                                     <h4><field name="name"/></h4>
                                     <div class="oe_kanban_project_list">
-                                        <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action"> <field name="task_count"/> Tasks</a>
+                                        <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action" style="margin-right: 10px"> <field name="task_count"/> Tasks</a>
                                     </div>
                                     <div class="oe_kanban_footer_left">
                                         <span groups="project.group_time_work_estimation_tasks">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 6ff5388ce4a..efb464d9e4c 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -378,7 +378,7 @@
                     <field name="issue_count" invisible="1"/>
                 </field>
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
-                    <a t-if="record.use_issues.raw_value"
+                    <a t-if="record.use_issues.raw_value" style="margin-right: 10px"
                         name="%(act_project_project_2_project_issue_all)d" type="action">
                         <field name="issue_count"/> Issues</a>
                 </xpath>

From 67a66d0ca47ec4a39c80182a192ea4c57ca704a0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 11:33:28 +0100
Subject: [PATCH 34/44] [IMP] Useability: contracts

bzr revid: fp@openerp.com-20121028103328-qjqeznq9a95mcdpe
---
 .../account_analytic_analysis_view.xml        | 22 ++++++---
 addons/analytic/analytic.py                   |  2 +-
 .../analytic_user_function.py                 | 45 ++++++++++---------
 .../analytic_user_function_view.xml           | 41 ++++++++++++-----
 .../hr_timesheet_invoice.py                   |  3 +-
 5 files changed, 71 insertions(+), 42 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 7678dc59f75..e1708cdd018 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -116,13 +116,21 @@
                         </tr>
                     </table>
                     <group name='invoice_on_timesheets' attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
-                        <field name="pricelist_id"
-                            class="oe_inline"
-                            attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
-                        <field name="to_invoice"
-                            class="oe_inline"
-                            widget="selection"
-                            attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                        <p class="oe_grey oe_edit_only" colspan="2">
+                            When invoicing on timesheet, OpenERP uses the
+                            pricelist of the contract which uses the price
+                            defined on the product related to each employee to
+                            define the customer invoice price rate.
+                        </p>
+                        <group>
+                            <field name="pricelist_id"
+                                class="oe_inline"
+                                attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                            <field name="to_invoice"
+                                class="oe_inline"
+                                widget="selection"
+                                attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                        </group>
                     </group>
                  </xpath>
             </field>
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 5ea8c59b848..369dbc829c2 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -156,7 +156,7 @@ class account_analytic_account(osv.osv):
         'debit': fields.function(_debit_credit_bal_qtty, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
         'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
         'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
-        'quantity_max': fields.float('Prepaid Units', help='Sets the higher limit of time to work on the contract.'),
+        'quantity_max': fields.float('Prepaid Units', help='Sets the higher limit of time to work on the contract, based on the timesheet.'),
         'partner_id': fields.many2one('res.partner', 'Customer'),
         'user_id': fields.many2one('res.users', 'Project Manager'),
         'manager_id': fields.many2one('res.users', 'Account Manager'),
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index 9233845f7eb..c3338cd3c84 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -21,39 +21,51 @@
 
 from osv import fields,osv
 from tools.translate import _
+import decimal_precision as dp
 
 class analytic_user_funct_grid(osv.osv):
-
     _name="analytic.user.funct.grid"
-    _description= "Relation table between users and products on a analytic account"
+    _description= "Price per User"
     _columns={
         'user_id': fields.many2one("res.users", "User", required=True,),
-        'product_id': fields.many2one("product.product", "Product", required=True,),
+        'product_id': fields.many2one("product.product", "Service", required=True,),
         'account_id': fields.many2one("account.analytic.account", "Analytic Account", required=True,),
-        }
+        'uom_id': fields.related("product_id", "uom_id", relation="product.uom", string="Unit of Measure", type="many2one", readonly=True),
+        'price': fields.float('Price', digits_compute=dp.get_precision('Product Price'), help="Price per hour for this user.", required=True),
+    }
+    def onchange_user_product_id(self, cr, uid, ids, user_id, product_id, context=None):
+        if not user_id:
+            return {}
+        emp_obj = self.pool.get('hr.employee')
+        emp_id = emp_obj.search(cr, uid, [('user_id', '=', user_id)], context=context)
+        if not emp_id:
+            return {}
 
-analytic_user_funct_grid()
+        value = {}
+        emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
+        if emp.product_id and not product_id:
+            value['product_id'] = emp.product_id.id
+            prod = emp.product_id
+        if product_id:
+            prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        if prod:
+            value['price'] = prod.list_price
+            value['uom_id'] = prod.uom_id.id
+        return {'value': value}
 
 
 class account_analytic_account(osv.osv):
-
     _inherit = "account.analytic.account"
     _columns = {
         'user_product_ids': fields.one2many('analytic.user.funct.grid', 'account_id', 'Users/Products Rel.'),
     }
 
-account_analytic_account()
-
 
 class hr_analytic_timesheet(osv.osv):
-
     _inherit = "hr.analytic.timesheet"
-
-
     # Look in account, if no value for the user => look in parent until there is no more parent to look
     # Take the first found... if nothing found => return False
     def _get_related_user_account_recursiv(self, cr, uid, user_id, account_id):
-
         temp=self.pool.get('analytic.user.funct.grid').search(cr, uid, [('user_id', '=', user_id),('account_id', '=', account_id) ])
         account=self.pool.get('account.analytic.account').browse(cr, uid, account_id)
         if temp:
@@ -64,7 +76,6 @@ class hr_analytic_timesheet(osv.osv):
             else:
                 return False
 
-
     def on_change_account_id(self, cr, uid, ids, account_id, user_id=False, unit_amount=0):
         res = {}
         if not (account_id):
@@ -106,12 +117,6 @@ class hr_analytic_timesheet(osv.osv):
         return res
 
     def on_change_user_id(self, cr, uid, ids, user_id, account_id, unit_amount=0):
-        res = {}
-        if not (user_id):
-            #avoid a useless call to super
-            return res
-
-        #get the old values from super
         res = super(hr_analytic_timesheet, self).on_change_user_id(cr, uid, ids, user_id)
 
         if account_id:
@@ -143,5 +148,3 @@ class hr_analytic_timesheet(osv.osv):
 
 hr_analytic_timesheet()
 
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index 6fa141f480d..490b3026d7f 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -7,9 +7,11 @@
             <field name="name">analytic_user_funct_grid.tree</field>
             <field name="model">analytic.user.funct.grid</field>
             <field name="arch" type="xml">
-                <tree string="User's Product for this Analytic Account" editable="bottom">
-                    <field name="user_id" required="1"/>
-                    <field name="product_id" required="1" />
+                <tree string="Invoicing Data" editable="bottom">
+                    <field name="user_id" on_change="onchange_user_product_id(user_id, product_id)"/>
+                    <field name="product_id" on_change="onchange_user_product_id(user_id, product_id)" domain="[('type','=','service')]"/>
+                    <field name="price"/>
+                    <field name="uom_id"/>
                 </tree>
             </field>
         </record>
@@ -18,9 +20,13 @@
             <field name="name">analytic_user_funct_grid.form</field>
             <field name="model">analytic.user.funct.grid</field>
             <field name="arch" type="xml">
-                <form string="User's Product for this Analytic Account">
-                    <field name="user_id" required="1"/>
-                    <field name="product_id" required="1"/>
+                <form string="Invoicing Data">
+                    <group>
+                        <field name="user_id" on_change="onchange_user_product_id(user_id, product_id)"/>
+                        <field name="product_id" domain="[('type','=','service')]" on_change="onchange_user_product_id(user_id, product_id)"/>
+                        <field name="price"/>
+                        <field name="uom_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -29,13 +35,26 @@
         <record model="ir.ui.view" id="view_account_analytic_account_form_inherit">
             <field name="name">account.analytic.account.form</field>
             <field name="model">account.analytic.account</field>
+            <field eval="60" name="priority"/>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//notebook/page" position="after">
-                    <page string="Users/Products Rel.">
-                        <field name="user_product_ids" colspan="4" nolabel="1"/>
-                    </page>
-                </xpath>
+                <separator name="description" position="before">
+                    <div name="user_function_price" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
+                        <separator string="Invoice Price Rate per User"/>
+                        <p class="oe_grey oe_edit_only">
+                            Define a specific service (e.g. Senior Consultant)
+                            and price for some users to use these data instead
+                            of the default values when invoicing the customer.
+                        </p>
+                        <p class="oe_grey oe_edit_only">
+                            OpenERP will recursively search on parent accounts
+                            to check if specific conditions are defined for a
+                            specific user. This allows to set invoicing
+                            conditions for a group of contracts.
+                        </p>
+                        <field name="user_product_ids"/>
+                    </div>
+                </separator>
             </field>
         </record>
 
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 67fcb100468..88094b4a0e0 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -70,8 +70,7 @@ class account_analytic_account(osv.osv):
         'amount_invoiced': fields.function(_invoiced_calc, string='Invoiced Amount',
             help="Total invoiced"),
         'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Timesheet Invoicing Ratio',
-            help="This field allows you to define the rate in case you plan to reinvoice " \
-            "the costs in this analytic account: timesheets, expenses, ..."),
+            help="You usually invoice 100% of the timesheets. But if you mix fixed price and timesheet invoicing, you may use another ratio. For instance, if you do a 20% advance invoice (fixed price, based on a sale order), you should invoice the rest on timesheet with a 80% ratio."),
     }
     _defaults = {
         'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),

From af4b056f242219127fee061e7a1e007c31d83ca5 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 12:05:06 +0100
Subject: [PATCH 35/44] [IMP] cleaned timesheets and contracts useability

bzr revid: fp@openerp.com-20121028110506-v53w8oh42xzrm9ff
---
 .../account_analytic_analysis_view.xml                      | 2 +-
 addons/analytic/analytic.py                                 | 2 +-
 addons/analytic/analytic_view.xml                           | 6 ++++--
 addons/hr_timesheet/hr_timesheet.py                         | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index e1708cdd018..513eb4c0ee2 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -91,7 +91,7 @@
                                     or view 
                                 </span>
                                 <div attrs="{'invisible': [('ca_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
-                                    No hours to invoice, create 
+                                    Nothing to invoice, create 
                                 </div>
 
                                 <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d"
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 369dbc829c2..f4c77177d0c 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -156,7 +156,7 @@ class account_analytic_account(osv.osv):
         'debit': fields.function(_debit_credit_bal_qtty, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
         'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
         'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
-        'quantity_max': fields.float('Prepaid Units', help='Sets the higher limit of time to work on the contract, based on the timesheet.'),
+        'quantity_max': fields.float('Prepaid Service Units', help='Sets the higher limit of time to work on the contract, based on the timesheet. (for instance, number of hours in a limited support contract.)'),
         'partner_id': fields.many2one('res.partner', 'Customer'),
         'user_id': fields.many2one('res.users', 'Project Manager'),
         'manager_id': fields.many2one('res.users', 'Account Manager'),
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 4d3296866b4..8098279b3ea 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -39,8 +39,10 @@
                                     <p colspan="2" class="oe_grey oe_edit_only">
                                         Once the end date of the contract is
                                         passed or the maximum number of service
-                                        units is reached, the account manager
-                                        is warned by email to renew the contract.
+                                        units (e.g. support contract) is
+                                        reached, the account manager is warned
+                                        by email to renew the contract with the
+                                        customer.
                                     </p>
                                     <field name="date_start"/>
                                     <label for="date" string="End Date"/>
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 3248f31a082..9e5337492d9 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -154,7 +154,7 @@ class hr_analytic_timesheet(osv.osv):
         'date': lambda self, cr, uid, ctx: ctx.get('date', fields.date.context_today(self,cr,uid,context=ctx)),
         'user_id': lambda obj, cr, uid, ctx: ctx.get('user_id', uid),
     }
-    def on_change_account_id(self, cr, uid, ids, account_id):
+    def on_change_account_id(self, cr, uid, ids, account_id, context=None):
         return {'value':{}}
 
     def on_change_date(self, cr, uid, ids, date):

From eff45f038d0398fd72e761eb445258a58d99a188 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 13:17:30 +0100
Subject: [PATCH 36/44] [IMP] invoice on timesheet using user price

bzr revid: fp@openerp.com-20121028121730-1sbhsoyxa220oktn
---
 .../account_analytic_analysis.py              | 42 ++++++-------------
 .../analytic_user_function.py                 | 10 ++++-
 .../wizard/hr_timesheet_invoice_create.py     | 23 ++++++----
 3 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 70beb41ac13..0fffde30719 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -74,36 +74,18 @@ class account_analytic_account(osv.osv):
                 for id in ids:
                     res[id][f] = 0.0
                 res2 = {}
-                if parent_ids:
-                    # Amount uninvoiced hours to invoice at sale price
-                    # Warning
-                    # This computation doesn't take care of pricelist !
-                    # Just consider list_price
-                    cr.execute("""SELECT account_analytic_account.id, \
-                                COALESCE(SUM (product_template.list_price * \
-                                    account_analytic_line.unit_amount * \
-                                    ((100-hr_timesheet_invoice_factor.factor)/100)), 0.0) \
-                                    AS ca_to_invoice \
-                            FROM product_template \
-                            JOIN product_product \
-                                ON product_template.id = product_product.product_tmpl_id \
-                            JOIN account_analytic_line \
-                                ON account_analytic_line.product_id = product_product.id \
-                            JOIN account_analytic_journal \
-                                ON account_analytic_line.journal_id = account_analytic_journal.id \
-                            JOIN account_analytic_account \
-                                ON account_analytic_account.id = account_analytic_line.account_id \
-                            JOIN hr_timesheet_invoice_factor \
-                                ON hr_timesheet_invoice_factor.id = account_analytic_account.to_invoice \
-                            WHERE account_analytic_account.id IN %s \
-                                AND account_analytic_line.invoice_id IS NULL \
-                                AND account_analytic_line.to_invoice IS NOT NULL \
-                                AND account_analytic_journal.type = 'general' \
-                            GROUP BY account_analytic_account.id;""", (parent_ids,))
-                    for account_id, sum in cr.fetchall():
-                        if account_id not in res:
-                            res[account_id] = {}
-                        res[account_id][f] = round(sum, dp)
+                for account in accounts:
+                    cr.execute("SELECT product_id, user_id, to_invoice, sum(unit_amount), product_uom_id, name " \
+                            "FROM account_analytic_line as line " \
+                            "WHERE account_id = %s " \
+                                "AND invoice_id is NULL AND to_invoice IS NOT NULL " \
+                            "GROUP BY product_id, user_id, to_invoice, product_uom_id, name", (account.id,))
+
+                    res[account.id][f] = 0.0
+                    for product_id, user_id, factor_id, qty, uom, line_name in cr.fetchall():
+                        price = self.pool.get('account.analytic.line')._get_invoice_price(cr, uid, account, product_id, user_id, qty, context)
+                        factor = self.pool.get('hr_timesheet_invoice.factor').browse(cr, uid, factor_id, context=context)
+                        res[account.id][f] += price * qty * (100-factor.factor or 0.0) / 100.0
 
                 # sum both result on account_id
                 for id in ids:
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index c3338cd3c84..e5902ca56c2 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -146,5 +146,13 @@ class hr_analytic_timesheet(osv.osv):
                 res ['value']['general_account_id']= a
         return res
 
-hr_analytic_timesheet()
+class account_analytic_line(osv.osv):
+    _inherit = "account.analytic.line"
+    def _get_invoice_price(self, cr, uid, account, product_id, user_id, qty, context = {}):
+        print 'Call'
+        for grid in account.user_product_ids:
+            if grid.user_id.id==user_id:
+                print '***', grid.price
+                return grid.price
+        return super(account_analytic_line, self)._get_invoice_price(cr, uid, account, product_id, user_id, qty, context)
 
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 2e220a9397b..5ec60c1ef52 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -29,6 +29,15 @@ from tools.translate import _
 
 class account_analytic_line(osv.osv):
     _inherit = "account.analytic.line"
+    def _get_invoice_price(self, cr, uid, account, product_id, user_id, qty, context = {}):
+        pro_price_obj = self.pool.get('product.pricelist')
+        if account.pricelist_id:
+            pl = account.pricelist_id.id
+            price = pro_price_obj.price_get(cr,uid,[pl], product_id, qty or 1.0, account.partner_id.id, context=context)[pl]
+        else:
+            price = 0.0
+        return price
+
 
     #
     # data = {
@@ -45,7 +54,6 @@ class account_analytic_line(osv.osv):
         invoice_obj = self.pool.get('account.invoice')
         product_obj = self.pool.get('product.product')
         invoice_factor_obj = self.pool.get('hr_timesheet_invoice.factor')
-        pro_price_obj = self.pool.get('product.pricelist')
         fiscal_pos_obj = self.pool.get('account.fiscal.position')
         product_uom_obj = self.pool.get('product.uom')
         invoice_line_obj = self.pool.get('account.invoice.line')
@@ -99,13 +107,13 @@ class account_analytic_line(osv.osv):
             last_invoice = invoice_obj.create(cr, uid, curr_invoice, context=context2)
             invoices.append(last_invoice)
 
-            cr.execute("SELECT product_id, to_invoice, sum(unit_amount), product_uom_id, name " \
+            cr.execute("SELECT product_id, user_id, to_invoice, sum(unit_amount), product_uom_id, name " \
                     "FROM account_analytic_line as line " \
                     "WHERE account_id = %s " \
                         "AND id IN %s AND to_invoice IS NOT NULL " \
-                    "GROUP BY product_id, to_invoice, product_uom_id, name", (account.id, tuple(ids),))
+                    "GROUP BY product_id, user_id, to_invoice, product_uom_id, name", (account.id, tuple(ids),))
 
-            for product_id, factor_id, qty, uom, line_name in cr.fetchall():
+            for product_id, user_id, factor_id, qty, uom, line_name in cr.fetchall():
                 if data.get('product'):
                      product_id = data['product'][0]
                 product = product_obj.browse(cr, uid, product_id, context=context2)
@@ -118,11 +126,8 @@ class account_analytic_line(osv.osv):
 
                 ctx =  context.copy()
                 ctx.update({'uom':uom})
-                if account.pricelist_id:
-                    pl = account.pricelist_id.id
-                    price = pro_price_obj.price_get(cr,uid,[pl], product_id, qty or 1.0, account.partner_id.id, context=ctx)[pl]
-                else:
-                    price = 0.0
+
+                price = self._get_invoice_price(cr, uid, account, product_id, user_id, qty, ctx)
 
                 general_account = product.product_tmpl_id.property_account_income or product.categ_id.property_account_income_categ
                 if not general_account:

From 06f1c8ddfe1059761a39c7327cac59a179370994 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 13:19:43 +0100
Subject: [PATCH 37/44] [IMP] remove print statement

bzr revid: fp@openerp.com-20121028121943-0ipufxo9omjoalm3
---
 addons/analytic_user_function/analytic_user_function.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index e5902ca56c2..c2a7ae8f05a 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -149,10 +149,8 @@ class hr_analytic_timesheet(osv.osv):
 class account_analytic_line(osv.osv):
     _inherit = "account.analytic.line"
     def _get_invoice_price(self, cr, uid, account, product_id, user_id, qty, context = {}):
-        print 'Call'
         for grid in account.user_product_ids:
             if grid.user_id.id==user_id:
-                print '***', grid.price
                 return grid.price
         return super(account_analytic_line, self)._get_invoice_price(cr, uid, account, product_id, user_id, qty, context)
 

From f721ff1d14e267d04e2d8aa24a95e5b190b9e943 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 13:32:16 +0100
Subject: [PATCH 38/44] [FIX] launch config wizards after changing settings

bzr revid: fp@openerp.com-20121028123216-sj9ds9xa9wtiuzyy
---
 openerp/addons/base/res/res_config.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py
index c24fc11a377..1aa108c14d2 100644
--- a/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@ -361,6 +361,7 @@ class res_config_installer(osv.osv_memory):
             'to install', ['uninstalled'], context=context)
         cr.commit() #TOFIX: after remove this statement, installation wizard is fail
         new_db, self.pool = pooler.restart_pool(cr.dbname, update_module=True)
+
 res_config_installer()
 
 DEPRECATION_MESSAGE = 'You are using an addon using old-style configuration '\
@@ -538,6 +539,10 @@ class res_config_settings(osv.osv_memory):
             ir_module.button_uninstall(cr, uid, to_uninstall_ids, context=context)
             ir_module.button_immediate_install(cr, uid, to_install_ids, context=context)
 
+        config = self.pool.get('res.config').next(cr, uid, [], context=context) or {}
+        if config.get('type') not in ('ir.actions.act_window_close',):
+            return config
+
         # force client-side reload (update user menu and current view)
         return {
             'type': 'ir.actions.client',

From 4f0c5bf19c04442a41d81d1f0045093858967b80 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 16:15:37 +0100
Subject: [PATCH 39/44] [IMP] contract useability and invoicing

bzr revid: fp@openerp.com-20121028151537-98wz6qiosmumbqvg
---
 .../account_analytic_analysis_view.xml        |  4 ++--
 addons/analytic/analytic.py                   |  4 ++--
 addons/hr_timesheet/hr_timesheet.py           |  2 +-
 addons/hr_timesheet/hr_timesheet_view.xml     | 17 ++++++++++++++++
 .../hr_timesheet_invoice_data.xml             |  5 +++++
 .../hr_timesheet_invoice_view.xml             |  4 ++--
 .../hr_timesheet_final_invoice_create.py      |  7 +++++--
 .../wizard/hr_timesheet_invoice_create.py     |  3 ++-
 ...hr_timesheet_invoice_create_final_view.xml | 20 ++++++++++++-------
 addons/sale/sale_view.xml                     | 15 +-------------
 10 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 513eb4c0ee2..2e89f85821d 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -61,7 +61,7 @@
                                 </span>
 
                                 <span attrs="{'invisible': [('fix_price_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
-                                    No order to invoice, view
+                                    No order to invoice, create
                                 </span>
                                 <button name="%(action_sales_order)d" string="Sale Orders"
                                     type="action"
@@ -84,7 +84,7 @@
                                 <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td class="oe_timesheet_action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
                                 <span attrs="{'invisible': [('ca_to_invoice','=',0.0)]}" class="oe_grey">
-                                    <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d"
+                                    <button name="%(hr_timesheet_invoice.action_hr_timesheet_invoice_create_final)d"
                                         type="action"
                                         class="oe_link"
                                         string="⇒ Invoice"/>
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index f4c77177d0c..3cb98d81f43 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -141,11 +141,11 @@ class account_analytic_account(osv.osv):
         'name': fields.char('Account/Contract Name', size=128, required=True),
         'complete_name': fields.function(_complete_name_calc, type='char', string='Full Account Name'),
         'code': fields.char('Reference', size=24, select=True),
-        'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Project')], 'Type of Account', required=True,
+        'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Contract')], 'Type of Account', required=True,
                                  help="If you select the View Type, it means you won\'t allow to create journal entries using that account.\n"\
                                   "The type 'Analytic account' stands for usual accounts that you only want to use in accounting.\n"\
                                   "If you select Contract or Project, it offers you the possibility to manage the validity and the invoicing options for this account.\n"\
-                                  "The special type 'Template of Project' allows you to define a template with default data that you can reuse easily."),
+                                  "The special type 'Template of Contract' allows you to define a template with default data that you can reuse easily."),
         'template_id': fields.many2one('account.analytic.account', 'Template of Contract'),
         'description': fields.text('Description'),
         'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2),
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 9e5337492d9..216541501b1 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -195,7 +195,7 @@ class account_analytic_account(osv.osv):
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
     _columns = {
-        'use_timesheets': fields.boolean('Timesheets', help="Check this field if this project manages timesheets"),
+        'use_timesheets': fields.boolean('Use Timesheets', help="Check this field if this project manages timesheets"),
     }
 
     def on_change_template(self, cr, uid, ids, template_id, context=None):
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 55c4680b6a1..ebdd05ed59c 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -85,6 +85,23 @@
             <field name="src_model">account.analytic.account</field>
             <field name="view_mode">tree,form</field>
             <field name="view_type">form</field>
+            <field name="help" type="html">
+              <p>
+                No activity yet on this contract.
+              </p><p>
+                In OpenERP, contracts and projects are implemented using
+                analytic account. So, you can track costs and revenues to analyse
+                your margins easily.
+              </p><p>
+                Costs will be created automatically when you register supplier
+                invoices, expenses or timesheets.
+              </p><p>
+                Revenues will be created automatically when you create customer
+                invoices. Customer invoices can be created based on sale orders
+                (fixed price invoices), on timesheets (based on the work done) or
+                on expenses (e.g. reinvoicing of travel costs).
+              </p>
+            </field>
         </record>
 
  
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
index 462888e0b39..5c0bc6d702f 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
@@ -16,5 +16,10 @@
             <field name="customer_name">50%</field>
             <field name="factor">50.0</field>
         </record>
+        <record id="timesheet_invoice_factor4" model="hr_timesheet_invoice.factor">
+            <field name="name">80%</field>
+            <field name="customer_name">80%</field>
+            <field name="factor">20.0</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 95fa39a6eda..e58b33634f8 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -9,8 +9,8 @@
             <field name="arch" type="xml">
                 <xpath expr='//separator[@name="description"]' position='before'>
                     <group string="Invoice on Timesheets Options" name="invoice_on_timesheets" col="4">
-                        <field name="pricelist_id" />
-                        <field name="to_invoice" widget="selection"/>
+                        <field name="pricelist_id" groups="product.group_sale_pricelist"/>
+                        <field name="to_invoice"/>
                     </group>
                  </xpath>
                 <xpath expr="//field[@name='use_timesheets']" position="replace">
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
index 4b98f7ec23f..2671cd1ab90 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
@@ -36,14 +36,17 @@ class final_invoice_create(osv.osv_memory):
     _description = 'Create invoice from timesheet final'
     _columns = {
         'date': fields.boolean('Date', help='Display date in the history of works'),
-        'time': fields.boolean('Time spent', help='Display time in the history of works'),
-        'name': fields.boolean('Name of entry', help='Display detail of work in the invoice line.'),
+        'time': fields.boolean('Time Spent', help='Display time in the history of works'),
+        'name': fields.boolean('Log of Activity', help='Display detail of work in the invoice line.'),
         'price': fields.boolean('Cost', help='Display cost of the item you reinvoice'),
         'product': fields.many2one('product.product', 'Product', help='The product that will be used to invoice the remaining amount'),
     }
 
     def do_create(self, cr, uid, ids, context=None):
         data = self.read(cr, uid, ids, [], context=context)[0]
+        # hack for fixing small issue (context should not propagate implicitly between actions)
+        if 'default_type' in context:
+            del context['default_type']
         ids = self.pool.get('account.analytic.line').search(cr, uid, [('invoice_id','=',False),('to_invoice','<>', False), ('account_id', 'in', context['active_ids'])], context=context)
         invs = self.pool.get('account.analytic.line').invoice_cost_create(cr, uid, ids, data, context=context)
         mod_obj = self.pool.get('ir.model.data')
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 5ec60c1ef52..1201cc7d4e5 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -169,7 +169,8 @@ class account_analytic_line(osv.osv):
                         details.append(line['name'])
                     note.append(u' - '.join(map(lambda x: unicode(x) or '',details)))
 
-                curr_line['name'] += "\n".join(map(lambda x: unicode(x) or '',note))
+                if note:
+                    curr_line['name'] += "\n" + ("\n".join(map(lambda x: unicode(x) or '',note)))
                 invoice_line_obj.create(cr, uid, curr_line, context=context)
                 cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id IN %s", (last_invoice, account.id, tuple(ids)))
 
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
index a0a0ceea2ac..d1c95212139 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
@@ -26,13 +26,19 @@
             <field name="model">hr.timesheet.invoice.create.final</field>
             <field name="arch" type="xml">
             <form string="Invoice contract" version="7.0">
-                    <separator string="Do you want to display work details on the invoice?" colspan="4"/>
-                    <field name="date"/>
-                    <field name="time"/>
-                    <field name="name"/>
-                    <field name="price"/>
-                    <separator string="Force to use a special product" colspan="4"/>
-                    <field name="product"/>
+                    <p>Do you want to show details of each activity to your customer?</p>
+                    <group>
+                        <group>
+                            <field name="date"/>
+                            <field name="time"/>
+                        </group><group>
+                            <field name="name"/>
+                            <field name="price"/>
+                        </group>
+                    </group>
+                    <group string="Force to use a special product" groups="base.group_no_one">
+                        <field name="product"/>
+                    </group>
                 <footer>
                     <button name="do_create" string="Create Invoice" type="object" class="oe_highlight"/>
                     or
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index bdc687f6e87..3d1c84659a3 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -306,20 +306,6 @@
                                 </group>
                             </group>
                         </page>
-                        <page string="History">
-                            <separator string="Invoices"/>
-                            <field name="invoice_ids" context="{'form_view_ref':'account.invoice_form'}">
-                                <tree string="Invoices" colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state == 'cancel'">
-                                    <field name="date_invoice"/>
-                                    <field name="number"/>
-                                    <field name="partner_id" string="Customer"/>
-                                    <field name="user_id"/>
-                                    <field name="date_due"/>
-                                    <field name="amount_total"/>
-                                    <field name="state"/>
-                                </tree>
-                            </field>
-                        </page>
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
@@ -360,6 +346,7 @@
                     <filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal" name="my_sale_orders_filter"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
+                    <field name="project_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>

From 75e76aef95c46c394e7e78df9c6421eacb244fbf Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 16:24:19 +0100
Subject: [PATCH 40/44] [IMP] filter timesheets to invoice

bzr revid: fp@openerp.com-20121028152419-sufllvbm16q1nuw5
---
 .../hr_timesheet_invoice_view.xml                  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index e58b33634f8..f4536309d70 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -91,6 +91,20 @@
             </field>
         </record>
 
+        <record id="view_hr_timesheet_line_search_to_invoice" model="ir.ui.view">
+            <field name="name">hr.analytic.timesheet.search.to_invoice</field>
+            <field name="model">hr.analytic.timesheet</field>
+            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='account_id']" position="after">
+                    <separator/>
+                    <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/>
+                    <filter name="invoiced" string="Invoiced" domain="[('invoice_id','!=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/> 
+                </xpath>
+            </field>
+        </record>
+
+
         <record id="view_account_analytic_line_tree_inherit" model="ir.ui.view">
             <field name="name">account.analytic.line.tree.to_invoice</field>
             <field name="model">account.analytic.line</field>

From 892c44f2974a666dafd070d48373ad4fb199ef6d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 16:37:55 +0100
Subject: [PATCH 41/44] [FIX]

bzr revid: fp@openerp.com-20121028153755-thiih4im6dzaxn28
---
 addons/sale_stock/sale_stock_view.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml
index a033e3e6d33..328581bf77c 100644
--- a/addons/sale_stock/sale_stock_view.xml
+++ b/addons/sale_stock/sale_stock_view.xml
@@ -68,18 +68,6 @@
                        <field name="shipped"/>
                        <field name="invoice_exists" invisible="1"/>
                    </field>
-                   <field name="invoice_ids" position="after">
-                       <separator string="Delivery Orders"/>
-                       <field name="picking_ids" context="{'default_type': 'out'}">
-                           <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date &lt; current_date" string="Delivery Orders">
-                               <field name="name"/>
-                               <field name="partner_id" string="Customer"/>
-                               <field name="min_date"/>
-                               <field name="state"/>
-                               <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward" context="{'default_type': 'out'}"/>
-                           </tree>
-                       </field>
-                   </field>
                    <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='type']" position="before">                   
                        <label for="delay"/>
                        <div>

From c645cff9528152d2967f0ed19c8f316a212080a0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 17:45:05 +0100
Subject: [PATCH 42/44] [FIX]

bzr revid: fp@openerp.com-20121028164505-n339qqi3nws4951b
---
 .../account_analytic_analysis_view.xml                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 2e89f85821d..fd32edba0a1 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -90,9 +90,9 @@
                                         string="⇒ Invoice"/>
                                     or view 
                                 </span>
-                                <div attrs="{'invisible': [('ca_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
+                                <span attrs="{'invisible': [('ca_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
                                     Nothing to invoice, create 
-                                </div>
+                                </span>
 
                                 <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d"
                                     string="Timesheets" type="action"

From e5a7eb11bc900fe2f82b80fd49853381d49c9548 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 17:49:09 +0100
Subject: [PATCH 43/44] [fIX] typo

bzr revid: fp@openerp.com-20121028164909-a20voaqf4swbe4r8
---
 .../analytic_contract_hr_expense_view.xml                   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
index bef0321a7c1..5628846a6a0 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
@@ -28,15 +28,15 @@
                                     class="oe_link"
                                     string="⇒ Invoice" type="object"
                                     />
-                                of view
+                                or view
                             </span>
                             <span attrs="{'invisible': [('expense_to_invoice','&lt;&gt;',0)]}" class="oe_grey">
-                                None to invoice, create 
+                                Nothing to invoice, create 
                             </span>
                             <button
                                 name="open_hr_expense"
                                 class="oe_link"
-                                string="Expenses" type="object"/>
+                                string="expenses" type="object"/>
                         </td>
                     </tr>
                 </xpath>

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

bzr revid: launchpad_translations_on_behalf_of_openerp-20121029050021-3df666wg6wqeormq
---
 addons/mail/i18n/hr.po | 147 ++++++++++++++++++++++-------------------
 1 file changed, 78 insertions(+), 69 deletions(-)

diff --git a/addons/mail/i18n/hr.po b/addons/mail/i18n/hr.po
index 36de7acc0b1..4535063726e 100644
--- a/addons/mail/i18n/hr.po
+++ b/addons/mail/i18n/hr.po
@@ -8,45 +8,45 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2011-12-22 17:13+0000\n"
-"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"PO-Revision-Date: 2012-10-28 19:42+0000\n"
+"Last-Translator: Marijan Rajic <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-29 05:00+0000\n"
+"X-Generator: Launchpad (build 16194)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
 #: field:mail.message.common,subtype:0
 msgid "Message Type"
-msgstr ""
+msgstr "Tip poruke"
 
 #. module: mail
 #: help:mail.compose.message,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Trajno obrisati e-poštu nakon slanja"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open Related Document"
-msgstr ""
+msgstr "Otvori povezani dokument"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open Attachments"
-msgstr "Otvori privitke"
+msgstr "Otvori priloge"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Message Details"
-msgstr "Detalji poruke"
+msgstr "Detalji porukue"
 
 #. module: mail
 #: view:mail.thread:0
 msgid "Communication History"
-msgstr ""
+msgstr "Povijest komunikacije"
 
 #. module: mail
 #: view:mail.message:0
@@ -57,73 +57,73 @@ msgstr "Grupiraj po..."
 #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
 #: view:mail.compose.message:0
 msgid "Compose Email"
-msgstr ""
+msgstr "Sastavi e-poštu"
 
 #. module: mail
 #: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
 #: help:mail.message.common,body_text:0
 msgid "Plain-text version of the message"
-msgstr ""
+msgstr "Verzija poruke u običnom tekstu"
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Body"
-msgstr ""
+msgstr "Sadržaj"
 
 #. module: mail
 #: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
 #: help:mail.message.common,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Primatelji poruke"
 
 #. module: mail
 #: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
 #: field:mail.message.common,body_text:0
 msgid "Text Contents"
-msgstr ""
+msgstr "Sadržaj"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Received"
-msgstr ""
+msgstr "Primljeno"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Thread"
-msgstr ""
+msgstr "Nit"
 
 #. module: mail
 #: field:mail.message,mail_server_id:0
 msgid "Outgoing mail server"
-msgstr ""
+msgstr "Izlazni poslužitelj e-pošte"
 
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazano"
 
 #. module: mail
 #: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
 #: field:mail.message.common,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Odgovori na"
 
 #. module: mail
 #: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
 #: help:mail.message.common,body_html:0
 msgid "Rich-text/HTML version of the message"
-msgstr ""
+msgstr "Verzija poruke u Rich-text/HTML formatu"
 
 #. module: mail
 #: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Auto brisanje"
 
 #. module: mail
 #: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
 #: help:mail.message.common,email_bcc:0
 msgid "Blind carbon copy message recipients"
-msgstr ""
+msgstr "Primatelji skrivene kopije poruke"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_partner view:mail.message:0
@@ -134,13 +134,13 @@ msgstr "Partner"
 #: field:mail.compose.message,subject:0 field:mail.message,subject:0
 #: field:mail.message.common,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Naslov"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
 msgid "On %(date)s, "
-msgstr ""
+msgstr "Na %(date)s, "
 
 #. module: mail
 #: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
@@ -151,32 +151,32 @@ msgstr "Od"
 #. module: mail
 #: view:mail.message:0
 msgid "Email message"
-msgstr ""
+msgstr "Poruka e-pošte"
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
-msgstr ""
+msgstr "Pošalji"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Failed"
-msgstr ""
+msgstr "Neuspjelo"
 
 #. module: mail
 #: view:mail.message:0 field:mail.message,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Reply"
-msgstr ""
+msgstr "Odgovor"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Sent"
-msgstr ""
+msgstr "Poslano"
 
 #. module: mail
 #: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
@@ -185,39 +185,41 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Tip poruke, obično 'html' ili 'običan tekst', koristi se za odabir običnog "
+"ili bogatije formatiranog teksta"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Recipients"
-msgstr ""
+msgstr "Primatelji"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Čarobnjak za sastavljanje e-pošte"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
 #: field:mail.message.common,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "Povezani ID dokumenta"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Advanced"
-msgstr ""
+msgstr "Napredno"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
 msgid "Re:"
-msgstr ""
+msgstr "Re:"
 
 #. module: mail
 #: field:mail.compose.message,model:0 field:mail.message,model:0
 #: field:mail.message.common,model:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Povezani model dokumenta"
 
 #. module: mail
 #: view:mail.message:0
@@ -227,42 +229,42 @@ msgstr "Mjesec"
 #. module: mail
 #: view:mail.message:0
 msgid "Email Search"
-msgstr "Pretraživanje e-mailova"
+msgstr "Pretraga e-pošte"
 
 #. module: mail
 #: help:mail.message,original:0
 msgid "Original version of the message, as it was sent on the network"
-msgstr ""
+msgstr "Originalna varijanta poruke, kakva je poslana na mrežu"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Partner Name"
-msgstr "Naziv partnera"
+msgstr "Ime partnera"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Retry"
-msgstr ""
+msgstr "Pokušaj ponovo"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Odlazno"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Send Now"
-msgstr ""
+msgstr "Pošalji odmah"
 
 #. module: mail
 #: field:mail.message,partner_id:0
 msgid "Related partner"
-msgstr ""
+msgstr "Povezani partner"
 
 #. module: mail
 #: view:mail.message:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: mail
 #: field:mail.compose.message,date:0 field:mail.message,date:0
@@ -273,19 +275,19 @@ msgstr "Datum"
 #. module: mail
 #: view:mail.message:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Prošireni filteri..."
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "%(sender_name)s wrote:"
-msgstr ""
+msgstr "%(sender_name)s je napisao:"
 
 #. module: mail
 #: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
 #: field:mail.message.common,body_html:0
 msgid "Rich-text Contents"
-msgstr ""
+msgstr "Formatirani tekst"
 
 #. module: mail
 #: field:mail.message,original:0
@@ -346,18 +348,18 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0
 msgid "Open"
-msgstr ""
+msgstr "Otvori"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:434
 #, python-format
 msgid "[OpenERP-Forward-Failed] %s"
-msgstr ""
+msgstr "[OpenERP-Forward-Failed] %s"
 
 #. module: mail
 #: field:mail.message,user_id:0
 msgid "Related User"
-msgstr ""
+msgstr "Povezani korisnik"
 
 #. module: mail
 #: help:mail.compose.message,headers:0 help:mail.message,headers:0
@@ -366,11 +368,13 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"Cjelovito zaglavlje poruke, npr. zaglavlje SMTP sesije (obično dostupno samo "
+"kod dolaznih poruka)"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Mjesec kreiranja"
 
 #. module: mail
 #: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
@@ -387,7 +391,7 @@ msgstr "Detalji"
 #: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
 #: view:mail.thread:0
 msgid "Email Threads"
-msgstr ""
+msgstr "Niti e-pošte"
 
 #. module: mail
 #: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
@@ -396,28 +400,30 @@ msgid ""
 "Message sender, taken from user preferences. If empty, this is not a mail "
 "but a message."
 msgstr ""
+"Pošiljatelj poruke, preuzet iz korisničkih preferenci. Ukoliko je prazno, "
+"biti će poruka a ne e-pošta."
 
 #. module: mail
 #: view:mail.message:0
 msgid "Body (Plain)"
-msgstr ""
+msgstr "Tijelo (obično)"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "You"
-msgstr ""
+msgstr "Vi"
 
 #. module: mail
 #: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
 #: help:mail.message.common,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "Jedinstveni identifikator poruke"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Body (Rich)"
-msgstr ""
+msgstr "Tijelo (formatirano)"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:155
@@ -427,6 +433,9 @@ msgid ""
 " Subject: %s \n"
 "\t"
 msgstr ""
+"%s napisano %s: \n"
+" Predmet: %s \n"
+"\t"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.act_res_partner_emails
@@ -445,64 +454,64 @@ msgstr "Poruke"
 #: field:mail.compose.message,headers:0 field:mail.message,headers:0
 #: field:mail.message.common,headers:0
 msgid "Message Headers"
-msgstr ""
+msgstr "Zaglavlja poruke"
 
 #. module: mail
 #: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
 #: field:mail.message.common,email_bcc:0
 msgid "Bcc"
-msgstr "Bcc"
+msgstr "Skrivena kopija"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message_common
 msgid "mail.message.common"
-msgstr ""
+msgstr "mail.message.common"
 
 #. module: mail
 #: help:mail.compose.message,references:0 help:mail.message,references:0
 #: help:mail.message.common,references:0
 msgid "Message references, such as identifiers of previous messages"
-msgstr ""
+msgstr "Reference poruke, poput identifikatora prethodnih poruka"
 
 #. module: mail
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Greška! Nije moguće kreirati pridružene članove rekurzivno."
 
 #. module: mail
 #: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
 #: help:mail.message.common,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Primatelji skrivene kopije"
 
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Delivery Failed"
-msgstr ""
+msgstr "Isporuka nije uspjela"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
 msgid "Email Message"
-msgstr ""
+msgstr "Poruka e-pošte"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
 msgid "Email Thread"
-msgstr ""
+msgstr "Nit e-pošte"
 
 #. module: mail
 #: field:mail.compose.message,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Filteri"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:220
 #, python-format
 msgid "Mail attachment"
-msgstr ""
+msgstr "Prilog e-pošte"
 
 #. module: mail
 #: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
 #: help:mail.message.common,reply_to:0
 msgid "Preferred response address for the message"
-msgstr ""
+msgstr "Željena povratna adresa za poruku"