Do not allow to add product or unit with amendment if there was no unit

Invoice lines may already exist with incompatible unit which will fail to
compute invoiced quantity.
(grafted from a261281e016c9445639fd7a47fdf41b8bbb4ab8b)

--HG--
branch : 6.0

modules/purchase_amendment/purchase.py

@@ -237,12 +237,12 @@ class AmendmentLine(ModelSQL, ModelView):
             If(Eval('state') == 'draft',
                 ('purchasable', '=', True),
                 ()),
-            If(Eval('product_uom_category'),
-                ('default_uom_category', '=', Eval('product_uom_category')),
-                ()),
+            ('default_uom_category', '=', Eval('product_uom_category', -1)),
             ],
         states={
-            'readonly': Eval('state') != 'draft',
+            'readonly': (
+                (Eval('state') != 'draft')
+                | ~Eval('product_uom_category', None)),
             'invisible': Eval('action') != 'line',
             },
         depends=['action', 'state', 'product_uom_category'])

modules/sale_amendment/sale.py

@@ -272,12 +272,12 @@ class AmendmentLine(ModelSQL, ModelView):
             If(Eval('state') == 'draft',
                 ('salable', '=', True),
                 ()),
-            If(Eval('product_uom_category'),
-                ('default_uom_category', '=', Eval('product_uom_category')),
-                ()),
+            ('default_uom_category', '=', Eval('product_uom_category', -1)),
             ],
         states={
-            'readonly': Eval('state') != 'draft',
+            'readonly': (
+                (Eval('state') != 'draft')
+                | ~Eval('product_uom_category', None)),
             'invisible': Eval('action') != 'line',
             },
         depends=['action', 'state', 'product_uom_category'])