From 9e56b3b6a8a761e02099146b338225d29dbc8c8a Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Mon, 5 Nov 2012 09:41:52 +0100
Subject: [PATCH 01/18] [ADD]QuickAdd Move Line View

bzr revid: dle@openerp.com-20121105084152-35bvurqkvuv4k0ow
---
 addons/account/__openerp__.py                 |  2 +
 addons/account/account_move_line.py           |  8 +++
 addons/account/account_view.xml               | 40 ++++++++++++
 .../src/js/account_move_reconciliation.js     | 61 +++++++++++++++++++
 4 files changed, 111 insertions(+)

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index c538614fd0f..39feb2cd546 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -128,9 +128,11 @@ for a particular financial year and for preparation of vouchers there is a modul
     ],
     'js': [
         'static/src/js/account_move_reconciliation.js',
+        
     ],
     'qweb' : [
         "static/src/xml/account_move_reconciliation.xml",
+        "static/src/xml/account_move_line_quickadd.xml",
     ],
     'css':['static/src/css/account_move_reconciliation.css'
     ],
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 67a55d8f451..373f8e89c29 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1383,6 +1383,14 @@ class account_move_line(osv.osv):
                 move_obj.button_validate(cr,uid, [vals['move_id']], context)
         return result
 
+    def list_periods(self, cr, uid, context=None):
+        ids = self.pool.get('account.period').search(cr,uid,[])
+        return self.pool.get('account.period').name_get(cr, uid, ids, context=context)
+
+    def list_journals(self, cr, uid, context=None):
+        ids = self.pool.get('account.journal').search(cr,uid,[])
+        return self.pool.get('account.journal').name_get(cr, uid, ids, context=context)
+
 account_move_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 63d7e891437..a639228aeea 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1055,6 +1055,30 @@
             </field>
         </record>
 
+         <record id="view_move_line_quickadd_tree" model="ir.ui.view">
+            <field name="model">account.move.line</field>
+            <field eval="24" name="priority"/>
+            <field name="arch" type="xml">
+                <tree_account_move_line_quickadd colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="false" version="7.0">
+                    <field name="date"/>
+                    <field name="move_id"/>
+                    <field name="ref"/>
+                    <field name="invoice"/>
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="account_id"/>
+                    <field name="reconcile_partial_id"/>
+                    <field name="debit" sum="Total debit"/>
+                    <field name="credit" sum="Total credit"/>
+                    <field name="account_tax_id"/>
+                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
+                    <field name="state" invisible="1"/>
+                    <field name="amount_currency" attrs="{'readonly':[('state','=','valid')]}"/>
+                    <field name="currency_id" attrs="{'readonly':[('state','=','valid')]}" groups="base.group_multi_currency"/>
+                </tree_account_move_line_quickadd>
+            </field>
+        </record>
+
          <record id="view_move_line_tree" model="ir.ui.view">
             <field name="name">account.move.line.tree</field>
             <field name="model">account.move.line</field>
@@ -1549,6 +1573,22 @@
                 </p>
             </field>
         </record>
+
+        <record id="action_account_manual_account_move_line_quickadd" model="ir.actions.act_window">
+            <field name="context">{'search_default_unreconciled': 1,'view_mode':True}</field>
+            <field name="name">Quick Journal Items</field>
+            <field name="res_model">account.move.line</field>
+            <field name="view_id" ref="view_move_line_quickadd_tree"/>
+            <field name="view_mode">tree_account_move_line_quickadd</field>
+        </record>
+
+        <menuitem
+             name="Quick Journal Items"
+             action="action_account_manual_account_move_line_quickadd"
+             id="menu_manual_account_move_line_quickadd"
+             sequence="20"
+             parent="account.menu_finance_bank_and_cash"/>
+
         <menuitem
              name="Journal Items to Reconcile"
              action="action_account_manual_reconcile"
diff --git a/addons/account/static/src/js/account_move_reconciliation.js b/addons/account/static/src/js/account_move_reconciliation.js
index 8e72e24eb22..c0d97fc554b 100644
--- a/addons/account/static/src/js/account_move_reconciliation.js
+++ b/addons/account/static/src/js/account_move_reconciliation.js
@@ -126,4 +126,65 @@ openerp.account = function (instance) {
         },
     });
     
+    instance.web.views.add('tree_account_move_line_quickadd', 'instance.web.account.QuickAddListView');
+    instance.web.account.QuickAddListView = instance.web.ListView.extend({
+        init: function() {
+            this._super.apply(this, arguments);
+            var self = this;
+            this.current_journal = null;
+            this.current_period = null;
+        },
+        load_list: function() {
+            var self = this;
+            var tmp = this._super.apply(this, arguments);
+            if (this.journals) {
+                this.$el.prepend(QWeb.render("AccountMoveLineQuickAdd", {widget: this}));
+            }
+            return tmp;
+        },
+        do_search: function(domain, context, group_by) {
+            var self = this;
+            this.last_domain = domain;
+            this.last_context = context;
+            this.last_group_by = group_by;
+            this.old_search = _.bind(this._super, this);
+            var mod = new instance.web.Model("account.move.line", context, domain);
+            return mod.call("list_journals", []).pipe(function(result) {
+                var current = self.current_journal !== null ? self.journals[self.current_journal][0] : null;
+                self.journals = result;
+                var index = _.find(_.range(self.journals.length), function(el) {
+                    if (current === self.journals[el][0])
+                        return true;
+                });
+                if (index !== undefined)
+                    self.current_journal = index;
+                else
+                    self.current_journal = self.journals.length == 0 ? null : 0;
+                self.search_by_journal();
+            });
+        },
+        search_by_journal: function() {
+            var self = this;
+            var fct = function() {
+                return self.old_search(new instance.web.CompoundDomain(self.last_domain, 
+                    [["journal_id", "in", self.current_journal === null ? [] :
+                    [self.journals[self.current_journal][0]] ]]), self.last_context, self.last_group_by);
+            };
+            return fct();
+        },
+        search_by_period: function() {
+            var self = this;
+            var fct = function() {
+                return self.old_search(new instance.web.CompoundDomain(self.last_domain, 
+                    [["period_id", "in", self.current_period === null ? [] :
+                    [self.periods[self.current_period][0]] ]]), self.last_context, self.last_group_by);
+            };
+            return fct();
+        },
+        do_select: function (ids, records) {
+            this.trigger('record_selected')
+            this._super.apply(this, arguments);
+        },
+    });
+
 };

From a6d97dccbd83a472aab48c148dacba5cc3f2bafd Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Fri, 9 Nov 2012 13:34:23 +0100
Subject: [PATCH 02/18] [ADD]Changes of context

