From 07d892bf6d606d5979b139dac910ac402a50372b Mon Sep 17 00:00:00 2001
From: espurio <espurio@disroot.org>
Date: Mon, 23 May 2022 09:39:18 -0500
Subject: [PATCH 01/13] first commit

---
 tryton.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tryton.cfg b/tryton.cfg
index fc8d266..172cec0 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=6.0.0
+version=6.2.0
 depends:
     ir
     res

From 840b2ed5d859a23987228c1de7e05fa16d186f47 Mon Sep 17 00:00:00 2001
From: sinergia <alejandro.ayala@onecluster.org>
Date: Fri, 11 Nov 2022 12:36:52 -0500
Subject: [PATCH 02/13] delete file 'default_performance_rate'

---
 shop.py                     | 16 ++++++----------
 view/purchase_shop_form.xml |  2 --
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/shop.py b/shop.py
index dcaede6..3e5d7de 100644
--- a/shop.py
+++ b/shop.py
@@ -77,10 +77,6 @@ class PurchaseShop(ModelSQL, ModelView):
                                       ],
                                       depends=['rate', 'group'])
 
-    default_performance_rate = fields.Numeric('Default Performance Rate', _digits)
-
-
-
     @classmethod
     def __register__(cls, module_name):
         connection = Transaction().connection
@@ -203,13 +199,13 @@ class PurchaseShop(ModelSQL, ModelView):
         config = Config(1)
         return config
 
-    @staticmethod
-    def default_performance_rate():
-        Config = Pool().get('purchase.configuration')
-        config = Config(1)
+    # @staticmethod
+    # def default_standard_performance_rate():
+    #     Config = Pool().get('purchase.configuration')
+    #     config = Config(1)
     
-        if config.default_performance_rate:
-            return config.default_performance_rate
+    #     if config.standard_performance_rate:
+    #         return config.standard_performance_rate
 
 
     @fields.depends('company')
diff --git a/view/purchase_shop_form.xml b/view/purchase_shop_form.xml
index 76b6fa6..d449bfd 100644
--- a/view/purchase_shop_form.xml
+++ b/view/purchase_shop_form.xml
@@ -18,8 +18,6 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
     <field name="analytic_account"/>
     <label name="withholding_tax"/>
     <field name="withholding_tax"/>
-    <label name="default_performance_rate"/>
-    <field name="default_performance_rate"/>
     <notebook colspan="4">
         <page string="General" id="general">
             <label name="purchase_sequence"/>

From 02baf4a6e433a53c21a339ffd056eae601ba5839 Mon Sep 17 00:00:00 2001
From: sinergia <alejandro.ayala@onecluster.org>
Date: Fri, 11 Nov 2022 12:37:42 -0500
Subject: [PATCH 03/13] delete file 'default_performance_rate'

---
 shop.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/shop.py b/shop.py
index 3e5d7de..82e5631 100644
--- a/shop.py
+++ b/shop.py
@@ -199,15 +199,6 @@ class PurchaseShop(ModelSQL, ModelView):
         config = Config(1)
         return config
 
-    # @staticmethod
-    # def default_standard_performance_rate():
-    #     Config = Pool().get('purchase.configuration')
-    #     config = Config(1)
-    
-    #     if config.standard_performance_rate:
-    #         return config.standard_performance_rate
-
-
     @fields.depends('company')
     def on_change_with_company_party(self, name=None):
         if self.company and self.company.party:

From 11ad43d929bfc4d60b3cb72b6c6c027598fe933f Mon Sep 17 00:00:00 2001
From: sinergia <alejandro.ayala@onecluster.org>
Date: Sun, 13 Nov 2022 11:31:26 -0500
Subject: [PATCH 04/13] add invoice_subtype

---
 shop.py                     | 2 +-
 view/purchase_shop_form.xml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/shop.py b/shop.py
index 82e5631..9eec025 100644
--- a/shop.py
+++ b/shop.py
@@ -76,6 +76,7 @@ class PurchaseShop(ModelSQL, ModelView):
                                           ('group.kind', '=', 'purchase'),
                                       ],
                                       depends=['rate', 'group'])
+    invoice_subtype = fields.Many2One('account.invoice.subtype', "Subtype")
 
     @classmethod
     def __register__(cls, module_name):
@@ -224,4 +225,3 @@ class PurchaseShopParty(ModelSQL):
                            select=True, required=True)
     party = fields.Many2One('party.party', 'Party', ondelete='CASCADE',
                             required=True)
-                    
diff --git a/view/purchase_shop_form.xml b/view/purchase_shop_form.xml
index d449bfd..aa8ebaf 100644
--- a/view/purchase_shop_form.xml
+++ b/view/purchase_shop_form.xml
@@ -33,6 +33,11 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
             <field name="price_list"/>
             <label name="payment_term"/>
             <field name="payment_term"/>
+	    <label name="invoice_subtype"/>
+            <field name="invoice_subtype"/>	    
+	    <newline/>    
+	    <label name="invoice_resolution"/>
+            <field name="invoice_resolution"/>
         </page>
         <page string="Users" id="users">
             <field name="users"/>

From b874885ff6286b51446cba25e82805165405ab31 Mon Sep 17 00:00:00 2001
From: cosmos <pablo.bolivar@onecluster.org>
Date: Mon, 14 Nov 2022 13:53:54 -0500
Subject: [PATCH 05/13] dell field invoice resolution

---
 view/purchase_shop_form.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/view/purchase_shop_form.xml b/view/purchase_shop_form.xml
