Skip to content

Commit e1df7cf

Browse files
committed
Merge PR #1001 into 14.0
Signed-off-by simahawk
2 parents 1b34f3b + fe5ca17 commit e1df7cf

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

product_import/tests/test_product_import.py

+5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"price": 12.55,
3131
"product_code": "MNTR011",
3232
"uom": {"unece_code": False},
33+
"sale_delay": 3,
3334
},
3435
{
3536
# Archived product
@@ -45,6 +46,7 @@
4546
"product_code": "MNTR012",
4647
"uom": {"unece_code": "C62"},
4748
"active": False,
49+
"sale_delay": 1,
4850
},
4951
],
5052
"ref": "1387",
@@ -136,6 +138,9 @@ def test_product_import(self):
136138
self.assertEqual(p_values, expected)
137139
self.assertEqual(pt_values, expected)
138140
self.assertEqual(product.seller_ids, product_tmpl.seller_ids)
141+
self.assertEqual(
142+
product.seller_ids.mapped("delay")[0], parsed.get("sale_delay", 0)
143+
),
139144

140145
def test_import_button(self):
141146
form = self.wiz_form

product_import/wizard/product_import.py

+2
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ def _prepare_supplierinfo(self, seller_info, product):
139139
and s_info.price == seller_info["price"]
140140
and s_info.currency_id.id == seller_info["currency_id"]
141141
and s_info.company_id.id == seller_info["company_id"]
142+
and s_info.delay == seller_info["delay"]
142143
):
143144
seller_id = s_info.id
144145
else:
@@ -187,6 +188,7 @@ def _prepare_product(self, parsed_product, chatter_msg, seller=None):
187188
"currency_id": currency.id,
188189
"min_qty": parsed_product["min_qty"],
189190
"company_id": product_company_id,
191+
"delay": parsed_product.get("sale_delay", 0),
190192
}
191193
product_vals["seller_ids"] = self._prepare_supplierinfo(seller_info, product)
192194
if product:

product_import_ubl/wizard/product_import.py

+3
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ def parse_ubl_catalogue_line(self, line, ns):
9090
"price": float(ele_price.text or 0),
9191
"currency": {"iso": currency} if currency else False,
9292
"min_qty": min_qty,
93+
"sale_delay": xline.text(
94+
"cac:RequiredItemLocationQuantity/cbc:LeadTimeMeasure"
95+
),
9396
}
9497
)
9598
return product_vals

0 commit comments

Comments
 (0)