Merge pull request '#27 fix: reconciliation jar.' (#28) from test_decimal_error_jar_#27 into main

Reviewed-on: #28

tienda_ilusion/don_confiao/api_views.py

@@ -38,10 +38,12 @@ class SaleView(viewsets.ModelViewSet):
         date = data['date']
         lines = data['saleline_set']
         payment_method = data['payment_method']
+        description = data.get('notes', '')
         sale = Sale.objects.create(
             customer=customer,
             date=date,
-            payment_method=payment_method
+            payment_method=payment_method,
+            description=description
         )
 
         for line in lines:
@@ -97,7 +99,8 @@ class ReconciliateJarView(APIView):
 
     def _is_valid_total(self, purchases, total):
         calculated_total = sum(p.get_total() for p in purchases)
-        return calculated_total == Decimal(total)
+        return Decimal(calculated_total).quantize(Decimal('.0001')) == (
+            Decimal(total).quantize(Decimal('.0001')))
 
     def _get_other_purchases(self, other_totals):
         if not other_totals:
@@ -233,14 +236,18 @@ class TrytonSale:
             "shipment_address": self.sale.customer.address_external_id,
             "invoice_address": self.sale.customer.address_external_id,
             "currency": TRYTON_COP_CURRENCY,
-            "description": self.sale.description or '',
+            "comment": self.sale.description or '',
+            "description": "Metodo pago: " + str(
+                self.sale.payment_method or ''
+            ),
             "party": self.sale.customer.external_id,
             "reference": "don_confiao " + str(self.sale.id),
             "sale_date": self._format_date(self.sale.date),
             "lines": [[
                 "create",
                 [TrytonLineSale(line).to_tryton() for line in self.lines]
-            ]]
+            ]],
+            "self_pick_up": True,
         }
 
 

tienda_ilusion/don_confiao/tests/test_exportar_ventas_para_tryton.py

@@ -25,6 +25,7 @@ class TestExportarVentasParaTryton(TestCase):
             customer=self.customer,
             date='2024-09-02',
             payment_method='CASH',
+            description='un comentario'
         )
         self.sale_line1 = SaleLine.objects.create(
             product=self.product,
@@ -71,7 +72,7 @@ class TestExportarVentasParaTryton(TestCase):
         self.assertEqual(next(csv_reader), expected_header)
 
         expected_rows = [
-            ["Camilo", "Camilo", "Camilo", "", "", "2024-09-02", "Contado", "Almacén", "Peso colombiano", "Panela", "2.00", "3000.00", "Unidad", "TIENDA LA ILUSIÓN", "Tienda La Ilusion", "La Ilusion", "True", ""],
+            ["Camilo", "Camilo", "Camilo", "un comentario", "un comentario", "2024-09-02", "Contado", "Almacén", "Peso colombiano", "Panela", "2.00", "3000.00", "Unidad", "TIENDA LA ILUSIÓN", "Tienda La Ilusion", "La Ilusion", "True", "un comentario"],
             ["", "", "", "", "", "", "", "", "", "Panela", "3.00", "5000.00", "Unidad", "", "", "", "", ""],
         ]
         csv_rows = list(csv_reader)
@@ -100,4 +101,4 @@ class TestExportarVentasParaTryton(TestCase):
         self.assertEqual(updated_sale.external_id, external_id)
         mock_connect.assert_called_once()
         mock_call.assert_called_once()
-        mock_call.assert_called_with('model.sale.sale.create', [[{'company': 1, 'shipment_address': '307', 'invoice_address': '307', 'currency': 31, 'description': '', 'party': '1', 'reference': 'don_confiao 1', 'sale_date': {'__class__': 'date', 'year': 2024, 'month': 9, 'day': 2}, 'lines': [['create', [{'product': '1', 'quantity': {'__class__': 'Decimal', 'decimal': '2.00'}, 'type': 'line', 'unit': '1', 'unit_price': {'__class__': 'Decimal', 'decimal': '3000.00'}}, {'product': '1', 'quantity': {'__class__': 'Decimal', 'decimal': '3.00'}, 'type': 'line', 'unit': '1', 'unit_price': {'__class__': 'Decimal', 'decimal': '5000.00'}}]]]}], {'company': 1, 'shops': [1]}])
+        mock_call.assert_called_with('model.sale.sale.create', [[{'company': 1, 'shipment_address': '307', 'invoice_address': '307', 'currency': 31, 'comment': 'un comentario', 'description': 'Metodo pago: CASH', 'party': '1', 'reference': 'don_confiao 1', 'sale_date': {'__class__': 'date', 'year': 2024, 'month': 9, 'day': 2}, 'lines': [['create', [{'product': '1', 'quantity': {'__class__': 'Decimal', 'decimal': '2.00'}, 'type': 'line', 'unit': '1', 'unit_price': {'__class__': 'Decimal', 'decimal': '3000.00'}}, {'product': '1', 'quantity': {'__class__': 'Decimal', 'decimal': '3.00'}, 'type': 'line', 'unit': '1', 'unit_price': {'__class__': 'Decimal', 'decimal': '5000.00'}}]]], 'self_pick_up': True}], {'company': 1, 'shops': [1]}])

tienda_ilusion/don_confiao/tests/test_jar_reconciliation.py

@@ -235,6 +235,47 @@ class TestJarReconcliation(TestCase):
             [sale['payment_method'] for sale in content['Sales']]
         )
 
+    def test_create_reconciliation_with_decimal_on_sale_lines(self):
+        customer = Customer()
+        customer.name = 'Consumidor final'
+        customer.save()
+
+        product = Product()
+        product.name = "Mantequilla natural gramos"
+        product.price = "57.50"
+        product.save()
+
+        purchase = Sale()
+        purchase.customer = customer
+        purchase.date = "2024-07-30"
+        purchase.payment_method = 'CASH'
+        purchase.clean()
+        purchase.save()
+
+        line = SaleLine()
+        line.sale = purchase
+        line.product = product
+        line.quantity = "0.24"
+        line.unit_price = "57.50"
+        line.save()
+
+        url = '/don_confiao/reconciliate_jar'
+        total_purchases = 13.80
+        data = {
+            'date_time': '2024-12-02T21:07',
+            'reconcilier': 'carlos',
+            'total_cash_purchases': total_purchases,
+            'cash_taken': total_purchases,
+            'cash_discrepancy': 0,
+            'cash_purchases': [purchase.id],
+        }
+        response = self.client.post(
+            url, data=json.dumps(data).encode('utf-8'),
+            content_type='application/json'
+        )
+        self.assertEqual(response.status_code, 200)
+
+
     def _create_simple_reconciliation(self):
         reconciliation = ReconciliationJar()
         reconciliation.date_time = "2024-07-30"