Skip to content

erp5
erp5
Commit fb0b7c82 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

Merge remote-tracking branch 'upstream/master' into zope4py2

parents 1226e496 76bc24f1
Hide whitespace changes
Inline Side-by-side
Showing with 391 additions and 51 deletions
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_guessGroupedLines.py
View file @ fb0b7c82
......@@ -4,17 +4,28 @@ If accounting_transaction_line_uid_list is not passed, this script assumes that
it's called on the context of an accounting transaction and it guess the grouping
of related accounting transactions using causality.
"""
import collections
from Products.ERP5Type.Utils import int2letter
# this dict associates (node, section, mirror_section, extra_grouping_parameter) to a list of
# accounting lines info (total_price, date and path)
lines_per_node = {}
# this counter associates the lines to the count of entities that are
# impacted by this accounting line.
# Typically it is 1 if the line is only for source/destination like in
# "normal" invoices and it can be 2 for Internal Invoices.
# When we found a match that can be grouped, we decrement this counter for
# this line. If all lines of the group have a 0 count, we can set grouping
# reference. This is a way to set grouping reference when the group is only
# valid for one side, it has to be valid for both side.
non_grouped_section_count = collections.Counter()
portal = context.getPortalObject()
allow_grouping_with_different_quantity = portal.portal_preferences.getPreference(
'preferred_grouping_with_different_quantities', 0)
if portal.portal_preferences.getPreference(
'preferred_grouping_with_different_quantities', False):
return
accounting_transaction_line_value_list = []
if accounting_transaction_line_uid_list is None:
......@@ -35,18 +46,22 @@ else:
uid=accounting_transaction_line_uid_list)
]
for line in accounting_transaction_line_value_list:
# source
section_relative_url = None
source_section = line.getSourceSectionValue(portal_type='Organisation')
if source_section is not None:
source_section = \
source_section.Organisation_getMappingRelatedOrganisation()
section_relative_url = source_section.getRelativeUrl()
lines_per_node.setdefault(
node_relative_url = line.getSource(portal_type='Account')
if node_relative_url:
section_relative_url = None
source_section = line.getSourceSectionValue(portal_type='Organisation')
if source_section is not None:
source_section = \
source_section.Organisation_getMappingRelatedOrganisation()
section_relative_url = source_section.getRelativeUrl()
line_relative_url = line.getRelativeUrl()
non_grouped_section_count.update({line_relative_url: 1})
lines_per_node.setdefault(
(
line.getSource(portal_type='Account'),
node_relative_url,
section_relative_url,
line.getDestinationSection(),
line.AccountingTransactionLine_getGroupingExtraParameterList(
......@@ -55,49 +70,68 @@ for line in accounting_transaction_line_value_list:
dict(
total_price=line.getSourceInventoriatedTotalAssetPrice() or 0,
date=line.getStartDate(),
path=line.getRelativeUrl()))
path=line_relative_url))
# destination
section_relative_url = None
destination_section = line.getDestinationSectionValue(
portal_type='Organisation')
if destination_section is not None:
destination_section = \
destination_section.Organisation_getMappingRelatedOrganisation()
section_relative_url = destination_section.getRelativeUrl()
lines_per_node.setdefault(
(
line.getDestination(portal_type='Account'),
section_relative_url,
line.getSourceSection(),
line.AccountingTransactionLine_getGroupingExtraParameterList(
source=False),
), []).append(
dict(
total_price=line.getDestinationInventoriatedTotalAssetPrice() or 0,
date=line.getStopDate(),
path=line.getRelativeUrl()))
node_relative_url = line.getDestination(portal_type='Account')
if node_relative_url:
section_relative_url = None
destination_section = line.getDestinationSectionValue(
portal_type='Organisation')
if destination_section is not None:
destination_section = \
destination_section.Organisation_getMappingRelatedOrganisation()
section_relative_url = destination_section.getRelativeUrl()
line_relative_url = line.getRelativeUrl()
non_grouped_section_count.update({line_relative_url: 1})
lines_per_node.setdefault(
(
node_relative_url,
section_relative_url,
line.getSourceSection(),
line.AccountingTransactionLine_getGroupingExtraParameterList(
source=False),
), []).append(
dict(
total_price=line.getDestinationInventoriatedTotalAssetPrice() or 0,
date=line.getStopDate(),
path=line_relative_url))
changed_line_set = set()
# We do two passes, a first pass to check if lines are groupable from both
# sides in case of internal invoices - then a second path to actually set
# grouping references on groups that were groupable from both sides.
for (
node,
section,
mirror_section,
_,
), line_info_list in lines_per_node.items():
if node is None:
continue
), line_info_list in list(lines_per_node.items()):
# get the currency rounding for this section, with a fallback that something that would
# allow grouping in case precision is not defined.
currency_precision = 5
if section:
default_currency = portal.restrictedTraverse(section).getPriceCurrencyValue()
default_currency = portal.restrictedTraverse(
section).getPriceCurrencyValue()
if default_currency is not None:
currency_precision = default_currency.getQuantityPrecision()
total_price = round(sum([l['total_price'] for l in line_info_list]), currency_precision)
if total_price == 0 or allow_grouping_with_different_quantity:
total_price = round(
sum([l['total_price'] for l in line_info_list]), currency_precision)
if total_price == 0:
for line in line_info_list:
non_grouped_section_count.subtract({line['path']: 1})
else:
# this group is not valid, remove it for second path
del lines_per_node[node, section, mirror_section, _]
changed_line_set = set()
for (
node,
section,
mirror_section,
_,
), line_info_list in lines_per_node.items():
if sum(non_grouped_section_count[line['path']] for line in line_info_list) == 0:
# we should include mirror node in the id_group, but this would reset
# id generators and generate grouping references that were already used.
id_group = ('grouping_reference', node, section, mirror_section)
......
bt5/erp5_accounting/TestTemplateItem/portal_components/test.erp5.testAccounting.py
View file @ fb0b7c82
......@@ -6304,12 +6304,13 @@ class TestInternalInvoiceTransaction(AccountingTestCase):
)
internal_invoice1.start()
internal_invoice1.newContent(
id='not_grouped',
id='line1',
source_value=self.portal.account_module.receivable,
destination_value=self.portal.account_module.payable,
source_debit=10,
)
internal_invoice1.newContent(
id='line2',
source_value=self.portal.account_module.goods_sales,
destination_value=self.portal.account_module.goods_purchase,
source_credit=10,
......@@ -6328,20 +6329,74 @@ class TestInternalInvoiceTransaction(AccountingTestCase):
)
internal_invoice2.start()
internal_invoice2.newContent(
id='line1',
source_value=self.portal.account_module.goods_sales,
destination_value=self.portal.account_module.payable,
source_debit=10,
)
internal_invoice2.newContent(
id='not_grouped',
id='line2',
source_value=self.portal.account_module.receivable,
destination_value=self.portal.account_module.goods_purchase,
source_debit=10,
)
internal_invoice2.stop()
self.tic()
self.assertFalse(internal_invoice1.not_grouped.getGroupingReference())
self.assertFalse(internal_invoice1.not_grouped.getGroupingReference())
self.assertFalse(internal_invoice1.line1.getGroupingReference())
self.assertFalse(internal_invoice1.line2.getGroupingReference())
self.assertFalse(internal_invoice2.line1.getGroupingReference())
self.assertFalse(internal_invoice2.line2.getGroupingReference())
def test_grouping_reference_both_sides_with_line_for_0(self):
# Lines for 0 are automatically grouped, but this takes care that the
# amount is also 0 for the mirror side.
# | Source Account | Debit | Credit | Grouping | Destination Account | Debit | Credit | Grouping |
# |----------------|-------|--------|----------|---------------------|-------|--------|----------|
# | receivable | 0 | | A | | | | |
# | sales | | 0 | | purchase | 10 | | |
# | | | | | payable | | 10 | |
# | | | | | receivable | | 0 | A |
#
internal_invoice1 = self.portal.accounting_module.newContent(
portal_type='Internal Invoice Transaction',
title='internal_invoice1',
source_section_value=self.section,
destination_section_value=self.main_section,
start_date=DateTime(2015, 1, 1),
created_by_builder=True,
)
# start before creating lines, because we don't want our lines to
# be initialized with mirror accounts.
internal_invoice1.start()
internal_invoice1.newContent(
id='line_1',
source_value=self.portal.account_module.receivable,
source_debit=0,
)
internal_invoice1.newContent(
id='line_2',
source_value=self.portal.account_module.goods_sales,
destination_value=self.portal.account_module.goods_purchase,
source_credit=0,
destination_asset_debit=10,
)
internal_invoice1.newContent(
id='line_3',
destination_value=self.portal.account_module.payable,
destination_asset_credit=10,
)
internal_invoice1.newContent(
id='line_4',
destination_value=self.portal.account_module.receivable,
destination_credit=0,
)
internal_invoice1.stop()
self.tic()
self.assertTrue(internal_invoice1.line_1.getGroupingReference())
self.assertFalse(internal_invoice1.line_2.getGroupingReference())
self.assertFalse(internal_invoice1.line_3.getGroupingReference())
self.assertTrue(internal_invoice1.line_4.getGroupingReference())
class TestAccountingAlarms(AccountingTestCase):
......
bt5/erp5_web_ui_test/PathTemplateItem/portal_tests/erp5_web_zuite/testWebPageSaveAndViewXHTMLStyle-reference-snapshot-1.png.xml 0 → 100644
View file @ fb0b7c82
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Image" module="OFS.Image"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__name__</string> </key>
<value> <string>testWebPageSaveAndViewXHTMLStyle-reference-snapshot-1.png</string> </value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>image/png</string> </value>
</item>
<item>
<key> <string>height</string> </key>
<value> <int>273</int> </value>
</item>
<item>
<key> <string>precondition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>testWebPageSaveAndViewXHTMLStyle-reference-snapshot-1.png</string> </value>
</item>
<item>
<key> <string>width</string> </key>
<value> <int>1115</int> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_web_ui_test/PathTemplateItem/portal_tests/erp5_web_zuite/testWebPageSaveAndViewXHTMLStyle.xml 0 → 100644
View file @ fb0b7c82
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>text/html</string> </value>
</item>
<item>
<key> <string>expand</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>testWebPageSaveAndViewXHTMLStyle</string> </value>
</item>
<item>
<key> <string>output_encoding</string> </key>
<value> <string>utf-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <unicode>Web Page Save and View with erp5_xhtml_style</unicode> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_web_ui_test/PathTemplateItem/portal_tests/erp5_web_zuite/testWebPageSaveAndViewXHTMLStyle.zpt 0 → 100644
View file @ fb0b7c82
<html xmlns:tal="http://xml.zope.org/namespaces/tal" xmlns:metal="http://xml.zope.org/namespaces/metal">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title tal:content="template/title_and_id"></title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
<tr>
<td rowspan="1" colspan="3" tal:content="template/title_and_id"></td>
</tr>
</thead>
<tbody>
<tal:block metal:use-macro="here/Zuite_erp5_web_common/macros/init" />
<tr>
<td>open</td>
<td>${base_url}/web_page_module/WebPageModule_createTestWebPage?id=test_web_page&amp;reference=test_web_page
</td>
<td></td>
<td></td>
</tr>
<tr>
<td>assertTextPresent</td>
<td>Created Successfully.</td>
<td></td>
<td></td>
</tr>
<tr>
<td>open</td>
<td>${base_url}/web_page_module/test_web_page/WebPage_viewEditor?editable_mode:int=1</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@data-gadget-scope="editor"]//iframe</td>
<td></td>
</tr>
<tr>
<!-- gadget iframe -->
<td>selectFrame</td>
<td>//div[@data-gadget-scope="editor"]//iframe</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//iframe</td>
<td></td>
</tr>
<tr>
<!-- CKEditor iframe -->
<td>selectFrame</td>
<td>//iframe</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//body</td>
<td></td>
</tr>
<tr>
<td>assertEval</td>
<td>
(function (){
selenium.browserbot.getCurrentWindow().document.body.innerHTML = `
&lt;h1&gt;Some Example content&lt;/h1&gt;
&lt;h2&gt;Tables&lt;/h2&gt;
&lt;table border="1"&gt;
&lt;caption&gt;A table with border=1&lt;/caption&gt;
&lt;thead&gt;
&lt;tr&gt;
&lt;th&gt;First&lt;/th&gt;
&lt;th&gt;Second&lt;/th&gt;
&lt;/tr&gt;
&lt;/thead&gt;
&lt;tbody&gt;
&lt;tr&gt;
&lt;td&gt;One&lt;/td&gt;
&lt;td&gt;Two&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;1&lt;/td&gt;
&lt;td&gt;2&lt;/td&gt;
&lt;/tr&gt;
&lt;/tbody&gt;
&lt;/table&gt;
&lt;table&gt;
&lt;caption&gt;A table without border=1&lt;/caption&gt;
&lt;thead&gt;
&lt;tr&gt;
&lt;th&gt;Third&lt;/th&gt;
&lt;th&gt;Forth&lt;/th&gt;
&lt;/tr&gt;
&lt;/thead&gt;
&lt;tbody&gt;
&lt;tr&gt;
&lt;td&gt;Three&lt;/td&gt;
&lt;td&gt;Four&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;3&lt;/td&gt;
&lt;td&gt;4&lt;/td&gt;
&lt;/tr&gt;
&lt;/tbody&gt;
&lt;/table&gt;
`;
return 'OK';
})()
<td>OK</td>
</tr>
<tr>
<td>selectFrame</td>
<td>relative=top</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>//button[@name="Base_edit:method"]</td>
<td></td>
</tr>
<tr>
<td>assertTextPresent</td>
<td>Data updated.</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=View</td>
<td></td>
</tr>
<tr>
<td>waitForText</td>
<td>//div[contains(@data-gadget-url, "gadget_html_viewer.html")]/h1</td>
<td>Some Example content</td>
</tr>
<tr>
<td>verifyImageMatchSnapshot</td>
<td>//div[contains(@data-gadget-url, "gadget_html_viewer.html")]</td>
<td></td>
</tr>
</tbody>
</table>
</body>
</html>
\ No newline at end of file
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_html_viewer.css.css
View file @ fb0b7c82
......@@ -125,7 +125,6 @@ div[data-gadget-url$="gadget_html_viewer.html"] listing {
div[data-gadget-url$="gadget_html_viewer.html"] table {
display: table;
border-spacing: 2px;
border: 1px solid #1F1F1F;
}
div[data-gadget-url$="gadget_html_viewer.html"] thead {
display: table-header-group;
......@@ -151,7 +150,6 @@ div[data-gadget-url$="gadget_html_viewer.html"] colgroup {
div[data-gadget-url$="gadget_html_viewer.html"] tr {
display: table-row;
vertical-align: middle;
border: 1px solid #1F1F1F;
padding: 0 6pt;
}
div[data-gadget-url$="gadget_html_viewer.html"] td,
......@@ -159,11 +157,16 @@ div[data-gadget-url$="gadget_html_viewer.html"] th {
display: table-cell;
vertical-align: inherit;
padding: 0 6pt;
border: 1px solid #1F1F1F;
}
div[data-gadget-url$="gadget_html_viewer.html"] th {
font-weight: bold;
}
div[data-gadget-url$="gadget_html_viewer.html"] table[border="1"],
div[data-gadget-url$="gadget_html_viewer.html"] table[border="1"] tr,
div[data-gadget-url$="gadget_html_viewer.html"] table[border="1"] th,
div[data-gadget-url$="gadget_html_viewer.html"] table[border="1"] td {
border: 1px solid #1F1F1F;
}
div[data-gadget-url$="gadget_html_viewer.html"] caption {
display: table-caption;
text-align: -webkit-center;
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_html_viewer.less.txt
View file @ fb0b7c82
......@@ -140,7 +140,6 @@ div[data-gadget-url$="gadget_html_viewer.html"] {
table {
display: table;
border-spacing: 2px;
border: 1px solid @colorforeground;
}
thead {
display: table-header-group;
......@@ -167,7 +166,6 @@ colgroup {
tr {
display: table-row;
vertical-align: middle;
border: 1px solid @colorforeground;
padding: 0 @margin-size;
}
......@@ -175,11 +173,18 @@ td, th {
display: table-cell;
vertical-align: inherit;
padding: 0 @margin-size;
border: 1px solid @colorforeground;
}
th {
font-weight: bold;
}
table[border="1"],
table[border="1"] tr,
table[border="1"] th,
table[border="1"] td {
border: 1px solid @colorforeground;
}
caption {
display: table-caption;
text-align: -webkit-center;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7