bzr revid: dle@openerp.com-20121109123423-3tkugord76afa2r9
---
 addons/account/__openerp__.py                 |  1 +
 addons/account/account_view.xml               |  4 +-
 .../src/js/account_move_reconciliation.js     | 65 -------------------
 3 files changed, 3 insertions(+), 67 deletions(-)

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 39feb2cd546..2641367edb3 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -128,6 +128,7 @@ for a particular financial year and for preparation of vouchers there is a modul
     ],
     'js': [
         'static/src/js/account_move_reconciliation.js',
+        'static/src/js/account_move_line_quickadd.js',
         
     ],
     'qweb' : [
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 6dbab2cd5e9..73980aecbd9 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1059,9 +1059,9 @@
             <field name="model">account.move.line</field>
             <field eval="24" name="priority"/>
             <field name="arch" type="xml">
-                <tree_account_move_line_quickadd colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="false" version="7.0" editable="bottom">
+                <tree_account_move_line_quickadd colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="true" on_write="on_create_write" version="7.0" editable="bottom">
                     <field name="date"/>
-                    <field name="move_id"/>
+                    <field name="move_id" required="0"/>
                     <field name="ref"/>
                     <field name="invoice"/>
                     <field name="name"/>
diff --git a/addons/account/static/src/js/account_move_reconciliation.js b/addons/account/static/src/js/account_move_reconciliation.js
index d1ad07b8a5f..eed56632808 100644
--- a/addons/account/static/src/js/account_move_reconciliation.js
+++ b/addons/account/static/src/js/account_move_reconciliation.js
@@ -125,69 +125,4 @@ openerp.account = function (instance) {
             this._super.apply(this, arguments);
         },
     });
-    
-    instance.web.views.add('tree_account_move_line_quickadd', 'instance.web.account.QuickAddListView');
-    instance.web.account.QuickAddListView = instance.web.ListView.extend({
-        init: function() {
-            var self = this;
-            this._super.apply(this, arguments);
-            this.journals = [];
-            this.periods = [];
-            this.current_journal = null;
-            this.current_period = null;
-        },
-        load_list: function() {
-            var self = this;
-            var tmp = this._super.apply(this, arguments);
-
-            this.$el.prepend(QWeb.render("AccountMoveLineQuickAdd", {widget: this}));
-            
-            this.$("#oe_account_select_journal").change(function() {
-                    self.current_journal = parseInt(this.value);
-                    self.do_search(self.last_domain, self.last_context, self.last_group_by);
-                });
-            this.$("#oe_account_select_period").change(function() {
-                    self.current_period = parseInt(this.value);
-                    self.do_search(self.last_domain, self.last_context, self.last_group_by);
-                });
-            
-            return tmp;
-        },
-        do_search: function(domain, context, group_by) {
-            var self = this;
-            this.last_domain = domain;
-            this.last_context = context;
-            this.last_group_by = group_by;
-            this.old_search = _.bind(this._super, this);
-            var mod = new instance.web.Model("account.move.line", context, domain);
-            var getarray = [];
-            getarray.push(mod.call("list_journals", []).pipe(function(result) {
-                self.journals = result;
-            }));
-            getarray.push(mod.call("list_periods", []).pipe(function(result) {
-                self.periods = result;
-            }));
-            $.when.apply($, getarray).done(function () {
-                self.search_by_journal_period();
-            });
-        },
-        search_by_journal_period: function() {
-            var self = this;
-            var fct = function() {
-                compoundDomain = new instance.web.CompoundDomain(self.last_domain, 
-                    [
-                    ["journal_id", "=", self.current_journal === null ? self.journals[0][0] : self.current_journal], 
-                    ["period_id", "=", self.current_period === null ? self.journals[0][0] :self.current_period] 
-                    ]);
-                return self.old_search(compoundDomain, self.last_context, self.last_group_by);
-            };
-            return fct();
-        },
-        
-        do_select: function (ids, records) {
-            this.trigger('record_selected')
-            this._super.apply(this, arguments);
-        },
-    });
-
 };

From 3f034c27a43ef6cd2560dcf2790494bda99e58d4 Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Fri, 9 Nov 2012 13:38:08 +0100
Subject: [PATCH 03/18] [ADD]Missing files

bzr revid: dle@openerp.com-20121109123808-9a6n4mn5dh6vidkb
---
 .../src/js/account_move_line_quickadd.js      | 81 +++++++++++++++++++
 .../src/xml/account_move_line_quickadd.xml    | 34 ++++++++
 2 files changed, 115 insertions(+)
 create mode 100644 addons/account/static/src/js/account_move_line_quickadd.js
 create mode 100644 addons/account/static/src/xml/account_move_line_quickadd.xml

diff --git a/addons/account/static/src/js/account_move_line_quickadd.js b/addons/account/static/src/js/account_move_line_quickadd.js
new file mode 100644
index 00000000000..91a725fce82
--- /dev/null
+++ b/addons/account/static/src/js/account_move_line_quickadd.js
@@ -0,0 +1,81 @@
+openerp.account = function (instance) {
+    var _t = instance.web._t,
+        _lt = instance.web._lt;
+    var QWeb = instance.web.qweb;
+    
+    instance.web.account = {};
+    
+    instance.web.views.add('tree_account_move_line_quickadd', 'instance.web.account.QuickAddListView');
+    instance.web.account.QuickAddListView = instance.web.ListView.extend({
+        _template: 'ListView',
+
+        init: function() {
+            var self = this;
+            this._super.apply(this, arguments);
+            this.journals = [];
+            this.periods = [];
+            this.current_journal = null;
+            this.current_period = null;
+        },
+        load_list: function() {
+            var self = this;
+            var tmp = this._super.apply(this, arguments);
+
+            this.$el.prepend(QWeb.render("AccountMoveLineQuickAdd", {widget: this}));
+            
+            this.$("#oe_account_select_journal").change(function() {
+                    self.current_journal = parseInt(this.value);
+                    self.do_search(self.last_domain, self.last_context, self.last_group_by);
+                });
+            this.$("#oe_account_select_period").change(function() {
+                    self.current_period = parseInt(this.value);
+                    self.do_search(self.last_domain, self.last_context, self.last_group_by);
+                });
+            return tmp;
+        },
+        do_search: function(domain, context, group_by) {
+            var self = this;
+            this.last_domain = domain;
+            this.last_context = context;
+            this.last_group_by = group_by;
+            this.old_search = _.bind(this._super, this);
+            var mod = new instance.web.Model("account.move.line", context, domain);
+            var getarray = [];
+            getarray.push(mod.call("list_journals", []).then(function(result) {
+                self.journals = result;
+            }));
+            getarray.push(mod.call("list_periods", []).then(function(result) {
+                self.periods = result;
+            }));
+            $.when.apply($, getarray).done(function () {
+                self.current_journal = self.current_journal === null ? self.journals[0][0] : self.current_journal;
+                self.current_period = self.current_period === null ? self.periods[0][0] :self.current_period;
+                var tmp = self.search_by_journal_period();
+            });
+        },
+        search_by_journal_period: function() {
+            var self = this;
+            
+            compoundDomain = new instance.web.CompoundDomain(self.last_domain, 
+                [
+                ["journal_id", "=", self.current_journal], 
+                ["period_id", "=", self.current_period] 
+                ]);
+            self.last_context["journal_id"] = self.current_journal;
+            self.last_context["period_id"] = self.current_period;
+            return self.old_search(compoundDomain, self.last_context, self.last_group_by);
+        },
+        _next: function (next_record, options) {
+            next_record = next_record || 'succ';
+            var self = this;
+            return this.save_edition().then(function (saveInfo) {
+                if (saveInfo.created || self.records.at(self.records.length-1).get("id") === saveInfo.record.get("id")) {
+                    return self.start_edition();
+                }
+                var record = self.records[next_record](
+                        saveInfo.record, {wraparound: true});
+                return self.start_edition(record, options);
+            });
+        },
+    });
+};
diff --git a/addons/account/static/src/xml/account_move_line_quickadd.xml b/addons/account/static/src/xml/account_move_line_quickadd.xml
new file mode 100644
index 00000000000..e43c3b4e76a
--- /dev/null
+++ b/addons/account/static/src/xml/account_move_line_quickadd.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<templates id="template" xml:space="preserve">
+    
+    <t t-name="AccountMoveLineQuickAdd">
+        <div class="oe_account_quickadd">
+            <div>
+                Journal : 
+                <select id="oe_account_select_journal">
+                    <t t-foreach="widget.journals" t-as="journal">
+                        <option t-if=" journal[0] === widget.current_journal" t-att-value="journal[0]" t-att-selected="'selected'">
+                            <t t-esc="journal[1]"/>
+                        </option>
+                        <option t-if="journal[0] !== widget.current_journal" t-att-value="journal[0]">
+                            <t t-esc="journal[1]"/>
+                        </option>
+                    </t>
+                </select>
+                Period : 
+                <select id="oe_account_select_period">
+                    <t t-foreach="widget.periods" t-as="period">
+                        <option t-if=" period[0] === widget.current_period" t-att-value="period[0]" t-att-selected="'selected'">
+                            <t t-esc="period[1]"/>
+                        </option>
+                        <option t-if=" period[0] !== widget.current_period" t-att-value="period[0]">
+                            <t t-esc="period[1]"/>
+                        </option>
+                    </t>
+                </select>
+            </div>
+        </div>
+    </t>
+
+</templates>

