From 205c8f6ea7e451354fade7a83c54ed64382ec9e6 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Mon, 21 Nov 2011 18:01:15 +0530
Subject: [PATCH 01/58] [IMP] mrp_operations: Improved work orders to
 initialize the workflow for demo data and existing records.

bzr revid: uco@tinyerp.com-20111121123115-3plhb42u04ye9ipj
---
 addons/mrp_operations/mrp_operation_data.xml |  3 +++
 addons/mrp_operations/mrp_operations.py      | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/addons/mrp_operations/mrp_operation_data.xml b/addons/mrp_operations/mrp_operation_data.xml
index 7ce25b6d250..2d0694f12ac 100644
--- a/addons/mrp_operations/mrp_operation_data.xml
+++ b/addons/mrp_operations/mrp_operation_data.xml
@@ -30,5 +30,8 @@
 		<field name="start_stop">done</field>
 	</record>
 
+	<!-- Initialize workflow instance -->
+    <function model="mrp_operations.operation" name="initialize_workflow_instance"/>
+
 </data>
 </openerp>
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 7dc93731b03..e4815fee4c6 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -552,6 +552,17 @@ class mrp_operations_operation(osv.osv):
 
         return super(mrp_operations_operation, self).create(cr, uid, vals, context=context)
 
+    def initialize_workflow_instance(self, cr, uid, context=None):
+        wf_service = netsvc.LocalService("workflow")
+        wc_line_obj = self.pool.get('mrp.production.workcenter.line')
+        prod_obj = self.pool.get('mrp.production')
+        production_ids = prod_obj.search(cr, uid, [], context=context)
+        for op in prod_obj.browse(cr, uid, production_ids, context=context):
+            wc_lines = wc_line_obj.search(cr, uid, [('production_id','=',op.id)], context=context)
+            for line_id in wc_lines:
+                wf_service.trg_create(uid, 'mrp.production.workcenter.line', line_id, cr)
+        return True
+
     _columns={
         'production_id':fields.many2one('mrp.production','Production',required=True),
         'workcenter_id':fields.many2one('mrp.workcenter','Work Center',required=True),

From eaebfd814d76a4767040d49e819a959fb89379f3 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Mon, 21 Nov 2011 18:31:53 +0530
Subject: [PATCH 02/58] [IMP] mrp_operations: Some usability improvements
 mentioned on pad.

bzr revid: uco@tinyerp.com-20111121130153-re5blfwujjwjvqy6
---
 addons/mrp_operations/mrp_operations.py       |  4 ++--
 addons/mrp_operations/mrp_operations_view.xml | 13 +++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index e4815fee4c6..74d4ee3cf8a 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -86,10 +86,10 @@ class mrp_production_workcenter_line(osv.osv):
     _order = "sequence, date_planned"
 
     _columns = {
-       'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Cancelled'),('done','Finished')],'State', readonly=True,
+       'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pending'),('cancel','Cancelled'),('done','Finished')],'State', readonly=True,
                                  help="* When a work order is created it is set in 'Draft' state.\n" \
                                        "* When user sets work order in start mode that time it will be set in 'In Progress' state.\n" \
-                                       "* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pause' state.\n" \
+                                       "* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pending' state.\n" \
                                        "* When the user cancels the work order it will be set in 'Canceled' state.\n" \
                                        "* When order is completely processed that time it is set in 'Finished' state."),
        'date_start_date': fields.function(_get_date_date, string='Start Date', type='date'),
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 377a57d6121..e7decebbf4b 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -16,7 +16,7 @@
                    <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert" help="Set to Draft"/>
 	               <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr" help="Start Working"/>
 	               <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause" help="Resume Work Order"/>
-	               <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>
+	               <button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>
 	               <button name="button_done" string="Finished" states="startworking" icon="terp-check" help="Finish Order"/>
                </group>
 	       </xpath>
@@ -30,13 +30,12 @@
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
         <field name="arch" type="xml">
            <xpath expr="/form/notebook/page/field[@name='workcenter_lines']/tree/field[@name='hour']" position="after">
-                <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
+                <field name="state"/>
                 <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
                 <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr"/>
                 <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause"/>
-                <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause"/>
+                <button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause"/>
                 <button name="button_done" string="Finished" states="startworking" icon="terp-check"/>
-                <field name="state"/>
            </xpath>
         </field>
     </record>
@@ -58,11 +57,9 @@
                 <field name="cycle"/>
                 <field name="hour"/>
                 <field name="state" />
-                <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert" help="Set to Draft"/>
                 <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr" help="Start Working"/>
                 <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause" help="Resume Work Order"/>
-                <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
-                <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>
+                <button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>
                 <button name="button_done" string="Finished" states="startworking" icon="terp-check" help="Finish Order"/>
             </tree>
         </field>
@@ -116,7 +113,7 @@
                         <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
                         <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr"/>
                         <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause"/>
-                        <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause"/>
+                        <button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause"/>
                         <button name="button_done" string="Finished" states="startworking" icon="terp-check"/>
                     </group>
                 </page>

From 7cd33b0c421ae064fd685c5c8dab414e4038b189 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Tue, 22 Nov 2011 10:46:36 +0530
Subject: [PATCH 03/58] [IMP] mrp_operations: Added separate data file so that
 workflow can be initialized even when no demo data is loaded.

bzr revid: uco@tinyerp.com-20111122051636-9ehoagna8o3x2gp7
---
 addons/mrp_operations/__openerp__.py          |  3 ++-
 addons/mrp_operations/mrp_operation_data.xml  |  3 ---
 addons/mrp_operations/mrp_operations_data.xml | 10 ++++++++++
 3 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 addons/mrp_operations/mrp_operations_data.xml

diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py
index d965ca5160c..111c4522d8e 100644
--- a/addons/mrp_operations/__openerp__.py
+++ b/addons/mrp_operations/__openerp__.py
@@ -62,7 +62,8 @@ So that we can compare the theoretic delay and real delay.
         'mrp_operations_view.xml',
         'mrp_operations_report.xml',
         'report/mrp_workorder_analysis_view.xml',
-        'process/mrp_operation_process.xml'
+        'process/mrp_operation_process.xml',
+        'mrp_operations_data.xml'
     ],
     'demo_xml': ['mrp_operation_data.xml'],
     'test': ['test/mrp_operations.yml', 'test/mrp_operations_report.yml','test/mrp_operation_test.yml'],
diff --git a/addons/mrp_operations/mrp_operation_data.xml b/addons/mrp_operations/mrp_operation_data.xml
index 2d0694f12ac..7ce25b6d250 100644
--- a/addons/mrp_operations/mrp_operation_data.xml
+++ b/addons/mrp_operations/mrp_operation_data.xml
@@ -30,8 +30,5 @@
 		<field name="start_stop">done</field>
 	</record>
 
-	<!-- Initialize workflow instance -->
-    <function model="mrp_operations.operation" name="initialize_workflow_instance"/>
-
 </data>
 </openerp>
diff --git a/addons/mrp_operations/mrp_operations_data.xml b/addons/mrp_operations/mrp_operations_data.xml
new file mode 100644
index 00000000000..b8239c18ccf
--- /dev/null
+++ b/addons/mrp_operations/mrp_operations_data.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+
+        <!-- Initialize workflow instance -->
+        <function model="mrp_operations.operation" name="initialize_workflow_instance"/>
+
+    </data>
+</openerp>
+

From 84f5e139f493219fe81a857d340c9612a1a6fa42 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Tue, 22 Nov 2011 11:52:40 +0530
Subject: [PATCH 04/58] [REN] mrp_operations: Renamed file.

bzr revid: uco@tinyerp.com-20111122062240-nxr7a2r8rsrfn2dj
---
 addons/mrp_operations/__openerp__.py                            | 2 +-
 ...operations_data.xml => mrp_operations_workflow_instance.xml} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename addons/mrp_operations/{mrp_operations_data.xml => mrp_operations_workflow_instance.xml} (100%)

diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py
index 111c4522d8e..caa33cc6556 100644
--- a/addons/mrp_operations/__openerp__.py
+++ b/addons/mrp_operations/__openerp__.py
@@ -63,7 +63,7 @@ So that we can compare the theoretic delay and real delay.
         'mrp_operations_report.xml',
         'report/mrp_workorder_analysis_view.xml',
         'process/mrp_operation_process.xml',
-        'mrp_operations_data.xml'
+        'mrp_operations_workflow_instance.xml'
     ],
     'demo_xml': ['mrp_operation_data.xml'],
     'test': ['test/mrp_operations.yml', 'test/mrp_operations_report.yml','test/mrp_operation_test.yml'],
diff --git a/addons/mrp_operations/mrp_operations_data.xml b/addons/mrp_operations/mrp_operations_workflow_instance.xml
similarity index 100%
rename from addons/mrp_operations/mrp_operations_data.xml
rename to addons/mrp_operations/mrp_operations_workflow_instance.xml

From 25b36b599a25463fb9ca89ea2bca8fea4405e51f Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 22 Nov 2011 17:55:37 +0100
Subject: [PATCH 05/58] [IMP] account_voucher: multi currency handling

bzr revid: qdp-launchpad@openerp.com-20111122165537-2c8a9ov2qjklq2wj
---
 addons/account_voucher/account_voucher.py     | 140 ++++++++++++++----
 .../account_voucher/test/account_voucher.yml  |   1 -
 addons/account_voucher/test/sales_receipt.yml |   1 -
 .../voucher_payment_receipt_view.xml          |  53 +++----
 4 files changed, 136 insertions(+), 59 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index fd6dac9f90d..4b099eedc66 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -90,6 +90,17 @@ class account_voucher(osv.osv):
             return tax_id
         return False
 
+    def _get_payment_rate_currency(self, cr, uid, context=None):
+        if context is None: context = {}
+        journal_pool = self.pool.get('account.journal')
+        journal_id = context.get('journal_id', False)
+        if journal_id:
+            journal = journal_pool.browse(cr, uid, journal_id, context=context)
+            if journal.currency:
+                return journal.currency.id
+        #no journal given in the context, use company currency as default
+        return self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
+
     def _get_currency(self, cr, uid, context=None):
         if context is None: context = {}
         journal_pool = self.pool.get('account.journal')
@@ -143,11 +154,21 @@ class account_voucher(osv.osv):
 
         res = super(account_voucher, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
         doc = etree.XML(res['arch'])
-        nodes = doc.xpath("//field[@name='partner_id']")
+
+        # replace the label of the field payment_rate
+        currency_obj = self.pool.get('res.currency')
+        base_currency_id = currency_obj.search(cr, uid, [('rate','=',1.0),('rate_ids','=',1.0)], context=context)
+        symbol = base_currency_id and currency_obj.name_get(cr, uid, base_currency_id, context=context)[0][1]
+        string = _("Rate for this operation: 1 %s is") % symbol
+        payment_rate_field = doc.xpath("//field[@name='payment_rate']")
+        for field in payment_rate_field:
+            field.set('string', string)
+
         if context.get('type', 'sale') in ('purchase', 'payment'):
+            nodes = doc.xpath("//field[@name='partner_id']")
             for node in nodes:
                 node.set('domain', "[('supplier', '=', True)]")
-            res['arch'] = etree.tostring(doc)
+        res['arch'] = etree.tostring(doc)
         return res
 
     def _compute_writeoff_amount(self, cr, uid, line_dr_ids, line_cr_ids, amount):
@@ -184,7 +205,10 @@ class account_voucher(osv.osv):
         res = {}
         debit = credit = 0.0
         for voucher in self.browse(cr, uid, ids, context=context):
-            res[voucher.id] =  voucher.amount / voucher.payment_rate
+            rate = voucher.currency_id.rate or voucher.company_id.currency_id.rate
+            if voucher.currency_id == voucher.payment_rate_currency_id:
+                rate =  voucher.payment_rate
+            res[voucher.id] =  voucher.amount / rate * voucher.company_id.currency_id.rate
         return res
 
     _name = 'account.voucher'
@@ -247,8 +271,9 @@ class account_voucher(osv.osv):
         'comment': fields.char('Counterpart Comment', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'analytic_id': fields.many2one('account.analytic.account','Write-Off Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),
         'writeoff_amount': fields.function(_get_writeoff_amount, string='Reconcile Amount', type='float', readonly=True),
+        'payment_rate_currency_id': fields.many2one('res.currency', 'Payment Rate Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'payment_rate': fields.float('Payment Rate', digits=(12,6), required=True, readonly=True, states={'draft': [('readonly', False)]},
-            help='The rate between the journal currency and the company currency for this particular payment.'),
+            help='The specific rate that will be used for this voucher for the selected currency.'),
         'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
     }
     _defaults = {
@@ -269,6 +294,7 @@ class account_voucher(osv.osv):
         'payment_option': 'without_writeoff',
         'comment': _('Write-Off'),
         'payment_rate': 1.0,
+        'payment_rate_currency_id': _get_payment_rate_currency,
     }
 
     def compute_tax(self, cr, uid, ids, context=None):
@@ -374,7 +400,7 @@ class account_voucher(osv.osv):
             })
         return {'value':default}
 
-    def onchange_journal_voucher(self, cr, uid, ids, line_ids=False, tax_id=False, price=0.0, partner_id=False, journal_id=False, ttype=False, context=None):
+    def onchange_journal_voucher(self, cr, uid, ids, line_ids=False, tax_id=False, price=0.0, partner_id=False, journal_id=False, ttype=False, company_id=False, context=None):
         """price
         Returns a dict that contains new values and context
 
@@ -413,20 +439,25 @@ class account_voucher(osv.osv):
         default['value']['account_id'] = account_id
         default['value']['type'] = ttype or tr_type
 
-        vals = self.onchange_journal(cr, uid, ids, journal_id, line_ids, tax_id, partner_id, context)
+        vals = self.onchange_journal(cr, uid, ids, journal_id, line_ids, tax_id, partner_id, company_id, context)
         default['value'].update(vals.get('value'))
 
         return default
 
-    def onchange_rate(self, cr, uid, ids, rate, amount, context=None):
-        res =  {'value': {'paid_amount_in_company_currency': 0.0}}
-        if rate and amount:
-            res['value']['paid_amount_in_company_currency'] = amount / rate
+    def onchange_rate(self, cr, uid, ids, rate, amount, currency_id, payment_rate_currency_id, company_id, context=None):
+        res =  {'value': {}}
+        if rate and amount and currency_id and currency_id == payment_rate_currency_id:
+            company_rate = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id.rate 
+            res['value']['paid_amount_in_company_currency'] = amount / rate * company_rate
         return res
 
-    def onchange_amount(self, cr, uid, ids, amount, rate, partner_id, journal_id, currency_id, ttype, date, context=None):
+    def onchange_amount(self, cr, uid, ids, amount, rate, partner_id, journal_id, currency_id, ttype, date, payment_rate_currency_id, company_id, context=None):
+        if context is None:
+            context = {}
         res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=context)
-        vals = self.onchange_rate(cr, uid, ids, rate, amount, context=context)
+        ctx = context.copy()
+        ctx.update({'date': date})
+        vals = self.onchange_rate(cr, uid, ids, rate, amount, currency_id, payment_rate_currency_id, company_id, context=ctx)
         for key in vals.keys():
             res[key].update(vals[key])
         return res
@@ -582,7 +613,22 @@ class account_voucher(osv.osv):
             default['value']['writeoff_amount'] = self._compute_writeoff_amount(cr, uid, default['value']['line_dr_ids'], default['value']['line_cr_ids'], price)
         return default
 
-    def onchange_date(self, cr, uid, ids, date, currency_id, amount, context=None):
+    def onchange_payment_rate_currency(self, cr, uid, ids, currency_id, payment_rate_currency_id, date, amount, company_id, context=None):
+        if context is None:
+            context = {}
+        res = {'value': {}}
+        #set the default payment rate of the voucher and compute the paid amount in company currency
+        if currency_id and currency_id == payment_rate_currency_id:
+            ctx = context.copy()
+            ctx.update({'date': date})
+            payment_rate = self.pool.get('res.currency').browse(cr, uid, currency_id, context=ctx).rate
+            res['value'].update({'payment_rate': payment_rate})
+            vals = self.onchange_rate(cr, uid, ids, payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context=ctx)
+            for key in vals.keys():
+                res[key].update(vals[key])
+        return res
+
+    def onchange_date(self, cr, uid, ids, date, currency_id, payment_rate_currency_id, amount, company_id, context=None):
         """
         @param date: latest value from user input for field date
         @param args: other arguments
