Elabore/odoo-usability
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #72 from akretion/10-fix-py3o-lines-sorting

Browse Source 
[FIX] keep the order line sorted when creating the layout_lines dict
This commit is contained in:
David Beal
2019-01-02 18:56:18 +01:00
committed by GitHub
parent 3fef559aac 118dd2a5c0
commit 6c3c6cd43b
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sale_usability/account_invoice.py
View File

@@ -4,6 +4,7 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import models from odoo import models
from collections import OrderedDict
class AccountInvoice(models.Model): class AccountInvoice(models.Model):
@@ -15,7 +16,7 @@ class AccountInvoice(models.Model):
# https://github.com/akretion/odoo-py3o-report-templates/tree/10.0/account_invoice_report_py3o # https://github.com/akretion/odoo-py3o-report-templates/tree/10.0/account_invoice_report_py3o
def py3o_lines_layout(self): def py3o_lines_layout(self):
self.ensure_one() self.ensure_one()
res1 = {} res1 = OrderedDict()
# {'categ(6)': {'lines': [l1, l2], 'subtotal': 23.32}} # {'categ(6)': {'lines': [l1, l2], 'subtotal': 23.32}}
for line in self.invoice_line_ids: for line in self.invoice_line_ids:
categ = line.layout_category_id categ = line.layout_category_id
@@ -52,7 +53,7 @@ class AccountInvoice(models.Model):
# defined above: you just have to change the call in the invoice # defined above: you just have to change the call in the invoice
# ODT template # ODT template
self.ensure_one() self.ensure_one()
res1 = {} res1 = OrderedDict()
# {categ(1): {'lines': [l1, l2], 'subtotal': 23.32}} # {categ(1): {'lines': [l1, l2], 'subtotal': 23.32}}
soo = self.env['sale.order'] soo = self.env['sale.order']
for line in self.invoice_line_ids: for line in self.invoice_line_ids:

3
sale_usability/sale.py
View File

@@ -4,6 +4,7 @@
from odoo import models, fields, api from odoo import models, fields, api
from odoo.tools import float_is_zero from odoo.tools import float_is_zero
from collections import OrderedDict
class SaleOrder(models.Model): class SaleOrder(models.Model):
@@ -55,7 +56,7 @@ class SaleOrder(models.Model):
@api.multi @api.multi
def py3o_lines_layout(self): def py3o_lines_layout(self):
self.ensure_one() self.ensure_one()
res1 = {} res1 = OrderedDict()
# {categ(6): {'lines': [l1, l2], 'subtotal': 23.32}} # {categ(6): {'lines': [l1, l2], 'subtotal': 23.32}}
for line in self.order_line: for line in self.order_line:
categ = line.layout_category_id categ = line.layout_category_id