diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-06-13 10:50:43 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-06-13 10:50:43 +0200 |
| commit | 788750ea513cb013db2d684b985efdb2e66dc5a7 (patch) | |
| tree | 95c43fd2b5cc551d47a5f01f39b35d5ab987eba9 | |
| parent | c8243e71c6da37547a19f61c58f25d5d03e13d38 (diff) | |
| parent | 444f0b6a7f62f8066f754e16f792f3901904249b (diff) | |
[MERGE] forward port branch 9.0 up to 444f0b6a7f6
| -rw-r--r-- | addons/payment_ogone/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/sale/models/sale.py | 2 | ||||
| -rw-r--r-- | doc/cla/individual/subodhdahal.md | 11 | ||||
| -rw-r--r-- | doc/howtos/themes.rst | 2 |
4 files changed, 14 insertions, 3 deletions
diff --git a/addons/payment_ogone/controllers/main.py b/addons/payment_ogone/controllers/main.py index af2e9e05732..a89ff2c63b3 100644 --- a/addons/payment_ogone/controllers/main.py +++ b/addons/payment_ogone/controllers/main.py @@ -48,7 +48,7 @@ class OgoneController(http.Controller): def feedback(self, **kwargs): try: tx = request.env['payment.transaction'].sudo()._ogone_form_get_tx_from_data(kwargs) - tx._ogone_s2s_validate() + tx._ogone_s2s_validate_tree(kwargs) except ValidationError: return 'ko' return 'ok' diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py index 1219680975f..190b7535b4f 100644 --- a/addons/sale/models/sale.py +++ b/addons/sale/models/sale.py @@ -659,7 +659,7 @@ class SaleOrderLine(models.Model): if line.state != 'sale' or not line.product_id._need_procurement(): continue qty = 0.0 - for proc in line.procurement_ids: + for proc in line.procurement_ids.filtered(lambda r: r.state != 'cancel'): qty += proc.product_qty if float_compare(qty, line.product_uom_qty, precision_digits=precision) >= 0: continue diff --git a/doc/cla/individual/subodhdahal.md b/doc/cla/individual/subodhdahal.md new file mode 100644 index 00000000000..4e4c389bc99 --- /dev/null +++ b/doc/cla/individual/subodhdahal.md @@ -0,0 +1,11 @@ +Nepal, 2018-02-09 + +I hereby agree to the terms of the Odoo Individual Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +Subodh Dahal contact.subodhdahal@gmail.com https://github.com/SubodhDahal diff --git a/doc/howtos/themes.rst b/doc/howtos/themes.rst index 531f5e2c8f0..e2dc46f647b 100644 --- a/doc/howtos/themes.rst +++ b/doc/howtos/themes.rst @@ -614,7 +614,7 @@ The previous code will create the snippet’s content, but we still need to plac .. code-block:: xml <template id="place_into_bar" inherit_id="website.snippets" name="Place into bar"> - <xpath expr="//div[@id='snippet_content']/div[@class='o_panel_body']" position="inside"> + <xpath expr="//div[@id='snippet_structure']/div[@class='o_panel_body']" position="inside"> <t t-snippet="theme_tutorial.snippet_testimonial" t-thumbnail="/theme_tutorial/static/src/img/ui/snippet_thumb.jpg"/> </xpath> |