From 4c7f0a9e060d2c14e3d448472163b4412941dc50 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 9 Nov 2012 13:56:18 +0100
Subject: [PATCH 04/18] Small corrections

bzr revid: nicolas.vanhoren@openerp.com-20121109125618-kdj4w7dv88dmepi1
---
 .../static/src/js/account_move_line_quickadd.js      | 12 +++++-------
 .../static/src/xml/account_move_line_quickadd.xml    |  4 ++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/account/static/src/js/account_move_line_quickadd.js b/addons/account/static/src/js/account_move_line_quickadd.js
index 91a725fce82..cee3142d436 100644
--- a/addons/account/static/src/js/account_move_line_quickadd.js
+++ b/addons/account/static/src/js/account_move_line_quickadd.js
@@ -40,17 +40,15 @@ openerp.account = function (instance) {
             this.last_group_by = group_by;
             this.old_search = _.bind(this._super, this);
             var mod = new instance.web.Model("account.move.line", context, domain);
-            var getarray = [];
-            getarray.push(mod.call("list_journals", []).then(function(result) {
+            return new instance.web.Model("account.move.line", context, domain);
+            $.when(mod.call("list_journals", []).then(function(result) {
                 self.journals = result;
-            }));
-            getarray.push(mod.call("list_periods", []).then(function(result) {
+            }),mod.call("list_periods", []).then(function(result) {
                 self.periods = result;
-            }));
-            $.when.apply($, getarray).done(function () {
+            })).then(function () {
                 self.current_journal = self.current_journal === null ? self.journals[0][0] : self.current_journal;
                 self.current_period = self.current_period === null ? self.periods[0][0] :self.current_period;
-                var tmp = self.search_by_journal_period();
+                return self.search_by_journal_period();
             });
         },
         search_by_journal_period: function() {
diff --git a/addons/account/static/src/xml/account_move_line_quickadd.xml b/addons/account/static/src/xml/account_move_line_quickadd.xml
index e43c3b4e76a..8023ff42210 100644
--- a/addons/account/static/src/xml/account_move_line_quickadd.xml
+++ b/addons/account/static/src/xml/account_move_line_quickadd.xml
@@ -8,7 +8,7 @@
                 Journal : 
                 <select id="oe_account_select_journal">
                     <t t-foreach="widget.journals" t-as="journal">
-                        <option t-if=" journal[0] === widget.current_journal" t-att-value="journal[0]" t-att-selected="'selected'">
+                        <option t-if=" journal[0] === widget.current_journal" t-att-value="journal[0]" selected="selected">
                             <t t-esc="journal[1]"/>
                         </option>
                         <option t-if="journal[0] !== widget.current_journal" t-att-value="journal[0]">
@@ -19,7 +19,7 @@
                 Period : 
                 <select id="oe_account_select_period">
                     <t t-foreach="widget.periods" t-as="period">
-                        <option t-if=" period[0] === widget.current_period" t-att-value="period[0]" t-att-selected="'selected'">
+                        <option t-if=" period[0] === widget.current_period" t-att-value="period[0]" selected="selected">
                             <t t-esc="period[1]"/>
                         </option>
                         <option t-if=" period[0] !== widget.current_period" t-att-value="period[0]">

From 1df1395e64a4bbb4e34d4a3ae0cbc84cf8aa20e4 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 9 Nov 2012 14:00:18 +0100
Subject: [PATCH 05/18] Changed context.

bzr revid: nicolas.vanhoren@openerp.com-20121109130018-9jvd3zrqbfvowfso
---
 .../static/src/js/account_move_line_quickadd.js      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/account/static/src/js/account_move_line_quickadd.js b/addons/account/static/src/js/account_move_line_quickadd.js
index cee3142d436..70cb5fb8629 100644
--- a/addons/account/static/src/js/account_move_line_quickadd.js
+++ b/addons/account/static/src/js/account_move_line_quickadd.js
@@ -3,7 +3,7 @@ openerp.account = function (instance) {
         _lt = instance.web._lt;
     var QWeb = instance.web.qweb;
     
-    instance.web.account = {};
+    instance.web.account = instance.web.account || {};
     
     instance.web.views.add('tree_account_move_line_quickadd', 'instance.web.account.QuickAddListView');
     instance.web.account.QuickAddListView = instance.web.ListView.extend({
@@ -54,14 +54,16 @@ openerp.account = function (instance) {
         search_by_journal_period: function() {
             var self = this;
             
-            compoundDomain = new instance.web.CompoundDomain(self.last_domain, 
+            var compoundDomain = new instance.web.CompoundDomain(self.last_domain, 
                 [
                 ["journal_id", "=", self.current_journal], 
                 ["period_id", "=", self.current_period] 
                 ]);
-            self.last_context["journal_id"] = self.current_journal;
-            self.last_context["period_id"] = self.current_period;
-            return self.old_search(compoundDomain, self.last_context, self.last_group_by);
+            var cc = new instance.web.CompoundContext(this.last_context, {
+                "journal_id": self.current_journal,
+                "period_id" :self.current_period,
+            });
+            return self.old_search(compoundDomain, cc, self.last_group_by);
         },
         _next: function (next_record, options) {
             next_record = next_record || 'succ';

From a3e379881adae04914ffb6820f1bdd29ac381aa1 Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Mon, 12 Nov 2012 10:36:09 +0100
Subject: [PATCH 06/18] [FIX]Review checks bugs

bzr revid: dle@openerp.com-20121112093609-a8xy1yi364r5w9tn
---
 addons/account/account_view.xml               |  2 +-
 .../src/js/account_move_line_quickadd.js      | 34 ++++++++++++++-----
 .../src/js/account_move_reconciliation.js     | 14 ++++----
 .../src/xml/account_move_line_quickadd.xml    |  6 ++--
 4 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 73980aecbd9..354614e3598 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1059,7 +1059,7 @@
             <field name="model">account.move.line</field>
             <field eval="24" name="priority"/>
             <field name="arch" type="xml">
-                <tree_account_move_line_quickadd colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="true" on_write="on_create_write" version="7.0" editable="bottom">
+                <tree_account_move_line_quickadd colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="true" on_write="on_create_write" version="7.0" editable="top">
                     <field name="date"/>
                     <field name="move_id" required="0"/>
                     <field name="ref"/>
diff --git a/addons/account/static/src/js/account_move_line_quickadd.js b/addons/account/static/src/js/account_move_line_quickadd.js
index 70cb5fb8629..c12a2d856b0 100644
--- a/addons/account/static/src/js/account_move_line_quickadd.js
+++ b/addons/account/static/src/js/account_move_line_quickadd.js
@@ -1,4 +1,5 @@
-openerp.account = function (instance) {
+
+openerp.account.quickadd = function (instance) {
     var _t = instance.web._t,
         _lt = instance.web._lt;
     var QWeb = instance.web.qweb;
@@ -23,11 +24,11 @@ openerp.account = function (instance) {
 
             this.$el.prepend(QWeb.render("AccountMoveLineQuickAdd", {widget: this}));
             
-            this.$("#oe_account_select_journal").change(function() {
+            this.$(".oe_account_select_journal").change(function() {
                     self.current_journal = parseInt(this.value);
                     self.do_search(self.last_domain, self.last_context, self.last_group_by);
                 });
-            this.$("#oe_account_select_period").change(function() {
+            this.$(".oe_account_select_period").change(function() {
                     self.current_period = parseInt(this.value);
                     self.do_search(self.last_domain, self.last_context, self.last_group_by);
                 });
@@ -40,8 +41,7 @@ openerp.account = function (instance) {
             this.last_group_by = group_by;
             this.old_search = _.bind(this._super, this);
             var mod = new instance.web.Model("account.move.line", context, domain);
-            return new instance.web.Model("account.move.line", context, domain);
-            $.when(mod.call("list_journals", []).then(function(result) {
+            return $.when(mod.call("list_journals", []).then(function(result) {
                 self.journals = result;
             }),mod.call("list_periods", []).then(function(result) {
                 self.periods = result;
@@ -59,13 +59,29 @@ openerp.account = function (instance) {
                 ["journal_id", "=", self.current_journal], 
                 ["period_id", "=", self.current_period] 
                 ]);
-            var cc = new instance.web.CompoundContext(this.last_context, {
+            //1
+            /*var ncontext = {
+                "journal_id": self.current_journal,
+                "period_id" :self.current_period,
+            };
+            var new instance.web.CompoundDomain(self.last_domain = new instance.web.CompoundContext(this.last_context, ncontext);
+
+            _.extend(this.dataset.context, ncontext);
+            */
+            //2
+            /*
+            var compoundContext = new instance.web.CompoundContext(self.last_context,{
                 "journal_id": self.current_journal,
                 "period_id" :self.current_period,
             });
-            return self.old_search(compoundDomain, cc, self.last_group_by);
+            */
+            //3
+            self.last_context["journal_id"] = self.current_journal;
+            self.last_context["period_id"] = self.current_period;
+            var compoundContext = self.last_context;
+            return self.old_search(compoundDomain, compoundContext, self.last_group_by);
         },
-        _next: function (next_record, options) {
+        /*_next: function (next_record, options) {
             next_record = next_record || 'succ';
             var self = this;
             return this.save_edition().then(function (saveInfo) {
@@ -76,6 +92,6 @@ openerp.account = function (instance) {
                         saveInfo.record, {wraparound: true});
                 return self.start_edition(record, options);
             });
-        },
+        },*/
     });
 };
diff --git a/addons/account/static/src/js/account_move_reconciliation.js b/addons/account/static/src/js/account_move_reconciliation.js
index eed56632808..19c194166e2 100644
--- a/addons/account/static/src/js/account_move_reconciliation.js
+++ b/addons/account/static/src/js/account_move_reconciliation.js
@@ -1,9 +1,10 @@
 openerp.account = function (instance) {
+    openerp.account.quickadd(instance);
     var _t = instance.web._t,
         _lt = instance.web._lt;
     var QWeb = instance.web.qweb;
     
-    instance.web.account = {};
+    instance.web.account = instance.web.account || {};
     
     instance.web.views.add('tree_account_reconciliation', 'instance.web.account.ReconciliationListView');
     instance.web.account.ReconciliationListView = instance.web.ListView.extend({
@@ -48,7 +49,7 @@ openerp.account = function (instance) {
             this.last_group_by = group_by;
             this.old_search = _.bind(this._super, this);
             var mod = new instance.web.Model("account.move.line", context, domain);
-            return mod.call("list_partners_to_reconcile", []).pipe(function(result) {
+            return mod.call("list_partners_to_reconcile", []).then(function(result) {
                 var current = self.current_partner !== null ? self.partners[self.current_partner][0] : null;
                 self.partners = result;
                 var index = _.find(_.range(self.partners.length), function(el) {
@@ -74,7 +75,7 @@ openerp.account = function (instance) {
                 return fct();
             } else {
                 return new instance.web.Model("res.partner").call("read",
-                    [self.partners[self.current_partner][0], ["last_reconciliation_date"]]).pipe(function(res) {
+                    [self.partners[self.current_partner][0], ["last_reconciliation_date"]]).then(function(res) {
                     self.last_reconciliation_date = 
                         instance.web.format_value(res.last_reconciliation_date, {"type": "datetime"}, _t("Never"));
                     return fct();
@@ -92,7 +93,7 @@ openerp.account = function (instance) {
                 return false;
             }
 
-            new instance.web.Model("ir.model.data").call("get_object_reference", ["account", "action_view_account_move_line_reconcile"]).pipe(function(result) {
+            new instance.web.Model("ir.model.data").call("get_object_reference", ["account", "action_view_account_move_line_reconcile"]).then(function(result) {
                 var additional_context = _.extend({
                     active_id: ids[0],
                     active_ids: ids,
@@ -101,7 +102,7 @@ openerp.account = function (instance) {
                 return self.rpc("/web/action/load", {
                     action_id: result[1],
                     context: additional_context
-                }).then(function (result) {
+                }).done(function (result) {
                     result.context = _.extend(result.context || {}, additional_context);
                     result.flags = result.flags || {};
                     result.flags.new_window = true;
@@ -116,7 +117,7 @@ openerp.account = function (instance) {
         mark_as_reconciled: function() {
             var self = this;
             var id = self.partners[self.current_partner][0];
-            new instance.web.Model("res.partner").call("mark_as_reconciled", [[id]]).pipe(function() {
+            new instance.web.Model("res.partner").call("mark_as_reconciled", [[id]]).then(function() {
                 self.do_search(self.last_domain, self.last_context, self.last_group_by);
             });
         },
@@ -125,4 +126,5 @@ openerp.account = function (instance) {
             this._super.apply(this, arguments);
         },
     });
+    
 };
diff --git a/addons/account/static/src/xml/account_move_line_quickadd.xml b/addons/account/static/src/xml/account_move_line_quickadd.xml
index 8023ff42210..4aa24d3b726 100644
--- a/addons/account/static/src/xml/account_move_line_quickadd.xml
+++ b/addons/account/static/src/xml/account_move_line_quickadd.xml
@@ -3,10 +3,10 @@
 <templates id="template" xml:space="preserve">
     
     <t t-name="AccountMoveLineQuickAdd">
-        <div class="oe_account_quickadd">
+        <div class="select2-container oe_account_quickadd">
             <div>
                 Journal : 
-                <select id="oe_account_select_journal">
+                <select class="oe_account_select_journal select2-choice" >
                     <t t-foreach="widget.journals" t-as="journal">
                         <option t-if=" journal[0] === widget.current_journal" t-att-value="journal[0]" selected="selected">
                             <t t-esc="journal[1]"/>
@@ -17,7 +17,7 @@
                     </t>
                 </select>
                 Period : 
-                <select id="oe_account_select_period">
+                <select class="oe_account_select_period select2-choice">
                     <t t-foreach="widget.periods" t-as="period">
                         <option t-if=" period[0] === widget.current_period" t-att-value="period[0]" selected="selected">
                             <t t-esc="period[1]"/>

From 3e1e1f268c243fd1730c658968226f2dbf2a8204 Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Mon, 12 Nov 2012 12:12:06 +0100
Subject: [PATCH 07/18] [IMP]Design and pading

bzr revid: dle@openerp.com-20121112111206-n1ayr44ywliprgy7
---
 .../src/xml/account_move_line_quickadd.xml    | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/addons/account/static/src/xml/account_move_line_quickadd.xml b/addons/account/static/src/xml/account_move_line_quickadd.xml
index 4aa24d3b726..ac79d32a393 100644
--- a/addons/account/static/src/xml/account_move_line_quickadd.xml
+++ b/addons/account/static/src/xml/account_move_line_quickadd.xml
@@ -3,21 +3,10 @@
 <templates id="template" xml:space="preserve">
     
     <t t-name="AccountMoveLineQuickAdd">
-        <div class="select2-container oe_account_quickadd">
-            <div>
-                Journal : 
-                <select class="oe_account_select_journal select2-choice" >
-                    <t t-foreach="widget.journals" t-as="journal">
-                        <option t-if=" journal[0] === widget.current_journal" t-att-value="journal[0]" selected="selected">
-                            <t t-esc="journal[1]"/>
-                        </option>
-                        <option t-if="journal[0] !== widget.current_journal" t-att-value="journal[0]">
-                            <t t-esc="journal[1]"/>
-                        </option>
-                    </t>
-                </select>
-                Period : 
-                <select class="oe_account_select_period select2-choice">
+        <div class="oe_account_quickadd ui-toolbar" style="margin-bottom:0px;">
+            <div class="oe_form_dropdown_section">
+                <h4>Period :</h4> 
+                <select class="oe_account_select_period">
                     <t t-foreach="widget.periods" t-as="period">
                         <option t-if=" period[0] === widget.current_period" t-att-value="period[0]" selected="selected">
                             <t t-esc="period[1]"/>
@@ -28,6 +17,19 @@
                     </t>
                 </select>
             </div>
+            <div class="oe_form_dropdown_section">
+                <h4>Journal :</h4> 
+                <select class="oe_account_select_journal" >
+                    <t t-foreach="widget.journals" t-as="journal">
+                        <option t-if=" journal[0] === widget.current_journal" t-att-value="journal[0]" selected="selected">
+                            <t t-esc="journal[1]"/>
+                        </option>
+                        <option t-if="journal[0] !== widget.current_journal" t-att-value="journal[0]">
+                            <t t-esc="journal[1]"/>
+                        </option>
+                    </t>
+                </select>
+            </div>
         </div>
     </t>
 

From 75971d90d82430f700f7958025c986dc343bff5c Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Mon, 12 Nov 2012 15:10:00 +0100
Subject: [PATCH 08/18] [ADD]Default get journal_id and period_id

bzr revid: dle@openerp.com-20121112141000-z26str1srei751of
---
 addons/account/account_move_line.py           | 32 +++++++++++++++++--
 addons/account/account_view.xml               |  4 +--
 .../src/js/account_move_line_quickadd.js      | 11 +++++--
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 373f8e89c29..58d6ce7a4e8 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -551,6 +551,34 @@ class account_move_line(osv.osv):
         cur = self.pool.get('account.journal').browse(cr, uid, context['journal_id']).currency
         return cur and cur.id or False
 
+    def _get_period(self, cr, uid, context=None):
+        """
+        Return  default account period value
+        """
+        account_period_obj = self.pool.get('account.period')
+        ids = account_period_obj.find(cr, uid, context=context)
+        period_id = False
+        if ids:
+            period_id = ids[0]
+        return period_id
+
+    def _get_journal(self, cr, uid, context=None):
+        """
+        Return journal based on the journal type
+        """
+
+        journal_id = False
+
+        journal_pool = self.pool.get('account.journal')
+        if context.get('journal_type', False):
+            jids = journal_pool.search(cr, uid, [('type','=', context.get('journal_type'))])
+            if not jids:
+                raise osv.except_osv(_('Configuration Error!'), _('Cannot find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration/Journals/Journals.') % context.get('journal_type'))
+            journal_id = jids[0]
+        print context
+        return journal_id
+
+
     _defaults = {
         'blocked': False,
         'centralisation': 'normal',
@@ -558,12 +586,12 @@ class account_move_line(osv.osv):
         'date_created': fields.date.context_today,
         'state': 'draft',
         'currency_id': _get_currency,
-        'journal_id': lambda self, cr, uid, c: c.get('journal_id', False),
+        'journal_id': _get_journal,
         'credit': 0.0,
         'debit': 0.0,
         'amount_currency': 0.0,
         'account_id': lambda self, cr, uid, c: c.get('account_id', False),
-        'period_id': lambda self, cr, uid, c: c.get('period_id', False),
+        'period_id': _get_period,
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.move.line', context=c)
     }
     _order = "date desc, id desc"
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 354614e3598..32c545e8f6b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1059,7 +1059,7 @@
             <field name="model">account.move.line</field>
             <field eval="24" name="priority"/>
             <field name="arch" type="xml">
-                <tree_account_move_line_quickadd colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="true" on_write="on_create_write" version="7.0" editable="top">
+                <tree_account_move_line_quickadd colors="red:state == 'draft';black:state == 'valid'" string="Journal Items" create="true" on_write="on_create_write" version="7.0" editable="top">
                     <field name="date"/>
                     <field name="move_id" required="0"/>
                     <field name="ref"/>
@@ -1575,7 +1575,7 @@
         </record>
 
         <record id="action_account_manual_account_move_line_quickadd" model="ir.actions.act_window">
-            <field name="context">{'view_mode':True}</field>
+            <field name="context">{'view_mode':True,'journal_type':'bank'}</field>
             <field name="name">Quick Journal Items</field>
             <field name="res_model">account.move.line</field>
             <field name="view_id" ref="view_move_line_quickadd_tree"/>
diff --git a/addons/account/static/src/js/account_move_line_quickadd.js b/addons/account/static/src/js/account_move_line_quickadd.js
index c12a2d856b0..612ee7c8aa2 100644
--- a/addons/account/static/src/js/account_move_line_quickadd.js
+++ b/addons/account/static/src/js/account_move_line_quickadd.js
@@ -17,6 +17,8 @@ openerp.account.quickadd = function (instance) {
             this.periods = [];
             this.current_journal = null;
             this.current_period = null;
+            this.default_period = null;
+            this.default_journal = null;
         },
         load_list: function() {
             var self = this;
@@ -45,9 +47,13 @@ openerp.account.quickadd = function (instance) {
                 self.journals = result;
             }),mod.call("list_periods", []).then(function(result) {
                 self.periods = result;
+            }),mod.call("default_get", [['journal_id','period_id'],self.last_context]).then(function(result) {
+                self.default_period = result['period_id'];
+                self.default_journal = result['journal_id'];
+                console.log(result);
             })).then(function () {
-                self.current_journal = self.current_journal === null ? self.journals[0][0] : self.current_journal;
-                self.current_period = self.current_period === null ? self.periods[0][0] :self.current_period;
+                self.current_journal = self.current_journal === null ? self.default_journal : self.current_journal;
+                self.current_period = self.current_period === null ? self.default_period :self.current_period;
                 return self.search_by_journal_period();
             });
         },
@@ -79,6 +85,7 @@ openerp.account.quickadd = function (instance) {
             self.last_context["journal_id"] = self.current_journal;
             self.last_context["period_id"] = self.current_period;
             var compoundContext = self.last_context;
+            debugger;
             return self.old_search(compoundDomain, compoundContext, self.last_group_by);
         },
         /*_next: function (next_record, options) {

From 3c06af7a58e9688bd438814d09e34923b855a8db Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Mon, 12 Nov 2012 16:14:18 +0100
Subject: [PATCH 09/18] [IMP]Menuitem moved

bzr revid: dle@openerp.com-20121112151418-ztaxxfbzpyw7s58i
---
 addons/account/account_move_line.py               |  1 -
 addons/account/account_view.xml                   | 15 +++++++++++++--
 .../static/src/js/account_move_line_quickadd.js   |  1 -
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 58d6ce7a4e8..568d1f65312 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -575,7 +575,6 @@ class account_move_line(osv.osv):
             if not jids:
                 raise osv.except_osv(_('Configuration Error!'), _('Cannot find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration/Journals/Journals.') % context.get('journal_type'))
             journal_id = jids[0]
-        print context
         return journal_id
 
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 32c545e8f6b..473584e3937 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1580,14 +1580,25 @@
             <field name="res_model">account.move.line</field>
             <field name="view_id" ref="view_move_line_quickadd_tree"/>
             <field name="view_mode">tree_account_move_line_quickadd</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to register a new journal item.
+              </p><p>
+                This view can be used by accountants in order to quickly record
+                entries in OpenERP. If you want to record a supplier invoice,
+                start by recording the line of the expense account. OpenERP
+                will propose to you automatically the Tax related to this
+                account and the counterpart "Account Payable".
+              </p>
+            </field>
         </record>
 
         <menuitem
              name="Quick Journal Items"
              action="action_account_manual_account_move_line_quickadd"
              id="menu_manual_account_move_line_quickadd"
-             sequence="20"
-             parent="account.menu_finance_bank_and_cash"/>
+             sequence="2"
+             parent="account.menu_finance_entries"/>
 
         <menuitem
              name="Journal Items to Reconcile"
diff --git a/addons/account/static/src/js/account_move_line_quickadd.js b/addons/account/static/src/js/account_move_line_quickadd.js
index 612ee7c8aa2..6820415b984 100644
--- a/addons/account/static/src/js/account_move_line_quickadd.js
+++ b/addons/account/static/src/js/account_move_line_quickadd.js
@@ -50,7 +50,6 @@ openerp.account.quickadd = function (instance) {
             }),mod.call("default_get", [['journal_id','period_id'],self.last_context]).then(function(result) {
                 self.default_period = result['period_id'];
                 self.default_journal = result['journal_id'];
-                console.log(result);
             })).then(function () {
                 self.current_journal = self.current_journal === null ? self.default_journal : self.current_journal;
                 self.current_period = self.current_period === null ? self.default_period :self.current_period;

From fee0e6b67af33d6547a16dbe5eb1c24551ca58d3 Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Mon, 12 Nov 2012 16:43:18 +0100
Subject: [PATCH 10/18] [DEL]Journal items menuitem for supplier, customer and
 bank/cash

bzr revid: dle@openerp.com-20121112154318-jt555uecspjxfj7f
---
 addons/account/__openerp__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 2641367edb3..614ffad5fd9 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -73,7 +73,6 @@ for a particular financial year and for preparation of vouchers there is a modul
         'wizard/account_fiscalyear_close_state.xml',
         'wizard/account_chart_view.xml',
         'wizard/account_tax_chart_view.xml',
-        'wizard/account_move_journal_view.xml',
         'wizard/account_move_line_reconcile_select_view.xml',
         'wizard/account_open_closed_fiscalyear_view.xml',
         'wizard/account_move_line_unreconcile_select_view.xml',

From cebd3c37b406a77966d65a3b61a8266745bc66d0 Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Tue, 13 Nov 2012 12:17:38 +0100
Subject: [PATCH 11/18] [FIX]Readding wizard and journals items menuitem

bzr revid: dle@openerp.com-20121113111738-rvvy3h3uox4odwyg
---
 addons/account/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 614ffad5fd9..68da4b1f8ba 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -73,6 +73,7 @@ for a particular financial year and for preparation of vouchers there is a modul
         'wizard/account_fiscalyear_close_state.xml',
         'wizard/account_chart_view.xml',
         'wizard/account_tax_chart_view.xml',
+        'wizard/account_move_journal_view.xml',
         'wizard/account_move_line_reconcile_select_view.xml',
         'wizard/account_open_closed_fiscalyear_view.xml',
         'wizard/account_move_line_unreconcile_select_view.xml',
@@ -128,7 +129,6 @@ for a particular financial year and for preparation of vouchers there is a modul
     'js': [
         'static/src/js/account_move_reconciliation.js',
         'static/src/js/account_move_line_quickadd.js',
-        
     ],
     'qweb' : [
         "static/src/xml/account_move_reconciliation.xml",

From 87cab5ffa15d715f27a3658bf0c99d555ac9965c Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Tue, 13 Nov 2012 14:14:12 +0100
Subject: [PATCH 12/18] [DEL]Journal Items

bzr revid: dle@openerp.com-20121113131412-6mm1pz8jhstr46pp
---
 addons/account/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 68da4b1f8ba..763cc723b8f 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -73,7 +73,7 @@ for a particular financial year and for preparation of vouchers there is a modul
         'wizard/account_fiscalyear_close_state.xml',
         'wizard/account_chart_view.xml',
         'wizard/account_tax_chart_view.xml',
-        'wizard/account_move_journal_view.xml',
+        #'wizard/account_move_journal_view.xml',
         'wizard/account_move_line_reconcile_select_view.xml',
         'wizard/account_open_closed_fiscalyear_view.xml',
         'wizard/account_move_line_unreconcile_select_view.xml',

From 796176711ade7a6955606e5de32951220cc0ddba Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Tue, 13 Nov 2012 14:41:48 +0100
Subject: [PATCH 13/18] [FIX]Failed unit test in account cause of menu item id
 changes

bzr revid: dle@openerp.com-20121113134148-yfvlab39vn0gmeha
---
 addons/account/test/account_validate_account_move.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account/test/account_validate_account_move.yml b/addons/account/test/account_validate_account_move.yml
index df58da6dfea..f5dbbbc92db 100644
--- a/addons/account/test/account_validate_account_move.yml
+++ b/addons/account/test/account_validate_account_move.yml
@@ -32,8 +32,8 @@
     import time
     date = self._get_date(cr, uid, {'lang': u'en_US', 'normal_view': False, 'active_model': 'ir.ui.menu',
       'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'journal_id': 1, 'view_mode': False,
-      'visible_id': 1, 'period_id': 6, 'tz': False, 'active_ids': [ref('menu_eaction_account_moves_sale')],
-      'search_default_posted': 0, 'active_id': ref('menu_eaction_account_moves_sale')})
+      'visible_id': 1, 'period_id': 6, 'tz': False, 'active_ids': [ref('action_account_manual_account_move_line_quickadd')],
+      'search_default_posted': 0, 'active_id': ref('action_account_manual_account_move_line_quickadd')})
     partner = self.onchange_partner_id(cr, uid, [], False, ref('base.res_partner_12'), ref('account.cash'), debit=0, credit=2000, date=date, journal=False)
     account = self.onchange_account_id(cr, uid, [], account_id=ref('account.a_recv'), partner_id= ref('base.res_partner_12'))
     vals = {
@@ -62,11 +62,11 @@
   !python {model: account.move.line}: |
     ids = self._balance_search(cr, uid, self, 'balance', [('balance', '=', 2000.0)], None, {'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu',
     'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'view_mode': False, 'visible_id': 1,
-    'active_ids': [ref('menu_eaction_account_moves_sale')], 'search_default_posted': 0, 'active_id': ref('menu_eaction_account_moves_sale')})
+    'active_ids': [ref('action_account_manual_account_move_line_quickadd')], 'search_default_posted': 0, 'active_id': ref('action_account_manual_account_move_line_quickadd')})
     bal = self._balance(cr, uid, ids[0][2], 'balance', None,{'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu',
       'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'view_mode': False,
-      'visible_id': 1, 'active_ids': [ref('menu_eaction_account_moves_sale')], 'search_default_posted': 0,
-      'active_id': ref('menu_eaction_account_moves_sale')})
+      'visible_id': 1, 'active_ids': [ref('action_account_manual_account_move_line_quickadd')], 'search_default_posted': 0,
+      'active_id': ref('action_account_manual_account_move_line_quickadd')})
     assert bal, 'Balance has not been computed correctly'
 -
   I check that Initially account move state is "Draft"

From 76a462eb9dffdc5969dc2c30d1c0ba8abfa833a1 Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Mon, 19 Nov 2012 11:48:50 +0100
Subject: [PATCH 14/18] [FIX]Select boxes field not reloaded at each do search
 call, only the option of them are reloaded at each search. Select boxes now
 just below the create button, like this the help message appears below the
 select boxes and not anymore above : )

bzr revid: dle@openerp.com-20121119104850-0krxa7fil3cx2yys
---
 .../src/js/account_move_line_quickadd.js      | 26 ++++++++++++++-----
 .../src/xml/account_move_line_quickadd.xml    | 18 ++-----------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/addons/account/static/src/js/account_move_line_quickadd.js b/addons/account/static/src/js/account_move_line_quickadd.js
index 6820415b984..d36565d2ecf 100644
--- a/addons/account/static/src/js/account_move_line_quickadd.js
+++ b/addons/account/static/src/js/account_move_line_quickadd.js
@@ -20,17 +20,16 @@ openerp.account.quickadd = function (instance) {
             this.default_period = null;
             this.default_journal = null;
         },
-        load_list: function() {
-            var self = this;
+        start:function(){
             var tmp = this._super.apply(this, arguments);
-
-            this.$el.prepend(QWeb.render("AccountMoveLineQuickAdd", {widget: this}));
+            var self = this;
+            this.$el.parent().prepend(QWeb.render("AccountMoveLineQuickAdd", {widget: this}));
             
-            this.$(".oe_account_select_journal").change(function() {
+            this.$el.parent().find('.oe_account_select_journal').change(function() {
                     self.current_journal = parseInt(this.value);
                     self.do_search(self.last_domain, self.last_context, self.last_group_by);
                 });
-            this.$(".oe_account_select_period").change(function() {
+            this.$el.parent().find('.oe_account_select_period').change(function() {
                     self.current_period = parseInt(this.value);
                     self.do_search(self.last_domain, self.last_context, self.last_group_by);
                 });
@@ -53,6 +52,20 @@ openerp.account.quickadd = function (instance) {
             })).then(function () {
                 self.current_journal = self.current_journal === null ? self.default_journal : self.current_journal;
                 self.current_period = self.current_period === null ? self.default_period :self.current_period;
+                var o;
+                //self.$('.oe_account_select_journal',self.$el.parent())[0].children().remove().end();
+                self.$el.parent().find('.oe_account_select_journal').children().remove().end();
+                for (var i = 0;i < self.journals.length;i++){
+                    o = new Option(self.journals[i][1], self.journals[i][0]);
+                    self.$el.parent().find('.oe_account_select_journal').append(o);
+                }
+                self.$el.parent().find('.oe_account_select_period').children().remove().end();
+                for (var i = 0;i < self.periods.length;i++){
+                    o = new Option(self.periods[i][1], self.periods[i][0]);
+                    self.$el.parent().find('.oe_account_select_period').append(o);
+                }    
+                self.$el.parent().find('.oe_account_select_journal').val(self.current_journal).attr('selected',true);
+                self.$el.parent().find('.oe_account_select_period').val(self.current_period).attr('selected',true);
                 return self.search_by_journal_period();
             });
         },
@@ -84,7 +97,6 @@ openerp.account.quickadd = function (instance) {
             self.last_context["journal_id"] = self.current_journal;
             self.last_context["period_id"] = self.current_period;
             var compoundContext = self.last_context;
-            debugger;
             return self.old_search(compoundDomain, compoundContext, self.last_group_by);
         },
         /*_next: function (next_record, options) {
diff --git a/addons/account/static/src/xml/account_move_line_quickadd.xml b/addons/account/static/src/xml/account_move_line_quickadd.xml
index ac79d32a393..3ed66eec917 100644
--- a/addons/account/static/src/xml/account_move_line_quickadd.xml
+++ b/addons/account/static/src/xml/account_move_line_quickadd.xml
@@ -7,27 +7,13 @@
             <div class="oe_form_dropdown_section">
                 <h4>Period :</h4> 
                 <select class="oe_account_select_period">
-                    <t t-foreach="widget.periods" t-as="period">
-                        <option t-if=" period[0] === widget.current_period" t-att-value="period[0]" selected="selected">
-                            <t t-esc="period[1]"/>
-                        </option>
-                        <option t-if=" period[0] !== widget.current_period" t-att-value="period[0]">
-                            <t t-esc="period[1]"/>
-                        </option>
-                    </t>
+                    
                 </select>
             </div>
             <div class="oe_form_dropdown_section">
                 <h4>Journal :</h4> 
                 <select class="oe_account_select_journal" >
-                    <t t-foreach="widget.journals" t-as="journal">
-                        <option t-if=" journal[0] === widget.current_journal" t-att-value="journal[0]" selected="selected">
-                            <t t-esc="journal[1]"/>
-                        </option>
-                        <option t-if="journal[0] !== widget.current_journal" t-att-value="journal[0]">
-                            <t t-esc="journal[1]"/>
-                        </option>
-                    </t>
+                    
                 </select>
             </div>
         </div>

From 30ea1678309f9ee5f0c62c977634367209b5d881 Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Mon, 19 Nov 2012 12:19:07 +0100
Subject: [PATCH 15/18] Select boxes disabled when editing : )

bzr revid: dle@openerp.com-20121119111907-x59ovkghvjpzh33n
---
 .../src/js/account_move_line_quickadd.js      | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/addons/account/static/src/js/account_move_line_quickadd.js b/addons/account/static/src/js/account_move_line_quickadd.js
index d36565d2ecf..1cc8942cb72 100644
--- a/addons/account/static/src/js/account_move_line_quickadd.js
+++ b/addons/account/static/src/js/account_move_line_quickadd.js
@@ -99,17 +99,27 @@ openerp.account.quickadd = function (instance) {
             var compoundContext = self.last_context;
             return self.old_search(compoundDomain, compoundContext, self.last_group_by);
         },
-        /*_next: function (next_record, options) {
-            next_record = next_record || 'succ';
+        start_edition: function (record, options) {
+            this.$el.parent().find('.oe_account_select_journal').attr('disabled', 'disabled');
+            this.$el.parent().find('.oe_account_select_period').attr('disabled', 'disabled');
+            return this._super.apply(this, arguments);
+        },
+        cancel_edition: function (force) {
+            this.$el.parent().find('.oe_account_select_journal').removeAttr('disabled');
+            this.$el.parent().find('.oe_account_select_period').removeAttr('disabled');
+            return this._super.apply(this, arguments);
+        },
+        save_edition: function () {
+            var tmp = this._super.apply(this, arguments);
             var self = this;
-            return this.save_edition().then(function (saveInfo) {
-                if (saveInfo.created || self.records.at(self.records.length-1).get("id") === saveInfo.record.get("id")) {
-                    return self.start_edition();
+            tmp.then(function (saveInfo){
+                console.log(saveInfo);
+                if (saveInfo) {
+                    self.$el.parent().find('.oe_account_select_journal').removeAttr('disabled');
+                    self.$el.parent().find('.oe_account_select_period').removeAttr('disabled');
                 }
-                var record = self.records[next_record](
-                        saveInfo.record, {wraparound: true});
-                return self.start_edition(record, options);
             });
-        },*/
+            return tmp;
+        }
     });
 };

From d831d5bd7c2c4b3cdd39394d5d40cde29c8960f7 Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Mon, 19 Nov 2012 13:32:54 +0100
Subject: [PATCH 16/18] [FIX]Select boxes disabled when editing : ) : Better
 implement way

bzr revid: dle@openerp.com-20121119123254-9rb4uxr97ux5iatv
---
 .../src/js/account_move_line_quickadd.js      | 30 +++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/addons/account/static/src/js/account_move_line_quickadd.js b/addons/account/static/src/js/account_move_line_quickadd.js
index 1cc8942cb72..5a66e311261 100644
--- a/addons/account/static/src/js/account_move_line_quickadd.js
+++ b/addons/account/static/src/js/account_move_line_quickadd.js
@@ -33,6 +33,14 @@ openerp.account.quickadd = function (instance) {
                     self.current_period = parseInt(this.value);
                     self.do_search(self.last_domain, self.last_context, self.last_group_by);
                 });
+            this.on('edit:after', this, function () {
+                self.$el.parent().find('.oe_account_select_journal').attr('disabled', 'disabled');
+                self.$el.parent().find('.oe_account_select_period').attr('disabled', 'disabled');
+            });
+            this.on('save:after cancel:after', this, function () {
+                self.$el.parent().find('.oe_account_select_journal').removeAttr('disabled');
+                self.$el.parent().find('.oe_account_select_period').removeAttr('disabled');
+            });
             return tmp;
         },
         do_search: function(domain, context, group_by) {
@@ -99,27 +107,5 @@ openerp.account.quickadd = function (instance) {
             var compoundContext = self.last_context;
             return self.old_search(compoundDomain, compoundContext, self.last_group_by);
         },
-        start_edition: function (record, options) {
-            this.$el.parent().find('.oe_account_select_journal').attr('disabled', 'disabled');
-            this.$el.parent().find('.oe_account_select_period').attr('disabled', 'disabled');
-            return this._super.apply(this, arguments);
-        },
-        cancel_edition: function (force) {
-            this.$el.parent().find('.oe_account_select_journal').removeAttr('disabled');
-            this.$el.parent().find('.oe_account_select_period').removeAttr('disabled');
-            return this._super.apply(this, arguments);
-        },
-        save_edition: function () {
-            var tmp = this._super.apply(this, arguments);
-            var self = this;
-            tmp.then(function (saveInfo){
-                console.log(saveInfo);
-                if (saveInfo) {
-                    self.$el.parent().find('.oe_account_select_journal').removeAttr('disabled');
-                    self.$el.parent().find('.oe_account_select_period').removeAttr('disabled');
-                }
-            });
-            return tmp;
-        }
     });
 };

From ad2c5376b0613f811141f7cc74730af5e5fd906a Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Mon, 19 Nov 2012 13:42:14 +0100
Subject: [PATCH 17/18] [ADD]Period and journal field in tree view with
 invisible = 1

bzr revid: dle@openerp.com-20121119124214-0hnx1gg5iksi2gpf
---
 addons/account/account_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index d3ec35cbea2..f5b21bfcdee 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1069,6 +1069,8 @@
             <field eval="24" name="priority"/>
             <field name="arch" type="xml">
                 <tree_account_move_line_quickadd colors="red:state == 'draft';black:state == 'valid'" string="Journal Items" create="true" on_write="on_create_write" version="7.0" editable="top">
+                    <field name="journal_id" invisible="1"/>
+                    <field name="period_id" invisible="1" />
                     <field name="date"/>
                     <field name="move_id" required="0"/>
                     <field name="ref"/>

From f80d9e61003428021b493691d5db2ef8193e58a5 Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Mon, 19 Nov 2012 14:22:32 +0100
Subject: [PATCH 18/18] [ADD]On_change partner_id and remove useless comments

bzr revid: dle@openerp.com-20121119132232-2ac4n7hodno1r7ju
---
 addons/account/account_view.xml                 |  4 ++--
 .../static/src/js/account_move_line_quickadd.js | 17 -----------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index f5b21bfcdee..34e7d3688c2 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1070,13 +1070,13 @@
             <field name="arch" type="xml">
                 <tree_account_move_line_quickadd colors="red:state == 'draft';black:state == 'valid'" string="Journal Items" create="true" on_write="on_create_write" version="7.0" editable="top">
                     <field name="journal_id" invisible="1"/>
-                    <field name="period_id" invisible="1" />
+                    <field name="period_id" invisible="1"/>
                     <field name="date"/>
                     <field name="move_id" required="0"/>
                     <field name="ref"/>
                     <field name="invoice"/>
                     <field name="name"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
                     <field name="account_id"/>
                     <field name="reconcile_partial_id"/>
                     <field name="debit" sum="Total debit"/>
diff --git a/addons/account/static/src/js/account_move_line_quickadd.js b/addons/account/static/src/js/account_move_line_quickadd.js
index 5a66e311261..a40774b346f 100644
--- a/addons/account/static/src/js/account_move_line_quickadd.js
+++ b/addons/account/static/src/js/account_move_line_quickadd.js
@@ -85,23 +85,6 @@ openerp.account.quickadd = function (instance) {
                 ["journal_id", "=", self.current_journal], 
                 ["period_id", "=", self.current_period] 
                 ]);
-            //1
-            /*var ncontext = {
-                "journal_id": self.current_journal,
-                "period_id" :self.current_period,
-            };
-            var new instance.web.CompoundDomain(self.last_domain = new instance.web.CompoundContext(this.last_context, ncontext);
-
-            _.extend(this.dataset.context, ncontext);
-            */
-            //2
-            /*
-            var compoundContext = new instance.web.CompoundContext(self.last_context,{
-                "journal_id": self.current_journal,
-                "period_id" :self.current_period,
-            });
-            */
-            //3
             self.last_context["journal_id"] = self.current_journal;
             self.last_context["period_id"] = self.current_period;
             var compoundContext = self.last_context;