Merge lp:~camptocamp/sale-financial/7.0-port-sale_line_watcher into lp:~sale-core-editors/sale-financial/7.0

[Yannick Vaucher @ Camptocamp]

Portage to v7 of module sale_line_watcher

Portage of module sale_line_watcher to v7

Rewritten using web_context_tunnel

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Yannick, several things:

- Instead of replacing a field, it's better to put position="attributes" and only overwrite attribute on_change, so that you don't replace another attributes of the field.

- I think it's better to use module web_context_tunnel to avoid changes on the signature of the method that provokes incompatibilities between modules.

Regards.

review: Needs Fixing (code review)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Thanks Pedro I wasn't aware of web_context_tunnel. This is indeed the right time to use it.

It would make this module obsolete.

Back to WIP

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

I rewrite all modules sale_line_watcher, sale_line_floor and sale_markup using web_context_tunnel.

It allowed me to break the dependancy from sale_markup on sale_line_floor

Looking for reviewers !

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Yannick, thanks for the changes. Do you it's worth while to keep this module instead of dropping it and implementing corresponding on_change when needed on dependant modules? One of the advantages of web_context_tunnel is that the context dictionary passed on each on_change is aggregated to previous ones, so there will not be possible incompatibilities (except a reuse of a key name with different meaning).

Regards.

review: Needs Information

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

How would I call super() in onchange if it doesn't exist ?

My intend was to break dependency of sale_markup on sale_floor_price but both use those on_changes which doesn't exists.

[Pedro Manuel Baeza (pedro.baeza)]

Why don't you check super method existence?:

