sale.py

@@ -204,16 +204,9 @@ class Sale(metaclass=PoolMeta):
             "uom": line.unit.name if line.type != 'title' else None}
             for line in report.lines if not line.impreso]
         data["deleted_lines"] = [{
-<<<<<<< HEAD
-                "product": line.product.name,
-                "quantity": str(-1 * line.quantity),
-                "unit": line.unit.symbol,
-             } for line in report.delete_lines if not line.printed]
-=======
             "product": line.product.name if line.type != 'title' else None,
             "quantity": line.quantity if line.type != 'title' else None,
         } for line in report.delete_lines if not line.impreso]
->>>>>>> 77d626374f847b8e54b81cc06f76b545e4014b29
 
         return data
 
@@ -238,11 +231,7 @@ class Sale(metaclass=PoolMeta):
             line.save()
 
         for line in record.delete_lines:
-<<<<<<< HEAD
-            line.printed = True
-=======
             line.impreso = True
->>>>>>> 77d626374f847b8e54b81cc06f76b545e4014b29
             line.save()
         record.save()
 
@@ -288,7 +277,7 @@ class Sale(metaclass=PoolMeta):
         headers = {"accept": 'application/json',
                    'Content-Type': 'application/json'}
         requests.post(
-            url, data=json.dumps(content), headers=headers, timeout=5)
+            url, data=json.dumps(content), headers=headers)
 
     @classmethod
     @ModelView.button
@@ -332,9 +321,8 @@ class Sale(metaclass=PoolMeta):
                    'Content-Type': 'application/json'}
         cls.impreso([record])
 
-        requests.post(
+        requests.post(url, data=json.dumps(content),
-            url, data=json.dumps(content),
+                      headers=headers)
-            headers=headers, timeout=5)
 
     @classmethod
     @ModelView.button