index aa8ebaf..3d0ee2c 100644
--- a/view/purchase_shop_form.xml
+++ b/view/purchase_shop_form.xml
@@ -35,9 +35,6 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
             <field name="payment_term"/>
 	    <label name="invoice_subtype"/>
             <field name="invoice_subtype"/>	    
-	    <newline/>    
-	    <label name="invoice_resolution"/>
-            <field name="invoice_resolution"/>
         </page>
         <page string="Users" id="users">
             <field name="users"/>

From 5717c06fc16cb1fbc7258432f0814658001f55a3 Mon Sep 17 00:00:00 2001
From: cosmos <pablo.bolivar@onecluster.org>
Date: Mon, 14 Nov 2022 14:04:28 -0500
Subject: [PATCH 06/13] Translate subtype - Tipo de documento

---
 locale/es.po | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/locale/es.po b/locale/es.po
index 25012ac..a8a9e84 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -201,3 +201,7 @@ msgstr "Tiendas"
 msgctxt "view:purchase.shop:"
 msgid "Users"
 msgstr "Usuarios"
+
+msgctxt "field:purchase.shop,invoice_subtype:"
+msgid "Subtype"
+msgstr "Tipo de Documento"

From 32f42f998b28bc5b6171110247f835a0774fbf03 Mon Sep 17 00:00:00 2001
From: yo <yo@yo>
Date: Sun, 20 Nov 2022 16:12:08 -0500
Subject: [PATCH 07/13] stringddd

Signed-off-by: yo <yo@yo>
---
 tryton.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tryton.cfg b/tryton.cfg
index 172cec0..03d02c1 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=6.2.0
+version=6.4.0
 depends:
     ir
     res

From a32b533391ef22f42da07de2831d53bd85868048 Mon Sep 17 00:00:00 2001
From: Rodia <rodia@noreply.onecluster.org>
Date: Fri, 3 Nov 2023 21:49:44 -0500
Subject: [PATCH 08/13] UPGRADE-6.8

Signed-off-by: Rodia <rodia@noreply.onecluster.org>
---
 tryton.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tryton.cfg b/tryton.cfg
index 03d02c1..4ef5113 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=6.4.0
+version=6.8.0
 depends:
     ir
     res

From f6cf2d1f9fa67e4b614f10123a52941782d1766b Mon Sep 17 00:00:00 2001
From: sinergia <alejandro.ayala@onecluster.org>
Date: Mon, 6 Nov 2023 21:50:47 -0500
Subject: [PATCH 09/13] =?UTF-8?q?fix:=20se=20limpia=20la=20casa=20para=20m?=
 =?UTF-8?q?igraci=C3=B3n=20a=206.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shop.py | 153 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 77 insertions(+), 76 deletions(-)

diff --git a/shop.py b/shop.py
index 9eec025..0ceb203 100644
--- a/shop.py
+++ b/shop.py
@@ -13,63 +13,64 @@ __all__ = ['PurchaseShop', 'PurchaseShopResUser', 'PurchaseShopParty']
 
 _digits = (16, 2)
 
+
 class PurchaseShop(ModelSQL, ModelView):
     'Purchase Shop'
     __name__ = 'purchase.shop'
 
