Commit 7e54bbcb authored by Jérome Perrin's avatar Jérome Perrin

pdm: expose quantity unit in default supply

Quantity unit was not defined in default supply property sheet, so the
fields were created local properties, because the accessors were not
existant. This change make the accessors for quantity unit on default
supply lines generated.

The implementation details is that it replaces priced_quantity, which was
defined twice
parent d835ace8
Pipeline #17772 passed with stage
...@@ -96,8 +96,74 @@ class TestPDMWithSecurity(ERP5TypeTestCase): ...@@ -96,8 +96,74 @@ class TestPDMWithSecurity(ERP5TypeTestCase):
self.assertEqual(len(product.contentValues(portal_type='Measure')), self.assertEqual(len(product.contentValues(portal_type='Measure')),
2) 2)
class DefaultSupplyLineTestCase(ERP5TypeTestCase):
def _makeOne(self):
raise NotImplementedError()
def afterSetUp(self):
super(DefaultSupplyLineTestCase, self).afterSetUp()
if self.portal.portal_categories.quantity_unit.get('time') is None:
self.portal.portal_categories.quantity_unit.newContent(id='time')
if self.portal.portal_categories.quantity_unit.time.get('hour') is None:
self.portal.portal_categories.quantity_unit.time.newContent(id='hour')
self.resource = self._makeOne()
def test_purchase_supply_line(self):
self.resource.edit(purchase_supply_line_base_price=123)
self.assertEqual(self.resource.getPurchaseSupplyLineBasePrice(), 123)
self.resource.edit(purchase_supply_line_priced_quantity=2)
self.assertEqual(self.resource.getPurchaseSupplyLinePricedQuantity(), 2)
self.resource.edit(purchase_supply_line_quantity_unit='time/hour')
self.assertEqual(
self.resource.getPurchaseSupplyLineQuantityUnitValue(),
self.portal.portal_categories.quantity_unit.time.hour)
self.assertEqual(
self.resource.default_psl.getPortalType(), 'Purchase Supply Line')
def test_internal_supply_line(self):
self.resource.edit(internal_supply_line_base_price=123)
self.assertEqual(self.resource.getInternalSupplyLineBasePrice(), 123)
self.resource.edit(internal_supply_line_priced_quantity=2)
self.assertEqual(self.resource.getInternalSupplyLinePricedQuantity(), 2)
self.resource.edit(internal_supply_line_quantity_unit='time/hour')
self.assertEqual(
self.resource.getInternalSupplyLineQuantityUnitValue(),
self.portal.portal_categories.quantity_unit.time.hour)
self.assertEqual(
self.resource.default_isl.getPortalType(), 'Internal Supply Line')
def test_sale_supply_line(self):
self.resource.edit(sale_supply_line_base_price=123)
self.assertEqual(self.resource.getSaleSupplyLineBasePrice(), 123)
self.resource.edit(sale_supply_line_priced_quantity=2)
self.assertEqual(self.resource.getSaleSupplyLinePricedQuantity(), 2)
self.resource.edit(sale_supply_line_quantity_unit='time/hour')
self.assertEqual(
self.resource.getSaleSupplyLineQuantityUnitValue(),
self.portal.portal_categories.quantity_unit.time.hour)
self.assertEqual(
self.resource.default_ssl.getPortalType(), 'Sale Supply Line')
class TestProductDefaultSupplyLine(DefaultSupplyLineTestCase):
def _makeOne(self):
return self.portal.product_module.newContent(portal_type='Product')
class TestServiceDefaultSupplyLine(DefaultSupplyLineTestCase):
def _makeOne(self):
return self.portal.service_module.newContent(portal_type='Service')
class TestComponentDefaultSupplyLine(DefaultSupplyLineTestCase):
def _makeOne(self):
return self.portal.component_module.newContent(portal_type='Component')
def test_suite(): def test_suite():
suite = unittest.TestSuite() suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestPDMWithSecurity)) suite.addTest(unittest.makeSuite(TestPDMWithSecurity))
suite.addTest(unittest.makeSuite(TestProductDefaultSupplyLine))
suite.addTest(unittest.makeSuite(TestServiceDefaultSupplyLine))
suite.addTest(unittest.makeSuite(TestComponentDefaultSupplyLine))
return suite return suite
...@@ -71,7 +71,8 @@ ...@@ -71,7 +71,8 @@
<string>destination_value_list</string> <string>destination_value_list</string>
<string>quantity_step</string> <string>quantity_step</string>
<string>quantity_step_list</string> <string>quantity_step_list</string>
<string>priced_quantity</string> <string>quantity_unit</string>
<string>quantity_unit_value</string>
<string>start_date</string> <string>start_date</string>
<string>stop_date</string> <string>stop_date</string>
<string>start_date_range_max</string> <string>start_date_range_max</string>
......
...@@ -71,7 +71,8 @@ ...@@ -71,7 +71,8 @@
<string>destination_value_list</string> <string>destination_value_list</string>
<string>quantity_step</string> <string>quantity_step</string>
<string>quantity_step_list</string> <string>quantity_step_list</string>
<string>priced_quantity</string> <string>quantity_unit</string>
<string>quantity_unit_value</string>
<string>start_date</string> <string>start_date</string>
<string>stop_date</string> <string>stop_date</string>
<string>start_date_range_max</string> <string>start_date_range_max</string>
......
...@@ -71,7 +71,8 @@ ...@@ -71,7 +71,8 @@
<string>destination_value_list</string> <string>destination_value_list</string>
<string>quantity_step</string> <string>quantity_step</string>
<string>quantity_step_list</string> <string>quantity_step_list</string>
<string>priced_quantity</string> <string>quantity_unit</string>
<string>quantity_unit_value</string>
<string>start_date</string> <string>start_date</string>
<string>stop_date</string> <string>stop_date</string>
<string>start_date_range_max</string> <string>start_date_range_max</string>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment