Skip to content

erp5
erp5
Commit d0a2a81c authored by Tristan Cavelier's avatar Tristan Cavelier
Browse files
Options

revert some commits to have nice diff output later 

Revert "erp5_project: translate title and description in sale order detailed report"

This reverts commit 54cfebfc.

Revert "erp5_project: translate title and comment in project coverage list"

This reverts commit 75710ed0.

Revert "erp5_project: translate comment and description in requirement view"

This reverts commit fa3b4c3a.
parent ccf1c354
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 572 deletions
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getProjectCoverageList.xml
View file @ d0a2a81c
...@@ -58,8 +58,8 @@ for r in context.contentValues(portal_type= "Requirement", sort_on = ((\'int_ind ...@@ -58,8 +58,8 @@ for r in context.contentValues(portal_type= "Requirement", sort_on = ((\'int_ind
if not requirement_related_list:\n if not requirement_related_list:\n
if not r.contentValues(portal_type= "Requirement", sort_on = ((\'int_index\',\'ascending\', \'int\'),), checked_permission=\'View\'):\n if not r.contentValues(portal_type= "Requirement", sort_on = ((\'int_index\',\'ascending\', \'int\'),), checked_permission=\'View\'):\n
result.append({\'requirement_reference\': r.Requirement_getDefaultReference(),\n result.append({\'requirement_reference\': r.Requirement_getDefaultReference(),\n
\'requirement_title\': r.getTranslatedTitle(),\n \'requirement_title\': r.getTitle(),\n
\'requirement_comment\': r.getTranslatedComment(),\n \'requirement_comment\': r.getComment(),\n
\'repeat_index\' : 0,\n \'repeat_index\' : 0,\n
\'repeat_count\' : 1,\n \'repeat_count\' : 1,\n
\'project_reference\': \'Not covered\',\n \'project_reference\': \'Not covered\',\n
...@@ -69,12 +69,12 @@ for r in context.contentValues(portal_type= "Requirement", sort_on = ((\'int_ind ...@@ -69,12 +69,12 @@ for r in context.contentValues(portal_type= "Requirement", sort_on = ((\'int_ind
i = 0\n i = 0\n
for p in requirement_related_list:\n for p in requirement_related_list:\n
result.append({\'requirement_reference\': r.Requirement_getDefaultReference(),\n result.append({\'requirement_reference\': r.Requirement_getDefaultReference(),\n
\'requirement_title\': r.getTranslatedTitle(),\n \'requirement_title\': r.getTitle(),\n
\'requirement_comment\': r.getTranslatedComment(),\n \'requirement_comment\': r.getComment(),\n
\'repeat_index\' : i,\n \'repeat_index\' : i,\n
\'repeat_count\' : requirement_related_count,\n \'repeat_count\' : requirement_related_count,\n
\'project_reference\': p.Project_getDefaultReference(),\n \'project_reference\': p.Project_getDefaultReference(),\n
\'project_title\': p.getTranslatedTitle(),\n \'project_title\': p.getTitle(),\n
\'stop_date\': p.getStopDate()})\n \'stop_date\': p.getStopDate()})\n
i += 1\n i += 1\n
result.extend(r.RequirementDocument_getProjectCoverageList())\n result.extend(r.RequirementDocument_getProjectCoverageList())\n
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view.xml
View file @ d0a2a81c
...@@ -75,7 +75,6 @@ ...@@ -75,7 +75,6 @@
<value> <value>
<list> <list>
<string>my_description</string> <string>my_description</string>
<string>my_translated_description</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -114,7 +113,6 @@ ...@@ -114,7 +113,6 @@
<string>my_source_decision_title</string> <string>my_source_decision_title</string>
<string>my_initial_implementation_state</string> <string>my_initial_implementation_state</string>
<string>my_comment</string> <string>my_comment</string>
<string>my_translated_comment</string>
<string>my_translated_validation_state_title</string> <string>my_translated_validation_state_title</string>
</list> </list>
</value> </value>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_translated_comment.xml deleted 100644 → 0
View file @ ccf1c354
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="TextAreaField" module="Products.Formulator.StandardFields"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>my_translated_comment</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
<item>
<key> <string>line_too_long</string> </key>
<value> <string>A line was too long.</string> </value>
</item>
<item>
<key> <string>required_not_found</string> </key>
<value> <string>Input is required but no input given.</string> </value>
</item>
<item>
<key> <string>too_long</string> </key>
<value> <string>You entered too many characters.</string> </value>
</item>
<item>
<key> <string>too_many_lines</string> </key>
<value> <string>You entered too many lines.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>height</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_linelength</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_lines</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>width</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>height</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_linelength</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_lines</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>width</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>height</string> </key>
<value> <int>5</int> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_linelength</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_lines</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Translated Comment</string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>width</string> </key>
<value> <int>40</int> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_translated_description.xml deleted 100644 → 0
View file @ ccf1c354
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="TextAreaField" module="Products.Formulator.StandardFields"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>my_translated_description</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
<item>
<key> <string>line_too_long</string> </key>
<value> <string>A line was too long.</string> </value>
</item>
<item>
<key> <string>required_not_found</string> </key>
<value> <string>Input is required but no input given.</string> </value>
</item>
<item>
<key> <string>too_long</string> </key>
<value> <string>You entered too many characters.</string> </value>
</item>
<item>
<key> <string>too_many_lines</string> </key>
<value> <string>You entered too many lines.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>height</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_linelength</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_lines</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>width</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>height</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_linelength</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_lines</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>width</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>height</string> </key>
<value> <int>5</int> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_linelength</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_lines</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Translated Description</string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>width</string> </key>
<value> <int>40</int> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportMacro.xml
View file @ d0a2a81c
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<!-- Display Lines -->\n <!-- Display Lines -->\n
<tal:block tal:repeat="line_item python:current_line.contentValues(portal_type=\'Sale Order Line\', sort_on = ((\'int_index\',\'ascending\', \'int\'),))">\n <tal:block tal:repeat="line_item python:current_line.contentValues(portal_type=\'Sale Order Line\', sort_on = ((\'int_index\',\'ascending\', \'int\'),))">\n
<text:h text:outline-level=\'1\' text:style-name=\'Heading_20_1\'\n <text:h text:outline-level=\'1\' text:style-name=\'Heading_20_1\'\n
tal:content="line_item/getTranslatedTitle"\n tal:content="line_item/getTitle"\n
tal:attributes="text:outline-level python:\'%s\' % depth;\n tal:attributes="text:outline-level python:\'%s\' % depth;\n
text:style-name python:\'Heading_20_%s\' % depth">Sale Order Line</text:h>\n text:style-name python:\'Heading_20_%s\' % depth">Sale Order Line</text:h>\n
<text:p text:style-name=\'Project_20_Box\'>\n <text:p text:style-name=\'Project_20_Box\'>\n
...@@ -99,10 +99,10 @@ ...@@ -99,10 +99,10 @@
</text:p>\n </text:p>\n
<text:p text:style-name=\'Project_20_Box\' tal:condition="line_item/getSourceTitleList">\n <text:p text:style-name=\'Project_20_Box\' tal:condition="line_item/getSourceTitleList">\n
<text:span text:style-name=\'T1\' i18n:translate="Resources" i18n:domain="erp5_ui">Resources</text:span>: <tal:block tal:replace="python:\', \'.join(line_item.getSourceTradeTitleList([]))">JP Smets, B. Faye</tal:block></text:p>\n <text:span text:style-name=\'T1\' i18n:translate="Resources" i18n:domain="erp5_ui">Resources</text:span>: <tal:block tal:replace="python:\', \'.join(line_item.getSourceTradeTitleList([]))">JP Smets, B. Faye</tal:block></text:p>\n
<text:p text:style-name=\'Project_20_Box\' tal:condition="line_item/getTranslatedOutcomeDescription">\n <text:p text:style-name=\'Project_20_Box\' tal:condition="line_item/getOutcomeDescription">\n
<text:span text:style-name=\'T1\' i18n:translate="Result" i18n:domain="erp5_ui">Result</text:span>: <tal:block tal:replace="line_item/getOutcomeDescription">description of result</tal:block>\n <text:span text:style-name=\'T1\' i18n:translate="Result" i18n:domain="erp5_ui">Result</text:span>: <tal:block tal:replace="line_item/getOutcomeDescription">description of result</tal:block>\n
</text:p>\n </text:p>\n
<tal:block tal:repeat="partial_description python: line_item.getTranslatedDescription().split(\'\\n\')">\n <tal:block tal:repeat="partial_description python: line_item.getDescription().split(\'\\n\')">\n
<text:p text:style-name=\'Text_20_body\' tal:content="partial_description">Project Line description</text:p>\n <text:p text:style-name=\'Text_20_body\' tal:content="partial_description">Project Line description</text:p>\n
</tal:block>\n </tal:block>\n
<tal:block tal:define="global current_line python:line_item"/>\n <tal:block tal:define="global current_line python:line_item"/>\n
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
<tal:block tal:define="global depth python:depth + 1"/>\n <tal:block tal:define="global depth python:depth + 1"/>\n
<text:h text:outline-level=\'1\' text:style-name=\'Heading_20_1\'\n <text:h text:outline-level=\'1\' text:style-name=\'Heading_20_1\'\n
tal:attributes="text:outline-level python:\'%s\' % depth;\n tal:attributes="text:outline-level python:\'%s\' % depth;\n
text:style-name python:\'Heading_20_%s\' % depth"><tal:block i18n:translate="Milestone:" i18n:domain="erp5_ui">Milestone: </tal:block><tal:block tal:content="line_item/getTranslatedTitle">Project Line</tal:block></text:h>\n text:style-name python:\'Heading_20_%s\' % depth"><tal:block i18n:translate="Milestone:" i18n:domain="erp5_ui">Milestone: </tal:block><tal:block tal:content="line_item/getTitle">Project Line</tal:block></text:h>\n
<text:p text:style-name=\'Project_20_Box\'>\n <text:p text:style-name=\'Project_20_Box\'>\n
<text:span text:style-name=\'T1\' i18n:translate="" i18n:domain="erp5_ui">ID</text:span>: <tal:block tal:replace="line_item/Project_getDefaultReference">description of result</tal:block>\n <text:span text:style-name=\'T1\' i18n:translate="" i18n:domain="erp5_ui">ID</text:span>: <tal:block tal:replace="line_item/Project_getDefaultReference">description of result</tal:block>\n
<tal:block tal:condition="line_item/getRequirementValueList">\n <tal:block tal:condition="line_item/getRequirementValueList">\n
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
</tal:block>\n </tal:block>\n
<text:span text:style-name=\'T1\' i18n:translate="End" i18n:domain="erp5_ui">End</text:span>: <tal:block tal:replace="line_item/getStopDate">2006-01-01</tal:block>\n <text:span text:style-name=\'T1\' i18n:translate="End" i18n:domain="erp5_ui">End</text:span>: <tal:block tal:replace="line_item/getStopDate">2006-01-01</tal:block>\n
</text:p>\n </text:p>\n
<tal:block tal:repeat="partial_description python: line_item.getTranslatedDescription().split(\'\\n\')">\n <tal:block tal:repeat="partial_description python: line_item.getDescription().split(\'\\n\')">\n
<text:p text:style-name=\'Text_20_body\' tal:content="partial_description">Milestone description</text:p>\n <text:p text:style-name=\'Text_20_body\' tal:content="partial_description">Milestone description</text:p>\n
</tal:block>\n </tal:block>\n
\n \n
......
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