-    name = fields.Char('Shop Name', required=True, select=True)
+    name = fields.Char('Shop Name', required=True, )
     users = fields.Many2Many('purchase.shop-res.user', 'shop', 'user', 'Users')
     address = fields.Many2One('party.address', 'Address', domain=[
-            ('party', '=', Eval('company_party')),
-            ], depends=['company_party'])
+        ('party', '=', Eval('company_party')),
+    ], depends=['company_party'])
     warehouse = fields.Many2One('stock.location', "Warehouse", required=True,
-        domain=[('type', '=', 'warehouse')])
+                                domain=[('type', '=', 'warehouse')])
     currency = fields.Many2One('currency.currency', 'Currency',)
     price_list = fields.Many2One('product.price_list', 'Price List')
     payment_term = fields.Many2One('account.invoice.payment_term',
-        'Payment Term')
+                                   'Payment Term')
     purchase_sequence = fields.Many2One(
         'ir.sequence', 'Purchase Sequence', domain=[
             ('company', 'in', [Eval('company', -1), None]),
             ('sequence_type', '=', Id('purchase', 'sequence_type_purchase')),
-            ],
+        ],
         depends=['company'])
     purchase_invoice_method = fields.Selection([
-            (None, ''),
-            ('manual', 'Manual'),
-            ('order', 'On Order Processed'),
-            ('shipment', 'On Shipment Sent')
-            ], 'Purchase Invoice Method')
+        (None, ''),
+        ('manual', 'Manual'),
+        ('order', 'On Order Processed'),
+        ('shipment', 'On Shipment Sent')
+    ], 'Purchase Invoice Method')
     purchase_shipment_method = fields.Selection([
-            (None, ''),
-            ('manual', 'Manual'),
-            ('order', 'On Order Processed'),
-            ('invoice', 'On Invoice Paid'),
-            ], 'Purchase Shipment Method')
+        (None, ''),
+        ('manual', 'Manual'),
+        ('order', 'On Order Processed'),
+        ('invoice', 'On Invoice Paid'),
+    ], 'Purchase Shipment Method')
     company = fields.Many2One('company.company', 'Company', required=True,
-        domain=[
-            ('id', If(Eval('context', {}).contains('company'), '=', '!='),
-                Eval('context', {}).get('company', 0)),
-            ], select=True)
+                              domain=[
+                                  ('id', If(Eval('context', {}).contains('company'), '=', '!='),
+                                   Eval('context', {}).get('company', 0)),
+                              ], )
     company_party = fields.Function(fields.Many2One('party.party',
-            'Company Party'),
-        'on_change_with_company_party')
-    active = fields.Boolean('Active', select=True)
-    analytic_root = fields.Many2One('analytic_account.account','Analytic Root', required=True,
-            domain=[
-                ('type', '=', 'root'),
-                ],
-            depends=['type']
-             )
+                                                    'Company Party'),
+                                    'on_change_with_company_party')
+    active = fields.Boolean('Active', )
+    analytic_root = fields.Many2One('analytic_account.account', 'Analytic Root', required=True,
+                                    domain=[
+                                        ('type', '=', 'root'),
+                                    ],
+                                    depends=['type']
+                                    )
     analytic_account = fields.Many2One('analytic_account.account',
-            'Analytic Account', required=True,
-            domain=[
-                ('type', '=', 'normal')
-                ],
-            depends=['analytic_root']
-            )
+                                       'Analytic Account', required=True,
+                                       domain=[
+                                           ('type', '=', 'normal')
+                                       ],
+                                       depends=['analytic_root']
+                                       )
     partys = fields.Many2Many('purchase.shop_party', 'shop', 'party',
-                         'Partys')
+                              'Partys')
     withholding_tax = fields.Many2One('account.tax', 'WithholdingTax',
                                       domain=[
                                           ('rate', '<', 0),
@@ -107,64 +108,64 @@ class PurchaseShop(ModelSQL, ModelView):
             # SQLite doesn't support this query as it generates and update
             # with an alias (AS) which is not valid on SQLite
             query = shop_table.update(columns=[shop_table.currency],
-                values=[company_table.currency],
-                from_=[company_table],
-                where=((shop_table.company == company_table.id)
-                    & (shop_table.currency == Null)))
+                                      values=[company_table.currency],
+                                      from_=[company_table],
+                                      where=((shop_table.company == company_table.id)
+                                             & (shop_table.currency == Null)))
             cursor.execute(*query)
 
         # Migration to remove Property
         if not purchase_sequence_exist and property_exist:
             cursor.execute(*property_
-                .join(field, condition=property_.field == field.id)
-                .join(model, condition=field.model == model.id)
-                .select(
-                    property_.res,
-                    property_.value,
-                    where=property_.res.like(cls.__name__ + ',%')
-                    & (field.name == 'purchase_sequence')
-                    & (model.model == cls.__name__)))
+                           .join(field, condition=property_.field == field.id)
+                           .join(model, condition=field.model == model.id)
+                           .select(
+                               property_.res,
+                               property_.value,
+                               where=property_.res.like(cls.__name__ + ',%')
+                               & (field.name == 'purchase_sequence')
+                               & (model.model == cls.__name__)))
             for res, value in cursor:
                 id_ = int(res.split(',')[1])
                 value = int(value.split(',')[1]) if value else None
                 update.execute(*table.update(
-                        [table.purchase_sequence],
-                        [value],
-                        where=table.id == id_))
+                    [table.purchase_sequence],
+                    [value],
+                    where=table.id == id_))
         if not purchase_invoice_method_exist and property_exist:
             cursor.execute(*property_
-                .join(field, condition=property_.field == field.id)
-                .join(model, condition=field.model == model.id)
-                .select(
-                    property_.res,
-                    property_.value,
-                    where=property_.res.like(cls.__name__ + ',%')
-                    & (field.name == 'purchase_invoice_method')
-                    & (model.model == cls.__name__)))
+                           .join(field, condition=property_.field == field.id)
+                           .join(model, condition=field.model == model.id)
+                           .select(
+                               property_.res,
+                               property_.value,
+                               where=property_.res.like(cls.__name__ + ',%')
+                               & (field.name == 'purchase_invoice_method')
+                               & (model.model == cls.__name__)))
             for res, value in cursor:
                 id_ = int(res.split(',')[1])
                 value = value.split(',')[1] if value else None
                 update.execute(*table.update(
-                        [table.purchase_invoice_method],
-                        [value],
-                        where=table.id == id_))
+                    [table.purchase_invoice_method],
+                    [value],
+                    where=table.id == id_))
         if not purchase_shipment_method_exist and property_exist:
             cursor.execute(*property_
-                .join(field, condition=property_.field == field.id)
-                .join(model, condition=field.model == model.id)
-                .select(
-                    property_.res,
-                    property_.value,
-                    where=property_.res.like(cls.__name__ + ',%')
-                    & (field.name == 'purchase_shipment_method')
-                    & (model.model == cls.__name__)))
+                           .join(field, condition=property_.field == field.id)
+                           .join(model, condition=field.model == model.id)
+                           .select(
+                               property_.res,
+                               property_.value,
+                               where=property_.res.like(cls.__name__ + ',%')
+                               & (field.name == 'purchase_shipment_method')
+                               & (model.model == cls.__name__)))
             for res, value in cursor:
                 id_ = int(res.split(',')[1])
                 value = value.split(',')[1] if value else None
                 update.execute(*table.update(
-                        [table.purchase_shipment_method],
-                        [value],
-                        where=table.id == id_))
+                    [table.purchase_shipment_method],
+                    [value],
+                    where=table.id == id_))
 
         # Migration from 5.2: do not require price_list
         table_h.not_null_action('price_list', action='remove')