@@ -590,22 +636,19 @@ class account_voucher(osv.osv):
         @return: Returns a dict which contains new values, and context
         """
         res = {'value': {}}
+        #FIXME: use find() hereunder
+
         #set the period of the voucher
         period_pool = self.pool.get('account.period')
         pids = period_pool.search(cr, uid, [('date_start', '<=', date), ('date_stop', '>=', date)])
         if pids:
             res['value'].update({'period_id':pids[0]})
-        #set the default payment rate of the voucher and compute the paid amount in company currency
-        payment_rate = 1.0
-        if currency_id:
-            payment_rate = self.pool.get('res.currency').browse(cr, uid, currency_id, context={'date': date}).rate
-        res['value'].update({'payment_rate': payment_rate})
-        vals = self.onchange_rate(cr, uid, ids, payment_rate, amount, context=context)
+        vals = self.onchange_payment_rate_currency(cr, uid, ids, currency_id, payment_rate_currency_id, date, amount, company_id, context=context)
         for key in vals.keys():
             res[key].update(vals[key])
         return res
 
-    def onchange_journal(self, cr, uid, ids, journal_id, line_ids, tax_id, partner_id, date, amount, ttype, context=None):
+    def onchange_journal(self, cr, uid, ids, journal_id, line_ids, tax_id, partner_id, date, amount, ttype, company_id, context=None):
         if not journal_id:
             return False
         journal_pool = self.pool.get('account.journal')
@@ -620,12 +663,16 @@ class account_voucher(osv.osv):
         currency_id = False
         if journal.currency:
             currency_id = journal.currency.id
-            payment_rate = self.pool.get('res.currency').browse(cr, uid, currency_id, context={'date': date}).rate
+            ctx = context.copy()
+            ctx.update({'date': date})
+            payment_rate = self.pool.get('res.currency').browse(cr, uid, currency_id, context=ctx).rate
             vals['value'].update({'payment_rate': payment_rate})
-            res = self.onchange_rate(cr, uid, ids, payment_rate, amount, context=context)
+            res = self.onchange_rate(cr, uid, ids, payment_rate, amount, currency_id, currency_id, company_id, context=ctx)
             for key in res.keys():
                 vals[key].update(res[key])
-        vals['value'].update({'currency_id': currency_id})
+        if currency_id:
+            vals['value'].update({'currency_id': currency_id})
+            vals['value'].update({'payment_rate_currency_id': currency_id})
         res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context)
         for key in res.keys():
             vals[key].update(res[key])
@@ -730,9 +777,9 @@ class account_voucher(osv.osv):
         # TODO: Make this logic available.
         # -for sale, purchase we have but for the payment and receipt we do not have as based on the bank/cash journal we can not know its payment or receipt
         if voucher_brw.type in ('purchase', 'payment'):
-            credit = voucher_brw.amount / voucher_brw.payment_rate
+            credit = voucher_brw.paid_amount_in_company_currency#voucher_brw.amount / voucher_brw.payment_rate * voucher_brw.company_id.currency_id.rate
         elif voucher_brw.type in ('sale', 'receipt'):
-            debit = voucher_brw.amount / voucher_brw.payment_rate
+            debit = voucher_brw.paid_amount_in_company_currency#amount / voucher_brw.payment_rate * voucher_brw.company_id.currency_id.rate
         if debit < 0: credit = -debit; debit = 0.0
         if credit < 0: debit = -credit; credit = 0.0
         sign = debit - credit < 0 and -1 or 1
@@ -831,6 +878,24 @@ class account_voucher(osv.osv):
         }
         return (move_line, move_line_counterpart)
 
+    def _convert_amount(self, cr, uid, amount, voucher_id, context=None):
+        #TODO: doccument me
+        currency_obj = self.pool.get('res.currency')
+        voucher = self.browse(cr, uid, voucher_id, context=context)
+        res = amount
+        if voucher.payment_rate_currency_id.id == voucher.company_id.currency_id.id:
+            rate_between_voucher_and_base = voucher.currency_id.rate or 1.0
+            rate_between_base_and_company = voucher.payment_rate or 1.0
+            res = amount / rate_between_voucher_and_base * rate_between_base_and_company
+        elif voucher.payment_rate_currency_id.id == voucher.currency_id.id:
+            rate_between_base_and_company = voucher.company_id.currency_id.rate or 1.0
+            rate_between_voucher_and_base = voucher.payment_rate or 1.0
+            res = amount / rate_between_voucher_and_base * rate_between_base_and_company
+        else:
+            res = currency_obj.compute(cr, uid, voucher.currency_id.id, voucher.company_id.currency_id.id, amount, context=ctx)
+        print 'res', res
+        return res
+
     def voucher_move_line_create(self, cr, uid, voucher_id, line_total, move_id, company_currency, current_currency, context=None):
         '''
         Create one account move line, on the given account move, per voucher line where amount is not 0.0.
@@ -843,24 +908,32 @@ class account_voucher(osv.osv):
         :param company_currency: id of currency of the company to which the voucher belong
         :param current_currency: id of currency of the voucher
         :return: Tuple build as (remaining amount not allocated on voucher lines, list of account_move_line created in this method)
-        :rtype: tuple(int, list of int)
+        :rtype: tuple(float, list of int)
         '''
+        if context is None:
+            context = {}
         move_line_obj = self.pool.get('account.move.line')
         currency_obj = self.pool.get('res.currency')
         tot_line = line_total
         rec_lst_ids = []
 
-        voucher_brw = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
+        voucher_brw = self.pool.get('account.voucher').browse(cr, uid, voucher_id, context)
+        ctx = context.copy()
+        ctx.update({'date': voucher_brw.date})
         for line in voucher_brw.line_ids:
             #create one move line per voucher line where amount is not 0.0
             if not line.amount:
                 continue
-            #we check if the voucher line is fully paid or not and create a move line to balance the payment and initial invoice if needed
+            #TODO: comment me
+            amount = self._convert_amount(cr, uid, line.untax_amount or line.amount, voucher_brw.id, context=ctx)
+            #residual amount in company currency
+            #amount_residual = line.move_line_id.amount_residual - amount
+            #TODO: remove me
             if line.amount == line.amount_unreconciled:
-                amount = (line.untax_amount or line.amount) / voucher_brw.payment_rate
+            #    amount = (line.untax_amount or line.amount) / voucher_brw.payment_rate 
                 amount_residual = line.move_line_id.amount_residual - amount #residual amount in company currency
             else:
-                amount = (line.untax_amount or line.amount)  / voucher_brw.payment_rate
+            #    amount = (line.untax_amount or line.amount)  / voucher_brw.payment_rate
                 amount_residual = 0.0
             move_line = {
                 'journal_id': voucher_brw.journal_id.id,
@@ -997,6 +1070,9 @@ class account_voucher(osv.osv):
         for voucher in self.browse(cr, uid, ids, context=context):
             if voucher.move_id:
                 continue
+            #TODO: -need to check- Can't we just use the context returned by _sel_context?
+            ctx = context.copy()
+            ctx.update({'date': voucher.date})
             company_currency = self._get_company_currency(cr, uid, voucher.id, context)
             current_currency = self._get_current_currency(cr, uid, voucher.id, context)
             context = self._sel_context(cr, uid, voucher.id, context)
@@ -1010,9 +1086,9 @@ class account_voucher(osv.osv):
             line_total = move_line_brw.debit - move_line_brw.credit
             rec_list_ids = []
             if voucher.type == 'sale':
-                line_total = line_total - (voucher.tax_amount / voucher.payment_rate)
+                line_total = line_total - self._convert_amount(cr, uid, voucher.tax_amount, voucher.id, context=ctx)
             elif voucher.type == 'purchase':
-                line_total = line_total + (voucher.tax_amount / voucher.payment_rate)
+                line_total = line_total + self._convert_amount(cr, uid, voucher.tax_amount, voucher.id, context=ctx)
             #create one move line per voucher line where amount is not 0.0
             line_total, rec_list_ids = self.voucher_move_line_create(cr, uid, voucher.id, line_total, move_id, company_currency, current_currency, context)
 
diff --git a/addons/account_voucher/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml
index 33ae609e3f3..7e5482aa931 100644
--- a/addons/account_voucher/test/account_voucher.yml
+++ b/addons/account_voucher/test/account_voucher.yml
@@ -5,7 +5,6 @@
     account_id: account.cash
     amount: 1000.0
     company_id: base.main_company
-    currency_id: base.EUR
     journal_id: account.bank_journal
     name: Voucher for Axelor
     narration: Basic Pc
diff --git a/addons/account_voucher/test/sales_receipt.yml b/addons/account_voucher/test/sales_receipt.yml
index d3fd720ec6d..7ea4f7d1c55 100644
--- a/addons/account_voucher/test/sales_receipt.yml
+++ b/addons/account_voucher/test/sales_receipt.yml
@@ -5,7 +5,6 @@
     account_id: account.a_recv
     amount: 30000.0
     company_id: base.main_company
-    currency_id: base.EUR
     journal_id: account.sales_journal
     line_cr_ids:
       - account_id: account.a_sale
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 46720b2732c..4adebed8a1a 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -75,13 +75,13 @@
                 <form string="Bill Payment">
                     <group col="6" colspan="4">
                         <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id}" string="Supplier"/>
-                        <field name="amount" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, context)"/>
+                        <field name="amount" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             widget="selection" select="1"
-                            on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, context)"
+                            on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
                             string="Payment Method"/>
-                        <field name="date" select="1" on_change="onchange_date(date, currency_id, amount, context)"/>
+                        <field name="date" select="1" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
                         <field name="reference" select="1" string="Payment Ref"/>
                         <field name="name" colspan="2"/>
                         <field name="account_id"
@@ -119,12 +119,13 @@
                                 <separator string="Internal Notes" colspan="2"/>
                                 <field name="narration" colspan="2" nolabel="1"/>
                             </group>
-                            <group col="2" colspan="1">
-                                <separator string="Other Information" colspan="2"/>
-                                <field name="currency_id"/>
-                                <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, context)" groups='base.group_extended'/>
-                                <field name="paid_amount_in_company_currency" groups='base.group_extended'/>
-                                <field name="number"/>
+                            <group col="4" colspan="1">
+                                <separator string="Other Information" colspan="4"/>
+                                <field name="currency_id" colspan="4"/>
+                                <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" groups='base.group_extended' colspan="3"/>
+                                <field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1"/>
+                                <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4" on_change="onchange_payment_rate_currency(currency_id, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                <field name="number" colspan="4"/>
                             </group>
                         </page>
                     </notebook>
@@ -140,14 +141,14 @@
                 <form string="Bill Payment">
                     <group col="6" colspan="4">
                         <field name="partner_id" domain="[('supplier','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id}" string="Supplier"/>
-                        <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, context)"/>
+                        <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             invisible="context.get('line_type', False)"
                             widget="selection" select="1"
-                            on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, context)"
+                            on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
                             string="Payment Method"/>
-                        <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, amount, context)"/>
+                        <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
                         <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
                         <field name="name" colspan="2" invisible="context.get('line_type', False)"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
@@ -188,12 +189,13 @@
                                 <field name="narration" colspan="2" nolabel="1"/>
                             </group>
                             <group col="2" colspan="1">
-                                <group col="2" colspan="1" attrs="{'invisible':[('currency_id','=',False)]}">
-                                    <separator string="Currency Options" colspan="2"/>
+                                <group col="4" colspan="1" attrs="{'invisible':[('currency_id','=',False)]}">
+                                    <separator string="Currency Options" colspan="4"/>
                                     <field name="exchange_acc_id"
-                                           domain="[('type','=','other')]"/>
-                                    <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, context)" groups='base.group_extended'/>
-                                    <field name="paid_amount_in_company_currency" groups='base.group_extended'/>
+                                           domain="[('type','=','other')]" colspan="4"/>
+                                    <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" groups='base.group_extended' colspan="3"/>
+                                    <field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1"/>
+                                    <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4" on_change="onchange_payment_rate_currency(currency_id, payment_rate_currency_id, date, amount, company_id, context)"/>
                                 </group>
                                 <group col="2" colspan="1">
                                     <separator string="Payment Options" colspan="2"/>
@@ -289,14 +291,14 @@
                         <field name="amount"
                             invisible="context.get('line_type', False)"
                             string="Paid Amount"
-                            on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, context)"/>
+                            on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             invisible="context.get('line_type', False)"
                             widget="selection" select="1"
-                            on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, context)"
+                            on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
                             string="Payment Method"/>
-                        <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, amount, context)"/>
+                        <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
                         <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
                         <field name="name" colspan="2" invisible="context.get('line_type', False)"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
@@ -337,12 +339,13 @@
                                 <field name="narration" colspan="2" nolabel="1"/>
                             </group>
                             <group col="2" colspan="1">
-                                <group col="2" colspan="1" attrs="{'invisible':[('currency_id','=',False)]}">
-                                    <separator string="Currency Options" colspan="2"/>
+                                <group col="4" colspan="1" attrs="{'invisible':[('currency_id','=',False)]}">
+                                    <separator string="Currency Options" colspan="4"/>
                                     <field name="exchange_acc_id"
-                                           domain="[('type','=','other')]"/>
-                                    <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, context)" groups='base.group_extended'/>
-                                    <field name="paid_amount_in_company_currency" groups='base.group_extended'/>
+                                           domain="[('type','=','other')]" colspan="4"/>
+                                    <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" groups='base.group_extended' colspan="3"/>
+                                    <field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1"/>
+                                    <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4" on_change="onchange_payment_rate_currency(currency_id, payment_rate_currency_id, date, amount, company_id, context)"/>
                                 </group>
                                 <group col="2" colspan="1">
                                     <separator string="Payment Options" colspan="2"/>

From 7393886d18ab5274cd5a1911e1280c8b3a9ce2b1 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 23 Nov 2011 14:38:14 +0100
Subject: [PATCH 06/58] [FIX] account_voucher: small fixes in
 account_voucher.py due to last commit and updating of yaml files to have them
 compliant with last changes

bzr revid: qdp-launchpad@openerp.com-20111123133814-w2vsqmklajtyonxk
---
 addons/account_voucher/account_voucher.py     |   5 +-
 addons/account_voucher/test/case1_usd_usd.yml | 113 +++++++++--------
 .../test/case2_suppl_usd_eur.yml              | 114 +++++++++---------
 .../test/case2_usd_eur_debtor_in_eur.yml      | 114 +++++++++---------
 .../test/case2_usd_eur_debtor_in_usd.yml      | 114 +++++++++---------
 addons/account_voucher/test/case3_eur_eur.yml | 113 ++++++++---------
 addons/account_voucher/test/case4_cad_chf.yml |  57 ++++-----
 7 files changed, 314 insertions(+), 316 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 4b099eedc66..b2c87a53672 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -600,7 +600,6 @@ class account_voucher(osv.osv):
                         rs['amount'] = amount
                         total_credit -= amount
 
-            default['value']['line_ids'].append(rs)
             if rs['type'] == 'cr':
                 default['value']['line_cr_ids'].append(rs)
             else:
@@ -880,6 +879,7 @@ class account_voucher(osv.osv):
 
     def _convert_amount(self, cr, uid, amount, voucher_id, context=None):
         #TODO: doccument me
+        #TODO: rounding errors
         currency_obj = self.pool.get('res.currency')
         voucher = self.browse(cr, uid, voucher_id, context=context)
         res = amount
@@ -892,8 +892,7 @@ class account_voucher(osv.osv):
             rate_between_voucher_and_base = voucher.payment_rate or 1.0
             res = amount / rate_between_voucher_and_base * rate_between_base_and_company
         else:
-            res = currency_obj.compute(cr, uid, voucher.currency_id.id, voucher.company_id.currency_id.id, amount, context=ctx)
-        print 'res', res
+            res = currency_obj.compute(cr, uid, voucher.currency_id.id, voucher.company_id.currency_id.id, amount, context=context)
         return res
 
     def voucher_move_line_create(self, cr, uid, voucher_id, line_total, move_id, company_currency, current_currency, context=None):
diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml
index e19e7e3ee46..96a0e07f70d 100644
--- a/addons/account_voucher/test/case1_usd_usd.yml
+++ b/addons/account_voucher/test/case1_usd_usd.yml
@@ -131,39 +131,41 @@
     assert (move_line.debit - move_line.credit == 80), "Invoice move is not correct for debtors account"
 
 -
-  I create the first voucher of payment
-  <create with values 240 USD, journal USD, and fill amounts 180 for the invoice of 200$ and 70 for the invoice of 100$>
+  I set the context that will be used for the encoding of all the vouchers of this file
+-
+  !context
+    'type': 'receipt'
+-
+  I create the first voucher of payment with values 240 USD, journal USD, 
+-
+  !record {model: account.voucher, id: account_voucher_1_case1, view: view_vendor_receipt_form}:
+    account_id: account.cash
+    amount: 240.0
+    company_id: base.main_company
+    journal_id: bank_journal_USD
+    name: 'First payment: Case 1 USD/USD'
+    partner_id: base.res_partner_seagate
+    period_id: account.period_3
+    date: !eval time.strftime("%Y-03-01")
+    payment_option: 'with_writeoff'
+    writeoff_acc_id: account.a_expense
+    comment: 'Write Off'
+
+-
+  I fill amounts 180 for the invoice of 200$ and 70 for the invoice of 100$>
 -
   !python {model: account.voucher}: |
     import netsvc, time
     vals = {}
-    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_USD'), 240.00, 2, ttype='receipt', date=False)
-    vals = {
-        'account_id': ref('account.cash'),
-        'amount': 240.00,
-        'company_id': ref('base.main_company'),
-        'currency_id': ref('base.USD'),
-        'journal_id': ref('bank_journal_USD'),
-        'partner_id': ref('base.res_partner_seagate'),
-        'period_id': ref('account.period_3'),
-        'type': 'receipt',
-        'date': time.strftime("%Y-%m-%d"),
-        'payment_option': 'with_writeoff',
-        'writeoff_acc_id': ref('account.a_expense'),
-        'comment': 'Write Off',
-        'name': 'First payment: Case 1 USD/USD',
-    }
-    vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-03-01'), ref('base.USD'), 240)['value'])
-    if not res['value']['line_cr_ids']:
-      res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
-    for item in res['value']['line_cr_ids']:
-        if item['amount_unreconciled'] == 200.00:
-            item['amount'] = 180.00
+    voucher_id = self.browse(cr, uid, ref('account_voucher_1_case1'))
+    data = []
+    for item in voucher_id.line_cr_ids:
+        if item.amount_unreconciled == 200.00:
+            data += [(item.id, 180.0)]
         else:
-            item['amount'] = 70.00
-    vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
-    id = self.create(cr, uid, vals)
-    voucher_id = self.browse(cr, uid, id)
+            data += [(item.id, 70.0)]
+    for line_id, amount in data:
+        self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
     assert (voucher_id.state=='draft'), "Voucher is not in draft state"
 -
   I check that writeoff amount computed is 10.0
@@ -228,41 +230,36 @@
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
     assert (move_line.amount_residual_currency == 30.0) , "Residual amount is not correct for first Invoice"
 -
-  I create the second voucher of payment
-  <create with values 45 USD, journal USD, and fill amounts 20 for the invoice of 200$ and 30 for the invoice of 100$>
-  
+  I create the second voucher of payment with values 45 USD, journal USD, 
+-
+  !record {model: account.voucher, id: account_voucher_2_case1}:
+    account_id: account.cash
+    amount: 45.0
+    company_id: base.main_company
+    journal_id: bank_journal_USD
+    name: 'Second payment: Case 1'
+    partner_id: base.res_partner_seagate
+    period_id: account.period_3
+    date: !eval time.strftime("%Y-04-01")
+    payment_option: 'with_writeoff'
+    writeoff_acc_id: account.a_expense
+    exchange_acc_id: account.o_expense
+    comment: 'Write Off'
+-
+  I fill amounts 20 for the invoice of 200$ and 30 for the invoice of 100$
 -
   !python {model: account.voucher}: |
     import netsvc, time
     vals = {}
-    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_USD'), 45.00, 2, ttype='receipt', date=False)
-    vals = {
-        'account_id': ref('account.cash'),
-        'amount': 45.00,
-        'exchange_acc_id': ref('account.o_expense'),
-        'company_id': ref('base.main_company'),
-        'currency_id': ref('base.USD'),
-        'journal_id': ref('bank_journal_USD'),
-        'partner_id': ref('base.res_partner_seagate'),
-        'period_id': ref('account.period_3'),
-        'type': 'receipt',
-        'date': time.strftime("%Y-%m-%d"),
-        'payment_option': 'with_writeoff',
-        'writeoff_acc_id': ref('account.a_expense'),
-        'comment': 'Write Off',
-        'name': 'Second payment: Case 1',
-    }
-    vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-04-01'), ref('base.USD'), 45.0)['value'])
-    if not res['value']['line_cr_ids']:
-      res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
-    for item in res['value']['line_cr_ids']:
-        if item['amount_unreconciled'] == 20.00:
-            item['amount'] = 20.00
+    voucher_id = self.browse(cr, uid, ref('account_voucher_2_case1'))
+    data = []
+    for item in voucher_id.line_cr_ids:
+        if item.amount_unreconciled == 20.00:
+            data += [(item.id, 20.0)]
         else:
-            item['amount'] = 30.00
-    vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
-    id = self.create(cr, uid, vals)
-    voucher_id = self.browse(cr, uid, id)
+            data += [(item.id, 30.0)]
+    for line_id, amount in data:
+        self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
     assert (voucher_id.state=='draft'), "Voucher is not in draft state"
 -
   I check that writeoff amount computed is 5.0
diff --git a/addons/account_voucher/test/case2_suppl_usd_eur.yml b/addons/account_voucher/test/case2_suppl_usd_eur.yml
index 23f11d28803..6d6f71b943e 100644
--- a/addons/account_voucher/test/case2_suppl_usd_eur.yml
+++ b/addons/account_voucher/test/case2_suppl_usd_eur.yml
@@ -104,38 +104,41 @@
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
     assert (move_line.debit - move_line.credit == -80), "Invoice move is incorrect for debtors account"
 -
-  I create the first voucher of payment
-  <create with values 240 EUR, journal EUR, and fills amount 180 for the invoice of 200$ and 70 for the invoice of 100$>
+  I set the context that will be used for the encoding of all the vouchers of this file
+-
+  !context
+    'type': 'payment'
+-
+  I create the first voucher of payment with values 240 EUR, journal EUR
+-
+  !record {model: account.voucher, id: account_voucher_1_case2_suppl, view: view_vendor_payment_form}:
+    account_id: account.cash
+    amount: 240.0
+    company_id: base.main_company
+    journal_id: bank_journal_EUR
+    name: 'First payment: Case 2 SUPPL USD/EUR',
+    partner_id: base.res_partner_seagate
+    period_id: account.period_3
+    date: !eval time.strftime("%Y-03-01")
+    payment_option: 'with_writeoff'
+    writeoff_acc_id: account.a_expense
+    comment: 'Write Off'
+
+-
+  I fill amounts 180 for the invoice of 200$ and 70 for the invoice of 100$
 -
   !python {model: account.voucher}: |
     import netsvc, time
     vals = {}
-    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_EUR'), 240.0, 2, ttype='payment', date=False)
-    vals = {
-        'account_id': ref('account.cash'),
-        'amount': 240.0,
-        'company_id': ref('base.main_company'),
-        'currency_id': ref('base.EUR'),
-        'journal_id': ref('bank_journal_EUR'),
-        'partner_id': ref('base.res_partner_seagate'),
-        'period_id': ref('account.period_3'),
-        'type': 'payment',
-        'date': time.strftime("%Y-03-01"),
-        'payment_option': 'with_writeoff',
-        'writeoff_acc_id': ref('account.a_expense'),
-        'comment': 'Write Off',
-        'name': 'First payment: Case 2 SUPPL USD/EUR',
-    }
-    if not res['value']['line_dr_ids']:
-      res['value']['line_dr_ids'] = [{'type': 'dr', 'account_id': ref('account.a_pay'),}]
-    for item in res['value']['line_dr_ids']:
-        if item['amount_unreconciled'] == 200.00:
-            item['amount'] = 180.00
+    voucher_id = self.browse(cr, uid, ref('account_voucher_1_case2_suppl'))
+    data = []
+    for item in voucher_id.line_cr_ids:
+        if item.amount_unreconciled == 200.00:
+            data += [(item.id, 180.0)]
         else:
-            item['amount'] = 70.00
-    vals['line_dr_ids'] = [(0,0,i) for i in res['value']['line_dr_ids']]
-    id = self.create(cr, uid, vals)
-    voucher_id = self.browse(cr, uid, id)
+            data += [(item.id, 70.0)]
+    for line_id, amount in data:
+        self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
     assert (voucher_id.state=='draft'), "Voucher is not in draft state"
 -
   I check that writeoff amount computed is -15.0
@@ -201,7 +204,7 @@
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
     assert (move_line.amount_residual_currency == 20.0 and move_line.amount_residual == 15) , "Residual amount is not correct for first Invoice"
--    
+-
   I check the residual amuont of Invoice2, should be 30 in residual currency and 24 in amount_residual
 -
    !python {model: account.invoice}: |
@@ -210,40 +213,37 @@
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
     assert (move_line.amount_residual_currency == 30 and move_line.amount_residual == 24) , "Residual amount is not correct for second Invoice"
--  
-  I create the second voucher of payment
-  <create with values 45 USD, journal USD, and fill amounts 20 for the invoice of 200$ and 30 for the invoice of 100$>
+-
+  I create the second voucher of payment with values 45 USD, journal USD, 
+-
+  !record {model: account.voucher, id: account_voucher_2_case2_suppl, view: view_vendor_payment_form}:
+    account_id: account.cash
+    amount: 45.0
+    company_id: base.main_company
+    journal_id: bank_journal_USD
+    partner_id: base.res_partner_seagate
+    period_id: account.period_3
+    date: !eval time.strftime("%Y-04-01")
+    payment_option: 'with_writeoff'
+    writeoff_acc_id: account.a_expense
+    comment: 'Write Off'
+    name: 'Second payment: Case 2 SUPPL USD/EUR'
+
+-
+  I fill amounts 20 for the invoice of 200$ and 30 for the invoice of 100$>
 -
   !python {model: account.voucher}: |
     import netsvc, time
     vals = {}
-    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_EUR'), 45.0, 2, ttype='payment', date=False)
-    vals = {
-        'account_id': ref('account.cash'),
-        'amount': 45.0,
-        'company_id': ref('base.main_company'),
-        'currency_id': ref('base.USD'),
-        'journal_id': ref('bank_journal_USD'),
-        'partner_id': ref('base.res_partner_seagate'),
-        'period_id': ref('account.period_3'),
-        'type': 'payment',
-        'date': time.strftime("%Y-%m-%d"),
-        'payment_option': 'with_writeoff',
-        'writeoff_acc_id': ref('account.a_expense'),
-        'comment': 'Write Off',
-        'name': 'Second payment: Case 2 SUPPL USD/EUR',
-    }
-    vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-04-01'), ref('base.USD'), 45.0)['value'])
-    if not res['value']['line_dr_ids']:
-      res['value']['line_dr_ids'] = [{'type': 'dr', 'account_id': ref('account.a_pay'),}]
-    for item in res['value']['line_dr_ids']:
-        if item['amount_unreconciled'] == 20.00:
-            item['amount'] = 20.00
+    voucher_id = self.browse(cr, uid, ref('account_voucher_2_case2_suppl'))
+    data = []
+    for item in voucher_id.line_cr_ids:
+        if item.amount_unreconciled == 20.00:
+            data += [(item.id, 20.0)]
         else:
-            item['amount'] = 30.00
-    vals['line_dr_ids'] = [(0,0,i) for i in res['value']['line_dr_ids']]
-    id = self.create(cr, uid, vals)
-    voucher_id = self.browse(cr, uid, id)
+            data += [(item.id, 30.0)]
+    for line_id, amount in data:
+        self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
     assert (voucher_id.state=='draft'), "Voucher is not in draft state"
 -
   I check that writeoff amount computed is -5.0
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
index 67287591778..fa87fc1289b 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
@@ -136,38 +136,41 @@
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
     assert (move_line.debit - move_line.credit == 80), "Invoice move is incorrect for debtors account"
 -
-  I create the first voucher of payment
-  <create with values 200 EUR, journal EUR, and fills amount 130 EUR for the invoice of 200 USD and 70 EUR for the invoice of 100 USD>
+  I set the context that will be used for the encoding of all the vouchers of this file
+-
+  !context
+    'type': 'receipt'
+-
+  I create the first voucher of payment with values 200 EUR, journal EUR 
+-
+  !record {model: account.voucher, id: account_voucher_1_case2a, view: view_vendor_receipt_form}:
+    account_id: account.cash
+    amount: 200.0
+    company_id: base.main_company
+    journal_id: bank_journal_EUR
+    partner_id: base.res_partner_seagate
+    period_id: account.period_3
+    date: !eval time.strftime("%Y-03-01")
+    payment_option: 'with_writeoff'
+    writeoff_acc_id: account.a_expense
+    comment: 'Write Off'
+    name: 'First payment: Case 2 USD/EUR DR EUR'
+
+-
+  I fill amounts 130 for the invoice of 200$ and 70 for the invoice of 100$
 -
   !python {model: account.voucher}: |
     import netsvc, time
     vals = {}
-    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_EUR'), 240.0, False, ttype='receipt', date=False)
-    vals = {
-        'account_id': ref('account.cash'),
-        'amount': 200.0,
-        'company_id': ref('base.main_company'),
-        'currency_id': False,
-        'journal_id': ref('bank_journal_EUR'),
-        'partner_id': ref('base.res_partner_seagate'),
-        'period_id': ref('account.period_3'),
-        'type': 'receipt',
-        'date': time.strftime("%Y-03-01"),
-        'payment_option': 'with_writeoff',
-        'writeoff_acc_id': ref('account.a_expense'),
-        'comment': 'Write Off',
-        'name': 'First payment: Case 2 USD/EUR DR EUR',
-    }
-    if not res['value']['line_cr_ids']:
-      res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
-    for item in res['value']['line_cr_ids']:
-        if item['amount_unreconciled'] == 150.00:
-            item['amount'] = 130.00
+    voucher_id = self.browse(cr, uid, ref('account_voucher_1_case2a'))
+    data = []
+    for item in voucher_id.line_cr_ids:
+        if item.amount_unreconciled == 150.00:
+            data += [(item.id, 130.0)]
         else:
-            item['amount'] = 70.00
-    vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
-    id = self.create(cr, uid, vals)
-    voucher_id = self.browse(cr, uid, id)
+            data += [(item.id, 70.0)]
+    for line_id, amount in data:
+        self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
     assert (voucher_id.state=='draft'), "Voucher is not in draft state"
 -
   I confirm the voucher
@@ -217,41 +220,38 @@
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
     assert (move_line.amount_residual_currency == 22.22 and move_line.amount_residual == 10) , "Residual amount is not correct for second Invoice"
--  
-  I create the second voucher of payment
-  <create with values 80 USD, journal USD, and fully reconcile the 2 invoices>
+-
+  I create the second voucher of payment with values 80 USD, journal USD
+-
+  !record {model: account.voucher, id: account_voucher_2_case2a, view: view_vendor_receipt_form}:
+    account_id: account.cash
+    amount: 80
+    company_id: base.main_company
+    journal_id: bank_journal_USD
+    partner_id: base.res_partner_seagate
+    period_id: account.period_3
+    date: !eval time.strftime("%Y-04-01")
+    payment_option: 'with_writeoff'
+    writeoff_acc_id: account.a_expense
+    exchange_acc_id: account.o_expense
+    comment: 'Write Off'
+    name: 'Second payment: Case 2 SUPPL USD/EUR DR EUR'
+
+-
+  and I fully reconcile the 2 previous invoices
 -
   !python {model: account.voucher}: |
     import netsvc, time
     vals = {}
-    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_USD'), 80.0, 2, ttype='receipt', date=False)
-    vals = {
-        'account_id': ref('account.cash'),
-        'amount': 80.0,
-        'company_id': ref('base.main_company'),
-        'currency_id': ref('base.USD'),
-        'journal_id': ref('bank_journal_USD'),
-        'partner_id': ref('base.res_partner_seagate'),
-        'period_id': ref('account.period_3'),
-        'type': 'receipt',
-        'date': time.strftime("%Y-%m-%d"),
-        'payment_option': 'with_writeoff',
-        'writeoff_acc_id': ref('account.a_expense'),
-        'exchange_acc_id': ref('account.o_expense'),
-        'comment': 'Write Off',
-        'name': 'Second payment: Case 2 SUPPL USD/EUR DR EUR',
-    }
-    vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-04-01'), ref('base.USD'), 80.0)['value'])
-    if not res['value']['line_cr_ids']:
-      res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
-    for item in res['value']['line_cr_ids']:
-        if item['amount_unreconciled'] == 55.56:
-            item['amount'] = 55.56
+    voucher_id = self.browse(cr, uid, ref('account_voucher_2_case2a'))
+    data = []
+    for item in voucher_id.line_cr_ids:
+        if item.amount_unreconciled == 55.56:
+            data += [(item.id, 55.56)]
         else:
-            item['amount'] = 22.22
-    vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
-    id = self.create(cr, uid, vals)
-    voucher_id = self.browse(cr, uid, id)
+            data += [(item.id, 22.22)]
+    for line_id, amount in data:
+        self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
     assert (voucher_id.state=='draft'), "Voucher is not in draft state"
 -
   I check that writeoff amount computed is 2.22
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
index ec4d653c8ab..43c00a9f798 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
@@ -136,38 +136,41 @@
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
     assert (move_line.debit - move_line.credit == 80), "Invoice move is incorrect for debtors account"
 -
-  I create the first voucher of payment
-  <create with values 200 EUR (€), journal EUR, and fills amount 130€ for the invoice of 200$ and 70€ for the invoice of 100$>
+  I set the context that will be used for the encoding of all the vouchers of this file
+-
+  !context
+    'type': 'receipt'
+-
+  I create the first voucher of payment with values 200 EUR, journal EUR
+-
+  !record {model: account.voucher, id: account_voucher_1_case2b, view: view_vendor_receipt_form}:
+    account_id: account.cash
+    amount: 200.0
+    company_id: base.main_company
+    journal_id: bank_journal_EUR
+    partner_id: base.res_partner_seagate
+    period_id: account.period_3
+    date: !eval time.strftime("%Y-03-01")
+    payment_option: 'with_writeoff'
+    writeoff_acc_id: account.a_expense
+    comment: 'Write Off'
+    name: 'First payment: Case 2 USD/EUR DR USD'
+
+-
+  I fill amounts 130 for the invoice of 200$ and 70 for the invoice of 100$>
 -
   !python {model: account.voucher}: |
     import netsvc, time
     vals = {}
-    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_EUR'), 200.0, False, ttype='receipt', date=False)
-    vals = {
-        'account_id': ref('account.cash'),
-        'amount': 200.0,
-        'company_id': ref('base.main_company'),
-        'currency_id': ref('base.EUR'),
-        'journal_id': ref('bank_journal_EUR'),
-        'partner_id': ref('base.res_partner_seagate'),
-        'period_id': ref('account.period_3'),
-        'type': 'receipt',
-        'date': time.strftime("%Y-03-01"),
-        'payment_option': 'with_writeoff',
-        'writeoff_acc_id': ref('account.a_expense'),
-        'comment': 'Write Off',
-        'name': 'First payment: Case 2 USD/EUR DR USD',
-    }
-    if not res['value']['line_cr_ids']:
-      res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
-    for item in res['value']['line_cr_ids']:
-        if item['amount_unreconciled'] == 150.00:
-            item['amount'] = 130.00
+    voucher_id = self.browse(cr, uid, ref('account_voucher_1_case2b'))
+    data = []
+    for item in voucher_id.line_cr_ids:
+        if item.amount_unreconciled == 150.00:
+            data += [(item.id, 130.0)]
         else:
-            item['amount'] = 70.00
-    vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
-    id = self.create(cr, uid, vals)
-    voucher_id = self.browse(cr, uid, id)
+            data += [(item.id, 70.0)]
+    for line_id, amount in data:
+        self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
     assert (voucher_id.state=='draft'), "Voucher is not in draft state"
 -
   I confirm the voucher
@@ -220,41 +223,38 @@
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
     assert (move_line.amount_residual_currency == 22.22 and move_line.amount_residual == 10) , "Residual amount is not correct for second Invoice"
--  
-  I create the second voucher of payment
-  <create with values 80 USD, journal USD, and fully reconcile the 2 invoices>
+-
+  I create the second voucher of payment with values 80 USD, journal USD
+-
+  !record {model: account.voucher, id: account_voucher_2_case2b, view: view_vendor_receipt_form}:
+    account_id: account.cash
+    amount: 80.0
+    company_id: base.main_company
+    journal_id: bank_journal_USD
+    partner_id: base.res_partner_seagate
+    period_id: account.period_3
+    date: !eval time.strftime("%Y-04-01")
+    payment_option: 'with_writeoff'
+    writeoff_acc_id: account.a_expense
+    exchange_acc_id: account.o_expense
+    comment: 'Write Off'
+    name: 'Second payment: Case 2 SUPPL USD/EUR DR USD'
+
+-
+  and I fully reconcil the 2 previous invoices
 -
   !python {model: account.voucher}: |
     import netsvc, time
     vals = {}
-    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_USD'), 80.0, ref('base.USD'), ttype='receipt', date=False)
-    vals = {
-        'account_id': ref('account.cash'),
-        'amount': 80.0,
-        'company_id': ref('base.main_company'),
-        'currency_id': ref('base.USD'),
-        'journal_id': ref('bank_journal_USD'),
-        'partner_id': ref('base.res_partner_seagate'),
-        'period_id': ref('account.period_3'),
-        'type': 'receipt',
-        'date': time.strftime("%Y-%m-%d"),
-        'payment_option': 'with_writeoff',
-        'writeoff_acc_id': ref('account.a_expense'),
-        'exchange_acc_id': ref('account.o_expense'),
-        'comment': 'Write Off',
-        'name': 'Second payment: Case 2 SUPPL USD/EUR DR USD',
-    }
-    vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-04-01'), ref('base.USD'), 80.0)['value'])
-    if not res['value']['line_cr_ids']:
-      res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
-    for item in res['value']['line_cr_ids']:
-        if item['amount_unreconciled'] == 55.56:
-            item['amount'] = 55.56
+    voucher_id = self.browse(cr, uid, ref('account_voucher_2_case2b'))
+    data = []
+    for item in voucher_id.line_cr_ids:
+        if item.amount_unreconciled == 55.56:
+            data += [(item.id, 55.56)]
         else:
-            item['amount'] = 22.22
-    vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
-    id = self.create(cr, uid, vals)
-    voucher_id = self.browse(cr, uid, id)
+            data += [(item.id, 22.22)]
+    for line_id, amount in data:
+        self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
     assert (voucher_id.state=='draft'), "Voucher is not in draft state"
 -
   I check that writeoff amount computed is 2.22
diff --git a/addons/account_voucher/test/case3_eur_eur.yml b/addons/account_voucher/test/case3_eur_eur.yml
index 09034fadf51..a2fc39e1844 100644
--- a/addons/account_voucher/test/case3_eur_eur.yml
+++ b/addons/account_voucher/test/case3_eur_eur.yml
@@ -99,38 +99,41 @@
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
     assert (move_line.debit - move_line.credit == 80.00), "Invoice move is incorrect for debtors account"
 -
-  I create the first voucher of payment
-  <create with values 120 EUR, journal EUR, and fill amounts 100 for the invoice of 150 EUR and 20 for the invoice of 80 EUR>
+  I set the context that will be used for the encoding of all the vouchers of this file
+-
+  !context
+    'type': 'receipt'
+-
+  I create the first voucher of payment with values 120 EUR, journal EUR
+-
+  !record {model: account.voucher, id: account_voucher_1_case3, view: view_vendor_receipt_form}:
+    account_id: account.cash
+    amount: 120.0
+    company_id: base.main_company
+    journal_id: bank_journal_EUR
+    partner_id: base.res_partner_seagate
+    period_id: account.period_3
+    date: !eval time.strftime("%Y-03-01")
+    payment_option: 'with_writeoff'
+    writeoff_acc_id: account.a_expense
+    comment: 'Write Off'
+    name: 'First payment: Case 3'
+
+-
+  I fill amounts 100 for the invoice of 150€ and 20 for the invoice of 80€
 -
   !python {model: account.voucher}: |
     import netsvc, time
     vals = {}
-    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_EUR'), 120.00, False, ttype='receipt', date=False)
-    vals = {
-        'account_id': ref('account.cash'),
-        'amount': 120.00,
-        'company_id': ref('base.main_company'),
-        'currency_id': ref('base.EUR'),
-        'journal_id': ref('bank_journal_EUR'),
-        'partner_id': ref('base.res_partner_seagate'),
-        'period_id': ref('account.period_3'),
-        'type': 'receipt',
-        'date': time.strftime("%Y-03-01"),
-        'payment_option': 'with_writeoff',
-        'writeoff_acc_id': ref('account.a_expense'),
-        'comment': 'Write Off',
-        'name': 'First payment: Case 3',
-    }
-    if not res['value']['line_cr_ids']:
-      res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
-    for item in res['value']['line_cr_ids']:
-        if item['amount_unreconciled'] == 150.00:
-            item['amount'] = 100.00
+    voucher_id = self.browse(cr, uid, ref('account_voucher_1_case3'))
+    data = []
+    for item in voucher_id.line_cr_ids:
+        if item.amount_unreconciled == 150.00:
+            data += [(item.id, 100.0)]
         else:
-            item['amount'] = 20.00
-    vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
-    id = self.create(cr, uid, vals)
-    voucher_id = self.browse(cr, uid, id)
+            data += [(item.id, 20.0)]
+    for line_id, amount in data:
+        self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
     assert (voucher_id.state=='draft'), "Voucher is not in draft state"
 -
   I check that writeoff amount computed is 0.00
@@ -181,7 +184,7 @@
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
     assert (move_line.amount_residual_currency == 50.0 and move_line.amount_residual == 50.0) , "Residual amount is not correct for first Invoice"
--    
+-
   I check the residual amuont of Invoice2 is 60
 -
    !python {model: account.invoice}: |
@@ -191,38 +194,36 @@
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
     assert (move_line.amount_residual_currency == 60.0 and move_line.amount_residual == 60.0) , "Residual amount is not correct for second Invoice"
 -
-  I create the second voucher of payment and check to let open the debtor overpaid amount.
-  <create with values 120 EUR, journal EUR, and fill amounts 50 for the invoice of 150 EUR and 70 for the invoice of 80 EUR>
+  I create the second voucher of payment with values 120€, journal EUR, and check to let open the debtor overpaid amount
+-
+  !record {model: account.voucher, id: account_voucher_2_case3, view: view_vendor_receipt_form}:
+    account_id: account.cash
+    amount: 120.0
+    company_id: base.main_company
+    journal_id: bank_journal_EUR
+    partner_id: base.res_partner_seagate
+    period_id: account.period_3
+    date: !eval time.strftime("%Y-04-01")
+    payment_option: 'with_writeoff'
+    writeoff_acc_id: account.a_expense
+    comment: 'Write Off'
+    name: 'Second payment: Case 3'
+
+-
+  I fill amounts 50 for the invoice of 150€ and 70 for the invoice of 80€
 -
   !python {model: account.voucher}: |
     import netsvc, time
     vals = {}
-    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_EUR'), 120.00, False, ttype='receipt', date=False)
-    vals = {
-        'account_id': ref('account.cash'),
-        'amount': 120.00,
-        'company_id': ref('base.main_company'),
-        'currency_id': ref('base.EUR'),
-        'journal_id': ref('bank_journal_EUR'),
-        'partner_id': ref('base.res_partner_seagate'),
-        'period_id': ref('account.period_3'),
-        'type': 'receipt',
-        'date': time.strftime("%Y-04-01"),
-        'payment_option': 'with_writeoff',
-        'writeoff_acc_id': ref('account.a_expense'),
-        'comment': 'Write Off',
-        'name': 'Second payment: Case 3',
-    }
-    if not res['value']['line_cr_ids']:
-      res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
-    for item in res['value']['line_cr_ids']:
-        if item['amount_unreconciled'] == 50.00:
-            item['amount'] = 50.00
-        elif item['amount_unreconciled'] == 60.00:
-            item['amount'] = 70.00
-    vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
-    id = self.create(cr, uid, vals)
-    voucher_id = self.browse(cr, uid, id)
+    voucher_id = self.browse(cr, uid, ref('account_voucher_2_case3'))
+    data = []
+    for item in voucher_id.line_cr_ids:
+        if item.amount_unreconciled == 50.00:
+            data += [(item.id, 50.0)]
+        elif item.amount_unreconciled == 60.00:
+            data += [(item.id, 70.00)]
+    for line_id, amount in data:
+        self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
     assert (voucher_id.state=='draft'), "Voucher is not in draft state"
 -
   I check that writeoff amount computed is 0.00
diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml
index b3abbb25e01..2fe43b57fd3 100644
--- a/addons/account_voucher/test/case4_cad_chf.yml
+++ b/addons/account_voucher/test/case4_cad_chf.yml
@@ -89,38 +89,39 @@
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
     assert (move_line.debit - move_line.credit == 149.39), "Invoice move is incorrect for debtors account"
 -
-  I create the first voucher of payment
-  <create with values 200 CHF, journal CHF, and completly pat the invoice of 200 CAD>
+  I set the context that will be used for the encoding of all the vouchers of this file
+-
+  !context
+    'type': 'receipt'
+-
+  I create the first voucher of payment with values 200 CHF, journal CHF
+-
+  !record {model: account.voucher, id: account_voucher_1_case4, view: view_vendor_receipt_form}:
+    account_id: account.cash
+    amount: 200
+    company_id: base.main_company
+    journal_id: bank_journal_CHF
+    partner_id: base.res_partner_seagate
+    period_id: account.period_3
+    date: !eval time.strftime("%Y-03-01")
+    payment_option: 'with_writeoff'
+    writeoff_acc_id: account.a_expense
+    exchange_acc_id: account.o_expense
+    comment: 'Write Off'
+    name: 'First payment: Case 4'
+-
+  I completly pay the invoice of 200 CAD
 -
   !python {model: account.voucher}: |
     import netsvc, time
     vals = {}
-    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_CHF'), 200.00, ref('base.CHF'), ttype='receipt', date=False)
-    vals = {
-        'account_id': ref('account.cash'),
-        'amount': 200.00,
-        'company_id': ref('base.main_company'),
-        'currency_id': ref('base.CHF'),
-        'journal_id': ref('bank_journal_CHF'),
-        'partner_id': ref('base.res_partner_seagate'),
-        'period_id': ref('account.period_3'),
-        'type': 'receipt',
-        'date': time.strftime("%Y-%m-%d"),
-        'payment_option': 'with_writeoff',
-        'writeoff_acc_id': ref('account.a_expense'),
-        'exchange_acc_id': ref('account.o_expense'),
-        'comment': 'Write Off',
-        'name': 'First payment: Case 4',
-    }
-    vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-03-01'), ref('base.CHF'), 200.0)['value'])
-    if not res['value']['line_cr_ids']:
-      res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
-    for item in res['value']['line_cr_ids']:
-        if item['amount_unreconciled'] == 186.74:
-            item['amount'] = 186.74
-    vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
-    id = self.create(cr, uid, vals)
-    voucher_id = self.browse(cr, uid, id)
+    voucher_id = self.browse(cr, uid, ref('account_voucher_1_case4'))
+    data = []
+    for item in voucher_id.line_cr_ids:
+        if item.amount_unreconciled == 186.74:
+            data += [(item.id, 186.74)]
+    for line_id, amount in data:
+        self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
     assert (voucher_id.state=='draft'), "Voucher is not in draft state"
 -
   I check that writeoff amount computed is 13.26

From e9051fabdb42caf291e6055b1cf957dd74290ee9 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 23 Nov 2011 15:32:22 +0100
Subject: [PATCH 07/58] [IMP] account_voucher: added a a column 'full
 reconcile' on the voucher lines

bzr revid: qdp-launchpad@openerp.com-20111123143222-xuj8dfjw0ne85dfb
---
 addons/account_voucher/account_voucher.py     | 19 ++++++++++++++++++-
 .../voucher_payment_receipt_view.xml          |  6 ++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index b2c87a53672..3c12db84a40 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -600,6 +600,9 @@ class account_voucher(osv.osv):
                         rs['amount'] = amount
                         total_credit -= amount
 
+            if rs['amount_unreconciled'] == rs['amount']:
+                rs['reconcile'] = True
+
             if rs['type'] == 'cr':
                 default['value']['line_cr_ids'].append(rs)
             else:
@@ -1165,6 +1168,7 @@ class account_voucher_line(osv.osv):
         'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'),
         'untax_amount':fields.float('Untax Amount'),
         'amount':fields.float('Amount', digits_compute=dp.get_precision('Account')),
+        'reconcile': fields.boolean('Full Reconcile'),
         'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Dr/Cr'),
         'account_analytic_id':  fields.many2one('account.analytic.account', 'Analytic Account'),
         'move_line_id': fields.many2one('account.move.line', 'Journal Item'),
@@ -1175,9 +1179,22 @@ class account_voucher_line(osv.osv):
         'company_id': fields.related('voucher_id','company_id', relation='res.company', type='many2one', string='Company', store=True, readonly=True),
     }
     _defaults = {
-        'name': ''
+        'name': '',
+        'reconcile': False,
     }
 
+    def onchange_reconcile(self, cr, uid, ids, reconcile, amount, amount_unreconciled, context=None):
+        vals = { 'amount': 0.0}
+        if reconcile:
+            vals = { 'amount': amount_unreconciled}
+        return {'value': vals}
+
+    def onchange_amount(self, cr, uid, ids, amount, amount_unreconciled, context=None):
+        vals = {}
+        if amount:
+            vals['reconcile'] = (amount == amount_unreconciled)
+        return {'value': vals}
+
     def onchange_move_line_id(self, cr, user, ids, move_line_id, context=None):
         """
         Returns a dict that contains new values and context
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 4adebed8a1a..6265abf1c7d 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -172,7 +172,8 @@
                                     <field name="date_due" readonly="1"/>
                                     <field name="amount_original" readonly="1"/>
                                     <field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
