mirror of
https://gitlab.com/datalifeit/trytond-stock_location_product_limit
synced 2023-12-14 04:23:00 +01:00
Move company_log as extra dependency
This commit is contained in:
parent
322f1d96f7
commit
b5941ccab4
|
@ -516,7 +516,7 @@
|
||||||
<table:table-column table:style-name="Table4.A"/>
|
<table:table-column table:style-name="Table4.A"/>
|
||||||
<table:table-row>
|
<table:table-row>
|
||||||
<table:table-cell table:style-name="Table4.A1" office:value-type="string">
|
<table:table-cell table:style-name="Table4.A1" office:value-type="string">
|
||||||
<text:p text:style-name="P1"><text:placeholder text:placeholder-type="text"><if test="company.logo"></text:placeholder></text:p>
|
<text:p text:style-name="P1"><text:placeholder text:placeholder-type="text"><if test="getattr(company, 'logo', None)"></text:placeholder></text:p>
|
||||||
</table:table-cell>
|
</table:table-cell>
|
||||||
</table:table-row>
|
</table:table-row>
|
||||||
<table:table-row table:style-name="Table4.2">
|
<table:table-row table:style-name="Table4.2">
|
||||||
|
|
|
@ -522,7 +522,7 @@
|
||||||
<table:table-column table:style-name="Table4.A"/>
|
<table:table-column table:style-name="Table4.A"/>
|
||||||
<table:table-row>
|
<table:table-row>
|
||||||
<table:table-cell table:style-name="Table4.A1" office:value-type="string">
|
<table:table-cell table:style-name="Table4.A1" office:value-type="string">
|
||||||
<text:p text:style-name="P7"><text:placeholder text:placeholder-type="text"><if test="company.logo"></text:placeholder></text:p>
|
<text:p text:style-name="P7"><text:placeholder text:placeholder-type="text"><if test="getattr(company, 'logo', None)"></text:placeholder></text:p>
|
||||||
</table:table-cell>
|
</table:table-cell>
|
||||||
</table:table-row>
|
</table:table-row>
|
||||||
<table:table-row table:style-name="Table4.2">
|
<table:table-row table:style-name="Table4.2">
|
||||||
|
|
7
setup.py
7
setup.py
|
@ -9,7 +9,6 @@ import io
|
||||||
from configparser import ConfigParser
|
from configparser import ConfigParser
|
||||||
|
|
||||||
MODULE2PREFIX = {
|
MODULE2PREFIX = {
|
||||||
'company_logo': 'trytonspain',
|
|
||||||
'stock_party_warehouse': 'datalife',
|
'stock_party_warehouse': 'datalife',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -51,12 +50,6 @@ if minor_version % 2:
|
||||||
else:
|
else:
|
||||||
branch = series
|
branch = series
|
||||||
dependency_links = {
|
dependency_links = {
|
||||||
'company_logo':
|
|
||||||
'git+https://github.com/trytonspain/'
|
|
||||||
'trytond-company_logo@%(branch)s'
|
|
||||||
'#egg=trytonspain_company_logo' % {
|
|
||||||
'branch': branch,
|
|
||||||
},
|
|
||||||
'stock_party_warehouse':
|
'stock_party_warehouse':
|
||||||
'git+https://gitlab.com/datalifeit/'
|
'git+https://gitlab.com/datalifeit/'
|
||||||
'trytond-stock_party_warehouse@%(branch)s'
|
'trytond-stock_party_warehouse@%(branch)s'
|
||||||
|
|
|
@ -1,10 +1,12 @@
|
||||||
[tryton]
|
[tryton]
|
||||||
version=6.0.0
|
version=6.0.0
|
||||||
depends:
|
depends:
|
||||||
company_logo
|
|
||||||
ir
|
ir
|
||||||
res
|
res
|
||||||
stock_party_warehouse
|
stock_party_warehouse
|
||||||
|
|
||||||
|
extras_depend:
|
||||||
|
company_logo
|
||||||
|
|
||||||
xml:
|
xml:
|
||||||
product_limit.xml
|
product_limit.xml
|
||||||
|
|
Loading…
Reference in a new issue