@@ -213,15 +214,15 @@ class PurchaseShopResUser(ModelSQL):
     _table = 'purchase_shop_res_user'
 
     shop = fields.Many2One('purchase.shop', 'Shop', ondelete='CASCADE',
-        select=True, required=True)
+                           , required=True)
     user = fields.Many2One('res.user', 'User', ondelete='RESTRICT',
-        required=True)
+                           required=True)
 
 
 class PurchaseShopParty(ModelSQL):
     'Purchase Schop Party'
     __name__ = 'purchase.shop_party'
     shop = fields.Many2One('purchase.shop', 'Shop', ondelete='CASCADE',
-                           select=True, required=True)
+                           , required=True)
     party = fields.Many2One('party.party', 'Party', ondelete='CASCADE',
                             required=True)

From 87e2d844ad1b0798fbbdee6557fcbda3c4da72ba Mon Sep 17 00:00:00 2001
From: sinergia <alejandro.ayala@onecluster.org>
Date: Tue, 7 Nov 2023 15:57:21 -0500
Subject: [PATCH 10/13] =?UTF-8?q?fix:=20Se=20corrige=20','=20sobrante=20en?=
 =?UTF-8?q?=20el=20c=C3=B3digo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shop.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shop.py b/shop.py
index 0ceb203..9cad213 100644
--- a/shop.py
+++ b/shop.py
@@ -214,7 +214,7 @@ class PurchaseShopResUser(ModelSQL):
     _table = 'purchase_shop_res_user'
 
     shop = fields.Many2One('purchase.shop', 'Shop', ondelete='CASCADE',
-                           , required=True)
+                           required=True)
     user = fields.Many2One('res.user', 'User', ondelete='RESTRICT',
                            required=True)
 
@@ -223,6 +223,6 @@ class PurchaseShopParty(ModelSQL):
     'Purchase Schop Party'
     __name__ = 'purchase.shop_party'
     shop = fields.Many2One('purchase.shop', 'Shop', ondelete='CASCADE',
-                           , required=True)
+                           required=True)
     party = fields.Many2One('party.party', 'Party', ondelete='CASCADE',
                             required=True)

From e89a08611da7159946d25a182757df3fd9505519 Mon Sep 17 00:00:00 2001
From: root <admin@admin.com>
Date: Wed, 3 Jan 2024 18:00:47 +0000
Subject: [PATCH 11/13] Actualizacion de las pruebas de estilo del modulo

---
 party.py       |  6 ++----
 purchase.py    | 30 +++++++++++++++--------------
 setup.py       | 51 +++++++++++++++++++++++++++-----------------------
 shop.py        | 24 ++++++++++++++----------
 stock.py       | 24 ++++++++++++------------
 tests/tools.py |  6 +++---
 6 files changed, 75 insertions(+), 66 deletions(-)

diff --git a/party.py b/party.py
index 44b0754..8b95f7d 100644
--- a/party.py
+++ b/party.py
@@ -2,7 +2,6 @@
 # The COPYRIGHT file at the top level of this repository contains
 # the full copyright notices and license terms.
 from trytond.model import fields
-from trytond.pyson import Eval
 from trytond.pool import PoolMeta
 from trytond.transaction import Transaction
 
@@ -17,7 +16,6 @@ class Party(metaclass=PoolMeta):
     @staticmethod
     def default_shops():
         if Transaction().context.get('shops'):
-               return Transaction().context.get('shops')
+            return Transaction().context.get('shops')
         else:
-               return []
-    
+            return []
diff --git a/purchase.py b/purchase.py
index 064d67b..ebf8bbd 100644
--- a/purchase.py
+++ b/purchase.py
@@ -15,13 +15,14 @@ __all__ = ['Purchase', 'PurchaseLine']
 class Purchase(metaclass=PoolMeta):
     __name__ = 'purchase.purchase'
     shop = fields.Many2One('purchase.shop', 'Shop', required=True, domain=[
-            ('id', 'in', Eval('context', {}).get('shops', [])),
-            ],
+        ('id', 'in', Eval('context', {}).get('shops', [])),
+    ],
         states={
             'readonly': (Eval('state') != 'draft') | Bool(Eval('number')),
-        }, depends=['number', 'state'])
+    }, depends=['number', 'state'])
     shop_address = fields.Function(fields.Many2One('party.address',
-            'Shop Address'), 'on_change_with_shop_address')
+                                                   'Shop Address'),
+                                   'on_change_with_shop_address')
 
     @classmethod
     def __setup__(cls):
@@ -89,7 +90,7 @@ class Purchase(metaclass=PoolMeta):
         if not shop or not shop.address:
             return
         return shop.address.id
-    
+
     @fields.depends('shop', 'party')
     def on_change_shop(self):
         if not self.shop:
@@ -105,7 +106,7 @@ class Purchase(metaclass=PoolMeta):
     @fields.depends('shop')
     def on_change_with_shop_address(self, name=None):
         return (self.shop and self.shop.address and
-            self.shop.address.id or None)
+                self.shop.address.id or None)
 
     @fields.depends('shop')
     def on_change_party(self):
@@ -117,7 +118,8 @@ class Purchase(metaclass=PoolMeta):
     @classmethod
     def set_number(cls, purchases):
         '''
-        Fill the reference field with the purchase shop or purchase config sequence
+        Fill the reference field with the purchase
+        shop or purchase config sequence
         '''
         for purchase in purchases:
             if purchase.number:
@@ -128,15 +130,14 @@ class Purchase(metaclass=PoolMeta):
         super().set_number(purchases)
 
 
