TechnoLibre/bemade-addons
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added a test and made small modifications for batch_picking_create_one_bill

Browse source
This commit is contained in:
Marc Durepos 2025-02-13 16:39:48 -05:00
parent 020ed0e99c
commit 1b95a6c2ea
3 changed files with 300 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
batch_picking_create_one_bill/tests/__init__.py Normal file
View file

@ -0,0 +1 @@
from . import test_batch_picking_bill

253
batch_picking_create_one_bill/tests/test_batch_picking_bill.py Normal file
View file

@ -0,0 +1,253 @@
# -*- coding: utf-8 -*-
from odoo.tests import tagged
from odoo.tests.common import TransactionCase
from odoo.exceptions import AccessError
from odoo import fields
@tagged("post_install", "-at_install")
class TestBatchPickingBill(TransactionCase):
@classmethod
def setUpClass(cls):
super().setUpClass()
# Create users with different access rights
cls.warehouse_user = cls.env["res.users"].create(
{
"name": "Warehouse User",
"login": "warehouse_user",
"email": "warehouse@test.com",
"groups_id": [
(
6,
0,
[
cls.env.ref("stock.group_stock_user").id,
cls.env.ref("purchase.group_purchase_user").id,
cls.env.ref(
"account.group_account_invoice"
).id, # Basic invoice rights
],
)
],
}
)
cls.accountant = cls.env["res.users"].create(
{
"name": "Accountant",
"login": "accountant",
"email": "accountant@test.com",
"groups_id": [
(
6,
0,
[
cls.env.ref("account.group_account_invoice").id,
cls.env.ref("account.group_account_manager").id,
],
)
],
}
)
# Create vendor
cls.vendor = cls.env["res.partner"].create(
{
"name": "Test Vendor",
"email": "vendor@test.com",
"supplier_rank": 1,
}
)
# Create products
cls.product_a = cls.env["product.product"].create(
{
"name": "Product A",
"type": "consu",
"tracking": "none",
"purchase_ok": True,
}
)
cls.product_b = cls.env["product.product"].create(
{
"name": "Product B",
"type": "consu",
"tracking": "none",
"purchase_ok": True,
}
)
# Create purchase orders
po_vals = {
"partner_id": cls.vendor.id,
"order_line": [
(
0,
0,
{
"product_id": cls.product_a.id,
"name": cls.product_a.name,
"product_qty": 5.0,
"product_uom": cls.product_a.uom_po_id.id,
"price_unit": 100.0,
},
),
(
0,
0,
{
"product_id": cls.product_b.id,
"name": cls.product_b.name,
"product_qty": 3.0,
"product_uom": cls.product_b.uom_po_id.id,
"price_unit": 200.0,
},
),
],
}
cls.po1 = cls.env["purchase.order"].create(po_vals)
cls.po2 = cls.env["purchase.order"].create(po_vals)
# Confirm purchase orders and receive products
cls.po1.button_confirm()
cls.po2.button_confirm()
# Receive products in pickings
for picking in (cls.po1 + cls.po2).picking_ids:
for move in picking.move_ids:
move.quantity = move.product_qty
def test_01_warehouse_user_flow(self):
"""Test the complete flow with warehouse user"""
# Switch to warehouse user
self.env = self.env(user=self.warehouse_user)
# Create batch picking
batch = self.env["stock.picking.batch"].create(
{
"picking_ids": [
(6, 0, (self.po1.picking_ids + self.po2.picking_ids).ids)
],
"zero_quantity_default": True,
}
)
# Check batch was created successfully
self.assertTrue(batch, "Batch picking should be created")
self.assertEqual(len(batch.picking_ids), 2, "Batch should have 2 pickings")
# Process the pickings
for picking in batch.picking_ids:
for move_line in picking.move_line_ids:
move_line.quantity = move_line.move_id.product_qty
# Validate batch
batch.action_done()
self.assertEqual(batch.state, "done", "Batch should be done")
# Try to create bill (should work)
wizard = (
self.env["create.bill.wizard"]
.with_context(default_batch_id=batch.id)
.create({})
)
# Execute the create bill action
action = wizard.action_create_bill()
self.assertTrue(action, "Should get action to merge bills")
self.assertEqual(
action["res_model"], "merge.bill.wizard", "Should open merge bill wizard"
)
def test_02_bill_creation_and_access(self):
"""Test bill creation and access rights"""
# Create and process batch as warehouse user
self.env = self.env(user=self.warehouse_user)
batch = self.env["stock.picking.batch"].create(
{
"picking_ids": [
(6, 0, (self.po1.picking_ids + self.po2.picking_ids).ids)
],
"zero_quantity_default": True,
}
)
# Process pickings as warehouse user
for picking in batch.picking_ids:
for move_line in picking.move_line_ids:
move_line.quantity = move_line.move_id.product_qty
batch.action_done()
# Create bill as warehouse user
wizard = (
self.env["create.bill.wizard"]
.with_context(default_batch_id=batch.id)
.create({})
)
action = wizard.action_create_bill()
# Execute merge wizard as warehouse user
merge_wizard = (
self.env["merge.bill.wizard"].with_context(**action["context"]).create({})
)
draft_invoices = merge_wizard.invoice_ids
self.assertTrue(draft_invoices, "Invoices should be created")
bill = self.env["account.move"].browse(merge_wizard.action_process()["res_id"])
self.assertTrue(bill, "Bill should be created")
self.assertEqual(
bill.mapped("state"),
["draft"],
"Bill should be draft",
)
# Validate invoice as accountant (should work)
bill.with_user(self.accountant).invoice_date = fields.Date.today()
bill.with_user(self.accountant).action_post()
self.assertEqual(
bill.mapped("state"),
["posted"],
"Bill should be posted",
)
def test_03_multi_vendor_constraint(self):
"""Test constraint preventing batch with multiple vendors"""
# Create another vendor and PO
other_vendor = self.env["res.partner"].create(
{
"name": "Other Vendor",
"email": "other@test.com",
"supplier_rank": 1,
}
)
other_po = self.env["purchase.order"].create(
{
"partner_id": other_vendor.id,
"order_line": [
(
0,
0,
{
"product_id": self.product_a.id,
"product_qty": 1,
"price_unit": 100,
},
)
],
}
)
other_po.button_confirm()
# Try to create batch with multiple vendors (should fail)
with self.assertRaises(Exception):
self.env["stock.picking.batch"].create(
{
"picking_ids": [
(6, 0, (self.po1.picking_ids + other_po.picking_ids).ids)
],
}
)

