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

Reviewed-on: #28

.env_example

@@ -0,0 +1,4 @@
+TRYTON_HOST=localhost
+TRYTON_DATABASE=tryton
+TRYTON_USERNAME=admin
+TRYTON_PASSWORD=admin

tienda_ilusion/don_confiao/api_views.py

@@ -18,6 +18,9 @@ TRYTON_HOST = os.environ.get('TRYTON_HOST', 'localhost')
 TRYTON_DATABASE = os.environ.get('TRYTON_DATABASE', 'tryton')
 TRYTON_USERNAME = os.environ.get('TRYTON_USERNAME', 'admin')
 TRYTON_PASSWORD = os.environ.get('TRYTON_PASSWORD', 'admin')
+TRYTON_COP_CURRENCY = 31
+TRYTON_COMPANY_ID = 1
+TRYTON_SHOPS = [1]
 
 
 class Pagination(PageNumberPagination):
@@ -35,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:
@@ -94,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:
@@ -183,19 +189,26 @@ class SalesToTrytonView(APIView):
         )
         tryton_client.connect()
         method = 'model.sale.sale.create'
-        tryton_context = {}
+        tryton_context = {'company': TRYTON_COMPANY_ID,
+                          'shops': TRYTON_SHOPS}
 
         successful = []
         failed = []
 
         sales = Sale.objects.filter(external_id=None)
         for sale in sales:
-            lines = SaleLine.objects.filter(sale=sale.id)
-            tryton_params = self.__to_tryton_params(sale, lines, tryton_context)
-            external_ids = tryton_client.call(method, tryton_params)
-            sale.external_id = external_ids[0]
-            sale.save()
-            successful.append(sale.id)
+            try:
+                lines = SaleLine.objects.filter(sale=sale.id)
+                tryton_params = self.__to_tryton_params(sale, lines, tryton_context)
+                external_ids = tryton_client.call(method, tryton_params)
+                sale.external_id = external_ids[0]
+                sale.save()
+                successful.append(sale.id)
+            except Exception as e:
+                print(f"Error al enviar la venta: {e}"
+                      f"venta_id: {sale.id}")
+                failed.append(sale.id)
+                continue
 
         return Response(
             {'successful': successful, 'failed': failed},
@@ -219,18 +232,22 @@ class TrytonSale:
 
     def to_tryton(self):
         return {
-            "company": 1,
+            "company": TRYTON_COMPANY_ID,
             "shipment_address": self.sale.customer.address_external_id,
             "invoice_address": self.sale.customer.address_external_id,
-            "currency": 1,
-            "description": self.sale.description or '',
+            "currency": TRYTON_COP_CURRENCY,
+            "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,
         }
 
 
@@ -279,9 +296,16 @@ class ProductsFromTrytonView(APIView):
                     external_id=tryton_product.get('id')
                 )
             except Product.DoesNotExist:
-                product = self.__create_product(tryton_product)
-                created_products.append(product.id)
-                continue
+                try:
+                    product = self.__create_product(tryton_product)
+                    created_products.append(product.id)
+                    continue
+                except Exception as e:
+                    print(f"Error al importar productos: {e}"
+                          f"El producto: {tryton_product}")
+                    failed_products.append(tryton_product.get('id'))
+                    continue
+
             if self.__need_update(product, tryton_product):
                 self.__update_product(product, tryton_product)
                 updated_products.append(product.id)
@@ -358,8 +382,6 @@ class CustomersFromTrytonView(APIView):
         updated_customers = []
         created_customers = []
         untouched_customers = []
-        print('aqui')
-        print(tryton_parties)
 
         for tryton_party in tryton_parties:
             try:
@@ -388,7 +410,7 @@ class CustomersFromTrytonView(APIView):
         )
 
     def __get_party_datails(self, party_ids, tryton_client, context):
-        tryton_fields = ['id', 'name']
+        tryton_fields = ['id', 'name', 'addresses']
         method = 'model.party.party.read'
         params = (party_ids, tryton_fields, context)
         response = tryton_client.call(method, params)
@@ -397,15 +419,22 @@ class CustomersFromTrytonView(APIView):
     def __need_update(self, customer, tryton_party):
         if not customer.name == tryton_party.get('name'):
             return True
+        if tryton_party.get('addresses') and tryton_party.get('addresses')[0]:
+            if not customer.address_external_id == str(tryton_party.get('addresses')[0]):
+                return True
 
     def __create_customer(self, tryton_party):
         customer = Customer()
         customer.name = tryton_party.get('name')
         customer.external_id = tryton_party.get('id')
+        if tryton_party.get('addresses') and tryton_party.get('addresses')[0]:
+            customer.address_external_id = tryton_party.get('addresses')[0]
         customer.save()
         return customer
 
     def __update_customer(self, customer, tryton_party):
         customer.name = tryton_party.get('name')
         customer.external_id = tryton_party.get('id')
+        if tryton_party.get('addresses') and tryton_party.get('addresses')[0]:
+            customer.address_external_id = tryton_party.get('addresses')[0]
         customer.save()

tienda_ilusion/don_confiao/serializers.py

@@ -15,7 +15,7 @@ class SaleSerializer(serializers.ModelSerializer):
     class Meta:
         model = Sale
         fields = ['id', 'customer', 'date', 'saleline_set',
-                  'total', 'payment_method']
+                  'total', 'payment_method', 'external_id']
 
 
 class ProductSerializer(serializers.ModelSerializer):
@@ -27,7 +27,7 @@ class ProductSerializer(serializers.ModelSerializer):
 class CustomerSerializer(serializers.ModelSerializer):
     class Meta:
         model = Customer
-        fields = ['id', 'name', 'address', 'email', 'phone']
+        fields = ['id', 'name', 'address', 'email', 'phone', 'external_id']
 
 
 class ReconciliationJarSerializer(serializers.ModelSerializer):

tienda_ilusion/don_confiao/tests/test_api.py

@@ -16,7 +16,8 @@ class TestAPI(APITestCase):
             measuring_unit='UNIT'
         )
         self.customer = Customer.objects.create(
-            name='Camilo'
+            name='Camilo',
+            external_id='18'
         )
 
     def test_create_sale(self):
@@ -67,6 +68,23 @@ class TestAPI(APITestCase):
         json_response = json.loads(response.content.decode('utf-8'))
         self.assertEqual(response.status_code, 200)
         self.assertEqual(self.customer.name, json_response[0]['name'])
+        self.assertEqual(
+            self.customer.external_id,
+            json_response[0]['external_id']
+        )
+
+    def test_get_sales(self):
+        url = '/don_confiao/api/sales/'
+        self._create_sale()
+
+        response = self.client.get(url)
+        json_response = json.loads(response.content.decode('utf-8'))
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(self.customer.id, json_response[0]['customer'])
+        self.assertEqual(
+            None,
+            json_response[0]['external_id']
+        )
 
     def test_get_sales_for_tryton(self):
         url = '/don_confiao/api/sales/for_tryton'

tienda_ilusion/don_confiao/tests/test_customers_from_tryton.py

@@ -24,19 +24,19 @@ class TestCustomersFromTryton(TestCase):
     def test_create_import_customer(self, mock_connect, mock_call):
         def fake_call(*args, **kwargs):
             party_search = 'model.party.party.search'
-            search_args = [[], 0, 1000, [['rec_name', 'ASC'], ['id', None]], {'company': 1}]
+            search_args = [[], 0, 1000, [['name', 'ASC'], ['id', None]], {'company': 1}]
 
             if (args == (party_search, search_args)):
                 return [5, 6, 7, 8]
 
             party_read = 'model.party.party.read'
-            read_args = ([5, 6, 7, 8], ['id', 'name'], {'company': 1})
+            read_args = ([5, 6, 7, 8], ['id', 'name', 'addresses'], {'company': 1})
             if (args == (party_read, read_args)):
                 return [
-                    {'id': 5, 'name': 'Carlos'},
-                    {'id': 6, 'name': 'Cristian'},
-                    {'id': 7, 'name': 'Ana'},
-                    {'id': 8, 'name': 'José'},
+                    {'id': 5, 'name': 'Carlos', 'addresses': [303]},
+                    {'id': 6, 'name': 'Cristian', 'addresses': []},
+                    {'id': 7, 'name': 'Ana', 'addresses': [302]},
+                    {'id': 8, 'name': 'José', 'addresses': []},
                 ]
 
             raise Exception(f"Sorry, args non expected on  this test: {args}")
@@ -60,7 +60,9 @@ class TestCustomersFromTryton(TestCase):
         created_customer = Customer.objects.get(id=3)
         self.assertEqual(created_customer.external_id, str(7))
         self.assertEqual(created_customer.name, 'Ana')
+        self.assertEqual(created_customer.address_external_id, str(302))
 
         updated_customer = Customer.objects.get(id=1)
         self.assertEqual(updated_customer.external_id, str(5))
         self.assertEqual(updated_customer.name, 'Carlos')
+        self.assertIn(updated_customer.address_external_id, str(303))

tienda_ilusion/don_confiao/tests/test_exportar_ventas_para_tryton.py

@@ -19,12 +19,13 @@ class TestExportarVentasParaTryton(TestCase):
         self.customer = Customer.objects.create(
             name='Camilo',
             external_id=1,
-            address_external_id=1
+            address_external_id=307,
         )
         self.sale = Sale.objects.create(
             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': '1', 'invoice_address': '1', 'currency': 1, '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'}}]]]}], {}])
+        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"

tienda_ilusion/don_confiao/tests/test_products_from_tryton.py

@@ -85,3 +85,44 @@ class TestProductsFromTryton(TestCase):
         self.assertEqual(updated_product.name, 'Panela2')
         self.assertEqual(updated_product.price, Decimal('6000'))
         self.assertEqual(updated_product.measuring_unit, 'Unit')
+
+    @patch('sabatron_tryton_rpc_client.client.Client.call')
+    @patch('sabatron_tryton_rpc_client.client.Client.connect')
+    def test_import_duplicated_name_products(self, mock_connect, mock_call):
+        mock_connect.return_value = None
+        def fake_call(*args, **kwargs):
+            product_search = 'model.product.product.search'
+            search_args = [[["salable", "=", True]], 0, 1000, [['rec_name', 'ASC'], ['id', None]], {'company': 1}]
+            if (args == (product_search, search_args)):
+                return [200]
+
+            product_read = 'model.product.product.read'
+            product_args = ([200],
+                            ['id', 'name', 'default_uom.id',
+                             'default_uom.rec_name', 'list_price'],
+                            {'company': 1}
+                            )
+            if (args == (product_read, product_args)):
+                return [
+                    {'id': 200, 'list_price': Decimal('25000'),
+                     'name': self.product.name,
+                     'default_uom.': {'id': 1, 'rec_name': 'Unit'}},
+                ]
+
+            raise Exception(f"Sorry, args non expected on  this test: {args}")
+
+        mock_call.side_effect = fake_call
+
+        url = '/don_confiao/api/importar_productos_de_tryton'
+        response = self.client.post(url)
+        self.assertEqual(response.status_code, 200)
+
+        content = json.loads(response.content.decode('utf-8'))
+        expected_response = {
+            'checked_tryton_products': [200],
+            'created_products': [],
+            'untouched_products': [],
+            'failed_products': [200],
+            'updated_products': [],
+        }
+        self.assertEqual(content, expected_response)