-
 class PurchaseLine(metaclass=PoolMeta):
     __name__ = 'purchase.line'
-    
-        
+
     @fields.depends('product', 'unit', 'quantity', 'purchase',
                     '_parent_purchase.party', 'product_supplier',
                     '_parent_purchase.shop',
-        methods=['_get_tax_rule_pattern', '_get_context_purchase_price'])
+                    methods=['_get_tax_rule_pattern',
+                             '_get_context_purchase_price'])
     def on_change_product(self):
         pool = Pool()
         Product = pool.get('product.product')
@@ -172,16 +173,17 @@ class PurchaseLine(metaclass=PoolMeta):
 
         if self.purchase and self.purchase.party:
             product_suppliers = [ps for ps in self.product.product_suppliers
-                if ps.party == self.purchase.party]
+                                 if ps.party == self.purchase.party]
             if len(product_suppliers) == 1:
                 self.product_supplier, = product_suppliers
         if (self.product_supplier
                 and (self.product_supplier
-                    not in self.product.product_suppliers)):
+                     not in self.product.product_suppliers)):
             self.product_supplier = None
 
         with Transaction().set_context(self._get_context_purchase_price()):
-            self.unit_price = Product.get_purchase_price([self.product],
+            self.unit_price = Product.get_purchase_price(
+                [self.product],
                 abs(self.quantity or 0))[self.product.id]
             if self.unit_price:
                 self.unit_price = self.unit_price.quantize(
diff --git a/setup.py b/setup.py
index abfeb94..ed72eea 100644
--- a/setup.py
+++ b/setup.py
@@ -26,9 +26,10 @@ def get_require_version(name):
     else:
         require = '%s >= %s.%s, < %s.%s'
     require %= (name, major_version, minor_version,
-        major_version, minor_version + 1)
+                major_version, minor_version + 1)
     return require
 
+
 config = ConfigParser()
 config.readfp(open('tryton.cfg'))
 info = dict(config.items('tryton'))
@@ -54,26 +55,30 @@ if minor_version % 2:
     dependency_links.append('https://trydevpi.tryton.org/')
 
 setup(name='%s_%s' % (PREFIX, MODULE),
-    version=version,
-    description='Tryton Purchase Shop Module',
-    long_description=read('README'),
-    author='Alnus Tmp',
-    author_email='alnus@disroot.org',
-    url='https://git.disroot.org/Etrivial/',
-    download_url='https://git.disroot.org/Etrivial/trytond-%s' % MODULE,
-    keywords='',
-    package_dir={'trytond.modules.%s' % MODULE: '.'},
-    packages=[
-        'trytond.modules.%s' % MODULE,
-        'trytond.modules.%s.tests' % MODULE,
-        ],
+      version=version,
+      description='Tryton Purchase Shop Module',
+      long_description=read('README'),
+      author='Alnus Tmp',
+      author_email='alnus@disroot.org',
+      url='https://git.disroot.org/Etrivial/',
+      download_url='https://git.disroot.org/Etrivial/trytond-%s' % MODULE,
+      keywords='',
+      package_dir={'trytond.modules.%s' % MODULE: '.'},
+      packages=[
+    'trytond.modules.%s' % MODULE,
+    'trytond.modules.%s.tests' % MODULE,
+],
     package_data={
-        'trytond.modules.%s' % MODULE: (info.get('xml', [])
-            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.odt',
-                'icons/*.svg', 'tests/*.rst']),
-        },
+    'trytond.modules.%s' % MODULE: (info.get('xml', [])
+                                    + ['tryton.cfg',
+                                       'view/*.xml',
+                                       'locale/*.po',
+                                       '*.odt',
+                                       'icons/*.svg',
+                                       'tests/*.rst']),
+},
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
+    'Development Status :: 5 - Production/Stable',
         'Environment :: Plugins',
         'Framework :: Tryton',
         'Intended Audience :: Developers',
@@ -101,7 +106,7 @@ setup(name='%s_%s' % (PREFIX, MODULE),
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business',
-        ],
+],
     license='GPL-3',
     install_requires=requires,
     dependency_links=dependency_links,
@@ -115,6 +120,6 @@ setup(name='%s_%s' % (PREFIX, MODULE),
     tests_require=tests_require,
     use_2to3=True,
     convert_2to3_doctests=[
-        'tests/scenario_purchase_shop.rst',
-        ],
-    )
+    'tests/scenario_purchase_shop.rst',
+],
+)
diff --git a/shop.py b/shop.py
index 9cad213..a82ddfd 100644
--- a/shop.py
+++ b/shop.py
@@ -2,11 +2,10 @@
 # The COPYRIGHT file at the top level of this repository contains
 # the full copyright notices and license terms.
 from sql import Null, Table
-
 from trytond.model import ModelView, ModelSQL, fields
 from trytond.pyson import If, Eval, Id
 from trytond.transaction import Transaction
-from trytond.pool import Pool, PoolMeta
+from trytond.pool import Pool
 from trytond import backend
 
 __all__ = ['PurchaseShop', 'PurchaseShopResUser', 'PurchaseShopParty']
