diff --git a/bt5/erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/InvoiceTransaction_selectDelivery.xml b/bt5/erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/InvoiceTransaction_selectDelivery.xml index 32ad036c0cba0de37cbab4810ed1b280591a3f74..6591b234f62179681fc05474d12d2d8c9a782d57 100644 --- a/bt5/erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/InvoiceTransaction_selectDelivery.xml +++ b/bt5/erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/InvoiceTransaction_selectDelivery.xml @@ -71,12 +71,11 @@ for movement in movement_list:\n continue\n for sm in other_rule.contentValues():\n line = sm.getDeliveryValue()\n +\n # case of trade model movement\n if ar.getParentValue().getParentValue().getSpecialiseValue().getPortalType() == \'Trade Model Rule\':\n tm_related_movement = ar.getParentValue().getParentValue().getParentValue()\n - line = tm_related_movement.getOrderValue()\n - if line is None:\n - line = tm_related_movement.getParentValue().getParentValue().getOrderValue()\n + line = tm_related_movement.getDeliveryValue()\n \n # in case of invoice rule (ie. starting from Invoice)\n if line is None:\n diff --git a/bt5/erp5_bpm/bt/revision b/bt5/erp5_bpm/bt/revision index 6fc1e6e18c45e38dba6c96fe27ed3514edfbb064..cde50ca2fd4ba909be88857a34e828b2d5e2373d 100644 --- a/bt5/erp5_bpm/bt/revision +++ b/bt5/erp5_bpm/bt/revision @@ -1 +1 @@ -178 \ No newline at end of file +179 \ No newline at end of file