parent = super(children, self)
if hasattr(parent, 'method') and callable(getattr(parent, 'method')):
    parent.method(cr, uid, ...

This seems a little tricky, but it removes the needed of the glue module. What do you think?

Regards.

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

In that case this module is providing an interface to declare the onchanges it seems cleaner to me.

Cheers

[Pedro Manuel Baeza (pedro.baeza)]

I think on contrary, but let others give their opinion.

Regards.

review: Abstain

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

I tend to agree with Pedro.

But I would say, given that Yannick refactored several modules to use this interface and that it seems working.

I would say, let's approve that 1st change and get the stuff working. Next, if somebody finds it useful to kill that module and refactor dependent modules in v8 and if that stays simple I would approve such new change.

But meanwhile, I approve this change because it's already an improvement and it's there.

review: Approve

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

Hello,

The management of the project has moved to Github: https://github.com/OCA/sale-financial

Please migrate your merge proposal to Github. You may want to check https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub for an explanation on how to proceed.

Thanks for contributing to the project

review: Needs Resubmitting

Unmerged revisions

24. By Yannick Vaucher @ Camptocamp on 2014-04-04

improve imports

23. By Yannick Vaucher @ Camptocamp on 2014-04-04

improve module description

22. By Yannick Vaucher @ Camptocamp on 2014-04-04

Rewrite onchange to use web_context_tunnel module

21. By Yannick Vaucher @ Camptocamp on 2014-04-03

Portage of module sale_line_watcher

=== modified file 'sale_line_watcher/__openerp__.py'
--- sale_line_watcher/__openerp__.py	2013-11-14 08:16:22 +0000
+++ sale_line_watcher/__openerp__.py	2014-04-04 14:22:40 +0000
@@ -23,19 +23,37 @@
  'author' : 'Camptocamp',
  'maintainer': 'Camptocamp',
  'category': 'Hidden',
- 'complexity': "normal",  # easy, normal, expert
- 'depends' : ['base', 'sale'],
- 'description': """Add new base onchange methods on sale_order class
-
- onchange_price_unit and onchange_discount both accept the following arguments:
- (self, cr, uid, ids, price_unit, product_id, discount, product_uom, pricelist, **kwargs)
+ 'complexity': "normal",
+ 'depends' : ['base', 'sale', 'web_context_tunnel'],
+ 'description': """
+Sale order line watcher
+=======================
+
+Add new base onchange methods on Sale Order Line form.
+
+`onchange_price_unit` and `onchange_discount`
+
+Those onchanges can be extendend with additionnal contexts using
+`web_context_tunnel` module
+
+Dependencies
+------------
+
+`web_context_tunnel` module from lp:server-env-tools branch
+
+Contributors
+------------
+
+* Nicolas Bessi <[e-mail]>
+* Yannick Vaucher <[e-mail]>
+
 """,
  'website': 'http://www.camptocamp.com',
  'init_xml': [],
  'update_xml': ['sale_view.xml'],
  'demo_xml': [],
  'tests': [],
- 'installable': False,
+ 'installable': True,
  'auto_install': False,
  'license': 'AGPL-3',
  'application': True}

=== modified file 'sale_line_watcher/sale_view.xml'
--- sale_line_watcher/sale_view.xml	2012-05-29 07:06:32 +0000
+++ sale_line_watcher/sale_view.xml	2014-04-04 14:22:40 +0000
@@ -3,27 +3,24 @@
   <data>
     <record model="ir.ui.view" id="sale_watcher_sale_order_line_form2">
       <field name="name">sales_line_watcher.view.form2</field>
-      <field name="type">form</field>
       <field name="model">sale.order.line</field>
       <field name="inherit_id" ref="sale.view_order_line_form2" />
       <field name="arch" type="xml">
-        <xpath expr="//field[@name='price_unit']" position="replace">
-          <field name="price_unit"
-                 on_change="onchange_price_unit(price_unit ,product_id, discount, product_uom_qty, parent.pricelist_id)"
-                 select="2"/>
+        <xpath expr="//field[@name='price_unit']" position="attributes">
+          <attribute name="context">{}</attribute>
+          <attribute name="on_change">onchange_price_unit(context)</attribute>
         </xpath>
       </field>
     </record>
 
     <record model="ir.ui.view" id="sale_watcher_sale_order_line_form3">
       <field name="name">sales_line_watcher.view.form3</field>
-      <field name="type">form</field>
       <field name="model">sale.order.line</field>
       <field name="inherit_id" ref="sale.view_order_line_form2" />
       <field name="arch" type="xml">
-        <xpath expr="//field[@name='discount']" position="replace">
-          <field name="discount"
-                 on_change="onchange_discount(price_unit, product_id, discount, product_uom_qty, parent.pricelist_id)"/>
+        <xpath expr="//field[@name='discount']" position="attributes">
+          <attribute name="context">{}</attribute>
+          <attribute name="on_change">onchange_discount(context)</attribute>
         </xpath>
       </field>
     </record>
@@ -32,25 +29,22 @@
       <field name="name">sales_line_watcher.form.floorprice</field>
       <field name="model">sale.order</field>
       <field name="inherit_id" ref="sale.view_order_form" />
-      <field name="type">form</field>
       <field name="arch" type="xml">
-        <field name="discount" position="replace">
-          <field name="discount"
-                 on_change="onchange_discount(price_unit, product_id,discount, product_uom_qty, parent.pricelist_id)"/>
+        <field name="discount" position="attributes">
+          <attribute name="context">{}</attribute>
+          <attribute name="on_change">onchange_discount(context)</attribute>
         </field>
       </field>
-    </record>w
+    </record>
 
     <record id="sale_watcher_order_form2" model="ir.ui.view">
       <field name="name">sales_line_watcher.form.floorprice</field>
       <field name="model">sale.order</field>
       <field name="inherit_id" ref="sale.view_order_form" />
-      <field name="type">form</field>
       <field name="arch" type="xml">
-        <field name="price_unit" position="replace">
-          <field name="price_unit"
-                 on_change="onchange_price_unit(price_unit ,product_id ,discount, product_uom_qty, parent.pricelist_id)"
-                 select="2"/>
+        <field name="price_unit" position="attributes">
+          <attribute name="context">{}</attribute>
+          <attribute name="on_change">onchange_price_unit(context)</attribute>
         </field>
       </field>
     </record>

=== modified file 'sale_line_watcher/sale_watcher.py'
--- sale_line_watcher/sale_watcher.py	2012-05-29 07:06:32 +0000
+++ sale_line_watcher/sale_watcher.py	2014-04-04 14:22:40 +0000
@@ -19,26 +19,20 @@
 #
 ##############################################################################
 
-from osv.orm import Model
+from openerp.osv.orm import Model
 
 class SaleOrderLine(Model):
     _inherit = 'sale.order.line'
 
-    def onchange_price_unit(self, cr, uid, ids,
-                            price_unit, product_id, discount, product_uom, pricelist,
-                            **kwargs):
-        '''
+    def onchange_price_unit(self, cr, uid, ids, context=None):
+        """
         Place holder function for onchange unit price
-        '''
-        res = {}
-        return res
+        """
+        return {}
 
-    def onchange_discount(self, cr, uid, ids,
-                          price_unit, product_id, discount, product_uom, pricelist,
-                          **kwargs):
-        '''
+    def onchange_discount(self, cr, uid, ids, context=None):
+        """
         Place holder function for onchange discount
-        '''
-        res = {}
-        return res
+        """
+        return {}