@@ -49,14 +48,17 @@ class PurchaseShop(ModelSQL, ModelView):
     ], 'Purchase Shipment Method')
     company = fields.Many2One('company.company', 'Company', required=True,
                               domain=[
-                                  ('id', If(Eval('context', {}).contains('company'), '=', '!='),
+                                  ('id',
+                                   If(Eval('context', {}).contains('company'),
+                                      '=', '!='),
                                    Eval('context', {}).get('company', 0)),
                               ], )
     company_party = fields.Function(fields.Many2One('party.party',
                                                     'Company Party'),
                                     'on_change_with_company_party')
     active = fields.Boolean('Active', )
-    analytic_root = fields.Many2One('analytic_account.account', 'Analytic Root', required=True,
+    analytic_root = fields.Many2One('analytic_account.account',
+                                    'Analytic Root', required=True,
                                     domain=[
                                         ('type', '=', 'root'),
                                     ],
@@ -99,7 +101,8 @@ class PurchaseShop(ModelSQL, ModelView):
         if property_exist:
             property_ = Table('ir_property')
         purchase_sequence_exist = table_h.column_exist('purchase_sequence')
-        purchase_invoice_method_exist = table_h.column_exist('purchase_invoice_method')
+        purchase_invoice_method_exist = table_h.column_exist(
+            'purchase_invoice_method')
         purchase_shipment_method_exist = table_h.column_exist(
             'purchase_shipment_method')
 
@@ -107,11 +110,12 @@ class PurchaseShop(ModelSQL, ModelView):
         if backend.name != 'sqlite':
             # SQLite doesn't support this query as it generates and update
             # with an alias (AS) which is not valid on SQLite
-            query = shop_table.update(columns=[shop_table.currency],
-                                      values=[company_table.currency],
-                                      from_=[company_table],
-                                      where=((shop_table.company == company_table.id)
-                                             & (shop_table.currency == Null)))
+            query = shop_table.update(
+                columns=[shop_table.currency],
+                values=[company_table.currency],
+                from_=[company_table],
+                where=((shop_table.company == company_table.id)
+                       & (shop_table.currency == Null)))
             cursor.execute(*query)
 
         # Migration to remove Property
diff --git a/stock.py b/stock.py
index 5693ce8..ec9f46a 100644
--- a/stock.py
+++ b/stock.py
@@ -12,8 +12,8 @@ class ShipmentOut(metaclass=PoolMeta):
     __name__ = 'stock.shipment.out'
 
     shop_addresses = fields.Function(fields.Many2Many('party.address', None,
-            None, 'Shop Addresses'),
-        'on_change_with_shop_addresses')
+                                                      None, 'Shop Addresses'),
+                                     'on_change_with_shop_addresses')
 
     @classmethod
     def __setup__(cls):
@@ -24,11 +24,11 @@ class ShipmentOut(metaclass=PoolMeta):
                 'OR',
                 delivery_addr_domain,
                 [('id', 'in', Eval('shop_addresses'))],
-                ]
+            ]
         else:
             cls.delivery_address.domain = [
                 ('id', 'in', Eval('shop_addresses')),
-                ]
+            ]
         if 'shop_addresses' not in cls.delivery_address.depends:
             cls.delivery_address.depends.append('shop_addresses')
 
@@ -38,8 +38,8 @@ class ShipmentOut(metaclass=PoolMeta):
         if not self.warehouse:
             return []
         warehouse_shops = Shop.search([
-                ('warehouse', '=', self.warehouse.id),
-                ])
+            ('warehouse', '=', self.warehouse.id),
+        ])
         return [s.address.id for s in warehouse_shops if s.address]
 
 
@@ -47,8 +47,8 @@ class ShipmentOutReturn(metaclass=PoolMeta):
     __name__ = 'stock.shipment.out.return'
 
     shop_addresses = fields.Function(fields.Many2Many('party.address', None,
-            None, 'Shop Addresses'),
-        'on_change_with_shop_addresses')
+                                                      None, 'Shop Addresses'),
+                                     'on_change_with_shop_addresses')
 
     @classmethod
     def __setup__(cls):
@@ -59,11 +59,11 @@ class ShipmentOutReturn(metaclass=PoolMeta):
                 'OR',
                 delivery_addr_domain,
                 [('id', 'in', Eval('shop_addresses'))],
-                ]
+            ]
         else:
             cls.delivery_address.domain = [
                 ('id', 'in', Eval('shop_addresses')),
-                ]
+            ]
         if 'shop_addresses' not in cls.delivery_address.depends:
             cls.delivery_address.depends.append('shop_addresses')
 
@@ -73,6 +73,6 @@ class ShipmentOutReturn(metaclass=PoolMeta):
         if not self.warehouse:
             return []
         warehouse_shops = Shop.search([
-                ('warehouse', '=', self.warehouse.id),
-                ])
+            ('warehouse', '=', self.warehouse.id),
+        ])
         return [s.address.id for s in warehouse_shops if s.address]
diff --git a/tests/tools.py b/tests/tools.py
index b5eee65..5a4be31 100644
--- a/tests/tools.py
+++ b/tests/tools.py
@@ -7,7 +7,7 @@ __all__ = ['create_shop']
 
 
 def create_shop(payment_term, product_price_list, name=None, warehouse=None,
-        sequence=None, config=None):
+                sequence=None, config=None):
     "Create a sale shop"
     Shop = Model.get('sale.shop', config=config)
     Sequence = Model.get('ir.sequence', config=config)
@@ -20,14 +20,14 @@ def create_shop(payment_term, product_price_list, name=None, warehouse=None,
     if not warehouse:
         warehouse, = Location.find([
             ('type', '=', 'warehouse'),
-            ])
+        ])
     shop.warehouse = warehouse
     shop.price_list = product_price_list
     shop.payment_term = payment_term
     if not sequence:
         sequence, = Sequence.find([
             ('name', '=', 'Sale'),
-            ])
+        ])
     shop.sale_sequence = sequence
     shop.sale_invoice_method = 'shipment'
     shop.sale_shipment_method = 'order'

