Matching
This commit is contained in:
@@ -2910,7 +2910,8 @@ class LotMatching(Wizard):
|
||||
'lot_matched_qt': 0,
|
||||
'lot_cp': cls._record_id(party),
|
||||
}
|
||||
values.update(LotQt._matching_line_tolerance_info(line))
|
||||
trade_line = line if side == 'purchase' else sale_line
|
||||
values.update(LotQt._matching_line_tolerance_info(trade_line))
|
||||
return values
|
||||
|
||||
@classmethod
|
||||
|
||||
@@ -2768,13 +2768,23 @@ class PurchaseTradeTestCase(ModuleTestCase):
|
||||
sale = Mock(id=30, party=Mock(id=40))
|
||||
product = Mock(id=50)
|
||||
purchase_lot = Mock(
|
||||
id=101, line=Mock(purchase=purchase), sale_line=None,
|
||||
id=101,
|
||||
line=Mock(
|
||||
purchase=purchase, inherit_tol=False,
|
||||
quantity_theorical=Decimal('100'), tol_min=0, tol_max=0),
|
||||
sale_line=None,
|
||||
lot_type='virtual', lot_product=product)
|
||||
sale_lot = Mock(
|
||||
id=102, line=None, sale_line=Mock(sale=sale),
|
||||
id=102, line=None,
|
||||
sale_line=Mock(
|
||||
sale=sale, inherit_tol=False,
|
||||
quantity_theorical=Decimal('80'), tol_min=0, tol_max=0),
|
||||
lot_type='virtual', lot_product=product)
|
||||
matched_sale_lot = Mock(
|
||||
id=103, line=None, sale_line=Mock(sale=sale),
|
||||
id=103, line=None,
|
||||
sale_line=Mock(
|
||||
sale=sale, inherit_tol=False,
|
||||
quantity_theorical=Decimal('20'), tol_min=0, tol_max=0),
|
||||
lot_type='virtual', lot_product=product)
|
||||
lot_qts = {
|
||||
1: Mock(
|
||||
@@ -2816,9 +2826,13 @@ class PurchaseTradeTestCase(ModuleTestCase):
|
||||
self.assertEqual(len(result['lot_s']), 1)
|
||||
self.assertEqual(result['lot_p'][0]['lot_r_id'], 1)
|
||||
self.assertEqual(result['lot_p'][0]['lot_quantity'], Decimal('100'))
|
||||
self.assertEqual(result['lot_p'][0]['lot_qt_min'], Decimal('100.00000'))
|
||||
self.assertEqual(result['lot_p'][0]['lot_qt_max'], Decimal('100.00000'))
|
||||
self.assertEqual(result['lot_p'][0]['lot_cp'], 20)
|
||||
self.assertEqual(result['lot_s'][0]['lot_r_id'], 2)
|
||||
self.assertEqual(result['lot_s'][0]['lot_quantity'], Decimal('80'))
|
||||
self.assertEqual(result['lot_s'][0]['lot_qt_min'], Decimal('80.00000'))
|
||||
self.assertEqual(result['lot_s'][0]['lot_qt_max'], Decimal('80.00000'))
|
||||
self.assertEqual(result['lot_s'][0]['lot_cp'], 40)
|
||||
|
||||
def test_lot_context_group_defaults_to_all(self):
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
<tree editable="1">
|
||||
<field name="lot_id"/>
|
||||
<field name="lot_id" width="70"/>
|
||||
<field name="lot_purchase"/>
|
||||
<field name="lot_sale"/>
|
||||
<field name="lot_type"/>
|
||||
<field name="lot_shipment_origin"/>
|
||||
<field name="lot_type" width="80"/>
|
||||
<field name="lot_cp"/>
|
||||
<field name="lot_product"/>
|
||||
<field name="lot_quantity"/>
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
<tree editable="1">
|
||||
<field name="lot_id"/>
|
||||
<field name="lot_id" width="70"/>
|
||||
<field name="lot_sale"/>
|
||||
<field name="lot_purchase"/>
|
||||
<field name="lot_type"/>
|
||||
<field name="lot_shipment_origin"/>
|
||||
<field name="lot_type" width="80"/>
|
||||
<field name="lot_cp"/>
|
||||
<field name="lot_product"/>
|
||||
<field name="lot_quantity"/>
|
||||
|
||||
Reference in New Issue
Block a user