-                                    <field name="amount" sum="Payment"/>
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
+                                    <field name="amount" sum="Payment" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
                             <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}">
@@ -322,7 +323,8 @@
                                     <field name="date_due" readonly="1"/>
                                     <field name="amount_original" readonly="1"/>
                                     <field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
-                                    <field name="amount" sum="Payment"/>
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
+                                    <field name="amount" sum="Payment" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
                             <field name="line_dr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, context)">

From e346d6c8ad4c13bea210174c36fb0c6c5a8f38db Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 23 Nov 2011 17:22:34 +0100
Subject: [PATCH 08/58] [IMP] account_voucher: changed logic when paying an
 invoice in a secondary currency => now we always write the amount_currency
 (and in the same currency)

bzr revid: qdp-launchpad@openerp.com-20111123162234-nr685qp729btv19c
---
 addons/account_voucher/account_voucher.py       | 17 ++++++++++++++---
 .../test/case2_usd_eur_debtor_in_eur.yml        | 12 ------------
 addons/account_voucher/test/case4_cad_chf.yml   |  4 ++--
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 3c12db84a40..e47038de03b 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -882,7 +882,7 @@ class account_voucher(osv.osv):
 
     def _convert_amount(self, cr, uid, amount, voucher_id, context=None):
         #TODO: doccument me
-        #TODO: rounding errors
+        #TODO: check: rounding errors ?
         currency_obj = self.pool.get('res.currency')
         voucher = self.browse(cr, uid, voucher_id, context=context)
         res = amount
@@ -944,7 +944,7 @@ class account_voucher(osv.osv):
                 'account_id': line.account_id.id,
                 'move_id': move_id,
                 'partner_id': voucher_brw.partner_id.id,
-                'currency_id': company_currency <> current_currency and current_currency or False,
+                'currency_id': line.move_line_id and (company_currency <> line.move_line_id.currency_id.id and line.move_line_id.currency_id.id) or False,
                 'analytic_account_id': line.account_analytic_id and line.account_analytic_id.id or False,
                 'quantity': 1,
                 'credit': 0.0,
@@ -976,7 +976,18 @@ class account_voucher(osv.osv):
                     raise osv.except_osv(_('No Account Base Code and Account Tax Code!'),_("You have to configure account base code and account tax code on the '%s' tax!") % (tax_data.name))
 
             sign = (move_line['debit'] - move_line['credit']) < 0 and -1 or 1
-            move_line['amount_currency'] = company_currency <> current_currency and sign * line.amount or False
+            #TODO: comment me
+            amount_currency = False
+            if line.move_line_id:
+                if line.move_line_id.currency_id and line.move_line_id.currency_id.id != company_currency:
+                    if line.move_line_id.currency_id.id == current_currency:
+                        amount_currency = sign * (line.amount)
+                    elif line.move_line_id.currency_id.id == voucher_brw.payment_rate_currency_id.id:
+                        amount_currency = (move_line['debit'] - move_line['credit']) * voucher_brw.payment_rate
+                    else:
+                        amount_currency = currency_obj.compute(cr, uid, company_currency, line.move_line_id.currency_id.id, move_line['debit']-move_line['credit'], context=ctx)
+
+            move_line['amount_currency'] = amount_currency
             voucher_line = move_line_obj.create(cr, uid, move_line)
             rec_ids = [voucher_line, line.move_line_id.id]
 
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
index fa87fc1289b..5aadc93be13 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
@@ -190,18 +190,6 @@
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
     for move_line in move_line_obj.browse(cr, uid, move_lines):
         assert move_line.state == 'valid', "Voucher move is not valid"
--
-  I check that my debtor account is correct
--
-  I check that the debtor account has 2 new lines with 0 in amount_currency columns and their credit columns are 130 and 70
--
-  !python {model: account.voucher}: |
-    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
-    voucher_id = self.browse(cr, uid, voucher[0])
-    move_line_obj = self.pool.get('account.move.line')
-    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
-    for move_line in move_line_obj.browse(cr, uid, move_lines):
-        assert move_line.amount_currency == 0.00, "A line has the 'amount_currency' column filled"
 -
   I check the residual amount of Invoice1, should be 55.56 in residual currency and 20 in amount_residual
 -
diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml
index 2fe43b57fd3..bb9bda9126c 100644
--- a/addons/account_voucher/test/case4_cad_chf.yml
+++ b/addons/account_voucher/test/case4_cad_chf.yml
@@ -152,7 +152,7 @@
 -
   I check that my debtor account is correct
 -
-  I check that the debtor account has 1 new line with -186.74 as amount_currency columns and 149.39 of credit and currency is CHF.
+  I check that the debtor account has 1 new line with -298.78 as amount_currency columns and 149.39 of credit and currency is CAD.
 -
   I check that my currency rate difference is correct. 0 in debit with no amount_currency
 -
@@ -166,7 +166,7 @@
     for move_line in move_line_obj.browse(cr, uid, move_lines):
         if move_line.amount_currency == 200:
             assert move_line.debit == 160.00, "Bank account has wrong entry."
-        elif move_line.amount_currency == -186.74:
+        elif move_line.amount_currency == -298.78:
             assert move_line.credit == 149.39, "Debtor account has wrong entry."
         elif move_line.debit == 0.00 and move_line.credit == 0.00:
             assert move_line.amount_currency == 0.00, "Incorrect Currency Difference."

From d92d56dc6f4d22e622382030e787b7ae96c6e1ef Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 23 Nov 2011 17:24:18 +0100
Subject: [PATCH 09/58] [IMP] account_followup: changing again the way to group
 lines in followup report in multi currency cases

bzr revid: qdp-launchpad@openerp.com-20111123162418-9qcdfw1sswxi2pc1
---
 addons/account_followup/report/account_followup_print.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py
index f2cf476e674..56004cebde3 100644
--- a/addons/account_followup/report/account_followup_print.py
+++ b/addons/account_followup/report/account_followup_print.py
@@ -64,9 +64,9 @@ class report_rappel(report_sxw.rml_parse):
         line_cur = {base_currency.id: {'line': []}}
 
         for line in movelines:
-            if line.account_id.currency_id and (not line.account_id.currency_id.id in line_cur):
-                line_cur[line.account_id.currency_id.id] = {'line': []}
-            currency = line.account_id.currency_id or line.company_id.currency_id
+            if line.currency_id and (not line.currency_id.id in line_cur):
+                line_cur[line.currency_id.id] = {'line': []}
+            currency = line.currency_id or line.company_id.currency_id
             line_data = {
                          'name': line.move_id.name,
                          'ref': line.ref,

From 3440aa70f4bec5f2679aeb874260ca07eb6faef4 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 23 Nov 2011 17:33:43 +0100
Subject: [PATCH 10/58] [IMP] account_voucher: usabilty small improvements

bzr revid: qdp-launchpad@openerp.com-20111123163343-v4nhltzvcd7r5ob3
---
 .../voucher_payment_receipt_view.xml          | 63 +++++++++++--------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 6265abf1c7d..17216ed5f21 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -108,10 +108,15 @@
                             </field>
                             <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('type', '=', 'payment')]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, context)">
                                 <tree string="Open Customer Journal Entries" editable="bottom" colors="gray:amount==0">
-                                    <field name="move_line_id"/>
-                                    <field name="account_id" groups="base.group_extended" domain="[('type','=','receivable')]"/>
-                                    <field name="date_original"/>
-                                    <field name="amount_original"/>
+                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
+                                        on_change="onchange_move_line_id(move_line_id)"
+                                        domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                                        />
+                                    <field name="account_id" groups="base.group_extended" domain="[('type','=','payable')]"/>
+                                    <field name="date_original" readonly="1"/>
+                                    <field name="date_due" readonly="1"/>
+                                    <field name="amount_original" readonly="1"/>
+                                    <field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
                                     <field name="amount" sum="Payment"/>
                                 </tree>
                             </field>
@@ -157,6 +162,7 @@
                             invisible="True"/>
                         <field name="pre_line" invisible="1"/>
                         <field name="type" invisible="True"/>
+                        <field name="currency_id" invisible="1" colspan="4"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Payment Information">
@@ -165,7 +171,7 @@
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
-                                        required="1"
+                                        required="1" readonly="1"
                                         />
                                     <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
                                     <field name="date_original" readonly="1"/>
@@ -178,11 +184,18 @@
                             </field>
                             <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}">
                                 <tree string="Credits" editable="bottom" colors="gray:amount==0">
-                                    <field name="move_line_id"/>
-                                    <field name="account_id" groups="base.group_extended" domain="[('type','=','receivable')]"/>
-                                    <field name="date_original"/>
-                                    <field name="amount_original"/>
-                                    <field name="amount" sum="Payment"/>
+                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
+                                        on_change="onchange_move_line_id(move_line_id)"
+                                        domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                                        required="1" readonly="1"
+                                        />
+                                    <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
+                                    <field name="date_original" readonly="1"/>
+                                    <field name="date_due" readonly="1"/>
+                                    <field name="amount_original" readonly="1"/>
+                                    <field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
+                                    <field name="amount" sum="Payment" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
                             <group col="2" colspan="3">
@@ -211,11 +224,6 @@
                                     <field name="analytic_id"
                                            groups="analytic.group_analytic_accounting"/>
                                 </group>
-                                <group col="4" colspan="2">
-                                    <separator string="Other Information" colspan="4"/>
-                                    <field name="number" colspan="4"/>
-                                    <field name="currency_id" invisible="1" colspan="4"/>
-                                </group>
                             </group>
                         </page>
                         <page string="Journal Items" groups="base.group_extended" attrs="{'invisible': [('state','!=','posted')]}">
@@ -223,6 +231,7 @@
                                 <field name="period_id"/>
                                 <field name="audit"/>
                             </group>
+                            <field name="number" colspan="4"/>
                             <field name="move_ids" colspan="4" nolabel="1" readonly="1">
                                <tree string="Journal Items">
                                    <field name="move_id"/>
@@ -316,7 +325,7 @@
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
-                                        required="1"
+                                        required="1" readonly="1"
                                         />
                                     <field name="account_id"  groups="base.group_no_one" domain="[('type','=','receivable')]"/>
                                     <field name="date_original" readonly="1"/>
@@ -329,11 +338,18 @@
                             </field>
                             <field name="line_dr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, context)">
                                 <tree string="Credits" editable="bottom" colors="gray:amount==0">
-                                    <field name="move_line_id"/>
-                                    <field name="account_id"  groups="base.group_extended" domain="[('type','=','receivable')]"/>
-                                    <field name="date_original"/>
-                                    <field name="amount_original"/>
-                                    <field name="amount" sum="Payment"/>
+                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
+                                        on_change="onchange_move_line_id(move_line_id)"
+                                        domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                                        required="1" readonly="1"
+                                        />
+                                    <field name="account_id"  groups="base.group_no_one" domain="[('type','=','receivable')]"/>
+                                    <field name="date_original" readonly="1"/>
+                                    <field name="date_due" readonly="1"/>
+                                    <field name="amount_original" readonly="1"/>
+                                    <field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
+                                    <field name="amount" sum="Payment" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
                             <group col="2" colspan="3">
@@ -362,10 +378,6 @@
                                     <field name="analytic_id"
                                            groups="analytic.group_analytic_accounting"/>
                                 </group>
-                                <group col="4" colspan="2">
-                                    <separator string="Other Information" colspan="4"/>
-                                    <field name="number" colspan="4"/>
-                                </group>
                             </group>
                         </page>
                         <page string="Journal Items" groups="base.group_extended" attrs="{'invisible': [('state','!=','posted')]}">
@@ -373,6 +385,7 @@
                                 <field name="period_id"/>
                                 <field name="audit"/>
                             </group>
+                            <field name="number" colspan="4"/>
                             <field name="move_ids" colspan="4" nolabel="1" readonly="1">
                                <tree string="Journal Items">
                                    <field name="move_id"/>

From d7827b9215321a91fc1e6330a40d4f6545207e52 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 23 Nov 2011 17:36:43 +0100
Subject: [PATCH 11/58] [IMP] account_voucher: removed reference to voucher
 print report

bzr revid: qdp-launchpad@openerp.com-20111123163643-k1pqx4u7d66gfuk7
---
 addons/account_voucher/account_voucher_report.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/account_voucher_report.xml b/addons/account_voucher/account_voucher_report.xml
index 8af204efbbe..97de2b89f3a 100644
--- a/addons/account_voucher/account_voucher_report.xml
+++ b/addons/account_voucher/account_voucher_report.xml
@@ -11,13 +11,14 @@
             header = "False"
             menu="True"/> -->
 
-        <report id="report_account_voucher_print"
+<!-- This report is awfull so it's better to hide it -->
+<!--        <report id="report_account_voucher_print"
             string="Voucher Print"
             model="account.voucher"
             name="voucher.print"
             rml="account_voucher/report/account_voucher_print.rml"
             auto="False"
             header = "False"
-            menu="True"/>
+            menu="True"/>-->
     </data>
 </openerp>

From bc07877f642a68abd57c78c1fc541abfd9ea9bcc Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 23 Nov 2011 17:48:34 +0100
Subject: [PATCH 12/58] [FIX] account_voucher: fixed
 onchange_payment_rate_currency

bzr revid: qdp-launchpad@openerp.com-20111123164834-m4tjfjtxpp8j2iew
---
 addons/account_voucher/account_voucher.py            |  4 +---
 .../account_voucher/voucher_payment_receipt_view.xml | 12 ++++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index e47038de03b..b759387b590 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -615,7 +615,7 @@ class account_voucher(osv.osv):
             default['value']['writeoff_amount'] = self._compute_writeoff_amount(cr, uid, default['value']['line_dr_ids'], default['value']['line_cr_ids'], price)
         return default
 
-    def onchange_payment_rate_currency(self, cr, uid, ids, currency_id, payment_rate_currency_id, date, amount, company_id, context=None):
+    def onchange_payment_rate_currency(self, cr, uid, ids, currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context=None):
         if context is None:
             context = {}
         res = {'value': {}}
@@ -623,8 +623,6 @@ class account_voucher(osv.osv):
         if currency_id and currency_id == payment_rate_currency_id:
             ctx = context.copy()
             ctx.update({'date': date})
-            payment_rate = self.pool.get('res.currency').browse(cr, uid, currency_id, context=ctx).rate
-            res['value'].update({'payment_rate': payment_rate})
             vals = self.onchange_rate(cr, uid, ids, payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context=ctx)
             for key in vals.keys():
                 res[key].update(vals[key])
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 17216ed5f21..4b6817d77ef 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -128,8 +128,8 @@
                                 <separator string="Other Information" colspan="4"/>
                                 <field name="currency_id" colspan="4"/>
                                 <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" groups='base.group_extended' colspan="3"/>
-                                <field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1"/>
-                                <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4" on_change="onchange_payment_rate_currency(currency_id, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                <field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4"/>
                                 <field name="number" colspan="4"/>
                             </group>
                         </page>
@@ -208,8 +208,8 @@
                                     <field name="exchange_acc_id"
                                            domain="[('type','=','other')]" colspan="4"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" groups='base.group_extended' colspan="3"/>
-                                    <field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1"/>
-                                    <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4" on_change="onchange_payment_rate_currency(currency_id, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                    <field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                    <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4"/>
                                 </group>
                                 <group col="2" colspan="1">
                                     <separator string="Payment Options" colspan="2"/>
@@ -362,8 +362,8 @@
                                     <field name="exchange_acc_id"
                                            domain="[('type','=','other')]" colspan="4"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" groups='base.group_extended' colspan="3"/>
-                                    <field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1"/>
-                                    <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4" on_change="onchange_payment_rate_currency(currency_id, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                    <field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                    <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4"/>
                                 </group>
                                 <group col="2" colspan="1">
                                     <separator string="Payment Options" colspan="2"/>

From 6cee9eb3a93d9d239213cf29bf52d1c5d3d0ffbd Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 24 Nov 2011 12:41:03 +0100
Subject: [PATCH 13/58] [IMP] account_voucher: code cleaning and bugfixes

bzr revid: qdp-launchpad@openerp.com-20111124114103-95pr374r2fqmc7np
---
 addons/account_voucher/account_voucher.py | 83 ++++++++++++++---------
 1 file changed, 52 insertions(+), 31 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index b759387b590..e03f45396a5 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -635,17 +635,23 @@ class account_voucher(osv.osv):
         @param context: context arguments, like lang, time zone
         @return: Returns a dict which contains new values, and context
         """
+        if context is None:
+            context ={}
         res = {'value': {}}
-        #FIXME: use find() hereunder
-
         #set the period of the voucher
         period_pool = self.pool.get('account.period')
-        pids = period_pool.search(cr, uid, [('date_start', '<=', date), ('date_stop', '>=', date)])
+        ctx = context.copy()
+        ctx.update({'company_id': company_id})
+        pids = period_pool.find(cr, uid, date, context=ctx)
         if pids:
             res['value'].update({'period_id':pids[0]})
-        vals = self.onchange_payment_rate_currency(cr, uid, ids, currency_id, payment_rate_currency_id, date, amount, company_id, context=context)
-        for key in vals.keys():
-            res[key].update(vals[key])
+        if payment_rate_currency_id:
+            ctx.update({'date': date})
+            payment_rate = self.pool.get('res.currency').browse(cr, uid, payment_rate_currency_id, context=ctx).rate
+            vals = self.onchange_payment_rate_currency(cr, uid, ids, currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context=context)
+            vals['value'].update({'payment_rate': payment_rate})
+            for key in vals.keys():
+                res[key].update(vals[key])
         return res
 
     def onchange_journal(self, cr, uid, ids, journal_id, line_ids, tax_id, partner_id, date, amount, ttype, company_id, context=None):
@@ -777,9 +783,9 @@ class account_voucher(osv.osv):
         # TODO: Make this logic available.
         # -for sale, purchase we have but for the payment and receipt we do not have as based on the bank/cash journal we can not know its payment or receipt
         if voucher_brw.type in ('purchase', 'payment'):
-            credit = voucher_brw.paid_amount_in_company_currency#voucher_brw.amount / voucher_brw.payment_rate * voucher_brw.company_id.currency_id.rate
+            credit = voucher_brw.paid_amount_in_company_currency
         elif voucher_brw.type in ('sale', 'receipt'):
-            debit = voucher_brw.paid_amount_in_company_currency#amount / voucher_brw.payment_rate * voucher_brw.company_id.currency_id.rate
+            debit = voucher_brw.paid_amount_in_company_currency
         if debit < 0: credit = -debit; debit = 0.0
         if credit < 0: debit = -credit; credit = 0.0
         sign = debit - credit < 0 and -1 or 1
@@ -879,20 +885,32 @@ class account_voucher(osv.osv):
         return (move_line, move_line_counterpart)
 
     def _convert_amount(self, cr, uid, amount, voucher_id, context=None):
-        #TODO: doccument me
-        #TODO: check: rounding errors ?
+        '''
+        This function convert the amount given in company currency. It takes either the rate in the voucher (if the
+        payment_rate_currency_id is relevant) either the rate encoded in the system.
+
+        :param amount: float. The amount to convert
+        :param voucher: id of the voucher on which we want the conversion
+        :param context: to context to use for the conversion. It may contain the key 'date' set to the voucher date
+            field in order to select the good rate to use.
+        :return: the amount in the currency of the voucher's company
+        :rtype: float
+        '''
         currency_obj = self.pool.get('res.currency')
         voucher = self.browse(cr, uid, voucher_id, context=context)
         res = amount
         if voucher.payment_rate_currency_id.id == voucher.company_id.currency_id.id:
+            # the rate specified on the voucher is for the company currency
             rate_between_voucher_and_base = voucher.currency_id.rate or 1.0
             rate_between_base_and_company = voucher.payment_rate or 1.0
             res = amount / rate_between_voucher_and_base * rate_between_base_and_company
         elif voucher.payment_rate_currency_id.id == voucher.currency_id.id:
+            # the rate specified on the voucher is for the voucher currency
             rate_between_base_and_company = voucher.company_id.currency_id.rate or 1.0
             rate_between_voucher_and_base = voucher.payment_rate or 1.0
             res = amount / rate_between_voucher_and_base * rate_between_base_and_company
         else:
+            # the rate specified on the voucher is not relevant, we use all the rates in the system
             res = currency_obj.compute(cr, uid, voucher.currency_id.id, voucher.company_id.currency_id.id, amount, context=context)
         return res
 
@@ -924,17 +942,14 @@ class account_voucher(osv.osv):
             #create one move line per voucher line where amount is not 0.0
             if not line.amount:
                 continue
-            #TODO: comment me
+            # convert the amount set on the voucher line into the currency of the voucher's company
             amount = self._convert_amount(cr, uid, line.untax_amount or line.amount, voucher_brw.id, context=ctx)
-            #residual amount in company currency
-            #amount_residual = line.move_line_id.amount_residual - amount
-            #TODO: remove me
+            # if the amount encoded in voucher is equal to the amount unreconciled, we need to compute the
+            # currency rate difference
             if line.amount == line.amount_unreconciled:
-            #    amount = (line.untax_amount or line.amount) / voucher_brw.payment_rate 
-                amount_residual = line.move_line_id.amount_residual - amount #residual amount in company currency
+                currency_rate_difference = line.move_line_id.amount_residual - amount
             else:
-            #    amount = (line.untax_amount or line.amount)  / voucher_brw.payment_rate
-                amount_residual = 0.0
+                currency_rate_difference = 0.0
             move_line = {
                 'journal_id': voucher_brw.journal_id.id,
                 'period_id': voucher_brw.period_id.id,
@@ -973,25 +988,30 @@ class account_voucher(osv.osv):
                 if not (tax_data.base_code_id and tax_data.tax_code_id):
                     raise osv.except_osv(_('No Account Base Code and Account Tax Code!'),_("You have to configure account base code and account tax code on the '%s' tax!") % (tax_data.name))
 
-            sign = (move_line['debit'] - move_line['credit']) < 0 and -1 or 1
-            #TODO: comment me
+            # compute the amount in foreign currency. 
             amount_currency = False
             if line.move_line_id:
+                # We want to set it on the account move line as soon as the original line had a foreign currency
                 if line.move_line_id.currency_id and line.move_line_id.currency_id.id != company_currency:
+                    # we compute the amount in that foreign currency. 
                     if line.move_line_id.currency_id.id == current_currency:
+                        # if the voucher and the voucher line share the same currency, there is no computation to do
+                        sign = (move_line['debit'] - move_line['credit']) < 0 and -1 or 1
                         amount_currency = sign * (line.amount)
                     elif line.move_line_id.currency_id.id == voucher_brw.payment_rate_currency_id.id:
+                        # if the rate is specified on the voucher, we must use it
                         amount_currency = (move_line['debit'] - move_line['credit']) * voucher_brw.payment_rate
                     else:
+                        # otherwise we use the rates of the system (giving the voucher date in the context)
                         amount_currency = currency_obj.compute(cr, uid, company_currency, line.move_line_id.currency_id.id, move_line['debit']-move_line['credit'], context=ctx)
 
             move_line['amount_currency'] = amount_currency
             voucher_line = move_line_obj.create(cr, uid, move_line)
             rec_ids = [voucher_line, line.move_line_id.id]
 
-            if amount_residual:
+            if currency_rate_difference:
                 # Change difference entry
-                exch_lines = self._get_exchange_lines(cr, uid, line, move_id, amount_residual, company_currency, current_currency, context=context)
+                exch_lines = self._get_exchange_lines(cr, uid, line, move_id, currency_rate_difference, company_currency, current_currency, context=context)
                 new_id = move_line_obj.create(cr, uid, exch_lines[0],context)
                 move_line_obj.create(cr, uid, exch_lines[1], context)
                 rec_ids.append(new_id)
@@ -1081,17 +1101,18 @@ class account_voucher(osv.osv):
         for voucher in self.browse(cr, uid, ids, context=context):
             if voucher.move_id:
                 continue
-            #TODO: -need to check- Can't we just use the context returned by _sel_context?
-            ctx = context.copy()
-            ctx.update({'date': voucher.date})
             company_currency = self._get_company_currency(cr, uid, voucher.id, context)
             current_currency = self._get_current_currency(cr, uid, voucher.id, context)
+            # we select the context to use accordingly if it's a multicurrency case or not
             context = self._sel_context(cr, uid, voucher.id, context)
-            #Create the account move record.
+            # But for the operations made by _convert_amount, we always need to give the date in the context
+            ctx = context.copy()
+            ctx.update({'date': voucher.date})
+            # Create the account move record.
             move_id = move_pool.create(cr, uid, self.account_move_get(cr, uid, voucher.id, context=context), context=context)
             # Get the name of the account_move just created
             name = move_pool.browse(cr, uid, move_id, context=context).name
-            #Create the first line of the voucher
+            # Create the first line of the voucher
             move_line_id = move_line_pool.create(cr, uid, self.first_move_line_get(cr,uid,voucher.id, move_id, company_currency, current_currency, context), context)
             move_line_brw = move_line_pool.browse(cr, uid, move_line_id, context=context)
             line_total = move_line_brw.debit - move_line_brw.credit
@@ -1100,14 +1121,14 @@ class account_voucher(osv.osv):
                 line_total = line_total - self._convert_amount(cr, uid, voucher.tax_amount, voucher.id, context=ctx)
             elif voucher.type == 'purchase':
                 line_total = line_total + self._convert_amount(cr, uid, voucher.tax_amount, voucher.id, context=ctx)
-            #create one move line per voucher line where amount is not 0.0
+            # Create one move line per voucher line where amount is not 0.0
             line_total, rec_list_ids = self.voucher_move_line_create(cr, uid, voucher.id, line_total, move_id, company_currency, current_currency, context)
 
-            #create the writeoff line if needed
+            # Create the writeoff line if needed
             ml_writeoff = self.writeoff_move_line_get(cr, uid, voucher.id, line_total, move_id, name, company_currency, current_currency, context)
             if ml_writeoff:
                 ml_writeoff_id = move_line_pool.create(cr, uid, ml_writeoff, context)
-            #We post the voucher.
+            # We post the voucher.
             self.write(cr, uid, [voucher.id], {
                 'move_id': move_id,
                 'state': 'posted',
@@ -1115,7 +1136,7 @@ class account_voucher(osv.osv):
             })
             if voucher.journal_id.entry_posted:
                 move_pool.post(cr, uid, [move_id], context={})
-            #We automatically reconcile the account move lines.
+            # We automatically reconcile the account move lines.
             for rec_ids in rec_list_ids:
                 if len(rec_ids) >= 2:
                     move_line_pool.reconcile_partial(cr, uid, rec_ids, writeoff_acc_id=voucher.exchange_acc_id.id, writeoff_period_id=voucher.period_id.id, writeoff_journal_id=voucher.journal_id.id)

From 07d143d74ddc359d664f7ca3fb8b7ed58b950076 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 24 Nov 2011 13:26:48 +0100
Subject: [PATCH 14/58] [FIX] account_voucher: fixed the views for sales and
 purchases receipt

bzr revid: qdp-launchpad@openerp.com-20111124122648-vl2xtgkpfji1v644
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index db21b4ce86a..03c462780bf 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -83,8 +83,8 @@
                 <form string="Sales Receipt">
                     <group col="6" colspan="4">
                         <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer"/>
-                        <field name="date" on_change="onchange_date(date, currency_id, amount, context)"/>
-                        <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, context)"/>
+                        <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
+                        <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
                         <field name="number"/>
                         <field name="name" colspan="2"/>
                         <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
@@ -210,8 +210,8 @@
                 <form string="Supplier Voucher">
                     <group col="6" colspan="4">
                         <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)"/>
-                        <field name="date" string="Bill Date" select="1" on_change="onchange_date(date, currency_id, amount, context)"/>
-                        <field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, context)"/>
+                        <field name="date" string="Bill Date" select="1" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
+                        <field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
                         <field name="number"/>
                         <field name="name" colspan="2"/>
                         <field name="reference" select="1"/>

From 62398c5cba3a821b24cf7cd30875c9fd286fb7e6 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 24 Nov 2011 16:42:16 +0100
Subject: [PATCH 15/58] [IMP + FIX] account_voucher: fixed few remaining bugs
 and improved the code in order to remove the field ecxhange_acc_id from the
 voucher. We now will use fields on the company

bzr revid: qdp-launchpad@openerp.com-20111124154216-ivne5w0q9cwhn12r
---
 addons/account_voucher/account_voucher.py     | 34 ++++++++++++++++---
 .../account_voucher/account_voucher_view.xml  | 14 ++++++++
 addons/account_voucher/test/case1_usd_usd.yml | 10 +++++-
 .../test/case2_suppl_usd_eur.yml              |  9 +++++
 .../test/case2_usd_eur_debtor_in_eur.yml      | 10 +++++-
 .../test/case2_usd_eur_debtor_in_usd.yml      | 10 +++++-
 addons/account_voucher/test/case4_cad_chf.yml | 10 +++++-
 .../voucher_payment_receipt_view.xml          | 12 +++----
 8 files changed, 92 insertions(+), 17 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index e03f45396a5..6860665f71d 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -91,6 +91,10 @@ class account_voucher(osv.osv):
         return False
 
     def _get_payment_rate_currency(self, cr, uid, context=None):
+        '''
+        Return the default value for field payment_rate_currency_id: the currency of the journal
+        if there is one, otherwise the currency of the user's company
+        '''
         if context is None: context = {}
         journal_pool = self.pool.get('account.journal')
         journal_id = context.get('journal_id', False)
@@ -266,7 +270,6 @@ class account_voucher(osv.osv):
                                            ('without_writeoff', 'Keep Open'),
                                            ('with_writeoff', 'Reconcile Payment Balance'),
                                            ], 'Payment Difference', required=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'exchange_acc_id': fields.many2one('account.account', 'Exchange Diff. Account', readonly=True, states={'draft': [('readonly', False)]}),
         'writeoff_acc_id': fields.many2one('account.account', 'Counterpart Account', readonly=True, states={'draft': [('readonly', False)]}),
         'comment': fields.char('Counterpart Comment', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'analytic_id': fields.many2one('account.analytic.account','Write-Off Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),
@@ -851,8 +854,14 @@ class account_voucher(osv.osv):
         :return: the account move line and its counterpart to create, depicted as mapping between fieldname and value
         :rtype: tuple of dict
         '''
-        if not line.voucher_id.exchange_acc_id.id:
-            raise osv.except_osv(_('Error!'), _('You must provide an account for the exchange difference.'))
+        if amount_residual > 0:
+            account_id = line.voucher_id.company_id.expense_currency_exchange_account_id
+            if not account_id:
+                raise osv.except_osv(_('Warning'),_("Unable to create accounting entry for currency rate difference. You have to configure the field 'Income Currency Rate' on the company! "))
+        else:
+            account_id = line.voucher_id.company_id.income_currency_exchange_account_id
+            if not account_id:
+                raise osv.except_osv(_('Warning'),_("Unable to create accounting entry for currency rate difference. You have to configure the field 'Expense Currency Rate' on the company! "))
 
         move_line = {
             'journal_id': line.voucher_id.journal_id.id,
@@ -872,7 +881,7 @@ class account_voucher(osv.osv):
             'journal_id': line.voucher_id.journal_id.id,
             'period_id': line.voucher_id.period_id.id,
             'name': _('change')+': '+(line.name or '/'),
-            'account_id': line.voucher_id.exchange_acc_id.id,
+            'account_id': account_id.id,
             'move_id': move_id,
             'amount_currency': 0.0,
             'partner_id': line.voucher_id.partner_id.id,
@@ -1139,7 +1148,7 @@ class account_voucher(osv.osv):
             # We automatically reconcile the account move lines.
             for rec_ids in rec_list_ids:
                 if len(rec_ids) >= 2:
-                    move_line_pool.reconcile_partial(cr, uid, rec_ids, writeoff_acc_id=voucher.exchange_acc_id.id, writeoff_period_id=voucher.period_id.id, writeoff_journal_id=voucher.journal_id.id)
+                    move_line_pool.reconcile_partial(cr, uid, rec_ids, writeoff_acc_id=voucher.writeoff_acc_id.id, writeoff_period_id=voucher.period_id.id, writeoff_journal_id=voucher.journal_id.id)
         return True
 
     def copy(self, cr, uid, id, default={}, context=None):
@@ -1390,4 +1399,19 @@ def resolve_o2m_operations(cr, uid, target_osv, operations, fields, context):
             results.append(result)
     return results
 
+class res_company(osv.osv):
+    _inherit = "res.company"
+    _columns = {
+        'income_currency_exchange_account_id': fields.many2one(
+            'account.account',
+            string="Income Currency Rate",
+            domain="[('type', '=', 'other')]",),
+        'expense_currency_exchange_account_id': fields.many2one(
+            'account.account',
+            string="Expense Currency Rate",
+            domain="[('type', '=', 'other')]",),
+    }
+
+res_company()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 4e218e04714..cbe35b5fc5f 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -259,5 +259,19 @@
             </field>
         </record>
 
+        <!-- res.company form view -->
+        <record model="ir.ui.view" id="view_company_inherit_currency_xchange_form">
+            <field name="name">res.company.form.inherit</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="currency_id" position="after">
+                      <field name="income_currency_exchange_account_id" colspan="2"/>
+                      <field name="expense_currency_exchange_account_id" colspan="2"/>
+                </field>
+            </field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml
index 96a0e07f70d..3432d3cf27b 100644
--- a/addons/account_voucher/test/case1_usd_usd.yml
+++ b/addons/account_voucher/test/case1_usd_usd.yml
@@ -1,6 +1,15 @@
 -
   In order to check the Account_voucher module with multi-currency in OpenERP, 
   I create 2 Invoices in USD and make 2 Payments in USD based on the currency rating on that particular date
+-
+  I set the income and expense currency accounts on the main company
+-
+  !python {model: res.company}: |
+    from datetime import datetime
+    vals = {
+      'income_currency_exchange_account_id': ref('account.o_expense'),
+      'expense_currency_exchange_account_id': ref('account.o_expense')}
+    self.write(cr, uid, ref('base.main_company'), vals)
 -
   I create currency USD in OpenERP for January of 1.333333 Rate
 -
@@ -243,7 +252,6 @@
     date: !eval time.strftime("%Y-04-01")
     payment_option: 'with_writeoff'
     writeoff_acc_id: account.a_expense
-    exchange_acc_id: account.o_expense
     comment: 'Write Off'
 -
   I fill amounts 20 for the invoice of 200$ and 30 for the invoice of 100$
diff --git a/addons/account_voucher/test/case2_suppl_usd_eur.yml b/addons/account_voucher/test/case2_suppl_usd_eur.yml
index 6d6f71b943e..0ad523b8004 100644
--- a/addons/account_voucher/test/case2_suppl_usd_eur.yml
+++ b/addons/account_voucher/test/case2_suppl_usd_eur.yml
@@ -1,6 +1,15 @@
 -
   In order to check the Account_voucher module with multi-currency in OpenERP, 
   I create 2 Invoices in USD and make 2 Payments one in USD and another in EUR, based on the currency rating on that particular date
+-
+  I set the income and expense currency accounts on the main company
+-
+  !python {model: res.company}: |
+    from datetime import datetime
+    vals = {
+      'income_currency_exchange_account_id': ref('account.o_expense'),
+      'expense_currency_exchange_account_id': ref('account.o_expense')}
+    self.write(cr, uid, ref('base.main_company'), vals)
 -
   I create a bank journal with EUR as currency
 -
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
index 5aadc93be13..ac77aef622d 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
@@ -1,6 +1,15 @@
 -
   In order to check the Account_voucher module with multi-currency in OpenERP, 
   I create 2 Invoices in USD and make 2 Payments one in USD and another in EUR, based on the currency rating on that particular date
+-
+  I set the income and expense currency accounts on the main company
+-
+  !python {model: res.company}: |
+    from datetime import datetime
+    vals = {
+      'income_currency_exchange_account_id': ref('account.o_expense'),
+      'expense_currency_exchange_account_id': ref('account.o_expense')}
+    self.write(cr, uid, ref('base.main_company'), vals)
 -
   I modify the debtor account in order to make sure there is no currency_id linked
 -
@@ -221,7 +230,6 @@
     date: !eval time.strftime("%Y-04-01")
     payment_option: 'with_writeoff'
     writeoff_acc_id: account.a_expense
-    exchange_acc_id: account.o_expense
     comment: 'Write Off'
     name: 'Second payment: Case 2 SUPPL USD/EUR DR EUR'
 
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
index 43c00a9f798..326ba6989d7 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
@@ -1,6 +1,15 @@
 -
   In order to check the Account_voucher module with multi-currency in OpenERP, 
   I create 2 Invoices in USD and make 2 Payments one in USD and another in EUR, based on the currency rating on that particular date
+-
+  I set the income and expense currency accounts on the main company
+-
+  !python {model: res.company}: |
+    from datetime import datetime
+    vals = {
+      'income_currency_exchange_account_id': ref('account.o_expense'),
+      'expense_currency_exchange_account_id': ref('account.o_expense')}
+    self.write(cr, uid, ref('base.main_company'), vals)
 -
   I modify the debtor account in order to set the currency_id = USD
 -
@@ -236,7 +245,6 @@
     date: !eval time.strftime("%Y-04-01")
     payment_option: 'with_writeoff'
     writeoff_acc_id: account.a_expense
-    exchange_acc_id: account.o_expense
     comment: 'Write Off'
     name: 'Second payment: Case 2 SUPPL USD/EUR DR USD'
 
diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml
index bb9bda9126c..7c0f9274ff8 100644
--- a/addons/account_voucher/test/case4_cad_chf.yml
+++ b/addons/account_voucher/test/case4_cad_chf.yml
@@ -1,6 +1,15 @@
 -
   In order to check the Account_voucher module with multi-currency in OpenERP,
   I create an invoice in CAD and make its Payment in CHF based on the currency rating on that particular date.
+-
+  I set the income and expense currency accounts on the main company
+-
+  !python {model: res.company}: |
+    from datetime import datetime
+    vals = {
+      'income_currency_exchange_account_id': ref('account.o_expense'),
+      'expense_currency_exchange_account_id': ref('account.o_expense')}
+    self.write(cr, uid, ref('base.main_company'), vals)
 -
   I create currency CAD in OpenERP for January of 1.338800 Rate
 -
@@ -106,7 +115,6 @@
     date: !eval time.strftime("%Y-03-01")
     payment_option: 'with_writeoff'
     writeoff_acc_id: account.a_expense
-    exchange_acc_id: account.o_expense
     comment: 'Write Off'
     name: 'First payment: Case 4'
 -
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 4b6817d77ef..db7c9d9ec54 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -171,7 +171,7 @@
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
-                                        required="1" readonly="1"
+                                        required="1"
                                         />
                                     <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
                                     <field name="date_original" readonly="1"/>
@@ -187,7 +187,7 @@
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
-                                        required="1" readonly="1"
+                                        required="1"
                                         />
                                     <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
                                     <field name="date_original" readonly="1"/>
@@ -205,8 +205,6 @@
                             <group col="2" colspan="1">
                                 <group col="4" colspan="1" attrs="{'invisible':[('currency_id','=',False)]}">
                                     <separator string="Currency Options" colspan="4"/>
-                                    <field name="exchange_acc_id"
-                                           domain="[('type','=','other')]" colspan="4"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" groups='base.group_extended' colspan="3"/>
                                     <field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
                                     <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4"/>
@@ -325,7 +323,7 @@
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
-                                        required="1" readonly="1"
+                                        required="1"
                                         />
                                     <field name="account_id"  groups="base.group_no_one" domain="[('type','=','receivable')]"/>
                                     <field name="date_original" readonly="1"/>
@@ -341,7 +339,7 @@
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
-                                        required="1" readonly="1"
+                                        required="1"
                                         />
                                     <field name="account_id"  groups="base.group_no_one" domain="[('type','=','receivable')]"/>
                                     <field name="date_original" readonly="1"/>
@@ -359,8 +357,6 @@
                             <group col="2" colspan="1">
                                 <group col="4" colspan="1" attrs="{'invisible':[('currency_id','=',False)]}">
                                     <separator string="Currency Options" colspan="4"/>
-                                    <field name="exchange_acc_id"
-                                           domain="[('type','=','other')]" colspan="4"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" groups='base.group_extended' colspan="3"/>
                                     <field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
                                     <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4"/>

From bb67abe9140d73f6c8ad4c25eefc9d38be777485 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 30 Nov 2011 11:11:10 +0100
Subject: [PATCH 16/58] [IMP] account_voucher: improvements inj usability +
 changed the semantic of the payment_rate, which now depicts the rate of the
 payment_rate_currency_id against the voucher currency (instead of the main
 currency)

bzr revid: qdp-launchpad@openerp.com-20111130101110-p19ujgsaqgfnuv1r
---
 addons/account_voucher/account_voucher.py     | 100 +++++++++++-------
 .../test/account_voucher_report.yml           |   4 +-
 addons/account_voucher/test/case4_cad_chf.yml |   2 +
 .../voucher_payment_receipt_view.xml          |  18 ++--
 4 files changed, 76 insertions(+), 48 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 6860665f71d..22824cb8db0 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -159,15 +159,6 @@ class account_voucher(osv.osv):
         res = super(account_voucher, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
         doc = etree.XML(res['arch'])
 
-        # replace the label of the field payment_rate
-        currency_obj = self.pool.get('res.currency')
-        base_currency_id = currency_obj.search(cr, uid, [('rate','=',1.0),('rate_ids','=',1.0)], context=context)
-        symbol = base_currency_id and currency_obj.name_get(cr, uid, base_currency_id, context=context)[0][1]
-        string = _("Rate for this operation: 1 %s is") % symbol
-        payment_rate_field = doc.xpath("//field[@name='payment_rate']")
-        for field in payment_rate_field:
-            field.set('string', string)
-
         if context.get('type', 'sale') in ('purchase', 'payment'):
             nodes = doc.xpath("//field[@name='partner_id']")
             for node in nodes:
@@ -183,17 +174,25 @@ class account_voucher(osv.osv):
             credit += l['amount']
         return abs(amount - abs(credit - debit))
 
-    def onchange_line_ids(self, cr, uid, ids, line_dr_ids, line_cr_ids, amount, context=None):
+    def onchange_line_ids(self, cr, uid, ids, line_dr_ids, line_cr_ids, amount, voucher_currency, context=None):
         context = context or {}
         if not line_dr_ids and not line_cr_ids:
             return {'value':{}}
         line_osv = self.pool.get("account.voucher.line")
         line_dr_ids = resolve_o2m_operations(cr, uid, line_osv, line_dr_ids, ['amount'], context)
         line_cr_ids = resolve_o2m_operations(cr, uid, line_osv, line_cr_ids, ['amount'], context)
-        return {'value': {'writeoff_amount': self._compute_writeoff_amount(cr, uid, line_dr_ids, line_cr_ids, amount)}}
+
+        #loop into the lines to see if there is an amount allocated on a voucher line with a currency different than the voucher currency
+        is_multi_currency = False
+        for voucher_line in line_dr_ids+line_cr_ids:
+            if voucher_line.get('currency_id',False) != voucher_currency:
+                is_multi_currency = True
+                break
+        return {'value': {'writeoff_amount': self._compute_writeoff_amount(cr, uid, line_dr_ids, line_cr_ids, amount), 'is_multi_currency': is_multi_currency}}
 
     def _get_writeoff_amount(self, cr, uid, ids, name, args, context=None):
         if not ids: return {}
+        currency_obj = self.pool.get('res.currency')
         res = {}
         debit = credit = 0.0
         for voucher in self.browse(cr, uid, ids, context=context):
@@ -201,18 +200,24 @@ class account_voucher(osv.osv):
                 debit += l.amount
             for l in voucher.line_cr_ids:
                 credit += l.amount
-            res[voucher.id] =  abs(voucher.amount - abs(credit - debit))
+            currency = voucher.currency_id or voucher.company_id.currency_id
+            res[voucher.id] =  currency_obj.round(cr, uid, currency, abs(voucher.amount - abs(credit - debit)))
         return res
 
     def _paid_amount_in_company_currency(self, cr, uid, ids, name, args, context=None):
         if not ids: return {}
         res = {}
-        debit = credit = 0.0
+        voucher_rate = company_currency_rate = 1.0
         for voucher in self.browse(cr, uid, ids, context=context):
-            rate = voucher.currency_id.rate or voucher.company_id.currency_id.rate
-            if voucher.currency_id == voucher.payment_rate_currency_id:
-                rate =  voucher.payment_rate
-            res[voucher.id] =  voucher.amount / rate * voucher.company_id.currency_id.rate
+            if voucher.currency_id:
+                ctx = context.copy()
+                ctx.update({'date': voucher.date})
+                voucher_rate = self.browse(cr, uid, voucher.id, context=ctx).currency_id.rate
+                if voucher.company_id.currency_id.id == voucher.payment_rate_currency_id.id:
+                    company_currency_rate =  voucher.payment_rate
+                else:
+                    company_currency_rate = voucher.company_id.currency_id.rate
+            res[voucher.id] =  voucher.amount / voucher_rate * company_currency_rate
         return res
 
     _name = 'account.voucher'
@@ -275,9 +280,10 @@ class account_voucher(osv.osv):
         'analytic_id': fields.many2one('account.analytic.account','Write-Off Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),
         'writeoff_amount': fields.function(_get_writeoff_amount, string='Reconcile Amount', type='float', readonly=True),
         'payment_rate_currency_id': fields.many2one('res.currency', 'Payment Rate Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'payment_rate': fields.float('Payment Rate', digits=(12,6), required=True, readonly=True, states={'draft': [('readonly', False)]},
-            help='The specific rate that will be used for this voucher for the selected currency.'),
+        'payment_rate': fields.float('Exchange Rate', digits=(12,6), required=True, readonly=True, states={'draft': [('readonly', False)]},
+            help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field)  and the voucher currency.'),
         'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
+        'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'),
     }
     _defaults = {
         'period_id': _get_period,
@@ -448,10 +454,15 @@ class account_voucher(osv.osv):
         return default
 
     def onchange_rate(self, cr, uid, ids, rate, amount, currency_id, payment_rate_currency_id, company_id, context=None):
-        res =  {'value': {}}
-        if rate and amount and currency_id and currency_id == payment_rate_currency_id:
-            company_rate = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id.rate 
-            res['value']['paid_amount_in_company_currency'] = amount / rate * company_rate
+        res =  {'value': {'paid_amount_in_company_currency': amount}}
+        company_currency = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id
+        if rate and amount and currency_id:# and currency_id == payment_rate_currency_id:
+            voucher_rate = self.pool.get('res.currency').browse(cr, uid, currency_id, context).rate
+            if company_currency.id == payment_rate_currency_id:
+                company_rate = rate
+            else:
+                company_rate = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id.rate
+            res['value']['paid_amount_in_company_currency'] = amount / voucher_rate * company_rate
         return res
 
     def onchange_amount(self, cr, uid, ids, amount, rate, partner_id, journal_id, currency_id, ttype, date, payment_rate_currency_id, company_id, context=None):
@@ -578,6 +589,7 @@ class account_voucher(osv.osv):
             else:
                 amount_original = currency_pool.compute(cr, uid, company_currency, currency_id, line.credit or line.debit or 0.0)
                 amount_unreconciled = currency_pool.compute(cr, uid, company_currency, currency_id, abs(line.amount_residual))
+            currency_id = line.currency_id and line.currency_id.id or line.company_id.currency_id.id
             rs = {
                 'name':line.move_id.name,
                 'type': line.credit and 'dr' or 'cr',
@@ -588,6 +600,7 @@ class account_voucher(osv.osv):
                 'date_original':line.date,
                 'date_due':line.date_maturity,
                 'amount_unreconciled': amount_unreconciled,
+                'currency_id': currency_id,
             }
 
             #split voucher amount by most old first, but only for lines in the same currency
@@ -650,7 +663,9 @@ class account_voucher(osv.osv):
             res['value'].update({'period_id':pids[0]})
         if payment_rate_currency_id:
             ctx.update({'date': date})
-            payment_rate = self.pool.get('res.currency').browse(cr, uid, payment_rate_currency_id, context=ctx).rate
+            payment_rate = 1.0
+            if payment_rate_currency_id != currency_id:
+                payment_rate = self.pool.get('res.currency').browse(cr, uid, payment_rate_currency_id, context=ctx).rate
             vals = self.onchange_payment_rate_currency(cr, uid, ids, currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context=context)
             vals['value'].update({'payment_rate': payment_rate})
             for key in vals.keys():
@@ -674,12 +689,13 @@ class account_voucher(osv.osv):
             currency_id = journal.currency.id
             ctx = context.copy()
             ctx.update({'date': date})
-            payment_rate = self.pool.get('res.currency').browse(cr, uid, currency_id, context=ctx).rate
-            vals['value'].update({'payment_rate': payment_rate})
+            #on change of the journal, we need to TODO coment me
+            payment_rate = 1.0
+
             res = self.onchange_rate(cr, uid, ids, payment_rate, amount, currency_id, currency_id, company_id, context=ctx)
             for key in res.keys():
                 vals[key].update(res[key])
-        if currency_id:
+            vals['value'].update({'payment_rate': payment_rate})
             vals['value'].update({'currency_id': currency_id})
             vals['value'].update({'payment_rate_currency_id': currency_id})
         res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context)
@@ -912,12 +928,7 @@ class account_voucher(osv.osv):
             # the rate specified on the voucher is for the company currency
             rate_between_voucher_and_base = voucher.currency_id.rate or 1.0
             rate_between_base_and_company = voucher.payment_rate or 1.0
-            res = amount / rate_between_voucher_and_base * rate_between_base_and_company
-        elif voucher.payment_rate_currency_id.id == voucher.currency_id.id:
-            # the rate specified on the voucher is for the voucher currency
-            rate_between_base_and_company = voucher.company_id.currency_id.rate or 1.0
-            rate_between_voucher_and_base = voucher.payment_rate or 1.0
-            res = amount / rate_between_voucher_and_base * rate_between_base_and_company
+            res = currency_obj.round(cr, uid, voucher.company_id.currency_id, (amount / rate_between_voucher_and_base * rate_between_base_and_company))
         else:
             # the rate specified on the voucher is not relevant, we use all the rates in the system
             res = currency_obj.compute(cr, uid, voucher.currency_id.id, voucher.company_id.currency_id.id, amount, context=context)
@@ -997,7 +1008,7 @@ class account_voucher(osv.osv):
                 if not (tax_data.base_code_id and tax_data.tax_code_id):
                     raise osv.except_osv(_('No Account Base Code and Account Tax Code!'),_("You have to configure account base code and account tax code on the '%s' tax!") % (tax_data.name))
 
-            # compute the amount in foreign currency. 
+            # compute the amount in foreign currency
             amount_currency = False
             if line.move_line_id:
                 # We want to set it on the account move line as soon as the original line had a foreign currency
@@ -1200,6 +1211,20 @@ class account_voucher_line(osv.osv):
             rs_data[line.id] = res
         return rs_data
 
+    def _currency_id(self, cr, uid, ids, name, args, context=None):
+        '''
+        This function returns the currency id of a voucher line. It's either the currency of the 
+        associated move line (if any) or the currency of the voucher or the company currency.
+        '''
+        res = {}
+        for line in self.browse(cr, uid, ids, context=context):
+            move_line = line.move_line_id
+            if move_line:
+                res[line.id] = move_line.currency_id and move_line.currency_id.id or move_line.company_id.currency_id.id
+            else:
+                res[line.id] = line.voucher_id.currency_id and line.voucher_id.currency_id.id or line.voucher_id.company_id.currency_id.id
+        return res
+
     _columns = {
         'voucher_id':fields.many2one('account.voucher', 'Voucher', required=1, ondelete='cascade'),
         'name':fields.char('Description', size=256),
@@ -1216,6 +1241,7 @@ class account_voucher_line(osv.osv):
         'amount_original': fields.function(_compute_balance, multi='dc', type='float', string='Original Amount', store=True),
         'amount_unreconciled': fields.function(_compute_balance, multi='dc', type='float', string='Open Balance', store=True),
         'company_id': fields.related('voucher_id','company_id', relation='res.company', type='many2one', string='Company', store=True, readonly=True),
+        'currency_id': fields.function(_currency_id, string='Currency', type='many2one', relation='res.currency', readonly=True),
     }
     _defaults = {
         'name': '',
@@ -1252,10 +1278,10 @@ class account_voucher_line(osv.osv):
                 ttype = 'dr'
             else:
                 ttype = 'cr'
-            account_id = move_line.account_id.id
             res.update({
-                'account_id':account_id,
-                'type': ttype
+                'account_id': move_line.account_id.id,
+                'type': ttype,
+                'currency_id': move_line.currency_id and move_line.currency_id.id or move_line.company_id.currency_id.id,
             })
         return {
             'value':res,
diff --git a/addons/account_voucher/test/account_voucher_report.yml b/addons/account_voucher/test/account_voucher_report.yml
index b41c33e4470..85432f747aa 100644
--- a/addons/account_voucher/test/account_voucher_report.yml
+++ b/addons/account_voucher/test/account_voucher_report.yml
@@ -1,7 +1,7 @@
 -
   Demo for Account Voucher
 -
-  !record {model: account.voucher, id: account_voucher_voucheraxelor0}:
+  !record {model: account.voucher, id: account_voucher_voucheraxelor0again}:
     account_id: account.cash
     company_id: base.main_company
     journal_id: account.bank_journal
@@ -19,6 +19,6 @@
 -
   !python {model: account.voucher}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.voucher.cash_receipt.drcr').create(cr, uid, [ref("account_voucher_voucheraxelor0")], {}, {})
+    (data, format) = netsvc.LocalService('report.voucher.cash_receipt.drcr').create(cr, uid, [ref("account_voucher_voucheraxelor0again")], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'account_voucher-report.'+format), 'wb+').write(data)
diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml
index 7c0f9274ff8..f31a7393a8e 100644
--- a/addons/account_voucher/test/case4_cad_chf.yml
+++ b/addons/account_voucher/test/case4_cad_chf.yml
@@ -128,6 +128,8 @@
     for item in voucher_id.line_cr_ids:
         if item.amount_unreconciled == 186.74:
             data += [(item.id, 186.74)]
+        else:
+            data += [(item.id, 0.0)]
     for line_id, amount in data:
         self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
     assert (voucher_id.state=='draft'), "Voucher is not in draft state"
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index db7c9d9ec54..6ed7ab0fe7c 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -92,7 +92,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Payment Information">
-                            <field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, context)">
+                            <field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
                                 <tree string="Open Supplier Journal Entries" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
@@ -106,7 +106,7 @@
                                     <field name="amount" sum="Payment"/>
                                 </tree>
                             </field>
-                            <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('type', '=', 'payment')]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, context)">
+                            <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('type', '=', 'payment')]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
                                 <tree string="Open Customer Journal Entries" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
@@ -129,7 +129,7 @@
                                 <field name="currency_id" colspan="4"/>
                                 <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" groups='base.group_extended' colspan="3"/>
                                 <field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
-                                <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4"/>
+                                <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4" invisible="1"/>
                                 <field name="number" colspan="4"/>
                             </group>
                         </page>
@@ -203,11 +203,11 @@
                                 <field name="narration" colspan="2" nolabel="1"/>
                             </group>
                             <group col="2" colspan="1">
-                                <group col="4" colspan="1" attrs="{'invisible':[('currency_id','=',False)]}">
+                                <group col="4" colspan="1" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
                                     <separator string="Currency Options" colspan="4"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" groups='base.group_extended' colspan="3"/>
                                     <field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
-                                    <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4"/>
+                                    <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4" invisible="1"/>
                                 </group>
                                 <group col="2" colspan="1">
                                     <separator string="Payment Options" colspan="2"/>
@@ -318,7 +318,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Payment Information">
-                            <field name="line_cr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, context)">
+                            <field name="line_cr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
                                 <tree string="Invoices and outstanding transactions" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
@@ -334,7 +334,7 @@
                                     <field name="amount" sum="Payment" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
-                            <field name="line_dr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, context)">
+                            <field name="line_dr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
                                 <tree string="Credits" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
@@ -355,11 +355,11 @@
                                 <field name="narration" colspan="2" nolabel="1"/>
                             </group>
                             <group col="2" colspan="1">
-                                <group col="4" colspan="1" attrs="{'invisible':[('currency_id','=',False)]}">
+                                <group col="4" colspan="1" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
                                     <separator string="Currency Options" colspan="4"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" groups='base.group_extended' colspan="3"/>
                                     <field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
-                                    <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4"/>
+                                    <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4" invisible="1"/>
                                 </group>
                                 <group col="2" colspan="1">
                                     <separator string="Payment Options" colspan="2"/>

From 832436c1487ca6accf074da8e73ce5cccda51c48 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 30 Nov 2011 14:30:08 +0100
Subject: [PATCH 17/58] [IMP] account_voucher: usability changes

bzr revid: qdp-launchpad@openerp.com-20111130133008-lki16nzzlz78s0h8
---
 addons/account_voucher/account_voucher.py     |  6 ++---
 .../voucher_payment_receipt_view.xml          | 24 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 22824cb8db0..999de8dfbf4 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -274,11 +274,11 @@ class account_voucher(osv.osv):
         'payment_option':fields.selection([
                                            ('without_writeoff', 'Keep Open'),
                                            ('with_writeoff', 'Reconcile Payment Balance'),
-                                           ], 'Payment Difference', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+                                           ], 'Payment Difference', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="This field helps you to choose what you want to do with the eventual difference between the paid amount and the sum of allocated amounts. You can either choose to keep open this difference on the partner's account, or reconcile it with the payment(s)"),
         'writeoff_acc_id': fields.many2one('account.account', 'Counterpart Account', readonly=True, states={'draft': [('readonly', False)]}),
         'comment': fields.char('Counterpart Comment', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'analytic_id': fields.many2one('account.analytic.account','Write-Off Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),
-        'writeoff_amount': fields.function(_get_writeoff_amount, string='Reconcile Amount', type='float', readonly=True),
+        'writeoff_amount': fields.function(_get_writeoff_amount, string='Difference Amount', type='float', readonly=True, help="Computed as the difference between the amount stated in the voucher and the sum of allocation on the voucher lines."),
         'payment_rate_currency_id': fields.many2one('res.currency', 'Payment Rate Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'payment_rate': fields.float('Exchange Rate', digits=(12,6), required=True, readonly=True, states={'draft': [('readonly', False)]},
             help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field)  and the voucher currency.'),
@@ -1231,7 +1231,7 @@ class account_voucher_line(osv.osv):
         'account_id':fields.many2one('account.account','Account', required=True),
         'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'),
         'untax_amount':fields.float('Untax Amount'),
-        'amount':fields.float('Amount', digits_compute=dp.get_precision('Account')),
+        'amount':fields.float('Allocation', digits_compute=dp.get_precision('Account')),
         'reconcile': fields.boolean('Full Reconcile'),
         'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Dr/Cr'),
         'account_analytic_id':  fields.many2one('account.analytic.account', 'Analytic Account'),
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 6ed7ab0fe7c..e2060a04533 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -102,8 +102,8 @@
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>
                                     <field name="amount_original" readonly="1"/>
-                                    <field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
-                                    <field name="amount" sum="Payment"/>
+                                    <field name="amount_unreconciled" readonly="1"/>
+                                    <field name="amount" sum="Total Allocation"/>
                                 </tree>
                             </field>
                             <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('type', '=', 'payment')]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
@@ -116,8 +116,8 @@
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>
                                     <field name="amount_original" readonly="1"/>
-                                    <field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
-                                    <field name="amount" sum="Payment"/>
+                                    <field name="amount_unreconciled" readonly="1"/>
+                                    <field name="amount" sum="Total Allocation"/>
                                 </tree>
                             </field>
                             <group col="2" colspan="3">
@@ -177,9 +177,9 @@
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>
                                     <field name="amount_original" readonly="1"/>
-                                    <field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
+                                    <field name="amount_unreconciled" readonly="1"/>
                                     <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
-                                    <field name="amount" sum="Payment" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
+                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
                             <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}">
@@ -193,9 +193,9 @@
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>
                                     <field name="amount_original" readonly="1"/>
-                                    <field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
+                                    <field name="amount_unreconciled" readonly="1"/>
                                     <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
-                                    <field name="amount" sum="Payment" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
+                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
                             <group col="2" colspan="3">
@@ -329,9 +329,9 @@
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>
                                     <field name="amount_original" readonly="1"/>
-                                    <field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
+                                    <field name="amount_unreconciled" readonly="1"/>
                                     <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
-                                    <field name="amount" sum="Payment" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
+                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
                             <field name="line_dr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
@@ -345,9 +345,9 @@
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>
                                     <field name="amount_original" readonly="1"/>
-                                    <field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
+                                    <field name="amount_unreconciled" readonly="1"/>
                                     <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
-                                    <field name="amount" sum="Payment" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
+                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
                             <group col="2" colspan="3">

From 8dcc7aac7ae32007795cf9c44f4a725a2c248404 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 30 Nov 2011 14:33:11 +0100
Subject: [PATCH 18/58] [IMP] account_voucher: usability changes

bzr revid: qdp-launchpad@openerp.com-20111130133311-8t4sxrikywrkkkhh
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index e2060a04533..13cbaa74688 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -252,7 +252,7 @@
                     <group col="10" colspan="4">
                         <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
-                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile this record ?"/>
+                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
                     </group>
@@ -404,7 +404,7 @@
                     <group col="10" colspan="4">
                         <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
-                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
+                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile and cancel this record ?"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
                     </group>

From e1e585aee35c774aef4b3132105a7fdef1c27c63 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 2 Dec 2011 12:07:16 +0100
Subject: [PATCH 19/58] [IMP] account: display the currency in name_get of
 journal also for journals in company currency

bzr revid: qdp-launchpad@openerp.com-20111202110716-yt4nc2v3p07zdmkl
---
 addons/account/account.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index c8895fa6946..e18b20fdc3c 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -789,9 +789,11 @@ class account_journal(osv.osv):
         result = self.browse(cr, user, ids, context=context)
         res = []
         for rs in result:
-            name = rs.name
             if rs.currency:
-                name = "%s (%s)" % (rs.name, rs.currency.name)
+                currency = rs.currency
+            else:
+                currency = rs.company_id.currency_id
+            name = "%s (%s)" % (rs.name, currency.name)
             res += [(rs.id, name)]
         return res
 

From c26cf39464dace43c9b27edf98c62ab69f691afa Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 2 Dec 2011 12:08:09 +0100
Subject: [PATCH 20/58] [IMP] account_voucher: usability change. Moved the
 writeoff amount outside the payment_option group

bzr revid: qdp-launchpad@openerp.com-20111202110809-4ytfndvh6fgkgy7v
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 13cbaa74688..5cf9b42be0b 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -211,9 +211,8 @@
                                 </group>
                                 <group col="2" colspan="1">
                                     <separator string="Payment Options" colspan="2"/>
+                                    <field name="writeoff_amount"/>
                                     <field name="payment_option" required="1"/>
-                                    <field name="writeoff_amount"
-                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
                                     <field name="writeoff_acc_id"
                                            attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
                                            domain="[('type','=','other')]"/>
@@ -363,9 +362,8 @@
                                 </group>
                                 <group col="2" colspan="1">
                                     <separator string="Payment Options" colspan="2"/>
+                                    <field name="writeoff_amount"/>
                                     <field name="payment_option" required="1"/>
-                                    <field name="writeoff_amount"
-                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
                                     <field name="writeoff_acc_id"
                                            attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
                                            domain="[('type','=','other')]"/>

From ee8fd8608fcf4a403247bdfd148fd213d6cfc6c2 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 2 Dec 2011 12:08:48 +0100
Subject: [PATCH 21/58] [FIX] account_voucher: several fixes

bzr revid: qdp-launchpad@openerp.com-20111202110848-cr4g0qmxj50dr440
---
 addons/account_voucher/account_voucher.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 999de8dfbf4..f92d01f6fe4 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -547,9 +547,9 @@ class account_voucher(osv.osv):
 
         #order the lines by most old first
         ids.reverse()
-        moves = move_line_pool.browse(cr, uid, ids, context=context)
+        account_move_lines = move_line_pool.browse(cr, uid, ids, context=context)
 
-        for line in moves:
+        for line in account_move_lines:
             if line.credit and line.reconcile_partial_id and ttype == 'receipt':
                 continue
             if line.debit and line.reconcile_partial_id and ttype == 'payment':
@@ -578,7 +578,7 @@ class account_voucher(osv.osv):
                 total_debit += line.debit and line.amount_currency or 0.0
 
         #voucher line creation
-        for line in moves:
+        for line in account_move_lines:
             if line.credit and line.reconcile_partial_id and ttype == 'receipt':
                 continue
             if line.debit and line.reconcile_partial_id and ttype == 'payment':
@@ -589,7 +589,7 @@ class account_voucher(osv.osv):
             else:
                 amount_original = currency_pool.compute(cr, uid, company_currency, currency_id, line.credit or line.debit or 0.0)
                 amount_unreconciled = currency_pool.compute(cr, uid, company_currency, currency_id, abs(line.amount_residual))
-            currency_id = line.currency_id and line.currency_id.id or line.company_id.currency_id.id
+            line_currency_id = line.currency_id and line.currency_id.id or company_currency
             rs = {
                 'name':line.move_id.name,
                 'type': line.credit and 'dr' or 'cr',
@@ -600,12 +600,11 @@ class account_voucher(osv.osv):
                 'date_original':line.date,
                 'date_due':line.date_maturity,
                 'amount_unreconciled': amount_unreconciled,
-                'currency_id': currency_id,
+                'currency_id': line_currency_id,
             }
 
             #split voucher amount by most old first, but only for lines in the same currency
             if not move_line_found:
-                line_currency_id = line.currency_id and line.currency_id.id or company_currency
                 if currency_id == line_currency_id:
                     if line.credit:
                         amount = min(amount_unreconciled, abs(total_debit))
@@ -1029,7 +1028,7 @@ class account_voucher(osv.osv):
             voucher_line = move_line_obj.create(cr, uid, move_line)
             rec_ids = [voucher_line, line.move_line_id.id]
 
-            if currency_rate_difference:
+            if not currency_obj.is_zero(cr, uid, voucher_brw.company_id.currency_id, currency_rate_difference):
                 # Change difference entry
                 exch_lines = self._get_exchange_lines(cr, uid, line, move_id, currency_rate_difference, company_currency, current_currency, context=context)
                 new_id = move_line_obj.create(cr, uid, exch_lines[0],context)
@@ -1245,7 +1244,6 @@ class account_voucher_line(osv.osv):
     }
     _defaults = {
         'name': '',
-        'reconcile': False,
     }
 
     def onchange_reconcile(self, cr, uid, ids, reconcile, amount, amount_unreconciled, context=None):
@@ -1418,6 +1416,7 @@ def resolve_o2m_operations(cr, uid, target_osv, operations, fields, context):
             result = operation[2]
         elif operation[0] == 1:
             result = target_osv.read(cr, uid, operation[1], fields, context=context)
+            if not result: result = {}
             result.update(operation[2])
         elif operation[0] == 4:
             result = target_osv.read(cr, uid, operation[1], fields, context=context)

From 64f357817fd13229ceee52f8e7a886a39a793d11 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 2 Dec 2011 17:44:21 +0100
Subject: [PATCH 22/58] [FIX] account_voucher: fixed typo in
 case2_usd_eur_debtor_in_usd.yml

bzr revid: qdp-launchpad@openerp.com-20111202164421-ao6fqrec2dsthu33
---
 .../account_voucher/test/case2_usd_eur_debtor_in_usd.yml  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
index 326ba6989d7..a3a32a32082 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
@@ -223,8 +223,8 @@
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
     assert (move_line.amount_residual_currency == 55.56 and move_line.amount_residual == 20) , "Residual amount is not correct for first Invoice"
--    toto
-  I check the residual amuont of Invoice2, should be 22.22 in residual currency and 10 in amount_residual
+-
+  I check the residual amount of Invoice2, should be 22.22 in residual currency and 10 in amount_residual
 -
    !python {model: account.invoice}: |
     invoice_id = self.browse(cr, uid, ref("account_second_invoice_feb_michal"))
@@ -328,8 +328,8 @@
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
     assert (move_line.amount_residual_currency == 0.0 and move_line.amount_residual == 0.0 and invoice_id.state == 'paid') , "Residual amount is not correct for first Invoice"
--    
-  I check the residual amuont of invoice 2, should be 0 in residual currency and 0 in amount_residual and paid
+-
+  I check the residual amount of invoice 2, should be 0 in residual currency and 0 in amount_residual and paid
 -
    !python {model: account.invoice}: |
     invoice_id = self.browse(cr, uid, ref("account_second_invoice_feb_michal"))

From 5fee518450ce0becccce39cc24702de77717bb21 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 2 Dec 2011 17:45:57 +0100
Subject: [PATCH 23/58] [FIX] account_voucher: fixes fixes fixes

bzr revid: qdp-launchpad@openerp.com-20111202164557-tt6cy8u4735ukw2o
---
 addons/account_voucher/account_voucher.py | 103 +++++++++++++++++-----
 1 file changed, 82 insertions(+), 21 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index f92d01f6fe4..a5cb694ca31 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -468,7 +468,7 @@ class account_voucher(osv.osv):
     def onchange_amount(self, cr, uid, ids, amount, rate, partner_id, journal_id, currency_id, ttype, date, payment_rate_currency_id, company_id, context=None):
         if context is None:
             context = {}
-        res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=context)
+        res = self.recompute_voucher_lines(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=context)
         ctx = context.copy()
         ctx.update({'date': date})
         vals = self.onchange_rate(cr, uid, ids, rate, amount, currency_id, payment_rate_currency_id, company_id, context=ctx)
@@ -476,7 +476,48 @@ class account_voucher(osv.osv):
             res[key].update(vals[key])
         return res
 
-    def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context=None):
+    def recompute_payment_rate(self, cr, uid, ids, vals, currency_id, date, ttype, journal_id, amount, context=None):
+        if context is None:
+            context = {}
+        #on change of the journal, we need to set also the default value for payment_rate and payment_rate_currency_id
+        currency_obj = self.pool.get('res.currency')
+        journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
+        company_id = journal.company_id.id
+        payment_rate = 1.0
+        payment_rate_currency_id = currency_id
+        ctx = context.copy()
+        ctx.update({'date': date})
+        o2m_to_loop = False
+        if ttype == 'receipt':
+            o2m_to_loop = 'line_cr_ids'
+        elif ttype == 'payment':
+            o2m_to_loop = 'line_dr_ids'
+        if o2m_to_loop and 'value' in vals and o2m_to_loop in vals['value']:
+            for voucher_line in vals['value'][o2m_to_loop]:
+                if voucher_line['currency_id'] != currency_id:
+                    # we take as default value for the payment_rate_currency_id, the currency of the first invoice that
+                    # is not in the voucher currency
+                    payment_rate_currency_id = voucher_line['currency_id']
+                    tmp = currency_obj.browse(cr, uid, payment_rate_currency_id, context=ctx).rate
+                    voucher_currency_id = currency_id or journal.company_id.currency_id.id
+                    payment_rate = tmp / currency_obj.browse(cr, uid, voucher_currency_id, context=ctx).rate
+                    break
+        res = self.onchange_rate(cr, uid, ids, payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context=ctx)
+        for key in res.keys():
+            vals[key].update(res[key])
+        vals['value'].update({'payment_rate': payment_rate})
+        if payment_rate_currency_id:
+            vals['value'].update({'payment_rate_currency_id': payment_rate_currency_id})
+        return vals
+
+    def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=None):
+        res = self.recompute_voucher_lines(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=context)
+        vals = self.recompute_payment_rate(cr, uid, ids, res, currency_id, date, ttype, journal_id, amount, context=context)
+        for key in vals.keys():
+            res[key].update(vals[key])
+        return res
+
+    def recompute_voucher_lines(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context=None):
         """
         Returns a dict that contains new values and context
 
@@ -655,6 +696,7 @@ class account_voucher(osv.osv):
         res = {'value': {}}
         #set the period of the voucher
         period_pool = self.pool.get('account.period')
+        currency_obj = self.pool.get('res.currency')
         ctx = context.copy()
         ctx.update({'company_id': company_id})
         pids = period_pool.find(cr, uid, date, context=ctx)
@@ -664,7 +706,9 @@ class account_voucher(osv.osv):
             ctx.update({'date': date})
             payment_rate = 1.0
             if payment_rate_currency_id != currency_id:
-                payment_rate = self.pool.get('res.currency').browse(cr, uid, payment_rate_currency_id, context=ctx).rate
+                tmp = currency_obj.browse(cr, uid, payment_rate_currency_id, context=ctx).rate
+                voucher_currency_id = currency_id or self.pool.get('res.company').browse(cr, uid, company_id, context=ctx).currency_id.id
+                payment_rate = tmp / currency_obj.browse(cr, uid, voucher_currency_id, context=ctx).rate
             vals = self.onchange_payment_rate_currency(cr, uid, ids, currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context=context)
             vals['value'].update({'payment_rate': payment_rate})
             for key in vals.keys():
@@ -686,17 +730,7 @@ class account_voucher(osv.osv):
         currency_id = False
         if journal.currency:
             currency_id = journal.currency.id
-            ctx = context.copy()
-            ctx.update({'date': date})
-            #on change of the journal, we need to TODO coment me
-            payment_rate = 1.0
-
-            res = self.onchange_rate(cr, uid, ids, payment_rate, amount, currency_id, currency_id, company_id, context=ctx)
-            for key in res.keys():
-                vals[key].update(res[key])
-            vals['value'].update({'payment_rate': payment_rate})
-            vals['value'].update({'currency_id': currency_id})
-            vals['value'].update({'payment_rate_currency_id': currency_id})
+        vals['value'].update({'currency_id': currency_id})
         res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context)
         for key in res.keys():
             vals[key].update(res[key])
@@ -859,9 +893,10 @@ class account_voucher(osv.osv):
 
     def _get_exchange_lines(self, cr, uid, line, move_id, amount_residual, company_currency, current_currency, context=None):
         '''
-        Prepare the two lines due to currency rate difference.
+        Prepare the two lines in company currency due to currency rate difference.
 
-        :param line: browse record of the voucher.line for which we want to create currency rate difference accounting entries
+        :param line: browse record of the voucher.line for which we want to create currency rate difference accounting
+            entries
         :param move_id: Account move wher the move lines will be.
         :param amount_residual: Amount to be posted.
         :param company_currency: id of currency of the company to which the voucher belong
@@ -877,7 +912,9 @@ class account_voucher(osv.osv):
             account_id = line.voucher_id.company_id.income_currency_exchange_account_id
             if not account_id:
                 raise osv.except_osv(_('Warning'),_("Unable to create accounting entry for currency rate difference. You have to configure the field 'Expense Currency Rate' on the company! "))
-
+        # Even if the amount_currency is never filled, we need to pass the foreign currency because otherwise
+        # the receivable/payable account may have a secondary currency, which render this field mandatory
+        account_currency_id = company_currency <> current_currency and current_currency or False
         move_line = {
             'journal_id': line.voucher_id.journal_id.id,
             'period_id': line.voucher_id.period_id.id,
@@ -885,7 +922,7 @@ class account_voucher(osv.osv):
             'account_id': line.account_id.id,
             'move_id': move_id,
             'partner_id': line.voucher_id.partner_id.id,
-            'currency_id': company_currency <> current_currency and current_currency or False,
+            'currency_id': account_currency_id,
             'amount_currency': 0.0,
             'quantity': 1,
             'credit': amount_residual > 0 and amount_residual or 0.0,
@@ -900,7 +937,7 @@ class account_voucher(osv.osv):
             'move_id': move_id,
             'amount_currency': 0.0,
             'partner_id': line.voucher_id.partner_id.id,
-            'currency_id': company_currency <> current_currency and current_currency or False,
+            'currency_id': account_currency_id,
             'quantity': 1,
             'debit': amount_residual > 0 and amount_residual or 0.0,
             'credit': amount_residual < 0 and -amount_residual or 0.0,
@@ -1008,8 +1045,10 @@ class account_voucher(osv.osv):
                     raise osv.except_osv(_('No Account Base Code and Account Tax Code!'),_("You have to configure account base code and account tax code on the '%s' tax!") % (tax_data.name))
 
             # compute the amount in foreign currency
+            foreign_currency_diff = 0.0
             amount_currency = False
             if line.move_line_id:
+                voucher_currency = voucher_brw.currency_id and voucher_brw.currency_id.id or voucher_brw.journal_id.company_id.currency_id.id
                 # We want to set it on the account move line as soon as the original line had a foreign currency
                 if line.move_line_id.currency_id and line.move_line_id.currency_id.id != company_currency:
                     # we compute the amount in that foreign currency. 
@@ -1019,22 +1058,44 @@ class account_voucher(osv.osv):
                         amount_currency = sign * (line.amount)
                     elif line.move_line_id.currency_id.id == voucher_brw.payment_rate_currency_id.id:
                         # if the rate is specified on the voucher, we must use it
-                        amount_currency = (move_line['debit'] - move_line['credit']) * voucher_brw.payment_rate
+                        voucher_rate = currency_obj.browse(cr, uid, voucher_currency, context=ctx).rate
+                        amount_currency = (move_line['debit'] - move_line['credit']) * voucher_brw.payment_rate * voucher_rate
                     else:
                         # otherwise we use the rates of the system (giving the voucher date in the context)
                         amount_currency = currency_obj.compute(cr, uid, company_currency, line.move_line_id.currency_id.id, move_line['debit']-move_line['credit'], context=ctx)
+                if line.amount == line.amount_unreconciled and line.move_line_id.currency_id.id == voucher_currency:
+                    foreign_currency_diff = line.move_line_id.amount_residual_currency + amount_currency
 
             move_line['amount_currency'] = amount_currency
             voucher_line = move_line_obj.create(cr, uid, move_line)
             rec_ids = [voucher_line, line.move_line_id.id]
 
             if not currency_obj.is_zero(cr, uid, voucher_brw.company_id.currency_id, currency_rate_difference):
-                # Change difference entry
+                # Change difference entry in company currency
                 exch_lines = self._get_exchange_lines(cr, uid, line, move_id, currency_rate_difference, company_currency, current_currency, context=context)
                 new_id = move_line_obj.create(cr, uid, exch_lines[0],context)
                 move_line_obj.create(cr, uid, exch_lines[1], context)
                 rec_ids.append(new_id)
 
+            if line.move_line_id and line.move_line_id.currency_id and not currency_obj.is_zero(cr, uid, line.move_line_id.currency_id, foreign_currency_diff):
+                # Change difference entry in voucher currency
+                move_line_foreign_currency = {
+                    'journal_id': line.voucher_id.journal_id.id,
+                    'period_id': line.voucher_id.period_id.id,
+                    'name': _('change')+': '+(line.name or '/'),
+                    'account_id': line.account_id.id,
+                    'move_id': move_id,
+                    'partner_id': line.voucher_id.partner_id.id,
+                    'currency_id': line.move_line_id.currency_id.id,
+                    'amount_currency': -1 * foreign_currency_diff,
+                    'quantity': 1,
+                    'credit': 0.0,
+                    'debit': 0.0,
+                    'date': line.voucher_id.date,
+                }
+                new_id = move_line_obj.create(cr, uid, move_line_foreign_currency, context=context)
+                rec_ids.append(new_id)
+
             if line.move_line_id.id:
                 rec_lst_ids.append(rec_ids)
 

From 7c63902af85f5ef1fb181b134e37fb3f5344f896 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Mon, 5 Dec 2011 16:03:11 +0100
Subject: [PATCH 24/58] [FIX] clean some warnings.

bzr revid: vmt@openerp.com-20111205150311-6xkx4eytvxnkvdck
---
 addons/anonymization/security/ir.model.access.csv | 2 --
 addons/hr_payroll/hr_payroll_demo.xml             | 1 -
 addons/l10n_ch/bank_view.xml                      | 8 --------
 addons/l10n_ch/sterchi_chart/account.xml          | 2 --
 addons/l10n_gt/l10n_gt_base.xml                   | 1 -
 addons/mrp_jit/__openerp__.py                     | 2 +-
 addons/stock_planning/test/stock_planning.yml     | 1 -
 7 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/addons/anonymization/security/ir.model.access.csv b/addons/anonymization/security/ir.model.access.csv
index b558227df24..5531738338b 100644
--- a/addons/anonymization/security/ir.model.access.csv
+++ b/addons/anonymization/security/ir.model.access.csv
@@ -3,5 +3,3 @@
 "access_ir_model_fields_anonymization_user","ir_model_fields_anonymization user","model_ir_model_fields_anonymization",,1,0,0,0
 "access_ir_model_fields_anonymization_history_group_system","ir_model_fields_anonymization_history group_user","model_ir_model_fields_anonymization_history","base.group_system",1,1,1,1
 "access_ir_model_fields_anonymization_history_user","ir_model_fields_anonymization_history user","model_ir_model_fields_anonymization_history",,1,0,0,0
-"access_ir_model_fields_anonymize_wizard_group_system","ir_model_fields_anonymize_wizard group_user","model_ir_model_fields_anonymize_wizard","base.group_system",1,1,1,1
-"access_ir_model_fields_anonymize_wizard_user","ir_model_fields_anonymize_wizard user","model_ir_model_fields_anonymize_wizard",,1,0,0,0
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index e888ad6f133..fbe8578b3ea 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -158,7 +158,6 @@
             <field name="employee_id" ref="hr.employee2"/>
             <field name="notes">This is Quentin Paolino's contract</field>
             <field eval="5000.0" name="wage"/>
-            <field eval="5" name="working_days_per_week"/>
             <field name="working_hours" ref="resource.timesheet_group1"/>
         </record>
 
diff --git a/addons/l10n_ch/bank_view.xml b/addons/l10n_ch/bank_view.xml
index 705e2d63ef4..e23be1bb6ac 100644
--- a/addons/l10n_ch/bank_view.xml
+++ b/addons/l10n_ch/bank_view.xml
@@ -6,7 +6,6 @@
             <field name="name">res.bank.form</field>
             <field name="model">res.bank</field>
             <field name="type">form</field>
-            <field name="sequence" eval="9" />
             <field name="inherit_id" ref="base.view_res_bank_form"/>
             <field name="arch" type="xml">
                 <field name="name" position="after">
@@ -23,7 +22,6 @@
             <field name="name">res.bank.tree</field>
             <field name="model">res.bank</field>
             <field name="type">tree</field>
-            <field name="sequence" eval="9" />
             <field name="inherit_id" ref="base.view_res_bank_tree"/>
             <field name="arch" type="xml">
                 <field name="name" position="after">
@@ -40,7 +38,6 @@
             <field name="name">res.partner_bank.form.hide.f1</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
-            <field name="sequence" eval="9" />
             <field name="inherit_id" ref="account.view_partner_property_form"/>
             <field name="arch" type="xml">
                 <field name="acc_number" position="replace">
@@ -51,7 +48,6 @@
             <field name="name">res.partner_bank.form.hide.f2</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
-            <field name="sequence" eval="9" />
             <field name="inherit_id" ref="account.view_partner_property_form"/>
             <field name="arch" type="xml">
                 <field name="bank" position="replace">
@@ -63,7 +59,6 @@
             <field name="name">res.partner_bank.form.hide.f2</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
-            <field name="sequence" eval="10" />
             <field name="inherit_id" ref="account.view_partner_property_form"/>
             <field name="arch" type="xml">
                 <field name="state" position="after">
@@ -94,7 +89,6 @@
             <field name="name">res.partner_bank.form.hide.acc_number.frominvoice</field>
             <field name="model">res.partner.bank</field>
             <field name="type">form</field>
-            <field name="sequence" eval="9" />
             <field name="inherit_id" ref="base.view_partner_bank_form"/>
             <field name="arch" type="xml">
                 <field name="acc_number" position="replace">
@@ -106,7 +100,6 @@
             <field name="name">res.partner_bank.form.hide.bank.frominvoice</field>
             <field name="model">res.partner.bank</field>
             <field name="type">form</field>
-            <field name="sequence" eval="9" />
             <field name="inherit_id" ref="base.view_partner_bank_form"/>
             <field name="arch" type="xml">
                 <field name="bank" position="replace"> 
@@ -118,7 +111,6 @@
             <field name="name">res.partner_bank.form.hide.frominvoice</field>
             <field name="model">res.partner.bank</field>
             <field name="type">form</field>
-            <field name="sequence" eval="10"/>
             <field name="inherit_id" ref="base.view_partner_bank_form"/>
             <field name="arch" type="xml">
                 <field name="state" position="after">
diff --git a/addons/l10n_ch/sterchi_chart/account.xml b/addons/l10n_ch/sterchi_chart/account.xml
index ded5f542fe5..8fdd29fe8a8 100644
--- a/addons/l10n_ch/sterchi_chart/account.xml
+++ b/addons/l10n_ch/sterchi_chart/account.xml
@@ -177,14 +177,12 @@
         <record model="account.account.type" id="account_type_receivable">
             <field name="name">Bilan : Debiteurs</field>
             <field name="code">receivable</field>
-            <field name="partner_account">True</field>
             <field name="close_method">unreconciled</field>
             <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_payable">
             <field name="name">Bilan : Fournisseurs</field>
             <field name="code">payable</field>
-            <field name="partner_account">True</field>
             <field name="close_method">unreconciled</field>
             <field name="report_type">none</field>
         </record>
diff --git a/addons/l10n_gt/l10n_gt_base.xml b/addons/l10n_gt/l10n_gt_base.xml
index c52e7e94532..5238d7b4f23 100644
--- a/addons/l10n_gt/l10n_gt_base.xml
+++ b/addons/l10n_gt/l10n_gt_base.xml
@@ -16,7 +16,6 @@
 
         <record id="GTQ" model="res.currency">
             <field name="name">GTQ</field>
-            <field name="code">GTQ</field>
             <field name="symbol">Q</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py
index 72ef35ebc4b..6f8aec2dcc9 100644
--- a/addons/mrp_jit/__openerp__.py
+++ b/addons/mrp_jit/__openerp__.py
@@ -41,7 +41,7 @@ In that case, you can not use priorities any more on the different picking.
 
     """,
     'author': 'OpenERP SA',
-    'depends': ['procurement'],
+    'depends': ['procurement', 'mrp'],
     'update_xml': ['mrp_jit.xml'],
     'demo_xml': [],
     'test': ['test/mrp_jit.yml'],
diff --git a/addons/stock_planning/test/stock_planning.yml b/addons/stock_planning/test/stock_planning.yml
index df2f53dbb6e..f9608461f8a 100644
--- a/addons/stock_planning/test/stock_planning.yml
+++ b/addons/stock_planning/test/stock_planning.yml
@@ -168,7 +168,6 @@
   !python {model: stock.sale.forecast}: |
     forecast_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_pc1'))])
     write_dict = {'product_qty': 30.0,
-    'analyzed_section_id': ref("crm.section_sales_department"),
     'analyzed_period1_id': ref("stock_period_03"),
     'analyzed_user_id': ref("base.user_root"),
     'analyzed_warehouse_id': ref("stock.warehouse0")}

From b28f574799bee172e0b35f6335e9a8722dbd3148 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Mon, 5 Dec 2011 16:55:10 +0100
Subject: [PATCH 25/58] [FIX] clean some warnings.

bzr revid: vmt@openerp.com-20111205155510-many34fn09yr58x0
---
 addons/hr_holidays/hr_holidays.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index d22c5b9f1bb..746c2764315 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -262,7 +262,7 @@ class hr_holidays(osv.osv):
                     'name': record.name,
                     'categ_id': record.holiday_status_id.categ_id.id,
                     'duration': record.number_of_days_temp * 8,
-                    'note': record.notes,
+                    'description': record.notes,
                     'user_id': record.user_id.id,
                     'date': record.date_from,
                     'end_date': record.date_to,

From bca8a89bc5afa128769e397ba5780f4957e39567 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Tue, 6 Dec 2011 11:13:54 +0100
Subject: [PATCH 26/58] [FIX] clean some warnings.

bzr revid: vmt@openerp.com-20111206101354-snbya2xtl8pjwskc
---
 addons/account/account.py                    |  2 +-
 addons/account/account_bank.py               |  1 -
 addons/account/account_invoice.py            |  6 +--
 addons/l10n_br/data/account_tax_template.xml | 47 +-------------------
 addons/l10n_cr/data/account_tax_template.xml |  2 -
 addons/mrp_jit/__openerp__.py                |  2 +-
 6 files changed, 6 insertions(+), 54 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 73c1018d66b..384ef47e980 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1223,7 +1223,7 @@ class account_move(osv.osv):
         'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}),
         'state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'State', required=True, readonly=True,
-            help='All manually created new journal entry are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'),
+            help='All manually created new journal entries are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'),
         'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
         'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'),
         'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True),
diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py
index 01eab2fbb01..02270b94186 100644
--- a/addons/account/account_bank.py
+++ b/addons/account/account_bank.py
@@ -99,7 +99,6 @@ class bank(osv.osv):
                     'type': 'bank',
                     'company_id': bank.company_id.id,
                     'analytic_journal_id': False,
-                    'currency_id': False,
                     'default_credit_account_id': acc_bank_id,
                     'default_debit_account_id': acc_bank_id,
                     'view_id': view_id_cash
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index fcd630ea78b..39cc471c2f6 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -923,7 +923,6 @@ class account_invoice(osv.osv):
                 'line_id': line,
                 'journal_id': journal_id,
                 'date': date,
-                'type': entry_type,
                 'narration':inv.comment
             }
             period_id = inv.period_id and inv.period_id.id or False
@@ -1081,7 +1080,8 @@ class account_invoice(osv.osv):
             del line['invoice_id']
             for field in ('company_id', 'partner_id', 'account_id', 'product_id',
                           'uos_id', 'account_analytic_id', 'tax_code_id', 'base_code_id'):
-                line[field] = line.get(field, False) and line[field][0]
+                if line.get(field):
+                    line[field] = line[field][0]
             if 'invoice_line_tax_id' in line:
                 line['invoice_line_tax_id'] = [(6,0, line.get('invoice_line_tax_id', [])) ]
         return map(lambda x: (0,0,x), lines)
@@ -1209,7 +1209,7 @@ class account_invoice(osv.osv):
         l2['name'] = name
 
         lines = [(0, 0, l1), (0, 0, l2)]
-        move = {'ref': ref, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date, 'type': entry_type}
+        move = {'ref': ref, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date}
         move_id = self.pool.get('account.move').create(cr, uid, move, context=context)
 
         line_ids = []
diff --git a/addons/l10n_br/data/account_tax_template.xml b/addons/l10n_br/data/account_tax_template.xml
index 58f860e0d90..fcdcb4d30e6 100644
--- a/addons/l10n_br/data/account_tax_template.xml
+++ b/addons/l10n_br/data/account_tax_template.xml
@@ -5,7 +5,6 @@
 		<record id="tax_template_1" model="account.tax.template">
 			<field name="description">IPI</field>
 			<field name="name">IPI</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -21,7 +20,6 @@
 		<record id="tax_template_3" model="account.tax.template">
 			<field name="description">IPI 2%</field>
 			<field name="name">IPI 2%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.02</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -37,7 +35,6 @@
 		<record id="tax_template_4" model="account.tax.template">
 			<field name="description">IPI 3%</field>
 			<field name="name">IPI 3%</field>
-      		<field name="tax_group">vat</field>
 			<field name="amount">0.03</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -53,7 +50,6 @@
 		<record id="tax_template_5" model="account.tax.template">
 			<field name="description">IPI 4%</field>
 			<field name="name">IPI 4%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.04</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -69,7 +65,6 @@
 		<record id="tax_template_6" model="account.tax.template">
 			<field name="description">IPI 5%</field>
 			<field name="name">IPI 5%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.05</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -85,7 +80,6 @@
 		<record id="tax_template_7" model="account.tax.template">
 			<field name="description">IPI 7%</field>
 			<field name="name">IPI 7%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.07</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -101,7 +95,6 @@
 		<record id="tax_template_8" model="account.tax.template">
 			<field name="description">IPI 8%</field>
 			<field name="name">IPI 8%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.08</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -117,7 +110,6 @@
 		<record id="tax_template_9" model="account.tax.template">
 			<field name="description">IPI 10%</field>
 			<field name="name">IPI 10%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.10</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -133,7 +125,6 @@
 		<record id="tax_template_10" model="account.tax.template">
 			<field name="description">IPI 12%</field>
 			<field name="name">IPI 12%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.12</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -149,7 +140,6 @@
 		<record id="tax_template_11" model="account.tax.template">
 			<field name="description">IPI 13%</field>
 			<field name="name">IPI 13%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.13</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -165,7 +155,6 @@
 		<record id="tax_template_12" model="account.tax.template">
 			<field name="description">IPI 15%</field>
 			<field name="name">IPI 15%</field>
-      		<field name="tax_group">vat</field>
 			<field name="amount">0.15</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -181,7 +170,6 @@
 		<record id="tax_template_13" model="account.tax.template">
 			<field name="description">IPI 16%</field>
 			<field name="name">IPI 16%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.16</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -197,7 +185,6 @@
 		<record id="tax_template_14" model="account.tax.template">
 			<field name="description">IPI 18%</field>
 			<field name="name">IPI 18%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.18</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -213,7 +200,6 @@
 		<record id="tax_template_15" model="account.tax.template">
 			<field name="description">IPI 20%</field>
 			<field name="name">IPI 20%</field>
-      		<field name="tax_group">vat</field>
 			<field name="amount">0.20</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -229,7 +215,6 @@
 		<record id="tax_template_16" model="account.tax.template">
 			<field name="description">IPI 22%</field>
 			<field name="name">IPI 22%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.22</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -245,7 +230,6 @@
 		<record id="tax_template_17" model="account.tax.template">
 			<field name="description">IPI 25%</field>
 			<field name="name">IPI 25%</field>
-      		<field name="tax_group">vat</field>
 			<field name="amount">0.25</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -261,7 +245,6 @@
 		<record id="tax_template_18" model="account.tax.template">
 			<field name="description">IPI 27%</field>
 			<field name="name">IPI 27%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.27</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -277,7 +260,6 @@
 		<record id="tax_template_19" model="account.tax.template">
 			<field name="description">IPI 30%</field>
 			<field name="name">IPI 30%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.30</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -293,7 +275,6 @@
 		<record id="tax_template_20" model="account.tax.template">
 			<field name="description">IPI 35%</field>
 			<field name="name">IPI 35%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.35</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -309,7 +290,6 @@
 		<record id="tax_template_21" model="account.tax.template">
 			<field name="description">IPI 40%</field>
 			<field name="name">IPI 40%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.40</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -325,7 +305,6 @@
 		<record id="tax_template_22" model="account.tax.template">
 			<field name="description">IPI 42%</field>
 			<field name="name">IPI 42%</field>
-      		<field name="tax_group">vat</field>
 			<field name="amount">0.42</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -341,7 +320,6 @@
 		<record id="tax_template_23" model="account.tax.template">
 			<field name="description">IPI 45%</field>
 			<field name="name">IPI 45%</field>
-      		<field name="tax_group">vat</field>
 			<field name="amount">0.45</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -357,7 +335,6 @@
 		<record id="tax_template_24" model="account.tax.template">
 			<field name="description">IPI 50%</field>
 			<field name="name">IPI 50%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.50</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -373,7 +350,6 @@
 		<record id="tax_template_25" model="account.tax.template">
 			<field name="description">IPI 60%</field>
 			<field name="name">IPI 60%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.60</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -389,7 +365,6 @@
 		<record id="tax_template_26" model="account.tax.template">
 			<field name="description">IPI 330%</field>
 			<field name="name">IPI 330%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">3.30</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -405,7 +380,6 @@
 		<record id="tax_template_27" model="account.tax.template">
 			<field name="description">ICMS Interno</field>
 			<field name="name">ICMS Interno</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<field ref="account_template_241" name="account_collected_id"/>
 			<field ref="account_template_42" name="account_paid_id"/>
@@ -421,7 +395,6 @@
 		<record id="tax_template_28" model="account.tax.template">
 			<field name="description">ICMS Externo</field>
 			<field name="name">ICMS Externo</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<field ref="account_template_241" name="account_collected_id"/>
 			<field ref="account_template_42" name="account_paid_id"/>
@@ -437,7 +410,6 @@
 		<record id="tax_template_29" model="account.tax.template">
 			<field name="description">ICMS Subist</field>
 			<field name="name">ICMS Subist</field>
-      		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<field eval="0" name="price_include"/>
 			<field eval="0" name="tax_discount"/>
@@ -451,7 +423,6 @@
 		<record id="tax_template_30" model="account.tax.template">
 			<field name="description">ICMS Externo 7%</field>
 			<field name="name">ICMS Externo 7%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.07</field>
 			<field ref="account_template_241" name="account_collected_id"/>
 			<field ref="account_template_42" name="account_paid_id"/>
@@ -467,7 +438,6 @@
 		<record id="tax_template_31" model="account.tax.template">
 			<field name="description">ICMS Externo 12%</field>
 			<field name="name">ICMS Externo 12%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.12</field>
 			<field ref="account_template_241" name="account_collected_id"/>
 			<field ref="account_template_42" name="account_paid_id"/>
@@ -483,7 +453,6 @@
 		<record id="tax_template_32" model="account.tax.template">
 			<field name="description">ICMS Interno 19%</field>
 			<field name="name">ICMS Interno 19%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.19</field>
 			<field ref="account_template_241" name="account_collected_id"/>
 			<field ref="account_template_42" name="account_paid_id"/>
@@ -499,7 +468,6 @@
 		<record id="tax_template_33" model="account.tax.template">
 			<field name="description">ICMS Interno 26%</field>
 			<field name="name">ICMS Interno 26%</field>
-      		<field name="tax_group">vat</field>
 			<field name="amount">0.26</field>
 			<field ref="account_template_241" name="account_collected_id"/>
 			<field ref="account_template_42" name="account_paid_id"/>
@@ -515,7 +483,6 @@
 		<record id="tax_template_34" model="account.tax.template">
 			<field name="description">PIS</field>
 			<field name="name">PIS</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<field ref="account_template_243" name="account_collected_id"/>
 			<field ref="account_template_49" name="account_paid_id"/>
@@ -531,7 +498,6 @@
 		<record id="tax_template_35" model="account.tax.template">
 			<field name="description">PIS 0,65%</field>
 			<field name="name">PIS 0,65%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.0065</field>
 			<field ref="account_template_243" name="account_collected_id"/>
 			<field ref="account_template_49" name="account_paid_id"/>
@@ -547,7 +513,6 @@
 		<record id="tax_template_36" model="account.tax.template">
 			<field name="description">COFINS</field>
 			<field name="name">COFINS</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<field ref="account_template_242" name="account_collected_id"/>
 			<field ref="account_template_39" name="account_paid_id"/>
@@ -563,7 +528,6 @@
 		<record id="tax_template_37" model="account.tax.template">
 			<field name="description">COFINS 3%</field>
 			<field name="name">COFINS 3%</field>
-            <field name="tax_group">vat</field>
 			<field name="amount">0.03</field>
 			<field ref="account_template_242" name="account_collected_id"/>
 			<field ref="account_template_39" name="account_paid_id"/>
@@ -579,7 +543,6 @@
 		<record id="tax_template_38" model="account.tax.template">
 			<field name="description">IRPJ</field>
 			<field name="name">IRPJ</field>
-            <field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<field eval="0" name="price_include"/>
 			<field eval="1" name="tax_discount"/>
@@ -593,7 +556,6 @@
 		<record id="tax_template_39" model="account.tax.template">
 			<field name="description">IR</field>
 			<field name="name">IR</field>
-            <field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<field eval="0" name="price_include"/>
 			<field eval="1" name="tax_discount"/>
@@ -607,7 +569,6 @@
 		<record id="tax_template_40" model="account.tax.template">
 			<field name="description">ISS</field>
 			<field name="name">ISS</field>
-            <field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<field eval="0" name="price_include"/>
 			<field eval="1" name="tax_discount"/>
@@ -621,7 +582,6 @@
         <record id="tax_template_41" model="account.tax.template">
 			<field name="description">ISS 1%</field>
 			<field name="name">ISS 1%</field>
-            <field name="tax_group">vat</field>
 			<field name="amount">0.01</field>
 			<field eval="0" name="price_include"/>
 			<field eval="1" name="tax_discount"/>
@@ -635,7 +595,6 @@
         <record id="tax_template_42" model="account.tax.template">
 			<field name="description">ISS 2%</field>
 			<field name="name">ISS 2%</field>
-            <field name="tax_group">vat</field>
 			<field name="amount">0.02</field>
 			<field eval="0" name="price_include"/>
 			<field eval="1" name="tax_discount"/>
@@ -649,7 +608,6 @@
         <record id="tax_template_43" model="account.tax.template">
 			<field name="description">ISS 3%</field>
 			<field name="name">ISS 3%</field>
-            <field name="tax_group">vat</field>
 			<field name="amount">0.03</field>
 			<field eval="0" name="price_include"/>
 			<field eval="1" name="tax_discount"/>
@@ -663,7 +621,6 @@
         <record id="tax_template_44" model="account.tax.template">
 			<field name="description">ISS 4%</field>
 			<field name="name">ISS 4%</field>
-            <field name="tax_group">vat</field>
 			<field name="amount">0.04</field>
 			<field eval="0" name="price_include"/>
 			<field eval="1" name="tax_discount"/>
@@ -677,7 +634,6 @@
         <record id="tax_template_45" model="account.tax.template">
 			<field name="description">ISS 5%</field>
 			<field name="name">ISS 5%</field>
-            <field name="tax_group">vat</field>
 			<field name="amount">0.05</field>
 			<field eval="0" name="price_include"/>
 			<field eval="1" name="tax_discount"/>
@@ -691,7 +647,6 @@
 		<record id="tax_template_46" model="account.tax.template">
 			<field name="description">CSLL</field>
 			<field name="name">CSLL</field>
-            <field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<field eval="0" name="price_include"/>
 			<field eval="1" name="tax_discount"/>
@@ -703,4 +658,4 @@
         </record>
         
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_cr/data/account_tax_template.xml b/addons/l10n_cr/data/account_tax_template.xml
index 7626b25b5ad..42b5ca03a13 100644
--- a/addons/l10n_cr/data/account_tax_template.xml
+++ b/addons/l10n_cr/data/account_tax_template.xml
@@ -11,7 +11,6 @@
             <field name="sequence">10</field>
             <field name="amount">13</field>
             <field name="type">percent</field>
-            <!-- <field name="tax_group">vat</field> -->
             <field name="type_tax_use">all</field>
             <field name="applicable_type">true</field>
             <field name="child_depend" eval="False"/>
@@ -34,7 +33,6 @@
             <field name="sequence">10</field>
             <field name="amount">13</field>
             <field name="type">percent</field>
-            <!-- <field name="tax_group">vat</field> -->
             <field name="type_tax_use">all</field>
             <field name="applicable_type">true</field>
             <field name="child_depend" eval="False"/>
diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py
index 6f8aec2dcc9..72ef35ebc4b 100644
--- a/addons/mrp_jit/__openerp__.py
+++ b/addons/mrp_jit/__openerp__.py
@@ -41,7 +41,7 @@ In that case, you can not use priorities any more on the different picking.
 
     """,
     'author': 'OpenERP SA',
-    'depends': ['procurement', 'mrp'],
+    'depends': ['procurement'],
     'update_xml': ['mrp_jit.xml'],
     'demo_xml': [],
     'test': ['test/mrp_jit.yml'],

From ce8bee8ba7b9f9ef6e3dba1fc33d343d6b878678 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Tue, 6 Dec 2011 11:29:01 +0100
Subject: [PATCH 27/58] [FIX] clean some warnings.

bzr revid: vmt@openerp.com-20111206102901-ngovpq1cky629xsp
---
 addons/l10n_br/data/l10n_br_account_chart_template.xml | 2 +-
 addons/l10n_uk/l10n_uk_wizard.xml                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_br/data/l10n_br_account_chart_template.xml b/addons/l10n_br/data/l10n_br_account_chart_template.xml
index 9dbcb4d558f..89ccee11edc 100644
--- a/addons/l10n_br/data/l10n_br_account_chart_template.xml
+++ b/addons/l10n_br/data/l10n_br_account_chart_template.xml
@@ -19,7 +19,7 @@
     This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
             <field name="action_id" ref="account.action_wizard_multi_chart"/>
             <field name="state">open</field>
-            <field name="restart">onskip</field>
+            <field name="type">once</field>
         </record>
 	
 	</data>
diff --git a/addons/l10n_uk/l10n_uk_wizard.xml b/addons/l10n_uk/l10n_uk_wizard.xml
index b7da2ee5c6b..b4f96afc700 100644
--- a/addons/l10n_uk/l10n_uk_wizard.xml
+++ b/addons/l10n_uk/l10n_uk_wizard.xml
@@ -34,7 +34,7 @@
         <record id="l10n_uk_latest_wizard_id" model="ir.actions.todo">
             <field name="action_id" ref="action_wizard_multi_chart_uk"/>
             <field name="sequence">10</field>
-            <field name="restart">onskip</field>
+            <field name="type">once</field>
             <field name="state">open</field>
         </record>
 

From 4660ee49907b68d07d5aaa352622e53d7f3907df Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Tue, 6 Dec 2011 11:57:58 +0100
Subject: [PATCH 28/58] [FIX] clean some warnings.

bzr revid: vmt@openerp.com-20111206105758-j00f9b67jfvp5dxh
---
 addons/sale/sale.py              | 1 -
 addons/stock/test/stock_test.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 48e51059cff..98a5f322842 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -701,7 +701,6 @@ class sale_order(osv.osv):
             'location_id': order.shop_id.warehouse_id.lot_stock_id.id,
             'procure_method': line.type,
             'move_id': move_id,
-            'property_ids': [(6, 0, [x.id for x in line.property_ids])],
             'company_id': order.company_id.id,
         }
 
diff --git a/addons/stock/test/stock_test.yml b/addons/stock/test/stock_test.yml
index 63650ffeb38..6e41849ea51 100644
--- a/addons/stock/test/stock_test.yml
+++ b/addons/stock/test/stock_test.yml
@@ -307,7 +307,6 @@
       }
     split_id = self.pool.get('stock.move.split').create(cr, uid, partial_datas, context={})
     split_move_data= {
-          'lot_id': split_id,
           'quantity': 10,
           'name': 'lot',
     }

From 159dc31327f179998c83dfa83d56deb1f2b96427 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Tue, 6 Dec 2011 12:22:58 +0100
Subject: [PATCH 29/58] [FIX] clean some warnings.

bzr revid: vmt@openerp.com-20111206112258-wnppot8orjvmpnh2
---
 addons/account/account.py             | 2 +-
 addons/project_issue/project_issue.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 384ef47e980..3fdd8a03b27 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -3154,7 +3154,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 'type': line.account_type == 'cash' and 'cash' or 'bank',
                 'company_id': company_id,
                 'analytic_journal_id': False,
-                'currency_id': False,
+                'currency': False,
             }
             if line.currency_id:
                 vals_journal['view_id'] = view_id_cur
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index b83efbc4996..22cc02b8645 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -312,7 +312,7 @@ class project_issue(crm.crm_case, osv.osv):
                 'name': bug.name,
                 'partner_id': bug.partner_id.id,
                 'description':bug.description,
-                'date': bug.date,
+                'date_deadline': bug.date,
                 'project_id': bug.project_id.id,
                 'priority': bug.priority,
                 'user_id': bug.user_id.id,

From f20cdb19f52dba8551a06a2bf02898502b695108 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Tue, 6 Dec 2011 13:19:55 +0100
Subject: [PATCH 30/58] [FIX] clean some warnings.

bzr revid: vmt@openerp.com-20111206121955-tbv84nfcni0c0q8k
---
 addons/hr_payroll/hr_payroll_demo.xml                         | 2 +-
 .../wizard/hr_timesheet_invoice_create_final_view.xml         | 1 -
 addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml         | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index fbe8578b3ea..7d670d6cafa 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -146,7 +146,7 @@
             <field name="employee_id" ref="hr_employee_bonamy0"/>
             <field name="notes">Default contract for marketing executives</field>
             <field eval="4000.0" name="wage"/>
-            <field eval="5" name="working_days_per_week"/>
+            <field name="working_hours" ref="resource.timesheet_group1"/>
         </record>
 
         <record id="hr_contract_quentin_paolino" model="hr.contract">
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 d366e795c15..514996816cc 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
@@ -13,7 +13,6 @@
 
         <record model="ir.values" id="hr_timesheet_invoice_create_final_values">
             <field name="model_id" ref="model_account_analytic_account" />
-            <field name="object" eval="1" />
             <field name="name">Invoice</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_timesheet_invoice_create_final'))" />
diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml
index 799c544a0c8..5acb2729abb 100644
--- a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml
@@ -165,7 +165,7 @@
         <field name="code">car</field>
         <field name="amount_select">fix</field>
         <field name="sequence">15</field>
-        <field name="condtion_select">none</field>
+        <field name="condition_select">none</field>
         <field name="appears_on_payslip" eval="False"/>
     </record>
     <record id="hr_payroll_rules_parent_company_car" model="hr.salary.rule">
@@ -266,7 +266,7 @@
         <field name="sequence">165</field>
         <field name="condition_select">python</field>
         <field name="condition_python">result = bool(contract.insurance_employee_deduction)</field>
-        <field name="amount_pyton_compute">result = -contract.insurance_employee_deduction</field>
+        <field name="amount_python_compute">result = -contract.insurance_employee_deduction</field>
     </record>
     <record id="hr_payroll_rules_advantage" model="hr.salary.rule">
         <field name="category_id" ref="hr_payroll.ALW"/>

From faedeae2309fe3db290a31df1503d1c39fc3ac9c Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Tue, 6 Dec 2011 14:12:45 +0100
Subject: [PATCH 31/58] [FIX] clean some warnings.

bzr revid: vmt@openerp.com-20111206131245-3my263o19q69f7e7
---
 .../marketing_campaign_demo.xml               | 104 +++++++-----------
 addons/survey/wizard/survey_answer.py         |   4 +-
 2 files changed, 42 insertions(+), 66 deletions(-)

diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
index ee11fbcdb75..abf29f2c011 100644
--- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
@@ -34,137 +34,113 @@
 
         <!-- Email tempalte -->
         <record id="email_template_1" model="email.template">
-            <field name="def_subject">Thanks for showing interest in OpenERP</field>
-            <field name="def_to">info@tinyerp.com</field>
-            <field eval="[(6,0,[])]" name="allowed_groups"/>
+            <field name="subject">Thanks for showing interest in OpenERP</field>
+            <field name="email_to">info@tinyerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
-            <field name="object_name" ref="crm.model_crm_lead"/>
-            <field eval="0" name="use_sign"/>
-            <field name="def_body_text">Hello,Thanks for generous interest you have shown in the openERP.Regards,OpenERP Team,</field>
-            <field name="template_language">mako</field>
+            <field name="model_id" ref="crm.model_crm_lead"/>
+            <field eval="0" name="user_signature"/>
+            <field name="body_text">Hello,Thanks for generous interest you have shown in the openERP.Regards,OpenERP Team,</field>
             <field name="name">For OpenERP OnDemand Free Trial 2010</field>
-            <field name="model_int_name">crm.lead</field>
         </record>
         <record id="email_template_2" model="email.template">
-            <field name="def_subject">Propose to subscribe to the OpenERP Discovery Day on May 2010</field>
-            <field name="def_to">info@tinyerp.com</field>
-            <field eval="[(6,0,[])]" name="allowed_groups"/>
+            <field name="subject">Propose to subscribe to the OpenERP Discovery Day on May 2010</field>
+            <field name="email_to">info@tinyerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
-            <field name="object_name" ref="crm.model_crm_lead"/>
-            <field eval="0" name="use_sign"/>
-            <field name="def_body_text">Hello,We have very good offer that might suit you.
+            <field name="model_id" ref="crm.model_crm_lead"/>
+            <field eval="0" name="user_signature"/>
+            <field name="body_text">Hello,We have very good offer that might suit you.
             We propose you to subscribe to the OpenERP Discovery Day on May 2010.
             If any further information required kindly revert back.
             We really appreciate your co-operation on this.
             Regards,OpenERP Team,</field>
-            <field name="template_language">mako</field>
             <field name="name">For OpenERP Discovery Day on May 2010</field>
-            <field name="model_int_name">crm.lead</field>
         </record>
 
             <record id="email_template_3" model="email.template">
-            <field name="def_subject">Thanks for subscribing to the OpenERP Discovery Day</field>
-            <field name="def_to">info@tinyerp.com</field>
-            <field eval="[(6,0,[])]" name="allowed_groups"/>
+            <field name="subject">Thanks for subscribing to the OpenERP Discovery Day</field>
+            <field name="email_to">info@tinyerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
-            <field name="object_name" ref="crm.model_crm_lead"/>
-            <field eval="0" name="use_sign"/>
-            <field name="def_body_text">Hello,Thanks for showing intrest and for subscribing to the OpenERP Discovery Day.
+            <field name="model_id" ref="crm.model_crm_lead"/>
+            <field eval="0" name="user_signature"/>
+            <field name="body_text">Hello,Thanks for showing intrest and for subscribing to the OpenERP Discovery Day.
              If any further information required kindly revert back.
              I really appreciate your co-operation on this.
              Regards,OpenERP Team,</field>
-            <field name="template_language">mako</field>
             <field name="name">For OpenERP Discovery Day</field>
-            <field name="model_int_name">crm.lead</field>
         </record>
 
              <record id="email_template_4" model="email.template">
-            <field name="def_subject">Thanks for buying the OpenERP book</field>
-            <field name="def_to">info@tinyerp.com</field>
-            <field eval="[(6,0,[])]" name="allowed_groups"/>
+            <field name="subject">Thanks for buying the OpenERP book</field>
+            <field name="email_to">info@tinyerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
-             <field name="object_name" ref="crm.model_crm_lead"/>
-            <field eval="0" name="use_sign"/>
-            <field name="def_body_text">Hello,Thanks for showing intrest and buying the OpenERP book.
+             <field name="model_id" ref="crm.model_crm_lead"/>
+            <field eval="0" name="user_signature"/>
+            <field name="body_text">Hello,Thanks for showing intrest and buying the OpenERP book.
             If any further information required kindly revert back.
             I really appreciate your co-operation on this.
             Regards,OpenERP Team,</field>
-            <field name="template_language">mako</field>
             <field name="name">For OpenERP book</field>
-            <field name="model_int_name">crm.lead</field>
         </record>
 
          <record id="email_template_5" model="email.template">
-            <field name="def_subject">Propose a free technical training to Gold partners</field>
-            <field name="def_to">info@tinyerp.com</field>
-            <field eval="[(6,0,[])]" name="allowed_groups"/>
+            <field name="subject">Propose a free technical training to Gold partners</field>
+            <field name="email_to">info@tinyerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
-            <field name="object_name" ref="crm.model_crm_lead"/>
-            <field eval="0" name="use_sign"/>
-            <field name="def_body_text">Hello, We have very good offer that might suit you.
+            <field name="model_id" ref="crm.model_crm_lead"/>
+            <field eval="0" name="user_signature"/>
+            <field name="body_text">Hello, We have very good offer that might suit you.
             For our gold partners,We are arranging free technical training on june,2010.
             If any further information required kindly revert back.
             I really appreciate your co-operation on this.
             Regards,OpenERP Team,</field>
-            <field name="template_language">mako</field>
             <field name="name">For technical training to Gold partners</field>
-            <field name="model_int_name">crm.lead</field>
         </record>
 
           <record id="email_template_6" model="email.template">
-            <field name="def_subject">Propose paid training to Silver partners</field>
-            <field name="def_to">info@tinyerp.com</field>
-            <field eval="[(6,0,[])]" name="allowed_groups"/>
+            <field name="subject">Propose paid training to Silver partners</field>
+            <field name="email_to">info@tinyerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
-            <field name="object_name" ref="crm.model_crm_lead"/>
-            <field eval="0" name="use_sign"/>
-            <field name="def_body_text">Hello, We have very good offer that might suit you.
+            <field name="model_id" ref="crm.model_crm_lead"/>
+            <field eval="0" name="user_signature"/>
+            <field name="body_text">Hello, We have very good offer that might suit you.
             For our silver partners,We are  paid technical training on june,2010.
             If any further information required kindly revert back.
             I really appreciate your co-operation on this.
             Regards,OpenERP Team,</field>
-            <field name="template_language">mako</field>
             <field name="name">For training to Silver partners</field>
-            <field name="model_int_name">crm.lead</field>
         </record>
 
         <record id="email_template_7" model="email.template">
-            <field name="def_subject">Propose gold partnership to silver partners</field>
-            <field name="def_to">info@tinyerp.com</field>
-            <field eval="[(6,0,[])]" name="allowed_groups"/>
+            <field name="subject">Propose gold partnership to silver partners</field>
+            <field name="email_to">info@tinyerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
-            <field name="object_name" ref="crm.model_crm_lead"/>
-            <field eval="0" name="use_sign"/>
-            <field name="def_body_text">Hello, We have very good offer that might suit you.
+            <field name="model_id" ref="crm.model_crm_lead"/>
+            <field eval="0" name="user_signature"/>
+            <field name="body_text">Hello, We have very good offer that might suit you.
             For our silver partners,We are  offering Gold partnership.
             If any further information required kindly revert back.
             I really appreciate your co-operation on this.
             Regards,OpenERP Team,</field>
-            <field name="template_language">mako</field>
             <field name="name">For gold partnership to silver partners</field>
-            <field name="model_int_name">crm.lead</field>
         </record>
 
         <record id="email_template_8" model="email.template">
-            <field name="def_subject">Thanks for subscribing to technical training</field>
-            <field name="def_to">info@tinyerp.com</field>
-            <field eval="[(6,0,[])]" name="allowed_groups"/>
+            <field name="subject">Thanks for subscribing to technical training</field>
+            <field name="email_to">info@tinyerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
-            <field name="object_name" ref="crm.model_crm_lead"/>
-            <field eval="0" name="use_sign"/>
-            <field name="def_body_text">Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.
+            <field name="model_id" ref="crm.model_crm_lead"/>
+            <field eval="0" name="user_signature"/>
+            <field name="body_text">Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.
             Regards,OpenERP Team,</field>
-            <field name="template_language">mako</field>
             <field name="name">For subscribing to technical training</field>
-            <field name="model_int_name">crm.lead</field>
         </record>
         <!-- Report -->
 
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index f913f922c55..b49c9c7d156 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -528,8 +528,8 @@ class survey_question_wiz(osv.osv_memory):
         Create the Answer of survey and store in survey.response object, and if set validation of question then check the value of question if value is wrong then raise the exception.
         """
         if context is None: context = {}
-        
-        survey_question_wiz_id = super(survey_question_wiz,self).create(cr, uid, vals, context=context)
+
+        survey_question_wiz_id = super(survey_question_wiz,self).create(cr, uid, {'name': vals.get('name')}, context=context)
         if context.has_key('active') and context.get('active',False):
             return survey_question_wiz_id
 

From ff22d6eca99d721b5b6b76730bc0053f677c3583 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Tue, 6 Dec 2011 15:21:30 +0100
Subject: [PATCH 32/58] [FIX] clean some warnings.

bzr revid: vmt@openerp.com-20111206142130-y2nu8bx6jzjviojk
---
 .../base_report_creator/security/ir.model.access.csv   |  1 +
 addons/email_template/security/ir.model.access.csv     |  1 +
 addons/import_sugarcrm/__openerp__.py                  | 10 ++++++----
 addons/import_sugarcrm/security/ir.model.access.csv    |  3 +++
 addons/users_ldap/__openerp__.py                       |  1 +
 5 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 addons/import_sugarcrm/security/ir.model.access.csv

diff --git a/addons/base_report_creator/security/ir.model.access.csv b/addons/base_report_creator/security/ir.model.access.csv
index 24e5a1c4cee..c9e78315b67 100644
--- a/addons/base_report_creator/security/ir.model.access.csv
+++ b/addons/base_report_creator/security/ir.model.access.csv
@@ -2,3 +2,4 @@
 "access_base_report_creator_report","base_report_creator.report","model_base_report_creator_report","base.group_system",1,1,1,1
 "access_base_report_creator_report_fields","base_report_creator.report.fields","model_base_report_creator_report_fields","base.group_system",1,1,1,1
 "access_base_report_creator_report_filter","base_report_creator.report.filter","model_base_report_creator_report_filter","base.group_system",1,1,1,1
+"access_base_report_creator_report_result","base_report_creator.report.result","model_base_report_creator_report_result","base.group_system",1,1,1,1
diff --git a/addons/email_template/security/ir.model.access.csv b/addons/email_template/security/ir.model.access.csv
index f5f61240a96..3903a95f9ce 100644
--- a/addons/email_template/security/ir.model.access.csv
+++ b/addons/email_template/security/ir.model.access.csv
@@ -2,3 +2,4 @@
 "access_email_template","email.template","model_email_template",,1,0,0,0
 "access_email_template_system","email.template system","model_email_template","base.group_system",1,1,1,1
 "access_email_template_manager","email.template","model_email_template",,1,1,1,1
+"access_email_template_preview_system","email.template.preview system","model_email_template_preview","base.group_system",1,1,1,1
diff --git a/addons/import_sugarcrm/__openerp__.py b/addons/import_sugarcrm/__openerp__.py
index 927a4b542ed..c0ad1ba250b 100644
--- a/addons/import_sugarcrm/__openerp__.py
+++ b/addons/import_sugarcrm/__openerp__.py
@@ -28,10 +28,12 @@
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['import_base','crm', 'document'],
-    'init_xml': [],
-    'update_xml': ["wizard/import_message_view.xml",
-                   "import_sugarcrm_view.xml"],
-    'demo_xml': [],
+    'data': [
+        "wizard/import_message_view.xml",
+        "import_sugarcrm_view.xml",
+        "security/ir.model.access.csv",
+    ],
+    'demo': [],
     'test': [],
     'installable': True,
     'active': False,
diff --git a/addons/import_sugarcrm/security/ir.model.access.csv b/addons/import_sugarcrm/security/ir.model.access.csv
new file mode 100644
index 00000000000..20e93035b6c
--- /dev/null
+++ b/addons/import_sugarcrm/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_import_sugarcrm_system","import.sugarcrm system","model_import_sugarcrm","base.group_system",1,1,1,1
+"access_import_message_system","import.message system","model_import_message","base.group_system",1,1,1,1
diff --git a/addons/users_ldap/__openerp__.py b/addons/users_ldap/__openerp__.py
index adab3ff892c..09b070b0be6 100644
--- a/addons/users_ldap/__openerp__.py
+++ b/addons/users_ldap/__openerp__.py
@@ -120,6 +120,7 @@ will disable LDAP authentication if installed at the same time.
     "data" : [
         "users_ldap_view.xml",
         "user_ldap_installer.xml",
+        "security/ir.model.access.csv",
     ],
     "active": False,
     "installable": True,

From a557720086c0b1ed003f33edf81bc50e6519a843 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 7 Dec 2011 10:07:05 +0100
Subject: [PATCH 33/58] [FIX] users_ldap: forgot to add ir_model_access csv
 file.

bzr revid: vmt@openerp.com-20111207090705-cnotcrjyc53bahud
---
 addons/users_ldap/security/ir.model.access.csv | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 addons/users_ldap/security/ir.model.access.csv

diff --git a/addons/users_ldap/security/ir.model.access.csv b/addons/users_ldap/security/ir.model.access.csv
new file mode 100644
index 00000000000..d26bd0a6d48
--- /dev/null
+++ b/addons/users_ldap/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_res_company_ldap","res_company_ldap","model_res_company_ldap","base.group_system",1,1,1,1

From 44bb69e3a1b42b00ab8bece9be314a458f77f5c9 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 7 Dec 2011 11:29:00 +0100
Subject: [PATCH 34/58] [FIX] Kanban ellipsis won't cut string if lenght <=
 size

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

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index bc4f788d989..2e5a2ebc755 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -534,8 +534,11 @@ openerp.web_kanban.KanbanRecord = openerp.web.Widget.extend({
         size = size || 160;
         if (!s) {
             return '';
+        } else if (s.length <= size) {
+            return s;
+        } else {
+            return s.substr(0, size) + '...';
         }
-        return s.substr(0, size) + '...';
     }
 });
 };

From f3c671cbd88d45f4be620b3845e7f56115a870e1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 7 Dec 2011 11:45:03 +0100
Subject: [PATCH 35/58] [ADD] push/pop API for views

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

bzr revid: xmo@openerp.com-20111207104503-gcy0gbin36s4uudh
---
 addons/web/static/src/js/view_form.js |  6 +++---
 addons/web/static/src/js/view_list.js |  4 ++--
 addons/web/static/src/js/views.js     | 30 ++++++++++++++++++++++-----
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index be0770a562b..aef11ed8456 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -357,11 +357,11 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
     on_button_save: function() {
         var self = this;
         return this.do_save().then(function() {
-            self.do_switch_view('page');
+            self.do_prev_view();
         });
     },
     on_button_cancel: function() {
-        return this.do_switch_view('page');
+        return this.do_prev_view();
     },
     on_button_new: function() {
         var self = this;
@@ -383,7 +383,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         return def.promise();
     },
     can_be_discarded: function() {
-        return true; // Disabled until the page view and button refactoring is done
+        return true; // FIXME: Disabled until the page view and button refactoring is done
         return !this.is_dirty() || confirm(_t("Warning, the record has been modified, your changes will be discarded."));
     },
     /**
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index de7dd1a77f5..6e62955f0b1 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -388,10 +388,10 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      * new record.
      *
      * @param {Number|void} index the record index (in the current dataset) to switch to
-     * @param {String} [view="form"] the view type to switch to
+     * @param {String} [view="page"] the view type to switch to
      */
     select_record:function (index, view) {
-        view = view || 'form';
+        view = view || 'page';
         this.dataset.index = index;
         _.delay(_.bind(function () {
             this.do_switch_view(view);
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index cd9d12dcd9c..081a1f47d9d 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -193,6 +193,8 @@ session.web.ViewManager =  session.web.Widget.extend(/** @lends session.web.View
         this.views = {};
         this.flags = this.flags || {};
         this.registry = session.web.views;
+        this.views = [];
+        this.views_history = [];
     },
     render: function() {
         return session.web.qweb.render(this.template, {
@@ -232,11 +234,15 @@ session.web.ViewManager =  session.web.Widget.extend(/** @lends session.web.View
      * Asks the view manager to switch visualization mode.
      *
      * @param {String} view_type type of view to display
+     * @param {Boolean} [no_store=false] don't store the view being switched to on the switch stack
      * @returns {jQuery.Deferred} new view loading promise
      */
-    on_mode_switch: function(view_type) {
+    on_mode_switch: function(view_type, no_store) {
         var self = this,
             view_promise;
+        if (!no_store) {
+            this.views_history.push(view_type);
+        }
         this.active_view = view_type;
         var view = this.views[view_type];
         if (!view.controller) {
@@ -247,6 +253,7 @@ session.web.ViewManager =  session.web.Widget.extend(/** @lends session.web.View
                 controller.set_embedded_view(view.embedded_view);
             }
             controller.do_switch_view.add_last(this.on_mode_switch);
+            controller.do_prev_view.add_last(this.on_prev_view);
             var container = $("#" + this.element_id + '_view_' + view_type);
             view_promise = controller.appendTo(container);
             this.views[view_type].controller = controller;
@@ -286,6 +293,11 @@ session.web.ViewManager =  session.web.Widget.extend(/** @lends session.web.View
         });
         return view_promise;
     },
+    on_prev_view: function () {
+        this.views_history.pop();
+        var previous_view = this.views_history[this.views_history.length - 1];
+        this.on_mode_switch(previous_view, true);
+    },
     /**
      * Sets up the current viewmanager's search view.
      *
@@ -453,10 +465,10 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
 
         return manager_ready;
     },
-    on_mode_switch: function (view_type) {
+    on_mode_switch: function (view_type, no_store) {
         var self = this;
         return $.when(
-                this._super(view_type),
+                this._super(view_type, no_store),
                 this.shortcut_check(this.views[view_type])
             ).then(function() {
                 var controller = self.views[self.active_view].controller,
@@ -939,8 +951,16 @@ session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{
         this.embedded_view = embedded_view;
         this.options.sidebar = false;
     },
-    do_switch_view: function(view) {
-    },
+    /**
+     * Switches to a specific view type
+     *
+     * @param {String} view view type to switch to
+     */
+    do_switch_view: function(view) { },
+    /**
+     * Cancels the switch to the current view, switches to the previous one
+     */
+    do_prev_view: function () { },
     do_search: function(view) {
     },
 

From faa8627737dbae93bb2bf3304c55cc486aa83ce5 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 7 Dec 2011 11:49:42 +0100
Subject: [PATCH 36/58] [FIX] have readonly m2o links open forms in readonly as
 well

bzr revid: xmo@openerp.com-20111207104942-w3x6trs3utk6fwpw
---
 addons/web/static/src/js/view_page.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_page.js b/addons/web/static/src/js/view_page.js
index 87f6be1e548..ee7ce2537ad 100644
--- a/addons/web/static/src/js/view_page.js
+++ b/addons/web/static/src/js/view_page.js
@@ -142,7 +142,7 @@ openerp.web.page = function (openerp) {
                             res_model: self.field.relation,
                             res_id: self.value[0],
                             context: self.build_context(),
-                            views: [[false, 'form']],
+                            views: [[false, 'page'], [false, 'form']],
                             target: 'current'
                         });
                         return false;

From d30c1d8c4f3623d108ce8a72d1c39bffa71d4ebe Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 7 Dec 2011 11:50:08 +0100
Subject: [PATCH 37/58] [imp] changed behavior when clicking on a root menu
 item wihout dashboard to be more consistent

bzr revid: nicolas.vanhoren@openerp.com-20111207105008-bt3m5vytpb2r06lh
---
 addons/web/static/src/js/chrome.js | 2 ++
 addons/web/static/src/js/views.js  | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index bac2c357c67..d08ff3c7491 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -973,6 +973,8 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
         if (data.action.length) {
             var action = data.action[0][2];
             self.on_action(action);
+        } else {
+            self.on_action({type: 'null_action'});
         }
     },
     on_action: function(action) {
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 081a1f47d9d..91d7aafe775 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -90,6 +90,10 @@ session.web.ActionManager = session.web.Widget.extend({
         }
         return this[type](action, on_close);
     },
+    null_action: function() {
+        this.dialog_stop();
+        this.content_stop();
+    },
     ir_actions_act_window: function (action, on_close) {
         if (_(['base.module.upgrade', 'base.setup.installer'])
                 .contains(action.res_model)) {

From aa93c2ca39a2a6aeda34bc80251b2d4d3e3d96c0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 7 Dec 2011 12:04:08 +0100
Subject: [PATCH 38/58] [IMP] hide res.log messages when doing view switches
 (e.g. edit/save/cancel/whatever)

bzr revid: xmo@openerp.com-20111207110408-qa2lv1mw4oxa3qpa
---
 addons/web/static/src/js/views.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 91d7aafe775..5bb51af7540 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -471,8 +471,13 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
     },
     on_mode_switch: function (view_type, no_store) {
         var self = this;
+        var switched = $.when(this._super(view_type, no_store)).then(function () {
+            self.$element.find('.oe-view-manager-logs:first')
+                .addClass('oe-folded').removeClass('oe-has-more')
+                .find('ul').empty();
+        });
         return $.when(
-                this._super(view_type, no_store),
+                switched,
                 this.shortcut_check(this.views[view_type])
             ).then(function() {
                 var controller = self.views[self.active_view].controller,

From ec123c78db07771fab750b8d558458e4e7f3e696 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 7 Dec 2011 12:35:59 +0100
Subject: [PATCH 39/58] [FIX] Disable tooltip when clicking on action buttons

bzr revid: fme@openerp.com-20111207113559-128r2hkg4x62in2i
---
 .../lib/jquery.tipTip/jquery.tipTip.fme.patch | 30 +++++++++++--------
 .../static/lib/jquery.tipTip/jquery.tipTip.js |  3 ++
 addons/web/static/src/js/view_form.js         |  1 +
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/addons/web/static/lib/jquery.tipTip/jquery.tipTip.fme.patch b/addons/web/static/lib/jquery.tipTip/jquery.tipTip.fme.patch
index 7af316b2f3f..1a62870a6b0 100644
--- a/addons/web/static/lib/jquery.tipTip/jquery.tipTip.fme.patch
+++ b/addons/web/static/lib/jquery.tipTip/jquery.tipTip.fme.patch
@@ -1,6 +1,16 @@
---- jquery.tipTip_old.js	2011-11-14 21:40:55.000000000 +0100
-+++ jquery.tipTip.js	2011-11-15 10:09:35.000000000 +0100
-@@ -31,7 +31,7 @@
+--- jquery.tipTip_old.js	2011-12-01 14:15:35.000000000 +0100
++++ jquery.tipTip.js	2011-12-07 12:32:32.000000000 +0100
+@@ -20,6 +20,9 @@
+  */
+ 
+ (function($){
++    $.tipTipClear = function() {
++        $("#tiptip_holder").remove();
++    }
+ 	$.fn.tipTip = function(options) {
+ 		var defaults = { 
+ 			activation: "hover",
+@@ -31,7 +34,7 @@
  			fadeIn: 200,
  			fadeOut: 200,
  			attribute: "title",
@@ -9,7 +19,7 @@
  		  	enter: function(){},
  		  	exit: function(){}
  	  	};
-@@ -51,12 +51,7 @@
+@@ -51,12 +54,7 @@
  		
  		return this.each(function(){
  			var org_elem = $(this);
@@ -23,24 +33,20 @@
  				if(!opts.content){
  					org_elem.removeAttr(opts.attribute); //remove original Attribute
  				}
-@@ -99,6 +94,8 @@
+@@ -99,6 +97,8 @@
  			
  				function active_tiptip(){
  					opts.enter.call(this);
-+					var org_title = typeof opts.content === 'function' ? opts.content() : opts.content;
++					var org_title = typeof opts.content === 'function' ? opts.content.call(org_elem, opts) : opts.content;
 +					org_title = org_title || org_elem.attr(opts.attribute);
  					tiptip_content.html(org_title);
  					tiptip_holder.hide().removeAttr("class").css("margin","0");
  					tiptip_arrow.removeAttr("style");
-@@ -176,8 +173,15 @@
- 					tiptip_arrow.css({"margin-left": arrow_left+"px", "margin-top": arrow_top+"px"});
+@@ -177,7 +177,12 @@
  					tiptip_holder.css({"margin-left": marg_left+"px", "margin-top": marg_top+"px"}).attr("class","tip"+t_class);
  					
--					if (timeout){ clearTimeout(timeout); }
+ 					if (timeout){ clearTimeout(timeout); }
 -					timeout = setTimeout(function(){ tiptip_holder.stop(true,true).fadeIn(opts.fadeIn); }, opts.delay);	
-+					if (timeout) {
-+						clearTimeout(timeout);
-+					}
 +					timeout = setTimeout(function() {
 +						tiptip_holder.stop(true,true);
 +						if ($.contains(document.documentElement, org_elem[0])) {
diff --git a/addons/web/static/lib/jquery.tipTip/jquery.tipTip.js b/addons/web/static/lib/jquery.tipTip/jquery.tipTip.js
index d5295f1e155..522df828003 100644
--- a/addons/web/static/lib/jquery.tipTip/jquery.tipTip.js
+++ b/addons/web/static/lib/jquery.tipTip/jquery.tipTip.js
@@ -20,6 +20,9 @@
  */
 
 (function($){
+    $.tipTipClear = function() {
+        $("#tiptip_holder").remove();
+    }
 	$.fn.tipTip = function(options) {
 		var defaults = { 
 			activation: "hover",
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index aef11ed8456..0e813f99166 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1043,6 +1043,7 @@ openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({
         this.execute_action().always(function() {
             self.force_disabled = false;
             self.check_disable();
+            $.tipTipClear();
         });
     },
     execute_action: function() {

From 21c1918717843ec404d84a92ca497cded6688dba Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 7 Dec 2011 12:22:14 +0100
Subject: [PATCH 40/58] [imp] improved menu disapearance

bzr revid: nicolas.vanhoren@openerp.com-20111207112214-hvff0rtfl12jk355
---
 addons/web/static/src/js/chrome.js              | 8 ++++++--
 addons/web_dashboard/static/src/js/dashboard.js | 5 +++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index d08ff3c7491..7a4b59bc68e 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -837,7 +837,8 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
     init: function(parent, element_id, secondary_menu_id) {
         this._super(parent, element_id);
         this.secondary_menu_id = secondary_menu_id;
-        this.$secondary_menu = $("#" + secondary_menu_id).hide();
+        this.$secondary_menu = $("#" + secondary_menu_id);
+        this.$secondary_menu.hide();
         this.menu = false;
         this.folded = false;
         if (window.localStorage) {
@@ -911,7 +912,10 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
         sub_menu_visible = $sub_menu.is(':visible');
         this.$secondary_menu.find('.oe_secondary_menu').hide();
 
-        $('.active', this.$element.add(this.$secondary_menu.show())).removeClass('active');
+        if (this.$secondary_menu.hasClass('oe_folded')) {
+            this.$secondary_menu.show();
+        }
+        $('.active', this.$element.add(this.$secondary_menu)).removeClass('active');
         $main_menu.add($clicked_menu).add($sub_menu).addClass('active');
 
         if (!(this.folded && manual)) {
diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index e79ccf7b4b6..07c9f83ef1f 100644
--- a/addons/web_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -376,8 +376,13 @@ openerp.web_dashboard.ApplicationTiles = openerp.web.View.extend({
     template: 'ApplicationTiles',
     start: function () {
         this._super();
+        $('.secondary_menu', this.$element.closest('.openerp')).hide();
         return this.do_display_root_menu();
     },
+    stop: function () {
+        $('.secondary_menu', this.$element.closest('.openerp')).show();
+        this._super();
+    },
     do_display_root_menu: function() {
         var self = this;
         return  new openerp.web.DataSetSearch( this, 'ir.ui.menu', null, [['parent_id', '=', false]])

From 74bd504779bb92f5e79f8492a05c7f209cf2df53 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 7 Dec 2011 14:24:47 +0100
Subject: [PATCH 41/58] [FIX] Translate icon is wrapped down

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

bzr revid: fme@openerp.com-20111207132447-dr9jbz25gqyhcar2
---
 addons/web/static/src/css/base.css | 15 ++++-----------
 addons/web/static/src/xml/base.xml | 15 +++++++--------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 067ea09cd38..0281ec3750f 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1061,6 +1061,7 @@ label.error {
 
 .openerp .oe_forms label.oe_label, .openerp .oe_forms label.oe_label_help {
     margin: 4px 0 0 3px;
+    white-space: nowrap;
 }
 .openerp .oe_forms .searchview_group_content label.oe_label, .openerp .searchview_group_content .oe_forms label.oe_label_help { /* making a distinction between labels in search view and other labels */
     margin: 3px 0 0 3px;
@@ -1153,9 +1154,9 @@ label.error {
 .openerp .oe_input_icon {
     position: absolute;
     cursor: pointer;
-    right: 5px;
-    top: 3px;
-    z-index: 2;
+    right: 4px;
+    top: 5px;
+    z-index: 1;
 }
 .openerp .oe_datepicker_container {
     position: absolute;
@@ -1164,7 +1165,6 @@ label.error {
     display: none;
 }
 .openerp .oe_datepicker_root {
-    position: relative;
     display: inline-block;
 }
 .openerp .oe_forms.oe_frame .oe_datepicker_root {
@@ -1178,13 +1178,6 @@ label.error {
     right: 5px;
     top: 3px;
 }
-.openerp img.oe_field_translate {
-    margin-left: -21px;
-    vertical-align: top;
-    cursor: pointer;
-    position: relative;
-    top: 4px;
-}
 .openerp .oe_trad_field.touched {
     border: 1px solid green !important;
 }
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index a75101f9867..618d135a919 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -726,7 +726,6 @@
         <t t-foreach="row" t-as="td">
             <td t-att-colspan="td.colspan gt 1 ? td.colspan : undefined"
                 t-att-width="td.width"
-                t-att-nowrap="td.nowrap or td.is_field_m2o? 'true' : undefined"
                 t-att-valign="td.table ? 'top' : undefined"
                 t-attf-class="oe_form_frame_cell #{td.classname} #{td.element_class}"
             >
@@ -863,15 +862,15 @@
         t-att-name="widget.name"
         t-att-id="widget.element_id"
         t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"
-        t-attf-style="width: #{widget.field.translate ? '99' : '100'}%"
+        style="width: 100%"
     />
-    <img class="oe_field_translate" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
+    <img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
 </t>
 <t t-name="FieldChar.readonly">
     <div
         t-att-id="widget.element_id"
         t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"
-        t-attf-style="width: #{widget.field.translate ? '99' : '100'}%">
+        style="width: 100%">
     </div>
 </t>
 <t t-name="FieldURI.readonly">
@@ -880,7 +879,7 @@
 <t t-name="FieldEmail">
     <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
-        <td width="100%">
+        <td width="100%" style="position: relative">
             <t t-call="FieldChar"/>
         </td>
         <td width="16">
@@ -894,7 +893,7 @@
 <t t-name="FieldUrl">
     <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
-        <td width="100%">
+        <td width="100%" style="position: relative">
             <t t-call="FieldChar"/>
         </td>
         <td width="16">
@@ -910,9 +909,9 @@
         t-att-name="widget.name"
         t-att-id="widget.element_id"
         t-attf-class="field_#{widget.type}"
-        t-attf-style="width: #{widget.field.translate ? '99' : '100'}%"
+        style="width: 100%"
     ></textarea>
-    <img class="oe_field_translate" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
+    <img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
 </t>
 <t t-name="web.datetimepicker">
     <div class="oe_datepicker_root">

From bbf46ca28806748d2c8f259293c2f81e15556f85 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 7 Dec 2011 14:32:29 +0100
Subject: [PATCH 42/58] [FIX] creation button in list view

bzr revid: xmo@openerp.com-20111207133229-m47jhi2kr01247k4
---
 addons/web/static/src/js/view_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 6e62955f0b1..f76eec7d178 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -391,7 +391,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      * @param {String} [view="page"] the view type to switch to
      */
     select_record:function (index, view) {
-        view = view || 'page';
+        view = view || index == null ? 'form' : 'page';
         this.dataset.index = index;
         _.delay(_.bind(function () {
             this.do_switch_view(view);

From 62c3f987146227ee1968541d8c2f7350660c2283 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 7 Dec 2011 14:45:35 +0100
Subject: [PATCH 43/58] [IMP] sale/procurement: still add the property_ids, but
 via inheritance (the property_ids value was removed in a previous clean
 warning commit).

bzr revid: vmt@openerp.com-20111207134535-y8oav1gurv8b7rd5
---
 addons/procurement/procurement.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 9556b1aa081..88238afd3ee 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -569,4 +569,15 @@ class stock_warehouse_orderpoint(osv.osv):
         return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context=context)
     
 stock_warehouse_orderpoint()
+
+class sale_order(osv.osv):
+    _inherit = 'sale.order'
+
+    def _prepare_order_line_procurement(self, cr, uid, order, line, move_id,
+        date_planned, *args):
+        d = super(sale_order, self)._prepare_order_line_procurement(cr, uid,
+            order, line, move_id, date_planned, *args)
+        d['property_ids'] = [(6, 0, [x.id for x in line.property_ids])]
+        return d
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 78d3e7426370e00749da325b30d09dba16e97e0a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 7 Dec 2011 15:06:44 +0100
Subject: [PATCH 44/58] [IMP] remove yield easier debug

bzr revid: al@openerp.com-20111207140644-5e60tbovfhxdx4r9
---
 addons/web/controllers/main.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 0b20e89f583..27cde36fa34 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -103,6 +103,7 @@ class WebClient(openerpweb.Controller):
             addons = self.server_wide_modules(req)
         else:
             addons = addons.split(',')
+        r = []
         for addon in addons:
             manifest = openerpweb.addons_manifest.get(addon, None)
             if not manifest:
@@ -112,7 +113,8 @@ class WebClient(openerpweb.Controller):
             globlist = manifest.get(key, [])
             for pattern in globlist:
                 for path in glob.glob(os.path.normpath(os.path.join(addons_path, addon, pattern))):
-                    yield path, path[len(addons_path):]
+                    r.append( (path, path[len(addons_path):]))
+        return r
 
     def manifest_list(self, req, mods, extension):
         if not req.debug:

From 43373001a6cfe0dd2374176d8b2b2900d7e08cbf Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 7 Dec 2011 15:35:18 +0100
Subject: [PATCH 45/58] [FIX] Removed unused code

bzr revid: fme@openerp.com-20111207143518-mq3dma93nu8khpqx
---
 addons/web/static/src/js/views.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 5bb51af7540..c156c0178c2 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -197,7 +197,6 @@ session.web.ViewManager =  session.web.Widget.extend(/** @lends session.web.View
         this.views = {};
         this.flags = this.flags || {};
         this.registry = session.web.views;
-        this.views = [];
         this.views_history = [];
     },
     render: function() {

From a4646392214df3c2f00b3111ec222fd15c319293 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 7 Dec 2011 15:55:14 +0100
Subject: [PATCH 46/58] [IMP] Improved debugging infos in sidebar and for debug
 View#xxx button

bzr revid: fme@openerp.com-20111207145514-s0yisb191841utp6
---
 addons/web/static/src/js/views.js       | 78 +++++++++++++++++++++----
 addons/web_graph/static/src/js/graph.js |  2 +-
 2 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index c156c0178c2..545db12a594 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -426,10 +426,11 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
         var manager_ready = $.when(searchview_loaded, main_view_loaded);
 
         this.$element.find('.oe_get_xml_view').click(function () {
-            // TODO: add search view?
-            $('<pre>').text(session.web.json_node_to_xml(
-                self.views[self.active_view].controller.fields_view.arch, true))
-                    .dialog({ width: '95%'});
+            var view = self.views[self.active_view].controller,
+                view_id = view.fields_view.view_id;
+            if (view_id) {
+                view.on_sidebar_edit_resource('ir.ui.view', view_id);
+            }
         });
         if (this.action.help && !this.flags.low_profile) {
             var Users = new session.web.DataSet(self, 'res.users'),
@@ -589,25 +590,29 @@ session.web.Sidebar = session.web.Widget.extend({
         });
     },
     add_default_sections: function() {
+        var self = this,
+            view = this.widget_parent,
+            view_manager = view.widget_parent,
+            action = view_manager.action;
         if (this.session.uid === 1) {
             this.add_section(_t('Customize'), 'customize');
             this.add_items('customize', [
                 {
                     label: _t("Manage Views"),
-                    callback: this.widget_parent.on_sidebar_manage_views,
+                    callback: view.on_sidebar_manage_views,
                     title: _t("Manage views of the current object")
                 }, {
                     label: _t("Edit Workflow"),
-                    callback: this.widget_parent.on_sidebar_edit_workflow,
+                    callback: view.on_sidebar_edit_workflow,
                     title: _t("Manage views of the current object"),
                     classname: 'oe_hide oe_sidebar_edit_workflow'
                 }, {
                     label: _t("Customize Object"),
-                    callback: this.widget_parent.on_sidebar_customize_object,
+                    callback: view.on_sidebar_customize_object,
                     title: _t("Manage views of the current object")
                 }, {
                     label: _t("Translate"),
-                    callback: this.widget_parent.on_sidebar_translate,
+                    callback: view.on_sidebar_translate,
                     title: _t("Technical translation")
                 }
             ]);
@@ -617,16 +622,48 @@ session.web.Sidebar = session.web.Widget.extend({
         this.add_items('other', [
             {
                 label: _t("Import"),
-                callback: this.widget_parent.on_sidebar_import
+                callback: view.on_sidebar_import
             }, {
                 label: _t("Export"),
-                callback: this.widget_parent.on_sidebar_export
+                callback: view.on_sidebar_export
             }, {
                 label: _t("View Log"),
-                callback: this.widget_parent.on_sidebar_view_log,
+                callback: view.on_sidebar_view_log,
                 classname: 'oe_hide oe_sidebar_view_log'
             }
         ]);
+
+        if (session.connection.debug) {
+            this.add_section("Debug", 'debug');
+            if (action && action.id) {
+                this.add_items('debug', [{
+                    label: "Edit Action",
+                    callback: function() {
+                        view.on_sidebar_edit_resource(action.type, action.id);
+                    }
+                }]);
+            }
+            this.add_items('debug', [{
+                label: "Edit Model",
+                callback: function() {
+                    self.rpc('/web/dataset/search_read', {
+                        model: 'ir.model',
+                        fields: ['id'],
+                        domain: [['model', '=', view.dataset.model]]
+                    }, function (result) {
+                        view.on_sidebar_edit_resource('ir.model', result.ids[0]);
+                    });
+                }
+            }]);
+            if (view_manager.searchview && view_manager.searchview.view_id) {
+                this.add_items('debug', [{
+                    label: "Edit SearchView",
+                    callback: function() {
+                        view.on_sidebar_edit_resource('ir.ui.view', view_manager.searchview.view_id);
+                    }
+                }]);
+            }
+        }
     },
 
     add_toolbar: function(toolbar) {
@@ -1007,6 +1044,25 @@ session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{
             view_mode : "list"
         });
     },
+    on_sidebar_edit_resource: function(model, id, domain) {
+        var action = {
+            res_model : model,
+            type : 'ir.actions.act_window',
+            view_type : 'form',
+            view_mode : 'form',
+            target : 'new',
+            flags : {}
+        }
+        if (id) {
+            action.res_id = id,
+            action.views = [[false, 'form']];
+        } else if (domain) {
+            action.views = [[false, 'list'], [false, 'form']];
+            action.domain = domain;
+            action.flags.views_switcher = true;
+        }
+        this.do_action(action);
+    },
     on_sidebar_view_log: function() {
     },
     sidebar_context: function () {
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js
index 7f8f619a8c9..8c330434075 100644
--- a/addons/web_graph/static/src/js/graph.js
+++ b/addons/web_graph/static/src/js/graph.js
@@ -62,7 +62,7 @@ openerp.web_graph.GraphView = openerp.web.View.extend({
             .then(function (fields_result, view_result) {
                 self.fields = fields_result[0];
                 self.fields_view = view_result[0];
-                self.on_loaded();
+                self.on_loaded(self.fields_view);
             });
     },
     /**

From 706e732f494b44408d276d245f53c9c9c87eb541 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 7 Dec 2011 15:58:54 +0100
Subject: [PATCH 47/58] [FIX] sale/mrp: revert previous commit, reestablish the
 setting of the property_ids fields (which does not exist yet).

bzr revid: vmt@openerp.com-20111207145854-p334skwo93fy124l
---
 addons/procurement/procurement.py | 11 -----------
 addons/sale/sale.py               |  3 +++
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 88238afd3ee..9556b1aa081 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -569,15 +569,4 @@ class stock_warehouse_orderpoint(osv.osv):
         return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context=context)
     
 stock_warehouse_orderpoint()
-
-class sale_order(osv.osv):
-    _inherit = 'sale.order'
-
-    def _prepare_order_line_procurement(self, cr, uid, order, line, move_id,
-        date_planned, *args):
-        d = super(sale_order, self)._prepare_order_line_procurement(cr, uid,
-            order, line, move_id, date_planned, *args)
-        d['property_ids'] = [(6, 0, [x.id for x in line.property_ids])]
-        return d
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 98a5f322842..9c3ba5d5200 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -701,6 +701,9 @@ class sale_order(osv.osv):
             'location_id': order.shop_id.warehouse_id.lot_stock_id.id,
             'procure_method': line.type,
             'move_id': move_id,
+            # Added by mrp, but mrp is not a dependency, this will trigger a warning
+            # if mrp is not installed.
+            'property_ids': [(6, 0, [x.id for x in line.property_ids])],
             'company_id': order.company_id.id,
         }
 

From 2c0a365da8f4b64048fc336b25e741914d92925a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 7 Dec 2011 16:17:57 +0100
Subject: [PATCH 48/58] [IMP] Debug "Edit Model" --> Sidebar "Customize Object"

bzr revid: fme@openerp.com-20111207151757-ww6kva60tudecf3l
---
 addons/web/static/src/js/views.js | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 545db12a594..40edc52ca87 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -643,18 +643,6 @@ session.web.Sidebar = session.web.Widget.extend({
                     }
                 }]);
             }
-            this.add_items('debug', [{
-                label: "Edit Model",
-                callback: function() {
-                    self.rpc('/web/dataset/search_read', {
-                        model: 'ir.model',
-                        fields: ['id'],
-                        domain: [['model', '=', view.dataset.model]]
-                    }, function (result) {
-                        view.on_sidebar_edit_resource('ir.model', result.ids[0]);
-                    });
-                }
-            }]);
             if (view_manager.searchview && view_manager.searchview.view_id) {
                 this.add_items('debug', [{
                     label: "Edit SearchView",
@@ -1024,7 +1012,14 @@ session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{
         console.log('Todo');
     },
     on_sidebar_customize_object: function() {
-        console.log('Todo');
+        var self = this;
+        this.rpc('/web/dataset/search_read', {
+            model: 'ir.model',
+            fields: ['id'],
+            domain: [['model', '=', self.dataset.model]]
+        }, function (result) {
+            self.on_sidebar_edit_resource('ir.model', result.ids[0]);
+        });
     },
     on_sidebar_import: function() {
         var import_view = new session.web.DataImport(this, this.dataset);

From c635bebcfc4b8ececd7e8a7a9acd4670776d7641 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 7 Dec 2011 16:59:13 +0100
Subject: [PATCH 49/58] [IMP] Update special case for dashboard

bzr revid: fme@openerp.com-20111207155913-o5e9rpthflfw2z10
---
 addons/web/static/src/js/views.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 40edc52ca87..403aa7ca87a 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -388,10 +388,16 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
         }
         this.dataset = dataset;
         this.flags = this.action.flags || {};
-        if (action.res_model == 'board.board' && action.views.length == 1 && action.views) {
-            // Not elegant but allows to avoid form chrome (pager, save/new
-            // buttons, sidebar, ...) displaying
-            this.flags.display_title = this.flags.search_view = this.flags.pager = this.flags.sidebar = this.flags.action_buttons = false;
+        if (action.res_model == 'board.board' && action.view_mode === 'form') {
+            // Special case for Dashboards
+            _.extend(this.flags, {
+                views_switcher : false,
+                display_title : false,
+                search_view : false,
+                pager : false,
+                sidebar : false,
+                action_buttons : false
+            });
         }
 
         // setup storage for session-wise menu hiding

From e9a54a5c1187ba9b9a0a263eb6519806dc0c79a5 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 7 Dec 2011 17:13:53 +0100
Subject: [PATCH 50/58] [IMP] Raise console.error when no action.type defined

I see this error from times to times but never had a chance to reproduce it.
console.error will give a traceback + action object in order to fix the issue

bzr revid: fme@openerp.com-20111207161353-vnp6dm21xyedxgeg
---
 addons/web/static/src/js/views.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 403aa7ca87a..cae83d48258 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -75,6 +75,10 @@ session.web.ActionManager = session.web.Widget.extend({
         }
     },
     do_action: function(action, on_close) {
+        if (!action.type) {
+            console.error("No type for action", action);
+            return;
+        }
         var type = action.type.replace(/\./g,'_');
         var popup = action.target === 'new';
         action.flags = _.extend({
@@ -85,7 +89,7 @@ session.web.ActionManager = session.web.Widget.extend({
             pager : !popup
         }, action.flags || {});
         if (!(type in this)) {
-            console.log("Action manager can't handle action of type " + action.type, action);
+            console.error("Action manager can't handle action of type " + action.type, action);
             return;
         }
         return this[type](action, on_close);

From 59191db574db9a0bafce65836d80f4be578b945d Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 7 Dec 2011 17:15:55 +0100
Subject: [PATCH 51/58] [FIX] account_voucher: fixed onchange_partner_id when
 no journal_id is given

bzr revid: qdp-launchpad@openerp.com-20111207161555-iatt11l2p3yynfzt
---
 addons/account_voucher/account_voucher.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index f751a154a42..535f76b8d64 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -511,6 +511,8 @@ class account_voucher(osv.osv):
         return vals
 
     def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=None):
+        if not journal_id:
+            return {}
         res = self.recompute_voucher_lines(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=context)
         vals = self.recompute_payment_rate(cr, uid, ids, res, currency_id, date, ttype, journal_id, amount, context=context)
         for key in vals.keys():

From 573bae6729976353bac369d8b73e0a9f61614c20 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 7 Dec 2011 17:31:31 +0100
Subject: [PATCH 52/58] [FIX] Shortcut icon + Process view button shall honor
 flags.display_title

Fixed dashboard buttons styling

bzr revid: fme@openerp.com-20111207163131-mi5cmtgficytw5c6
---
 addons/web/static/src/xml/base.xml                | 4 ++--
 addons/web_dashboard/static/src/css/dashboard.css | 2 +-
 addons/web_process/static/src/xml/web_process.xml | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 618d135a919..8e7358a316f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -460,11 +460,11 @@
         </tr>
     </t>
     <t t-jquery="h2.oe_view_title" t-operation="prepend">
-        <a class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
+        <a t-if="self.flags.display_title !== false" class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
             href="javascript: void(0)"> </a>
     </t>
     <t t-jquery="h2.oe_view_title" t-operation="after">
-        <button t-if="self.session.debug" class="oe_get_xml_view">
+        <button t-if="self.session.debug and self.flags.display_title !== false" class="oe_get_xml_view">
             View#<span></span>
         </button>
     </t>
diff --git a/addons/web_dashboard/static/src/css/dashboard.css b/addons/web_dashboard/static/src/css/dashboard.css
index 572340a3e13..d3e05cc4e3b 100644
--- a/addons/web_dashboard/static/src/css/dashboard.css
+++ b/addons/web_dashboard/static/src/css/dashboard.css
@@ -3,7 +3,7 @@
 }
 .openerp .oe-dashboard-links {
     text-align: right;
-    margin: -2em 0.4em 1em 0;
+    margin: 0 4px 6px 0;
 }
 .openerp .oe-dashboard-action {
     margin: 0 0.5em 0.5em 0;
diff --git a/addons/web_process/static/src/xml/web_process.xml b/addons/web_process/static/src/xml/web_process.xml
index 727bdad9d25..d9726a3b325 100644
--- a/addons/web_process/static/src/xml/web_process.xml
+++ b/addons/web_process/static/src/xml/web_process.xml
@@ -1,7 +1,9 @@
 <template>
+<!-- vim:fdl=1:
+-->
     <t t-extend="ViewManager" t-name="ViewManagerAction">
         <t t-jquery=".oe-view-manager-header" t-operation="append">
-            <a class="oe-process-view" title="Process View" href="javascript: void(0)"></a>
+            <a t-if="self.flags.display_title !== false" class="oe-process-view" title="Process View" href="javascript: void(0)"></a>
         </t>
     </t>
     <t t-name="ProcessView">
@@ -140,4 +142,4 @@
             </tr>
         </table>
     </t>
-</template>
\ No newline at end of file
+</template>

From 019946150930f297d33251c3eeaabf658ea2b169 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 8 Dec 2011 06:07:00 +0000
Subject: [PATCH 53/58] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20111208053607-5eolhazj9nhu05j3
bzr revid: launchpad_translations_on_behalf_of_openerp-20111208060700-nb1yi7ecs4q7932m
---
 addons/account/i18n/ar.po        | 26 +++++------
 addons/sale/i18n/fr.po           | 14 +++---
 addons/web_calendar/po/uk.po     | 30 +++++++++++++
 addons/web_default_home/po/uk.po | 38 ++++++++++++++++
 addons/web_mobile/po/uk.po       | 74 ++++++++++++++++++++++++++++++++
 5 files changed, 162 insertions(+), 20 deletions(-)
 create mode 100644 addons/web_calendar/po/uk.po
 create mode 100644 addons/web_default_home/po/uk.po
 create mode 100644 addons/web_mobile/po/uk.po

diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index faecaa6fe04..35a130927be 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-12-04 22:14+0000\n"
+"PO-Revision-Date: 2011-12-08 00:21+0000\n"
 "Last-Translator: kifcaliph <kifcaliph@hotmail.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: 2011-12-05 05:22+0000\n"
-"X-Generator: Launchpad (build 14418)\n"
+"X-Launchpad-Export-Date: 2011-12-08 05:35+0000\n"
+"X-Generator: Launchpad (build 14443)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -152,7 +152,7 @@ msgstr "الاصل"
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Reconcile"
-msgstr "توافق"
+msgstr "تسوية"
 
 #. module: account
 #: field:account.bank.statement.line,ref:0
@@ -209,7 +209,7 @@ msgstr "سالب"
 #: code:addons/account/wizard/account_move_journal.py:95
 #, python-format
 msgid "Journal: %s"
-msgstr "سجل : %s"
+msgstr "يومية: %s"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -230,7 +230,7 @@ msgstr "قوالب الضريبة"
 #. module: account
 #: model:ir.model,name:account.model_account_tax
 msgid "account.tax"
-msgstr "حساب.ضريبة"
+msgstr "account.tax"
 
 #. module: account
 #: code:addons/account/account.py:901
@@ -661,7 +661,7 @@ msgstr "اقفال الفترة"
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr ""
+msgstr "تقرير الحساب المشترك للشريك"
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
@@ -908,7 +908,7 @@ msgstr "مرشحات مفصلة..."
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
 msgid "Centralizing Journal"
-msgstr "مركزية السجل"
+msgstr "مركزية اليومية"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -1689,7 +1689,7 @@ msgstr "كل الشركاء"
 #. module: account
 #: report:account.move.voucher:0
 msgid "Ref. :"
-msgstr ""
+msgstr "مرجع:"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -2622,7 +2622,7 @@ msgstr ""
 #. module: account
 #: report:account.move.voucher:0
 msgid "Number:"
-msgstr ""
+msgstr "رقم:"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
@@ -3069,7 +3069,7 @@ msgstr ""
 #. module: account
 #: report:account.move.voucher:0
 msgid "Journal:"
-msgstr ""
+msgstr "يومية:"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3121,7 +3121,7 @@ msgstr "سنة"
 #. module: account
 #: report:account.move.voucher:0
 msgid "Authorised Signatory"
-msgstr ""
+msgstr "إمضاء المسؤول"
 
 #. module: account
 #: view:validate.account.move.lines:0
@@ -4389,7 +4389,7 @@ msgstr "عناصر اليومية"
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "Balance Sheet (Asset Accounts)"
-msgstr ""
+msgstr "الميزانية العمومية (حسابات الأصول)"
 
 #. module: account
 #: report:account.tax.code.entries:0
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index 9e1c20409be..645dbcc4e38 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/sale/i18n/fr.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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-18 13:16+0000\n"
-"Last-Translator: Aline (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-07 09:17+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-08 05:36+0000\n"
+"X-Generator: Launchpad (build 14443)\n"
 
 #. module: sale
 #: code:addons/sale/sale.py:620
@@ -315,7 +315,7 @@ msgstr "Tableau de bord du responsable des ventes"
 #. module: sale
 #: field:sale.order.line,product_packaging:0
 msgid "Packaging"
-msgstr "Colis"
+msgstr "Conditionnement"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
@@ -600,8 +600,8 @@ msgid ""
 "For every sales order line, a procurement order is created to supply the "
 "sold product."
 msgstr ""
-"Pour chaque ligne de vente, un ordre d'approvisionnement est créé pour "
-"approvisionner le produit vendu."
+"Pour chaque ligne de commande, un ordre d'approvisionnement est créé pour "
+"fournir le produit vendu."
 
 #. module: sale
 #: help:sale.order,incoterm:0
diff --git a/addons/web_calendar/po/uk.po b/addons/web_calendar/po/uk.po
new file mode 100644
index 00000000000..9cb7cae4797
--- /dev/null
+++ b/addons/web_calendar/po/uk.po
@@ -0,0 +1,30 @@
+# Ukrainian translation for openerp-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-12-05 11:50+0100\n"
+"PO-Revision-Date: 2011-12-07 16:53+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian <uk@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: 2011-12-08 06:06+0000\n"
+"X-Generator: Launchpad (build 14443)\n"
+
+#: addons/web_calendar/static/src/js/calendar.js:409
+msgid "Responsible"
+msgstr ""
+
+#: addons/web_calendar/static/src/js/calendar.js:438
+msgid "Navigator"
+msgstr ""
+
+#: addons/web_calendar/static/src/xml/web_calendar.xml:0
+msgid "&nbsp;"
+msgstr ""
diff --git a/addons/web_default_home/po/uk.po b/addons/web_default_home/po/uk.po
new file mode 100644
index 00000000000..7e3c560a2f6
--- /dev/null
+++ b/addons/web_default_home/po/uk.po
@@ -0,0 +1,38 @@
+# Ukrainian translation for openerp-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-10-07 10:39+0200\n"
+"PO-Revision-Date: 2011-12-07 16:56+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian <uk@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: 2011-12-08 06:06+0000\n"
+"X-Generator: Launchpad (build 14443)\n"
+
+#: addons/web_default_home/static/src/xml/web_default_home.xml:0
+msgid "Welcome to your new OpenERP instance."
+msgstr ""
+
+#: addons/web_default_home/static/src/xml/web_default_home.xml:0
+msgid "Remember to bookmark this page."
+msgstr ""
+
+#: addons/web_default_home/static/src/xml/web_default_home.xml:0
+msgid "Remember your login:"
+msgstr ""
+
+#: addons/web_default_home/static/src/xml/web_default_home.xml:0
+msgid "Choose the first OpenERP Application you want to install.."
+msgstr ""
+
+#: addons/web_default_home/static/src/xml/web_default_home.xml:0
+msgid "Install"
+msgstr ""
diff --git a/addons/web_mobile/po/uk.po b/addons/web_mobile/po/uk.po
new file mode 100644
index 00000000000..5c9f7c291f7
--- /dev/null
+++ b/addons/web_mobile/po/uk.po
@@ -0,0 +1,74 @@
+# Ukrainian translation for openerp-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-12-05 11:50+0100\n"
+"PO-Revision-Date: 2011-12-07 16:51+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian <uk@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: 2011-12-08 06:06+0000\n"
+"X-Generator: Launchpad (build 14443)\n"
+
+#: addons/web_mobile/static/src/xml/web_mobile.xml:0
+msgid "OpenERP"
+msgstr ""
+
+#: addons/web_mobile/static/src/xml/web_mobile.xml:0
+msgid "Database:"
+msgstr ""
+
+#: addons/web_mobile/static/src/xml/web_mobile.xml:0
+msgid "Login:"
+msgstr ""
+
+#: addons/web_mobile/static/src/xml/web_mobile.xml:0
+msgid "Password:"
+msgstr ""
+
+#: addons/web_mobile/static/src/xml/web_mobile.xml:0
+msgid "Login"
+msgstr ""
+
+#: addons/web_mobile/static/src/xml/web_mobile.xml:0
+msgid "Bad username or password"
+msgstr ""
+
+#: addons/web_mobile/static/src/xml/web_mobile.xml:0
+msgid "Powered by openerp.com"
+msgstr ""
+
+#: addons/web_mobile/static/src/xml/web_mobile.xml:0
+msgid "Favourite"
+msgstr ""
+
+#: addons/web_mobile/static/src/xml/web_mobile.xml:0
+msgid "Preference"
+msgstr ""
+
+#: addons/web_mobile/static/src/xml/web_mobile.xml:0
+msgid "Logout"
+msgstr ""
+
+#: addons/web_mobile/static/src/xml/web_mobile.xml:0
+msgid "There is no records to show."
+msgstr ""
+
+#: addons/web_mobile/static/src/xml/web_mobile.xml:0
+msgid ":"
+msgstr ""
+
+#: addons/web_mobile/static/src/xml/web_mobile.xml:0
+msgid "On"
+msgstr ""
+
+#: addons/web_mobile/static/src/xml/web_mobile.xml:0
+msgid "Off"
+msgstr ""

From 22fb18bcbf480b28c3f96e16ceb207116e77fadd Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 7 Dec 2011 16:31:01 +0100
Subject: [PATCH 54/58] [ADD] special case: creating a record from list goes
 back to page view, not list view

bzr revid: xmo@openerp.com-20111207153101-kzpolvmvmxnjl20m
---
 addons/web/static/src/js/view_form.js |  5 +++--
 addons/web/static/src/js/views.js     | 19 ++++++++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 0e813f99166..46bb2ef7c35 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -356,8 +356,8 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
     },
     on_button_save: function() {
         var self = this;
-        return this.do_save().then(function() {
-            self.do_prev_view();
+        return this.do_save().then(function(result) {
+            self.do_prev_view(result.created);
         });
     },
     on_button_cancel: function() {
@@ -433,6 +433,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
                     if (success) {
                         success();
                     }
+                    return $.Deferred().resolve({}).promise();
                 } else {
                     openerp.log("FormView(", self, ") : About to save", values);
                     return self.dataset.write(self.datarecord.id, values, {}).pipe(function(r) {
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index cae83d48258..f583dd259e7 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -300,10 +300,23 @@ session.web.ViewManager =  session.web.Widget.extend(/** @lends session.web.View
         });
         return view_promise;
     },
-    on_prev_view: function () {
-        this.views_history.pop();
+    /**
+     * Returns to the view preceding the caller view in this manager's
+     * navigation history (the navigation history is appended to via
+     * on_mode_switch)
+     *
+     * @param {Boolean} [created=false] returning from a creation
+     * @returns {$.Deferred} switching end signal
+     */
+    on_prev_view: function (created) {
+        var current_view = this.views_history.pop();
         var previous_view = this.views_history[this.views_history.length - 1];
-        this.on_mode_switch(previous_view, true);
+        // APR special case: "If creation mode from list (and only from a list),
+        // after saving, go to page view (don't come back in list)"
+        if (created && current_view === 'form' && previous_view === 'list') {
+            return this.on_mode_switch('page');
+        }
+        return this.on_mode_switch(previous_view, true);
     },
     /**
      * Sets up the current viewmanager's search view.

From ebac9ace6edd4ee5ea28d8af6296575e3bdd6c84 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 8 Dec 2011 09:30:34 +0100
Subject: [PATCH 55/58] [FIX] l10n_ch: kwargs fix

bzr revid: qdp-launchpad@openerp.com-20111208083034-lkvwxbv1xw0s9eps
---
 addons/l10n_ch/wizard/bvr_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_ch/wizard/bvr_import.py b/addons/l10n_ch/wizard/bvr_import.py
index 31c1e9ab96f..e98053513cd 100644
--- a/addons/l10n_ch/wizard/bvr_import.py
+++ b/addons/l10n_ch/wizard/bvr_import.py
@@ -168,7 +168,7 @@ def _import(self, cursor, user, data, context=None):
 #                    line2reconcile = line.id
                     account_id = line.account_id.id
                     break
-        result = voucher_obj.onchange_partner_id(cursor, user, [], partner_id, journal_id=statement.journal_id.id, price=abs(record['amount']), currency_id= statement.currency.id, ttype='receipt', date=statement.date ,context=context)
+        result = voucher_obj.onchange_partner_id(cursor, user, [], partner_id, journal_id=statement.journal_id.id, amount=abs(record['amount']), currency_id= statement.currency.id, ttype='receipt', date=statement.date ,context=context)
         voucher_res = { 'type': 'receipt' ,
 
              'name': values['name'],

From f3d42191643159b0a27f9c370cc713055fdf4b7d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 8 Dec 2011 10:10:55 +0100
Subject: [PATCH 56/58] [IMP] editable list UI

* removed cancel edition button
* used an icon for save edition button

bzr revid: xmo@openerp.com-20111208091055-j80gi36s0j5c3mpi
---
 addons/web/static/src/css/base.css               |   6 +++++-
 .../web/static/src/img/icons/save-document.png   | Bin 0 -> 1189 bytes
 addons/web/static/src/js/view_list_editable.js   |  15 +++++----------
 addons/web/static/src/xml/base.xml               |   6 ++----
 4 files changed, 12 insertions(+), 15 deletions(-)
 create mode 100644 addons/web/static/src/img/icons/save-document.png

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 0281ec3750f..9f70a5eebfb 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -768,13 +768,17 @@ label.error {
     padding: 1px 2px;
 }
 
-.openerp .oe-record-delete button{
+.openerp .oe-record-delete button,
+.openerp button.oe-edit-row-save {
     border: none;
     height: 12px;
     width: 12px;
     background: url("/web/static/src/img/iconset-b-remove.png") no-repeat scroll center center transparent;
     cursor: pointer;
 }
+.openerp button.oe-edit-row-save {
+    background-image: url('/web/static/src/img/icons/save-document.png');
+}
 
 /* Could use :not selectors if they were supported by MSIE8... */
 .openerp .oe-listview tbody td {
diff --git a/addons/web/static/src/img/icons/save-document.png b/addons/web/static/src/img/icons/save-document.png
new file mode 100644
index 0000000000000000000000000000000000000000..8933ca0bed9cb93dcb4aa588f87fe3310ff3f2a9
GIT binary patch
literal 1189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_GbVtiUlHNQ3n=#2j0Dn1O+LrKgKyh{fsHN!dP=(<R#W>zw8*jJ{KM
zCZ#Q3IWMg#a&DoX&fy0Iy9D@LJyo@sx2W8jR$#}o^^iu&(q^$!GL74|HMBZ4DsgTQ
zS$K;f%ITP*#jilWrS4H(htKBf-P}9<RDY^}(cg;tJJ*X(c)zVwulas5BCpg&ef96f
z9)AD+31>d%I~I3p#rmnG(j{w^ZQtsaTW{5Mo-1qhc*W0s7gOY9ea;BK=2!igwDN6|
ztfi~Eig=XebeA0g5&z3qo%s+xXUp@Mo3{R)e{y5>jBP!Rt6sWnE0d_57O8V{?ui^J
zhUKf~CKmp<cx9n~@{1!=R-dt)#}czpC|snxaM?i)*VTNRC-ZMGFz*d=H9u$4?_8SC
zRs1=OBgC!1^t<3xWzFS$GIpNvXa3DQsT10$JK>>sqO_9MuEN!Oxwp9+N5pPX3a^r`
z-fS}AOV5LYEvz<Q1$Nvjl+j-$8pz&P<GTF$HG?K2Q@b9`BhhoT-e~7EUc10=%~?IS
zEM|4~@q3?zLb7-yq~s2zo;BDZE9Nrwglou+ixO74@y9;6>L#d)D7OT6ZirzOk*%FE
zvv%L+!W^Nmx8k-)zH?an+QDr#=bd%)3;+D;Pig9iu-fWzj^l_`jApLGx`@s_v(iFL
zUMcLp+rF#M@x)jAg?$QdWgJ|i?JIt@Ke#vZsCcTc%ZEstzhBMGB^zDZ4^9kZ`6Kt^
z+Fk342j43<K8$xyINW}=L7s0qcjR8-j?3pCOqT9-`CvKQZ|AK8AF{s~%#u$kPL}<b
z@S(Codi`<E<F~kEzNOx{{>DS?ce|;-;+7qacOFD2%~i@t`mxp4pf9S4>3-h<U%nlC
zjwDo0Jou`M_uSS{i#dFA%zYkaT(_|k(CSps>f9HwEa}p!-G&}&6*3<Zn@hg#xaN_e
zC~@cAJGJ+@8*jgM{dGXbk7u2N&lR0T-&{AnTrsCA+hwBE-en&b9C#XWw5gQO?Ab-X
z@2*Obt;gT;aOw5mD7f{8arG)+m%UX6R!{D3zP?7sQTEpv;U90W^RC(LY2L3~apCxE
zJDZ!gj$FP!|G~}q^$Eq<+>*?f{TExS&v|%%>$KqA5zC$K`RUBy_g&wz>^{rtUd8)g
z#n0RpJD{VVcrovI*Jak-$GNB5H?U3@KbfoczHZ~SFLgU#MZbFb-L5XzKPIirqo~uy
z$n-h8+4=>F^TIEPoYxOg<><QlW{uF<mo^XAE?HER`l+-~`FYzDHSZ-;+P%MCUHEfS
z@|FLuSPyx(#I~4o<iFc6`-9a((L>$;dH--fVd$8Dzo_^>FbAuaxJHzuB$lLFB^RXv
zDF!1014~^XGBge`G`BJ|wK6u-HZZa>FxY=k#vesPZhlH;S|x4`=jJT=4AdYAvLQG>
qt)x7$D3zhSyj(9cFS|H7u^?41zbJk7I~ysWA_h-aKbLh*2~7Y{FcQxI

literal 0
HcmV?d00001

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index f6b7f85dee1..37c14d31323 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -179,9 +179,6 @@ openerp.web.list_editable = function (openerp) {
                     .delegate('button.oe-edit-row-save', 'click', function () {
                         self.save_row();
                     })
-                    .delegate('button.oe-edit-row-cancel', 'click', function () {
-                        self.cancel_edition();
-                    })
                     .delegate('button', 'keyup', function (e) {
                         e.stopImmediatePropagation();
                     })
@@ -231,20 +228,18 @@ openerp.web.list_editable = function (openerp) {
                           .addClass('oe-field-cell')
                           .removeAttr('width')
                       .end()
-                      .find('td:first').removeClass('oe-field-cell').end()
                       .find('td:last').removeClass('oe-field-cell').end();
+                    if (self.options.selectable) {
+                        $new_row.prepend('<td>');
+                    }
                     // pad in case of groupby
                     _(self.columns).each(function (column) {
                         if (column.meta) {
                             $new_row.prepend('<td>');
                         }
                     });
-                    // Add columns for the cancel and save buttons, if
-                    // there are none in the list
-                    if (!self.options.selectable) {
-                        self.view.pad_columns(
-                            1, {except: $new_row, position: 'before'});
-                    }
+                    // Add column for the save, if
+                    // there is none in the list
                     if (!self.options.deletable) {
                         self.view.pad_columns(
                             1, {except: $new_row});
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 8e7358a316f..5eb19a70136 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1412,10 +1412,8 @@
             .replaceAll(this)
             .after($(document.createElement('td')).append(
                 $(document.createElement('button')).attr({
-                    'class': 'oe-edit-row-save', 'type': 'button'}).text('Save')))
-            .before($(document.createElement('td')).append(
-                $(document.createElement('button')).attr({
-                    'class': 'oe-edit-row-cancel', 'type': 'button'}).text('Cancel')))
+                    'class': 'oe-edit-row-save', 'type': 'button'})
+                  .html(' ')))
             .unwrap();
     </t>
 </t>

From fef31e0d712b17840dec660a32b1413c88abf102 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 8 Dec 2011 11:28:09 +0100
Subject: [PATCH 57/58] [ADD] page view reference field

behaves much like the corresponding m2o field: simply links to the referenced object

bzr revid: xmo@openerp.com-20111208102809-ljc9sm84pc9snda0
---
 addons/web/static/src/css/base.css    | 10 ++++++++--
 addons/web/static/src/js/view_page.js | 20 +++++++++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 9f70a5eebfb..3a163beb832 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -956,13 +956,19 @@ label.error {
     background: #f9f9f9;
 }
 /* Unedit Form */
-.openerp .field_char, .openerp .field_date, .openerp .field_float, .openerp .oe_form_field_many2one a {
+.openerp .field_char,
+.openerp .field_date,
+.openerp .field_float,
+.openerp .field_selection,
+.openerp .oe_form_field_many2one a,
+.openerp .oe_form_field_reference a{
     vertical-align: middle;
     padding-top: 3px;
     font-size: 90%;
     color: #222;
 }
-.openerp .oe_form_field_many2one a {
+.openerp .oe_form_field_many2one a,
+.openerp .oe_form_field_reference a {
     color: #9A0404;
     line-height: 12px;
 }
diff --git a/addons/web/static/src/js/view_page.js b/addons/web/static/src/js/view_page.js
index ee7ce2537ad..76ad81837c2 100644
--- a/addons/web/static/src/js/view_page.js
+++ b/addons/web/static/src/js/view_page.js
@@ -168,7 +168,24 @@ openerp.web.page = function (openerp) {
             }
         }
     });
-    
+    openerp.web.form.FieldReferenceReadonly = openerp.web.form.FieldMany2OneReadonly.extend({
+        set_value: function (value) {
+            if (!value) {
+                return this._super(null);
+            }
+            var reference = value.split(',');
+            this.field.relation = reference[0];
+            var id = parseInt(reference[1], 10);
+            return this._super(id);
+        },
+        get_value: function () {
+            if (!this.value) {
+                return null;
+            }
+            return _.str.sprintf('%s,%d', this.field.relation, this.value[0]);
+        }
+    });
+
     openerp.web.form.FieldMany2ManyReadonly = openerp.web.form.FieldMany2Many.extend({
         force_readonly: true
     });
@@ -188,6 +205,7 @@ openerp.web.page = function (openerp) {
         'many2many' : 'openerp.web.form.FieldMany2ManyReadonly',
         'one2many' : 'openerp.web.form.FieldOne2ManyReadonly',
         'one2many_list' : 'openerp.web.form.FieldOne2ManyReadonly',
+        'reference': 'openerp.web.form.FieldReferenceReadonly',
         'boolean': 'openerp.web.form.FieldBooleanReadonly',
         'float': 'openerp.web.form.FieldCharReadonly',
         'integer': 'openerp.web.form.FieldCharReadonly',

From 2891eeb1f82e0372771ff41f96d8199931e5f7db Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 8 Dec 2011 11:32:22 +0100
Subject: [PATCH 58/58] [IMP] search view on calendars

bzr revid: fp@tinyerp.com-20111208103222-p1eh7yv431kig1pa
---
 addons/crm/crm_meeting_view.xml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index d35300b62b5..ad2c31f7b12 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -294,14 +294,18 @@
         <field name="arch" type="xml">
                 <search string="Search Meetings">
                        <group>
-                           <field name="name" string="Subject"/>
-                           <field name="partner_id"/>
-                           <field name="section_id" widget="selection">
+                           <field name="name" string="Meeting / Partner"
+                                domain="[('name','ilike',self), ('partner_id','ilike', self)]"/>
+                           <field name="user_id" groups="base.group_extended">
+                               <filter icon="terp-personal" groups="base.group_extended"
+                                   domain="[('user_id','=',uid)]"
+                                   help="My Meetings" />
+                           </field>
+                           <field name="section_id" widget="selection" groups="base.group_extended">
                                <filter icon="terp-personal+" groups="base.group_extended"
-                                   domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                                   domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                                    help="My Sales Team(s)" />
                            </field>
-                           <field name="user_id"/>
                        </group>
                 </search>
             </field>