From 7ebc1a962a01faeae6a40829b885c2dbc6cb3a54 Mon Sep 17 00:00:00 2001
From: sinergia <alejandro.ayala@onecluster.org>
Date: Thu, 4 Jan 2024 22:14:06 -0500
Subject: [PATCH 12/13] fix: Se corrigen pruebas de Tryton

---
 party.xml                    |  5 ----
 purchase.py                  |  2 --
 shop.py                      |  9 +++----
 stock.py                     | 14 +++++------
 tests/__init__.py            |  6 -----
 tests/scenario_sale_shop.rst | 46 ++++++++++++++++++------------------
 tests/test_sale_shop.py      | 26 --------------------
 tryton.cfg                   |  2 ++
 8 files changed, 35 insertions(+), 75 deletions(-)
 delete mode 100644 tests/test_sale_shop.py

diff --git a/party.xml b/party.xml
index 2f4c038..e5c6732 100644
--- a/party.xml
+++ b/party.xml
@@ -3,11 +3,6 @@
 this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
-        <record model="ir.ui.view" id="party_view_tree">
-            <field name="model">party.party</field>
-            <field name="inherit" ref="party.party_view_tree"/>
-            <field name="name">party_tree</field>
-	</record>
         <record model="ir.ui.view" id="party_view_form">
             <field name="model">party.party</field>
             <field name="inherit" ref="party.party_view_form"/>
diff --git a/purchase.py b/purchase.py
index ebf8bbd..c565044 100644
--- a/purchase.py
+++ b/purchase.py
@@ -7,7 +7,6 @@ from trytond.model import fields
 from trytond.transaction import Transaction
 from trytond.pool import Pool, PoolMeta
 from trytond.pyson import Bool, Eval
-from trytond.exceptions import UserError
 
 __all__ = ['Purchase', 'PurchaseLine']
 
@@ -78,7 +77,6 @@ class Purchase(metaclass=PoolMeta):
 
     @classmethod
     def default_price_list(cls):
-        raise UserError(str(cls))
         shop = cls.current_shop()
         if not shop or not shop.price_list:
             return
diff --git a/shop.py b/shop.py
index a82ddfd..ca42cea 100644
--- a/shop.py
+++ b/shop.py
@@ -61,15 +61,13 @@ class PurchaseShop(ModelSQL, ModelView):
                                     'Analytic Root', required=True,
                                     domain=[
                                         ('type', '=', 'root'),
-                                    ],
-                                    depends=['type']
+                                    ]
                                     )
     analytic_account = fields.Many2One('analytic_account.account',
                                        'Analytic Account', required=True,
                                        domain=[
                                            ('type', '=', 'normal')
-                                       ],
-                                       depends=['analytic_root']
+                                       ]
                                        )
     partys = fields.Many2Many('purchase.shop_party', 'shop', 'party',
                               'Partys')
@@ -77,8 +75,7 @@ class PurchaseShop(ModelSQL, ModelView):
                                       domain=[
                                           ('rate', '<', 0),
                                           ('group.kind', '=', 'purchase'),
-                                      ],
-                                      depends=['rate', 'group'])
+                                      ])
     invoice_subtype = fields.Many2One('account.invoice.subtype', "Subtype")
 
     @classmethod
diff --git a/stock.py b/stock.py
index ec9f46a..6e13200 100644
--- a/stock.py
+++ b/stock.py
@@ -30,7 +30,7 @@ class ShipmentOut(metaclass=PoolMeta):
                 ('id', 'in', Eval('shop_addresses')),
             ]
         if 'shop_addresses' not in cls.delivery_address.depends:
-            cls.delivery_address.depends.append('shop_addresses')
+            cls.delivery_address.depends.add('shop_addresses')
 
     @fields.depends('warehouse')
     def on_change_with_shop_addresses(self, name=None):
@@ -53,19 +53,19 @@ class ShipmentOutReturn(metaclass=PoolMeta):
     @classmethod
     def __setup__(cls):
         super(ShipmentOutReturn, cls).__setup__()
