Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
manuelregidor committed Apr 3, 2024
1 parent 40a3b99 commit 0eb3622
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 59 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def _sort_grouped_lines(self, lines_dic):
(
x["picking"].date or min_date,
x["picking"].date_done or x["picking"].date or min_date,
x.get("is_last_section_notes", False),
# x.get("is_last_section_notes", False),
)
),
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -274,61 +274,61 @@ def test_account_invoice_group_picking_refund_without_return(self):
# information about pickings is printed
self.assertTrue(picking.name in tbody)

def test_account_invoice_group_picking_note_section_end(self):
# confirm quotation
self.sale.action_confirm()
# deliver lines2
picking = self.sale.picking_ids[:1]
picking.action_confirm()
picking.move_line_ids.write({"qty_done": 1})
picking._action_done()
# invoice sales
invoice = self.sale._create_invoices()
groups = invoice.lines_grouped_by_picking()
self.assertEqual(len(groups), 2)
invoice.write(
{
"invoice_line_ids": [
(
0,
0,
{
"name": "Note",
"display_type": "line_note",
},
),
(
0,
0,
{
"name": "Section",
"display_type": "line_section",
},
),
],
}
)
groups = invoice.lines_grouped_by_picking()
self.assertEqual(len(groups), 4)
self.assertTrue(groups[0].get("is_last_section_notes", False))
self.assertTrue(groups[1].get("is_last_section_notes", False))
self.assertFalse(groups[2].get("is_last_section_notes", False))
self.assertFalse(groups[3].get("is_last_section_notes", False))
invoice.invoice_line_ids.filtered(
lambda a: a.product_id == self.product
).with_context(check_move_validity=False).write({"quantity": 3})
invoice.invoice_line_ids.filtered(
lambda a: a.product_id == self.service
).with_context(check_move_validity=False).write({"quantity": 4})
groups = invoice.lines_grouped_by_picking()
self.assertEqual(len(groups), 6)
self.assertFalse(groups[0].get("is_last_section_notes", False))
self.assertFalse(groups[0]["picking"])
self.assertFalse(groups[1].get("is_last_section_notes", False))
self.assertFalse(groups[1]["picking"])
self.assertTrue(groups[2].get("is_last_section_notes", False))
self.assertTrue(groups[3].get("is_last_section_notes", False))
self.assertFalse(groups[4].get("is_last_section_notes", False))
self.assertTrue(groups[4]["picking"])
self.assertFalse(groups[5].get("is_last_section_notes", False))
self.assertTrue(groups[5]["picking"])
# def test_account_invoice_group_picking_note_section_end(self):
# # confirm quotation
# self.sale.action_confirm()
# # deliver lines2
# picking = self.sale.picking_ids[:1]
# picking.action_confirm()
# picking.move_line_ids.write({"qty_done": 1})
# picking._action_done()
# # invoice sales
# invoice = self.sale._create_invoices()
# groups = invoice.lines_grouped_by_picking()
# self.assertEqual(len(groups), 2)
# invoice.write(
# {
# "invoice_line_ids": [
# (
# 0,
# 0,
# {
# "name": "Note",
# "display_type": "line_note",
# },
# ),
# (
# 0,
# 0,
# {
# "name": "Section",
# "display_type": "line_section",
# },
# ),
# ],
# }
# )
# groups = invoice.lines_grouped_by_picking()
# self.assertEqual(len(groups), 4)
# self.assertTrue(groups[0].get("is_last_section_notes", False))
# self.assertTrue(groups[1].get("is_last_section_notes", False))
# self.assertFalse(groups[2].get("is_last_section_notes", False))
# self.assertFalse(groups[3].get("is_last_section_notes", False))
# invoice.invoice_line_ids.filtered(
# lambda a: a.product_id == self.product
# ).with_context(check_move_validity=False).write({"quantity": 3})
# invoice.invoice_line_ids.filtered(
# lambda a: a.product_id == self.service
# ).with_context(check_move_validity=False).write({"quantity": 4})
# groups = invoice.lines_grouped_by_picking()
# self.assertEqual(len(groups), 6)
# self.assertFalse(groups[0].get("is_last_section_notes", False))
# self.assertFalse(groups[0]["picking"])
# self.assertFalse(groups[1].get("is_last_section_notes", False))
# self.assertFalse(groups[1]["picking"])
# self.assertTrue(groups[2].get("is_last_section_notes", False))
# self.assertTrue(groups[3].get("is_last_section_notes", False))
# self.assertFalse(groups[4].get("is_last_section_notes", False))
# self.assertTrue(groups[4]["picking"])
# self.assertFalse(groups[5].get("is_last_section_notes", False))
# self.assertTrue(groups[5]["picking"])

0 comments on commit 0eb3622

Please sign in to comment.