Skip to content

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

revert some commit to have nice diff later 

Revert "erp5_project: update Project_viewMilestone"

This reverts commit c79aae61.

Revert "erp5_project: add info_tooltip to TaskReportModule_viewPlanningReport/planning_box"

This reverts commit 69c540315d4727a368b324885802fe519cedcc81.

Revert "erp5_project: reword domain root and report root titles in Task Report Module listbox"

This reverts commit 1d141241.

Revert "erp5_project: don't use movement table anymore in ProjectModule_generateMilestoneReport"

This reverts commit 6f113ced.

Revert "erp5_project: add some forms"

This reverts commit e964f08a.

Revert "erp5_project: add images to detailed report for requirement document"

This reverts commit fa304045.

Revert "erp5_project: add Quantity and Quantity Unit columns to ProjectModule_viewMilestoneReport listbox"

This reverts commit e68e5fcb.

Revert "XXX erp5_project: don't send task notification to person without email address (DO UNIT TESTS XXX)"

This reverts commit b562e505.

Revert "XXX erp5_project: increase chance to find related project for update task fast input"

This reverts commit 6a50e704.

Revert "erp5_project: allow to cancel a task report from the stopped state"

This reverts commit 146833e6.
parent b4929dce
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 5979 deletions
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectDeliverableModule_viewProjectDeliverableList/listbox.xml deleted 100644 → 0
View file @ b4929dce
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>columns</string>
<string>selection_name</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox</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>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>columns</string> </key>
<value>
<list>
<tuple>
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_list_mode_listbox</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value>
<list>
<tuple>
<string>Project Deliverable</string>
<string>Project Deliverable</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>project_deliverable_module_selection</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Project Deliverables</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_generateMilestoneReport.xml
View file @ c3028f7e
...@@ -50,27 +50,46 @@ ...@@ -50,27 +50,46 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string>"""\n
"""\n
This script is in charge to retrive all milestones that\n This script is in charge to retrive all milestones that\n
match report parameters, then sort them and prepare data\n match report parameters, then sort them and prepare data\n
that will allows to generate temp objects for listbox\n that will allows to generate temp objects for listbox\n
"""\n """\n
listbox = []\n listbox = []\n
translateString = context.Base_translateString\n
portal = context.getPortalObject()\n portal = context.getPortalObject()\n
\n \n
query_kw = {}\n
\n
sql_kw = {}\n sql_kw = {}\n
if project_validation_state_list is not None and \\\n if project_validation_state_list is not None and \\\n
len(project_validation_state_list):\n len(project_validation_state_list):\n
sql_kw[\'validation_state\'] = project_validation_state_list\n sql_kw[\'validation_state\'] = project_validation_state_list\n
\n \n
from Products.ZSQLCatalog.SQLCatalog import Query, NegatedQuery, ComplexQuery\n
project_list = portal.portal_catalog(portal_type=\'Project\', **sql_kw)\n project_list = portal.portal_catalog(portal_type=\'Project\', **sql_kw)\n
project_uid_list = [x.uid for x in project_list]\n project_uid_list = [x.uid for x in project_list]\n
\n \n
\n
# the start date of milestones is only in the movement table\n
sql_kw = {}\n sql_kw = {}\n
query_list = []\n
if from_date is not None:\n
query_kw = {}\n
query_kw[\'movement.stop_date\'] = from_date\n
query_kw[\'range\'] = \'min\'\n
query_list.append(Query(**query_kw))\n
if at_date is not None:\n
query_kw = {}\n
query_kw[\'movement.stop_date\'] = at_date\n
query_kw[\'range\'] = \'ngt\'\n
query_list.append(Query(**query_kw))\n
if len(query_list):\n
query_kw = {\'operator\': \'AND\'}\n
sql_kw[\'query\'] = ComplexQuery(*query_list, **query_kw)\n
\n \n
select_dict = {}\n select_dict = {}\n
select_dict[\'movement.stop_date\'] = None\n
select_dict[\'title\'] = None\n select_dict[\'title\'] = None\n
select_dict[\'description\'] = None\n select_dict[\'description\'] = None\n
select_dict[\'parent_title\'] = None\n select_dict[\'parent_title\'] = None\n
...@@ -94,15 +113,6 @@ milestone_list.sort(key = lambda x: (x.parent_title, getattr(x, \'stop_date\', N ...@@ -94,15 +113,6 @@ milestone_list.sort(key = lambda x: (x.parent_title, getattr(x, \'stop_date\', N
for milestone in milestone_list:\n for milestone in milestone_list:\n
# We wish to display the project only for the first milestone\n # We wish to display the project only for the first milestone\n
# of this project\n # of this project\n
\n
# XXX These two statements below filter the result,\n
# we can increase speed by filtering directly from the catalog.\n
if from_date is not None:\n
if milestone.getStartDate() < from_date:\n
continue\n
if at_date is not None:\n
if milestone.getStopDate() >= at_date:\n
continue\n
line_kw = {}\n line_kw = {}\n
line_kw[\'project_title\'] = milestone.parent_title\n line_kw[\'project_title\'] = milestone.parent_title\n
line_kw[\'milestone_title\'] = milestone.title\n line_kw[\'milestone_title\'] = milestone.title\n
...@@ -113,9 +123,7 @@ for milestone in milestone_list:\n ...@@ -113,9 +123,7 @@ for milestone in milestone_list:\n
\n \n
context.Base_updateDialogForm(listbox=listbox, empty_line_number=0)\n context.Base_updateDialogForm(listbox=listbox, empty_line_number=0)\n
return context.ProjectModule_viewMilestoneReport()\n return context.ProjectModule_viewMilestoneReport()\n
</string> </value>
]]></string> </value>
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewMilestoneReport/listbox.xml
View file @ c3028f7e
...@@ -343,14 +343,6 @@ ...@@ -343,14 +343,6 @@
<string>milestone_outcome_description</string> <string>milestone_outcome_description</string>
<string>Outcome</string> <string>Outcome</string>
</tuple> </tuple>
<tuple>
<string>quantity</string>
<string>Quantity</string>
</tuple>
<tuple>
<string>quantity_unit</string>
<string>Quantity Unit</string>
</tuple>
<tuple> <tuple>
<string>stop_date</string> <string>stop_date</string>
<string>Stop Date</string> <string>Stop Date</string>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMilestone.xml
View file @ c3028f7e
...@@ -84,7 +84,6 @@ ...@@ -84,7 +84,6 @@
<string>listbox_int_index</string> <string>listbox_int_index</string>
<string>listbox_quantity</string> <string>listbox_quantity</string>
<string>listbox_stop_date</string> <string>listbox_stop_date</string>
<string>listbox_title</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMilestone/listbox.xml
View file @ c3028f7e
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
<value> <value>
<list> <list>
<string>all_columns</string> <string>all_columns</string>
<string>anchor</string>
<string>columns</string> <string>columns</string>
<string>editable_columns</string> <string>editable_columns</string>
<string>portal_types</string> <string>portal_types</string>
...@@ -126,10 +125,6 @@ ...@@ -126,10 +125,6 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>anchor</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>columns</string> </key> <key> <string>columns</string> </key>
<value> <value>
...@@ -158,12 +153,12 @@ ...@@ -158,12 +153,12 @@
<string>Index</string> <string>Index</string>
</tuple> </tuple>
<tuple> <tuple>
<string>stop_date</string> <string>quantity</string>
<string>End Date</string> <string>Estimated Time</string>
</tuple> </tuple>
<tuple> <tuple>
<string>title</string> <string>stop_date</string>
<string>Title</string> <string>End Date</string>
</tuple> </tuple>
</list> </list>
</value> </value>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMilestone/listbox_title.xml deleted 100644 → 0
View file @ b4929dce
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>display_width</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_title</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>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>display_width</string> </key>
<value> <int>80</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_title</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewDetailedReportAsOdt.xml
View file @ c3028f7e
...@@ -149,15 +149,6 @@ AAA=</string> </value> ...@@ -149,15 +149,6 @@ AAA=</string> </value>
<text:p text:style-name=\'Comment\'\n <text:p text:style-name=\'Comment\'\n
tal:condition="python: request.get(\'show_comment\') and requirement.getTranslatedComment()"\n tal:condition="python: request.get(\'show_comment\') and requirement.getTranslatedComment()"\n
tal:content="requirement/getTranslatedComment">Comment here</text:p>\n tal:content="requirement/getTranslatedComment">Comment here</text:p>\n
<tal:block tal:repeat="image python:here.portal_catalog(follow_up_uid=requirement.getUid(), portal_type=\'Image\')">\n
<text:p text:style-name="P1">\n
<draw:frame draw:style-name="fr1" draw:name="Image1" text:anchor-type="as-char" svg:width="3in" draw:z-index="0"\n
tal:attributes="draw:name python:\'embedded_erp5_image_%s\' % image.getId();\n
svg:height python: \'%1.1fin\' % (3.0 * image.getHeight() / (image.getWidth() or 1.0))">\n
<draw:image><office:binary-data tal:content="python:str(image.convert(format=\'png\')[1]).encode(\'base64\')" /></draw:image>\n
</draw:frame>\n
</text:p>\n
</tal:block>\n
</table:table-cell>\n </table:table-cell>\n
</table:table-row>\n </table:table-row>\n
</tal:block>\n </tal:block>\n
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewTimesheetReportDialog/your_format.xml deleted 100644 → 0
View file @ b4929dce
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_format</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>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string>Printing format</string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>your_format</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewDialogFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Format</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewPlanningReport/planning_box.xml
View file @ c3028f7e
...@@ -10,13 +10,12 @@ ...@@ -10,13 +10,12 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>info_tooltip</string> <string>title</string>
<string>list_method</string>
<string>portal_types</string>
<string>report_root_list</string> <string>report_root_list</string>
<string>round_script</string>
<string>selection_name</string> <string>selection_name</string>
<string>title</string> <string>portal_types</string>
<string>list_method</string>
<string>round_script</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -89,10 +88,6 @@ ...@@ -89,10 +88,6 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value> <value> <string>Base_viewFieldLibrary</string> </value>
</item> </item>
<item>
<key> <string>info_tooltip</string> </key>
<value> <string>getSourceTitle</string> </value>
</item>
<item> <item>
<key> <string>list_method</string> </key> <key> <string>list_method</string> </key>
<value> <value>
...@@ -153,7 +148,10 @@ ...@@ -153,7 +148,10 @@
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<global name="Method" module="Products.Formulator.MethodField"/> <tuple>
<global name="Method" module="Products.Formulator.MethodField"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewTaskReportList/listbox.xml
View file @ c3028f7e
...@@ -176,15 +176,11 @@ ...@@ -176,15 +176,11 @@
<list> <list>
<tuple> <tuple>
<string>region</string> <string>region</string>
<string>Region</string> <string>region</string>
</tuple>
<tuple>
<string>journal</string>
<string>Journal</string>
</tuple> </tuple>
<tuple> <tuple>
<string>validated_project_domain</string> <string>validated_project_domain</string>
<string>Open Projects</string> <string>Open Project</string>
</tuple> </tuple>
<tuple> <tuple>
<string>preferred_group_person_list_domain</string> <string>preferred_group_person_list_domain</string>
...@@ -237,7 +233,7 @@ ...@@ -237,7 +233,7 @@
<list> <list>
<tuple> <tuple>
<string>region</string> <string>region</string>
<string>Region</string> <string>region</string>
</tuple> </tuple>
<tuple> <tuple>
<string>preferred_group_person_list_domain</string> <string>preferred_group_person_list_domain</string>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_copyOrderPropertiesAndNotifyAssignee.xml
View file @ c3028f7e
...@@ -85,15 +85,12 @@ destination_decision_person = task_report.getDestinationDecisionValue(portal_typ ...@@ -85,15 +85,12 @@ destination_decision_person = task_report.getDestinationDecisionValue(portal_typ
if destination_decision_person is None:\n if destination_decision_person is None:\n
destination_decision_person = task_report.getDestinationValue(portal_type="Person")\n destination_decision_person = task_report.getDestinationValue(portal_type="Person")\n
\n \n
# We send a message only if the requester has an email\n # We send a message only if the requester have an email and the assignee \n
# and the assignee has one too and is an user that can view the task report.\n # is an user that can view the task report.\n
if (\n if source_person is not None \\\n
source_person is not None and\n and destination_decision_person is not None \\\n
source_person.getDefaultEmailText() and # XXX Add unit test: check if task confirmation works if assignee has no mail\n and destination_decision_person.getDefaultEmailText() \\\n
destination_decision_person is not None and\n and destination_decision_person.getReference():\n
destination_decision_person.getDefaultEmailText() and\n
destination_decision_person.getReference()\n
):\n
if len(portal.acl_users.erp5_users.getUserByLogin(source_person.getReference())):\n if len(portal.acl_users.erp5_users.getUserByLogin(source_person.getReference())):\n
message = """A new task has been assigned to you by %(assignor)s.\n message = """A new task has been assigned to you by %(assignor)s.\n
\n \n
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewTimesheetReportItem/listbox_stop_date.xml deleted 100644 → 0
View file @ b4929dce
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_stop_date</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>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_date_time_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Delivery Date</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewTimesheetReportItem/my_start_date.xml deleted 100644 → 0
View file @ b4929dce
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_start_date</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>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_date_time_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Starting</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewTimesheetReportItem/my_stop_date.xml deleted 100644 → 0
View file @ b4929dce
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_stop_date</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>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_date_time_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Due</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/Delivery_updateTaskFastInputDialog.xml
View file @ c3028f7e
...@@ -111,10 +111,7 @@ for line in line_list:\n ...@@ -111,10 +111,7 @@ for line in line_list:\n
error_message = None\n error_message = None\n
if result is None:\n if result is None:\n
result = portal.portal_catalog(portal_type=(\'Project\', \'Project Line\'),\n result = portal.portal_catalog(portal_type=(\'Project\', \'Project Line\'),\n
reference=line_source_project_title)\n title=line_source_project_title)\n
if len(result) == 0:\n
result = portal.portal_catalog(portal_type=(\'Project\', \'Project Line\'),\n
title=line_source_project_title)\n
project_search_dict[line_source_project_title] = result\n project_search_dict[line_source_project_title] = result\n
if len(result) == 0:\n if len(result) == 0:\n
error_message = "No such project"\n error_message = "No such project"\n
......
bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/stopped.xml
View file @ c3028f7e
...@@ -28,8 +28,6 @@ ...@@ -28,8 +28,6 @@
<key> <string>transitions</string> </key> <key> <string>transitions</string> </key>
<value> <value>
<tuple> <tuple>
<string>cancel</string>
<string>cancel_action</string>
<string>deliver</string> <string>deliver</string>
<string>deliver_action</string> <string>deliver_action</string>
<string>restart</string> <string>restart</string>
......
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