-        delivery_addr_domain = cls.delivery_address.domain[:]
-        if delivery_addr_domain:
-            cls.delivery_address.domain = [
+        contact_addr_domain = cls.contact_address.domain[:]
+        if contact_addr_domain:
+            cls.contact_address.domain = [
                 'OR',
-                delivery_addr_domain,
+                contact_addr_domain,
                 [('id', 'in', Eval('shop_addresses'))],
             ]
         else:
             cls.delivery_address.domain = [
                 ('id', 'in', Eval('shop_addresses')),
             ]
-        if 'shop_addresses' not in cls.delivery_address.depends:
-            cls.delivery_address.depends.append('shop_addresses')
+        if 'shop_addresses' not in cls.contact_address.depends:
+            cls.contact_address.depends.add('shop_addresses')
 
     @fields.depends('warehouse')
     def on_change_with_shop_addresses(self, name=None):
diff --git a/tests/__init__.py b/tests/__init__.py
index 0eb1e2a..f2e9088 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,9 +1,3 @@
 # This file is part sale_shop module for Tryton.
 # The COPYRIGHT file at the top level of this repository contains the full
 # copyright notices and license terms.
-try:
-    from trytond.modules.sale_shop.tests.test_sale_shop import suite
-except ImportError:
-    from .test_sale_shop import suite
-
-__all__ = ['suite']
diff --git a/tests/scenario_sale_shop.rst b/tests/scenario_sale_shop.rst
index a5116f8..54b08d5 100644
--- a/tests/scenario_sale_shop.rst
+++ b/tests/scenario_sale_shop.rst
@@ -1,5 +1,5 @@
 ==================
-Sale Shop Scenario
+Purchase Shop Scenario
 ==================
 
 Imports::
@@ -14,12 +14,12 @@ Imports::
     ...     create_chart, get_accounts, create_tax
     >>> from trytond.modules.account_invoice.tests.tools import \
     ...     set_fiscalyear_invoice_sequences, create_payment_term
-    >>> from trytond.modules.sale_shop.tests.tools import create_shop
+    >>> from trytond.modules.purchase_shop.tests.tools import create_shop
     >>> today = datetime.date.today()
 
-Install sale::
+Install purchase::
 
-    >>> config = activate_modules('sale_shop')
+    >>> config = activate_modules('purchase_shop')
 
 Create company::
 
@@ -114,12 +114,12 @@ Create an Inventory::
     >>> inventory.state == 'done'
     True
 
-Create Sale Shop::
+Create Purchase Shop::
 
     >>> shop = create_shop(payment_term, product_price_list)
     >>> shop.save()
 
-Save Sale Shop User::
+Save Purchase Shop User::
 
     >>> User = Model.get('res.user')
     >>> user, = User.find([])
@@ -128,22 +128,22 @@ Save Sale Shop User::
     >>> user.save()
     >>> set_user(user)
 
-Sale 5 products::
+Purchase 5 products::
 
-    >>> Sale = Model.get('sale.sale')
-    >>> SaleLine = Model.get('sale.line')
-    >>> sale = Sale()
-    >>> sale.party = customer
-    >>> sale.payment_term = payment_term
-    >>> sale.invoice_method = 'shipment'
-    >>> sale_line = SaleLine()
-    >>> sale.lines.append(sale_line)
-    >>> sale_line.product = product
-    >>> sale_line.quantity = 2.0
-    >>> sale_line = SaleLine()
-    >>> sale.lines.append(sale_line)
-    >>> sale_line.product = product
-    >>> sale_line.quantity = 3.0
-    >>> sale.save()
-    >>> sale.state == 'draft'
+    >>> Purchase = Model.get('purchase.purchase')
+    >>> PurchaseLine = Model.get('purchase.line')
+    >>> purchase = Purchase()
+    >>> purchase.party = customer
+    >>> purchase.payment_term = payment_term
+    >>> purchase.invoice_method = 'shipment'
+    >>> purchase_line = PurchaseLine()
+    >>> purchase.lines.append(purchase_line)
+    >>> purchase_line.product = product
+    >>> purchase_line.quantity = 2.0
+    >>> purchase_line = PurchaseLine()
+    >>> purchase.lines.append(purchase_line)
+    >>> purchase_line.product = product
+    >>> purchase_line.quantity = 3.0
+    >>> purchase.save()
+    >>> purchase.state == 'draft'
     True
diff --git a/tests/test_sale_shop.py b/tests/test_sale_shop.py
deleted file mode 100644
index 0cf8cb7..0000000
--- a/tests/test_sale_shop.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file is part of the sale_shop module for Tryton.
-# The COPYRIGHT file at the top level of this repository contains the full
-# copyright notices and license terms.
-import unittest
-import doctest
-import trytond.tests.test_tryton
-from trytond.tests.test_tryton import ModuleTestCase
-from trytond.tests.test_tryton import doctest_teardown
-from trytond.tests.test_tryton import doctest_checker
-
-
-class SaleShopTestCase(ModuleTestCase):
-    'Test Sale Shop module'
-    module = 'sale_shop'
-
-
-def suite():
-    suite = trytond.tests.test_tryton.suite()
-    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
-        SaleShopTestCase))
-    suite.addTests(doctest.DocFileSuite(
-            'scenario_sale_shop.rst',
-            tearDown=doctest_teardown, encoding='utf-8',
-            checker=doctest_checker,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    return suite
diff --git a/tryton.cfg b/tryton.cfg
index 4ef5113..f1f4ef6 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -6,6 +6,8 @@ depends:
     purchase_price_list
     analytic_purchase
     account
+    account_invoice_subtype
+    party
 xml:
     shop.xml
     purchase.xml

From cc93a8d14279705b2e5a09a5e4db0870f5952da1 Mon Sep 17 00:00:00 2001
From: sinergia <alejandro.ayala@onecluster.org>
Date: Thu, 4 Jan 2024 22:14:16 -0500
Subject: [PATCH 13/13] fix: Se corrigen pruebas de Tryton

---
 tests/test_purchase_shop.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 tests/test_purchase_shop.py

diff --git a/tests/test_purchase_shop.py b/tests/test_purchase_shop.py
new file mode 100644
index 0000000..663ecab
--- /dev/null
+++ b/tests/test_purchase_shop.py
@@ -0,0 +1,12 @@
+# This file is part of the sale_shop module for Tryton.
+# The COPYRIGHT file at the top level of this repository contains the full
+# copyright notices and license terms.
+from trytond.tests.test_tryton import ModuleTestCase
+
+
+class PurchaseShopTestCase(ModuleTestCase):
+    'Test Sale Shop module'
+    module = 'purchase_shop'
+
+
+del ModuleTestCase