Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
3d24a52a
Commit
3d24a52a
authored
May 16, 2024
by
Jérome Perrin
Committed by
Arnaud Fontaine
Jul 11, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*: fix used-before-assignment and possibly-used-before-assignment from pylint 3.2.0
parent
f5c8c656
Changes
27
Hide whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
88 additions
and
72 deletions
+88
-72
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_createReversalTransaction.py
...unting/AccountingTransaction_createReversalTransaction.py
+26
-26
bt5/erp5_advanced_ecommerce/SkinTemplateItem/portal_skins/erp5_advanced_ecommerce/Resource_addToShoppingCart.py
...ins/erp5_advanced_ecommerce/Resource_addToShoppingCart.py
+1
-0
bt5/erp5_advanced_ecommerce/SkinTemplateItem/portal_skins/erp5_advanced_ecommerce/Resource_getPriceCalculationDefaultContext.py
...d_ecommerce/Resource_getPriceCalculationDefaultContext.py
+1
-2
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedContributionList.py
...ins/erp5_base/Person_getPersonDetailedContributionList.py
+2
-0
bt5/erp5_big_file/DocumentTemplateItem/portal_components/document.erp5.BigFile.py
...ntTemplateItem/portal_components/document.erp5.BigFile.py
+5
-3
bt5/erp5_configurator/DocumentTemplateItem/portal_components/document.erp5.CategoriesSpreadsheetConfiguratorItem.py
...ts/document.erp5.CategoriesSpreadsheetConfiguratorItem.py
+2
-0
bt5/erp5_configurator/ToolComponentTemplateItem/portal_components/tool.erp5.ConfiguratorTool.py
...plateItem/portal_components/tool.erp5.ConfiguratorTool.py
+1
-0
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_validateLink.py
...tal_skins/erp5_corporate_identity/WebPage_validateLink.py
+1
-0
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewAsSlideshow.py
..._skins/erp5_corporate_identity/WebPage_viewAsSlideshow.py
+1
-0
bt5/erp5_hal_json_style/ExtensionTemplateItem/portal_components/extension.erp5.HalStyle.py
...TemplateItem/portal_components/extension.erp5.HalStyle.py
+1
-0
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_doAction.py
...ateItem/portal_skins/erp5_hal_json_style/Base_doAction.py
+1
-2
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
...rtal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
+27
-27
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createDeliveryLine.py
...m/portal_skins/erp5_item/ItemModule_createDeliveryLine.py
+2
-3
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getAggregatedAmountList.py
..._skins/erp5_pdm/Transformation_getAggregatedAmountList.py
+1
-1
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getTotalPrice.py
...tem/portal_skins/erp5_pdm/Transformation_getTotalPrice.py
+1
-1
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_generateRequirements.py
...al_skins/erp5_project/Requirement_generateRequirements.py
+1
-3
bt5/erp5_syncml/ModuleComponentTemplateItem/portal_components/module.erp5.ERP5Conduit.py
...TemplateItem/portal_components/module.erp5.ERP5Conduit.py
+1
-0
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_getFastInputLineList.py
.../portal_skins/erp5_trade/Delivery_getFastInputLineList.py
+1
-1
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_setFastInputLineList.py
.../portal_skins/erp5_trade/Delivery_setFastInputLineList.py
+2
-0
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_updateFastInputLineList.py
...rtal_skins/erp5_trade/Delivery_updateFastInputLineList.py
+1
-0
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_activateGetOrderStatList.py
..._skins/erp5_trade/OrderModule_activateGetOrderStatList.py
+2
-0
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Base_convertHtmlToSingleFile.py
...tem/portal_skins/erp5_web/Base_convertHtmlToSingleFile.py
+1
-0
product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.ImmobilisableItem.py
...Item/portal_components/document.erp5.ImmobilisableItem.py
+2
-1
product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.AmountGeneratorMixin.py
...Item/portal_components/mixin.erp5.AmountGeneratorMixin.py
+1
-0
product/ERP5/bootstrap/erp5_core/ModuleComponentTemplateItem/portal_components/module.erp5.ExpandPolicy.py
...emplateItem/portal_components/module.erp5.ExpandPolicy.py
+1
-1
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_validateRelation.py
...plateItem/portal_skins/erp5_core/Base_validateRelation.py
+1
-0
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiableFieldList.py
...kins/erp5_core/BusinessTemplate_getModifiableFieldList.py
+1
-1
No files found.
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_createReversalTransaction.py
View file @
3d24a52a
...
...
@@ -64,35 +64,35 @@ line_list = context.AccountingTransaction_getAccountingTransactionLineList(
if
not
cancellation_amount
:
line_list
.
reverse
()
# guess portal_type to create lines
if
line_list
:
# guess portal_type to create lines
line_portal_type
=
line_list
[
0
].
getPortalType
()
for
line
in
line_list
:
new_line
=
reversal
.
newContent
(
portal_type
=
line_portal_type
)
new_line
.
edit
(
source
=
line
.
getSource
(
portal_type
=
'Account'
),
destination
=
line
.
getDestination
(
portal_type
=
'Account'
),
quantity
=
-
line
.
getQuantity
(),
)
if
line
.
getSourceTotalAssetPrice
():
new_line
.
setSourceTotalAssetPrice
(
-
line
.
getSourceTotalAssetPrice
()
)
if
line
.
getDestinationTotalAssetPrice
():
new_line
.
setDestinationTotalAssetPrice
(
-
line
.
getDestinationTotalAssetPrice
()
)
new_line
.
setCancellationAmount
(
cancellation_amount
)
# copy some values if they are defined explicitly on line
for
prop
in
[
'source_section'
,
'destination_section'
,
'source_payment'
,
'destination_payment'
,
'source_project'
,
'destination_project'
,
'source_function'
,
'destination_function'
,
'source_funding'
,
'destination_funding'
,
'source_payment_request'
,
'destination_payment_request'
,
'resource'
,
'product_line'
,
'string_index'
]:
if
line
.
getProperty
(
prop
)
!=
context
.
getProperty
(
prop
):
new_line
.
setProperty
(
prop
,
line
.
getProperty
(
prop
))
for
line
in
line_list
:
new_line
=
reversal
.
newContent
(
portal_type
=
line_portal_type
)
new_line
.
edit
(
source
=
line
.
getSource
(
portal_type
=
'Account'
),
destination
=
line
.
getDestination
(
portal_type
=
'Account'
),
quantity
=
-
line
.
getQuantity
(),
)
if
line
.
getSourceTotalAssetPrice
():
new_line
.
setSourceTotalAssetPrice
(
-
line
.
getSourceTotalAssetPrice
()
)
if
line
.
getDestinationTotalAssetPrice
():
new_line
.
setDestinationTotalAssetPrice
(
-
line
.
getDestinationTotalAssetPrice
()
)
new_line
.
setCancellationAmount
(
cancellation_amount
)
# copy some values if they are defined explicitly on line
for
prop
in
[
'source_section'
,
'destination_section'
,
'source_payment'
,
'destination_payment'
,
'source_project'
,
'destination_project'
,
'source_function'
,
'destination_function'
,
'source_funding'
,
'destination_funding'
,
'source_payment_request'
,
'destination_payment_request'
,
'resource'
,
'product_line'
,
'string_index'
]:
if
line
.
getProperty
(
prop
)
!=
context
.
getProperty
(
prop
):
new_line
.
setProperty
(
prop
,
line
.
getProperty
(
prop
))
if
plan
:
reversal
.
plan
()
...
...
bt5/erp5_advanced_ecommerce/SkinTemplateItem/portal_skins/erp5_advanced_ecommerce/Resource_addToShoppingCart.py
View file @
3d24a52a
...
...
@@ -55,6 +55,7 @@ shopping_cart_items = context.SaleOrder_getShoppingCartItemList()
# get category like size and variation
category
=
request
.
form
.
get
(
'field_variation_box_your_category'
,
''
)
base_category
=
''
if
category
:
[
base_category
,
category
]
=
category
.
split
(
'/'
,
1
)
variation
=
request
.
form
.
get
(
'field_variation_box_your_variation'
,
None
)
...
...
bt5/erp5_advanced_ecommerce/SkinTemplateItem/portal_skins/erp5_advanced_ecommerce/Resource_getPriceCalculationDefaultContext.py
View file @
3d24a52a
...
...
@@ -37,8 +37,7 @@ else:
variation_dict
[
"start_date"
]
=
date
variation_dict
[
"stop_date"
]
=
date
+
0.00001
if
web_site_value
is
not
None
:
price_currency_value
=
web_site_value
.
WebSite_getShoppingCartDefaultCurrency
()
price_currency_value
=
web_site_value
.
WebSite_getShoppingCartDefaultCurrency
()
movement
=
context
.
newContent
(
temp_object
=
True
,
...
...
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedContributionList.py
View file @
3d24a52a
...
...
@@ -28,6 +28,8 @@ elif aggregation_level == "week":
sql_format
=
"%Y-%u"
elif
aggregation_level
==
"day"
:
sql_format
=
"%Y-%m-%d"
else
:
raise
ValueError
(
"Unsupported aggregation level %s"
%
aggregation_level
)
if
to_date
is
not
None
:
to_date
=
atTheEndOfPeriod
(
to_date
,
period
=
aggregation_level
)
count_kw
=
{}
...
...
bt5/erp5_big_file/DocumentTemplateItem/portal_components/document.erp5.BigFile.py
View file @
3d24a52a
...
...
@@ -30,7 +30,9 @@ import re
import
six
if
six
.
PY3
:
long
=
int
# pylint:disable=redefined-builtin
long_or_int
=
int
else
:
long_or_int
=
long
# pylint:disable=undefined-variable
class
BigFile
(
File
):
"""
...
...
@@ -189,13 +191,13 @@ class BigFile(File):
else
:
# Date
date
=
if_range
.
split
(
';'
)[
0
]
try
:
mod_since
=
long
(
DateTime
(
date
).
timeTime
())
try
:
mod_since
=
long
_or_int
(
DateTime
(
date
).
timeTime
())
except
Exception
:
mod_since
=
None
if
mod_since
is
not
None
:
last_mod
=
self
.
_data_mtime
()
if
last_mod
is
None
:
last_mod
=
0
last_mod
=
long
(
last_mod
)
last_mod
=
long
_or_int
(
last_mod
)
if
last_mod
>
mod_since
:
# Modified, so send a normal response. We delete
# the ranges, which causes us to skip to the 200
...
...
bt5/erp5_configurator/DocumentTemplateItem/portal_components/document.erp5.CategoriesSpreadsheetConfiguratorItem.py
View file @
3d24a52a
...
...
@@ -81,6 +81,8 @@ class CategoriesSpreadsheetConfiguratorItem(ConfiguratorItemMixin, XMLObject):
"Base Category %s should be created"
%
bc_id
))
if
fixit
:
bc
=
ctool
.
newContent
(
id
=
bc_id
)
else
:
continue
if
fixit
:
for
category_info
in
category_list
:
...
...
bt5/erp5_configurator/ToolComponentTemplateItem/portal_components/tool.erp5.ConfiguratorTool.py
View file @
3d24a52a
...
...
@@ -226,6 +226,7 @@ class ConfiguratorTool(BaseTool):
return
response
## show next form in transitions
html
=
None
rendered
=
False
while
rendered
is
False
:
if
need_validation
==
1
:
...
...
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_validateLink.py
View file @
3d24a52a
...
...
@@ -11,6 +11,7 @@ Upgrade link for the specific type of display
import
re
link_href
=
re
.
findall
(
"href=['
\
"
](.*?)['
\
"
]"
,
link_string
)[
0
]
link_title
=
''
# XXX flag if broken link
if
link_href
.
find
(
"http"
)
==
-
1
:
...
...
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewAsSlideshow.py
View file @
3d24a52a
...
...
@@ -29,6 +29,7 @@ from Products.PythonScripts.standard import html_quote
from
base64
import
b64encode
blank
=
''
slide_content
=
blank
flags
=
re
.
MULTILINE
|
re
.
DOTALL
|
re
.
IGNORECASE
details_separator
=
'</section><section class="ci-notes-continue"><section><h1>cont.</h1></section>'
pref
=
context
.
getPortalObject
().
portal_preferences
...
...
bt5/erp5_hal_json_style/ExtensionTemplateItem/portal_components/extension.erp5.HalStyle.py
View file @
3d24a52a
...
...
@@ -22,6 +22,7 @@ def Listbox_getBrainValue(self, brain, obj, select, can_check_local_property, ed
ListBox.py / getValueList
"""
tales
=
False
default_field_value
=
None
# Use a widget, if any.
if
editable_field
is
not
None
:
...
...
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_doAction.py
View file @
3d24a52a
...
...
@@ -4,8 +4,7 @@ Base_translateString = portal.Base_translateString
preserved_parameter_dict
=
{}
Base_doAction
=
select_action
.
split
()
if
len
(
Base_doAction
)
!=
0
:
doAction0
=
Base_doAction
[
0
]
doAction0
=
Base_doAction
[
0
]
kw
[
'keep_items'
]
=
preserved_parameter_dict
...
...
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
View file @
3d24a52a
...
...
@@ -202,37 +202,37 @@ def generateDomainTreeList(url_tool, domain_tool, domain, depth, domain_list):
def
getDomainSelection
(
domain_list
):
root_dict
=
{}
if
len
(
domain_list
)
>
0
:
if
domain_list
:
category_tool
=
portal
.
portal_categories
domain_tool
=
portal
.
portal_domains
preference_tool
=
portal
.
portal_preferences
url_tool
=
portal
.
portal_url
for
base_domain_id
in
domain_list
:
domain
=
None
if
category_tool
is
not
None
:
domain
=
category_tool
.
restrictedTraverse
(
base_domain_id
,
None
)
if
domain
is
not
None
:
root_dict
[
base_domain_id
]
=
getattr
(
domain
,
preference_tool
.
getPreference
(
'preferred_category_child_item_list_method_id'
,
'getCategoryChildCompactLogicalPathItemList'
)
)(
local_sort_id
=
(
'int_index'
,
'translated_title'
),
checked_permission
=
'View'
,
filter_node
=
0
,
display_none_category
=
0
)
elif
domain_tool
is
not
None
:
try
:
domain
=
domain_tool
.
getDomainByPath
(
base_domain_id
,
None
)
except
KeyError
:
domain
=
None
if
domain
is
not
None
:
# XXX Implement recursive fetch
domain_list
=
[]
generateDomainTreeList
(
url_tool
,
domain_tool
,
domain
,
0
,
domain_list
)
root_dict
[
base_domain_id
]
=
domain_list
for
base_domain_id
in
domain_list
:
domain
=
None
if
category_tool
is
not
None
:
domain
=
category_tool
.
restrictedTraverse
(
base_domain_id
,
None
)
if
domain
is
not
None
:
root_dict
[
base_domain_id
]
=
getattr
(
domain
,
preference_tool
.
getPreference
(
'preferred_category_child_item_list_method_id'
,
'getCategoryChildCompactLogicalPathItemList'
)
)(
local_sort_id
=
(
'int_index'
,
'translated_title'
),
checked_permission
=
'View'
,
filter_node
=
0
,
display_none_category
=
0
)
elif
domain_tool
is
not
None
:
try
:
domain
=
domain_tool
.
getDomainByPath
(
base_domain_id
,
None
)
except
KeyError
:
domain
=
None
if
domain
is
not
None
:
# XXX Implement recursive fetch
domain_list
=
[]
generateDomainTreeList
(
url_tool
,
domain_tool
,
domain
,
0
,
domain_list
)
root_dict
[
base_domain_id
]
=
domain_list
return
root_dict
...
...
@@ -2169,7 +2169,7 @@ def calculateHateoas(is_portal=None, is_site_root=None, traversed_document=None,
# XXX If only available on brains, maybe better to call on aq_self
getBrainListItemUrlDict
=
getattr
(
brain
,
'getListItemUrlDict'
,
None
)
is_getListItemUrlDict_calculated
=
True
if
getBrainListItemUrlDict
is
not
None
:
if
getBrainListItemUrlDict
is
not
None
:
# pylint:disable=possibly-used-before-assignment
# Check if we can get URL result from the brain
try
:
url_parameter_dict
=
getBrainListItemUrlDict
(
...
...
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createDeliveryLine.py
View file @
3d24a52a
...
...
@@ -44,10 +44,9 @@ delivery_count = len(source_section_list)
for
item
in
object_list
:
source_section
=
item
.
Item_getCurrentOwnerValue
()
if
source_section
is
not
None
:
if
source_section
.
getUid
()
is
not
None
:
pl_value
=
pl_dict
[
str
(
source_section
.
getUid
())]
pl_value
=
pl_dict
[
str
(
source_section
.
getUid
())]
else
:
pl_value
=
pl_dict
[
'UID'
]
pl_value
=
pl_dict
[
'UID'
]
source
=
item
.
Item_getCurrentSiteValue
()
resource
=
item
.
Item_getResourceValue
()
...
...
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getAggregatedAmountList.py
View file @
3d24a52a
...
...
@@ -12,7 +12,7 @@ for line in result:
resource
=
line
.
getResourceValue
()
if
resource
is
not
None
:
sender
=
line
.
getResourceValue
().
getPurchaseSupplyLineSource
()
line
.
setCategoryMembership
(
'source'
,
sender
)
line
.
setCategoryMembership
(
'source'
,
sender
)
line
.
setCategoryMembership
(
'price_currency'
,
price_currency
)
return
result
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getTotalPrice.py
View file @
3d24a52a
...
...
@@ -16,7 +16,7 @@ if selection_name is not None:
resource
=
line
.
getResourceValue
()
if
resource
is
not
None
:
sender
=
line
.
getResourceValue
().
getPurchaseSupplyLineSource
()
line
.
setCategoryMembership
(
'source'
,
sender
)
line
.
setCategoryMembership
(
'source'
,
sender
)
line
.
setCategoryMembership
(
'price_currency'
,
price_currency
)
result
=
aal
.
getTotalPrice
()
...
...
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_generateRequirements.py
View file @
3d24a52a
...
...
@@ -52,12 +52,10 @@ for requirement_item in requirements_items:
has_1st_level_requirement
=
True
new_1st_level_requirement
=
[]
new_1st_level_requirement_title
=
requirement_item
[
'title'
]
description_dict
[
new_1st_level_requirement_title
]
=
''
else
:
has_1st_level_requirement
=
False
if
has_1st_level_requirement
:
description_dict
[
new_1st_level_requirement_title
]
=
''
# the item has a second level requirement, built it
if
requirement_item
[
'sub_title'
]
not
in
(
''
,
None
):
has_2nd_level_requirement
=
True
...
...
bt5/erp5_syncml/ModuleComponentTemplateItem/portal_components/module.erp5.ERP5Conduit.py
View file @
3d24a52a
...
...
@@ -477,6 +477,7 @@ class ERP5Conduit(XMLSyncUtilsMixin):
if get_target_parent:
result_list = result_list[:-1]
first_object = True
sub_context = None
while result_list:
object_block = result_list[0][0]
sub_context_id = result_list[0][3]
...
...
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_getFastInputLineList.py
View file @
3d24a52a
...
...
@@ -21,7 +21,7 @@ if line_portal_type in portal.getPortalSaleTypeList():
section_uid
=
context
.
getSourceSectionUid
()
elif
line_portal_type
in
portal
.
getPortalPurchaseTypeList
():
section_uid
=
context
.
getDestinationSectionUid
()
el
if
line_portal_type
in
portal
.
getPortalInternalTypeList
()
+
portal
.
getPortalInventoryMovementTypeList
()
:
el
se
:
section_uid
=
None
len_line_list
=
len
(
line_list
)
used_id
=
[]
# list use to make sure we do not generate two line with same id/uid
...
...
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_setFastInputLineList.py
View file @
3d24a52a
...
...
@@ -3,6 +3,8 @@
input information.It should take into account any trade document line
which were already created so that they are not duplicated.
"""
# pylint:disable=possibly-used-before-assignment
from
Products.ERP5Type.Message
import
translateString
portal
=
context
.
getPortalObject
()
...
...
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_updateFastInputLineList.py
View file @
3d24a52a
...
...
@@ -43,6 +43,7 @@ elif line_portal_type in portal.getPortalInternalTypeList():
elif
line_portal_type
in
portal
.
getPortalInventoryMovementTypeList
():
section_uid
=
None
no_inventory
=
True
supply_cell_portal_type
=
supply_line_id
=
None
use_list
=
portal
.
portal_preferences
.
getPreferredPurchaseUseList
()
\
+
portal
.
portal_preferences
.
getPreferredSaleUseList
()
else
:
...
...
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_activateGetOrderStatList.py
View file @
3d24a52a
...
...
@@ -51,6 +51,8 @@ elif aggregation_level == "week":
date_format
=
"%Y-%U"
elif
aggregation_level
==
"day"
:
date_format
=
"%Y-%m-%d"
else
:
raise
ValueError
(
"Unsupported aggregation_level: %s"
%
aggregation_level
)
if
from_date
is
not
None
and
at_date
is
not
None
:
catalog_params
[
'delivery.start_date'
]
=
{
...
...
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Base_convertHtmlToSingleFile.py
View file @
3d24a52a
...
...
@@ -247,6 +247,7 @@ if force_base_url:
root_url
=
"/"
.
join
(
base_url
.
split
(
"/"
,
3
)[:
3
])
if
root_url
!=
base_url
:
base_url
=
"/"
.
join
(
base_url
.
split
(
"/"
)[:
-
1
])
request_protocol
=
'https:'
else
:
request_protocol
=
context
.
REQUEST
.
SERVER_URL
.
split
(
":"
,
1
)[
0
]
+
":"
root_url
=
base_url_root_object
.
absolute_url
()
...
...
product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.ImmobilisableItem.py
View file @
3d24a52a
...
...
@@ -989,7 +989,8 @@ class ImmobilisableItem(Item, Amount):
raw_annuity_price
=
annuity_start_price
*
current_ratio
elif
price_calculation_basis
==
"period recalculated start price"
:
raw_annuity_price
=
local_period_start_price
*
current_ratio
else
:
raise
ValueError
(
"Unsupported price_calculation_basis: %s"
%
price_calculation_basis
)
# Apply the prorata temporis on the raw annuity value
if
annuity_number
and
\
price_calculation_basis
==
'period recalculated start price'
and
\
...
...
product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.AmountGeneratorMixin.py
View file @
3d24a52a
...
...
@@ -271,6 +271,7 @@ class AmountGeneratorMixin:
- is rounding really well supported (ie. before and after aggregation)
very likely not - proxying before or after must be decided
"""
# pylint:disable=self-cls-assignment,possibly-used-before-assignment
# It is the only place where we can import this
portal
=
self
.
getPortalObject
()
getRoundingProxy
=
portal
.
portal_roundings
.
getRoundingProxy
...
...
product/ERP5/bootstrap/erp5_core/ModuleComponentTemplateItem/portal_components/module.erp5.ExpandPolicy.py
View file @
3d24a52a
...
...
@@ -85,7 +85,7 @@ class _Policy(object):
if
attr
==
'merge_parent'
:
self
.
merge_parent
=
value
=
self
.
context
.
getRootAppliedRule
().
getPath
()
else
:
object
.
__getattribute__
(
self
,
attr
)
value
=
object
.
__getattribute__
(
self
,
attr
)
return
value
def
deferAll
(
self
):
...
...
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_validateRelation.py
View file @
3d24a52a
...
...
@@ -8,6 +8,7 @@ request=context.REQUEST
# We stop doing this
#base_category = context.getBaseCategoryId()
base_category
=
None
redirect_url
=
None
o
=
context
.
restrictedTraverse
(
object_path
)
...
...
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiableFieldList.py
View file @
3d24a52a
...
...
@@ -42,7 +42,7 @@ skin_id_list = context.getTemplateSkinIdList()
if
skin_id_list
:
if
bt_title
in
skin_id_list
:
main_skin_id
=
bt_title
el
if
skin_id_list
:
el
se
:
main_skin_id
=
skin_id_list
[
0
]
form_path
=
'%s/%s'
%
(
main_skin_id
,
field_library_id
)
form
=
getForm
(
portal
.
portal_skins
[
main_skin_id
],
field_library_id
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment