From b5941ccab4c6226cbdd49d079306cc14d0cf4d6e Mon Sep 17 00:00:00 2001
From: Sergio Morillo <sergio.morillo@datalifeit.es>
Date: Fri, 5 Nov 2021 16:52:47 +0100
Subject: [PATCH] Move company_log as extra dependency

---
 customer_return_restocking_list.fodt | 2 +-
 delivery_note.fodt                   | 2 +-
 setup.py                             | 7 -------
 tryton.cfg                           | 4 +++-
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/customer_return_restocking_list.fodt b/customer_return_restocking_list.fodt
index 62d82db..96841ac 100644
--- a/customer_return_restocking_list.fodt
+++ b/customer_return_restocking_list.fodt
@@ -516,7 +516,7 @@
         <table:table-column table:style-name="Table4.A"/>
         <table:table-row>
          <table:table-cell table:style-name="Table4.A1" office:value-type="string">
-          <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;company.logo&quot;&gt;</text:placeholder></text:p>
+          <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;getattr(company, &apos;logo&apos;, None)&quot;&gt;</text:placeholder></text:p>
          </table:table-cell>
         </table:table-row>
         <table:table-row table:style-name="Table4.2">
diff --git a/delivery_note.fodt b/delivery_note.fodt
index 383ea69..5fa103b 100644
--- a/delivery_note.fodt
+++ b/delivery_note.fodt
@@ -522,7 +522,7 @@
         <table:table-column table:style-name="Table4.A"/>
         <table:table-row>
          <table:table-cell table:style-name="Table4.A1" office:value-type="string">
-          <text:p text:style-name="P7"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;company.logo&quot;&gt;</text:placeholder></text:p>
+          <text:p text:style-name="P7"><text:placeholder text:placeholder-type="text">&lt;if test=&quot;getattr(company, &apos;logo&apos;, None)&quot;&gt;</text:placeholder></text:p>
          </table:table-cell>
         </table:table-row>
         <table:table-row table:style-name="Table4.2">
diff --git a/setup.py b/setup.py
index 9ce7eca..5f525c8 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,6 @@ import io
 from configparser import ConfigParser
 
 MODULE2PREFIX = {
-    'company_logo': 'trytonspain',
     'stock_party_warehouse': 'datalife',
 }
 
@@ -51,12 +50,6 @@ if minor_version % 2:
 else:
     branch = series
 dependency_links = {
-    'company_logo':
-        'git+https://github.com/trytonspain/'
-        'trytond-company_logo@%(branch)s'
-        '#egg=trytonspain_company_logo' % {
-            'branch': branch,
-            },
     'stock_party_warehouse':
         'git+https://gitlab.com/datalifeit/'
         'trytond-stock_party_warehouse@%(branch)s'
diff --git a/tryton.cfg b/tryton.cfg
index d73c3ae..9634afe 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,10 +1,12 @@
 [tryton]
 version=6.0.0
 depends:
-  company_logo
   ir
   res
   stock_party_warehouse
 
+extras_depend:
+  company_logo
+
 xml:
   product_limit.xml