94
batch_picking_create_one_bill/wizards/merge_bill_wizard.py
View file

@ -2,24 +2,19 @@
from odoo import models, fields, api, _
from odoo.exceptions import ValidationError
class MergeBillWizard(models.TransientModel):
_name = 'merge.bill.wizard'
_description = 'Assistant de fusion des factures'
_name = "merge.bill.wizard"
_description = "Assistant de fusion des factures"
invoice_ids = fields.Many2many(
'account.move',
string='Factures à fusionner',
required=True
)
partner_id = fields.Many2one(
'res.partner',
string='Fournisseur',
required=True
"account.move", string="Factures à fusionner", required=True
)
partner_id = fields.Many2one("res.partner", string="Fournisseur", required=True)
merge_invoices = fields.Boolean(
string='Fusionner les factures',
string="Fusionner les factures",
default=True,
help='Si coché, les factures seront fusionnées en une seule'
help="Si coché, les factures seront fusionnées en une seule",
)
def _merge_invoices(self):
@ -28,10 +23,12 @@ class MergeBillWizard(models.TransientModel):
return False
# Collecte les informations des factures existantes
invoice_origin = ', '.join(self.invoice_ids.mapped('invoice_origin'))
journal = self.env['account.journal'].search([('type', '=', 'purchase')], limit=1)
invoice_origin = ", ".join(self.invoice_ids.mapped("invoice_origin"))
journal = self.env["account.journal"].search(
[("type", "=", "purchase")], limit=1
)
if not journal:
raise ValidationError(_('Aucun journal de factures fournisseur trouvé'))
raise ValidationError(_("Aucun journal de factures fournisseur trouvé"))
# Regroupe les lignes par produit
product_lines = {}
@ -40,29 +37,31 @@ class MergeBillWizard(models.TransientModel):
key = (line.product_id.id, line.price_unit, tuple(line.tax_ids.ids))
if key not in product_lines:
product_lines[key] = {
'product_id': line.product_id.id,
'name': line.name,
'quantity': 0,
'price_unit': line.price_unit,
'tax_ids': line.tax_ids.ids,
'purchase_line_ids': [],
"product_id": line.product_id.id,
"name": line.name,
"quantity": 0,
"price_unit": line.price_unit,
"tax_ids": line.tax_ids.ids,
"purchase_line_ids": [],
}
product_lines[key]['quantity'] += line.quantity
product_lines[key]["quantity"] += line.quantity
if line.purchase_line_id:
product_lines[key]['purchase_line_ids'].append(line.purchase_line_id.id)
product_lines[key]["purchase_line_ids"].append(
line.purchase_line_id.id
)
# Crée les lignes de la nouvelle facture
invoice_lines = []
for values in product_lines.values():
line_vals = {
'product_id': values['product_id'],
'name': values['name'],
'quantity': values['quantity'],
'price_unit': values['price_unit'],
'tax_ids': [(6, 0, values['tax_ids'])],
"product_id": values["product_id"],
"name": values["name"],
"quantity": values["quantity"],
"price_unit": values["price_unit"],
"tax_ids": [(6, 0, values["tax_ids"])],
}
if values['purchase_line_ids']:
line_vals['purchase_line_id'] = values['purchase_line_ids'][0]
if values["purchase_line_ids"]:
line_vals["purchase_line_id"] = values["purchase_line_ids"][0]
invoice_lines.append((0, 0, line_vals))
# Supprime les factures originales
@ -70,18 +69,17 @@ class MergeBillWizard(models.TransientModel):
# Crée la nouvelle facture
vals = {
'move_type': 'in_invoice',
'partner_id': self.partner_id.id,
'invoice_date': fields.Date.context_today(self),
'invoice_origin': invoice_origin,
'journal_id': journal.id,
'state': 'draft',
'invoice_line_ids': invoice_lines,
"move_type": "in_invoice",
"partner_id": self.partner_id.id,
"invoice_date": fields.Date.context_today(self),
"invoice_origin": invoice_origin,
"journal_id": journal.id,
"state": "draft",
"invoice_line_ids": invoice_lines,
}
# Crée et valide la facture
merged_invoice = self.env['account.move'].create(vals)
merged_invoice.action_post()
# Crée la facture
merged_invoice = self.env["account.move"].create(vals)
return merged_invoice
@ -93,17 +91,17 @@ class MergeBillWizard(models.TransientModel):
# Fusionne les factures et affiche la nouvelle facture
merged_invoice = self._merge_invoices()
if not merged_invoice:
raise ValidationError(_('Erreur lors de la fusion des factures'))
raise ValidationError(_("Erreur lors de la fusion des factures"))
invoice = merged_invoice
else:
invoice = self.invoice_ids[0]
# Retourne la vue de la facture
return {
'name': _('Facture fournisseur'),
'type': 'ir.actions.act_window',
'res_model': 'account.move',
'res_id': invoice.id,
'view_mode': 'form',
'target': 'current',
"name": _("Facture fournisseur"),
"type": "ir.actions.act_window",
"res_model": "account.move",
"res_id": invoice.id,
"view_mode": "form",
"target": "current",
}