Skip to content

Commit ff4c5b4

Browse files
sjai-odoovlst-odoo
authored andcommitted
[FIX] l10n_es_pos: fixed tests
1 parent 61e3fb5 commit ff4c5b4

File tree

5 files changed

+22
-15
lines changed

5 files changed

+22
-15
lines changed

addons/l10n_es_pos/models/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
from . import res_config_settings
44
from . import account_move
55
from . import res_company
6+
from . import pos_session

addons/l10n_es_pos/models/pos_order.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,3 @@ def _prepare_invoice_vals(self):
2020
if self.config_id.is_spanish and self.is_l10n_es_simplified_invoice:
2121
res["journal_id"] = self.config_id.l10n_es_simplified_invoice_journal_id.id
2222
return res
23-
24-
def get_invoice_name(self):
25-
return self.account_move.name
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
from odoo import models, api
2+
3+
4+
class PosSession(models.Model):
5+
_inherit = "pos.session"
6+
7+
@api.model
8+
def _load_pos_data_models(self, config_id):
9+
data = super()._load_pos_data_models(config_id)
10+
if self.env.company.country_id.code == "ES":
11+
data += ['account.move']
12+
return data

addons/l10n_es_pos/static/src/app/screens/payment_screen/payment_screen.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,14 @@ patch(PaymentScreen.prototype, {
5151
}
5252
return false;
5353
},
54-
shouldDownloadInvoice() {
55-
return this.pos.config.is_spanish
56-
? !this.currentOrder.is_l10n_es_simplified_invoice
57-
: super.shouldDownloadInvoice();
58-
},
54+
// shouldDownloadInvoice() {
55+
// return this.pos.config.is_spanish
56+
// ? !this.currentOrder.is_l10n_es_simplified_invoice
57+
// : super.shouldDownloadInvoice();
58+
// },
5959
async _postPushOrderResolve(order, order_server_ids) {
6060
if (this.pos.config.is_spanish) {
61-
const invoiceName = await this.pos.data.call("pos.order", "get_invoice_name", [
62-
order_server_ids,
63-
]);
64-
order.invoice_name = invoiceName;
61+
order.invoice_name = order.account_move?.name;;
6562
}
6663
return super._postPushOrderResolve(...arguments);
6764
},

addons/l10n_es_pos/tests/test_frontend.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ def get_number_of_regular_invoices():
3434
self.main_pos_config.l10n_es_simplified_invoice_journal_id = simp
3535
# this `limit` value is linked to the `SIMPLIFIED_INVOICE_LIMIT` const in the tour
3636
self._get_main_company().l10n_es_simplified_invoice_limit = 1000
37-
self.main_pos_config.with_user(self.pos_user).open_ui()
38-
self.start_pos_tour("spanish_pos_tour")
37+
self.main_pos_config.with_user(self.pos_admin).open_ui()
38+
self.start_pos_tour("spanish_pos_tour", login="accountman")
3939
num_of_simp_invoices = self.env['account.move'].search_count([('journal_id', '=', simp.id), ('l10n_es_is_simplified', '=', True)])
4040
num_of_regular_invoices = get_number_of_regular_invoices() - initial_number_of_regular_invoices
4141
self.assertEqual(num_of_simp_invoices, 3)
@@ -150,6 +150,6 @@ def test_simplified_invoice_not_override_set_pricelist(self):
150150
self.assertTrue(len(self.main_pos_config.available_pricelist_ids.ids) > 1)
151151
self.main_pos_config.l10n_es_simplified_invoice_journal_id = self.main_pos_config.journal_id
152152
self.main_pos_config.open_ui()
153-
self.start_tour("/pos/ui?config_id=%d" % self.main_pos_config.id, 'test_simplified_invoice_not_override_set_pricelist', login="pos_user")
153+
self.start_tour("/pos/ui?config_id=%d" % self.main_pos_config.id, 'test_simplified_invoice_not_override_set_pricelist', login="accountman")
154154
order = self.env['pos.order'].search([('partner_id', '=', self.main_pos_config.simplified_partner_id.id)])
155155
self.assertNotEqual(order.pricelist_id, self.main_pos_config.simplified_partner_id.property_product_pricelist)

0 commit comments

Comments
 (0)