Skip to content

erp5
erp5
Commit 7811f2cd authored by Sebastien Robin's avatar Sebastien Robin
Browse files
Options

rename objectValues to contentValues in some listbox (by Aurelien) 

fixed some worklists

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11270 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 6a61a53a
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 35 deletions
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPayment_viewAccounting/listbox.xml
View file @ 7811f2cd
......@@ -459,6 +459,10 @@
<list/>
</value>
</item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
......@@ -496,7 +500,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>banking_operation_line_selection</string> </value>
<value> <string>check_payment_banking_operation_line_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
......@@ -564,7 +568,7 @@
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>objectValues</string> </value>
<value> <string>contentValues</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDelivery_view/listbox.xml
View file @ 7811f2cd
......@@ -461,7 +461,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>checkbook_delivery_selection</string> </value>
<value> <string>checkbook_delivery_line_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
......@@ -515,7 +515,7 @@
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>objectValues</string> </value>
<value> <string>contentValues</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookMovement_view/listbox.xml
View file @ 7811f2cd
......@@ -440,6 +440,10 @@
<list/>
</value>
</item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
......@@ -477,7 +481,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>checkbook_movement_selection</string> </value>
<value> <string>checkbook_movement_line_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
......@@ -531,7 +535,7 @@
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>objectValues</string> </value>
<value> <string>contentValues</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/listbox.xml
View file @ 7811f2cd
......@@ -481,7 +481,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>checkbook_reception_selection</string> </value>
<value> <string>checkbook_reception_line_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
......@@ -535,7 +535,7 @@
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>objectValues</string> </value>
<value> <string>contentValues</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookUsualCashTransfer_view/listbox.xml
View file @ 7811f2cd
......@@ -440,6 +440,10 @@
<list/>
</value>
</item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
......@@ -477,7 +481,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>checkbook_vault_transfer_selection</string> </value>
<value> <string>checkbook_usual_cash_transfer_line_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
......@@ -531,7 +535,7 @@
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>objectValues</string> </value>
<value> <string>contentValues</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookVaultTransfer_view/listbox.xml
View file @ 7811f2cd
......@@ -440,6 +440,10 @@
<list/>
</value>
</item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
......@@ -477,7 +481,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>checkbook_vault_transfer_selection</string> </value>
<value> <string>checkbook_vault_transfer_line_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
......@@ -531,7 +535,7 @@
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>objectValues</string> </value>
<value> <string>contentValues</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/reject_action.xml
View file @ 7811f2cd
......@@ -117,7 +117,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python:len(here.searchFolder(portal_type=\'Check Payment Line\'))==0</string> </value>
<value> <string>python:len(here.objectValues(portal_type=\'Check Payment Line\'))==0</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/worklists/confirmed.xml
View file @ 7811f2cd
......@@ -24,19 +24,19 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Vault Transfers To Validate (%(count)s)</string> </value>
<value> <string>Checkbook Movements To Validate (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
Base_viewWorklist?simulation_state=confirmed&reset=1&portal_type=Vault Transfer
Base_viewWorklist?simulation_state=confirmed&reset=1&portal_type=Checkbook Movement
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Vault Transfers To Validate</string> </value>
<value> <string>Checkbook Movements To Validate</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/worklists/draft.xml
View file @ 7811f2cd
......@@ -30,7 +30,7 @@
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
Base_viewWorklist?simulation_state=draft&portal_type=Vault Transfer&reset=1
Base_viewWorklist?simulation_state=draft&portal_type=Checkbook Movement&reset=1
]]></string> </value>
</item>
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/worklists/ordered.xml
View file @ 7811f2cd
......@@ -24,19 +24,19 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Vault Transfers To Validate (%(count)s)</string> </value>
<value> <string>Checkbook Movements To Validate (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
Base_viewWorklist?simulation_state=planned&reset=1&portal_type=Vault Transfer
Base_viewWorklist?simulation_state=planned&reset=1&portal_type=Checkbook Movement
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Vault Transfers To Validate</string> </value>
<value> <string>Checkbook Movements To Validate</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/worklists/planned.xml
View file @ 7811f2cd
......@@ -24,19 +24,19 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Vault Transfers To Validate By Vault Controler (%(count)s)</string> </value>
<value> <string>Checkbook Movements To Validate By Vault Controler (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
Base_viewWorklist?simulation_state=planned&reset=1&portal_type=Vault Transfer
Base_viewWorklist?simulation_state=planned&reset=1&portal_type=Checkbook Movement
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Vault Transfers To Validate By Vault Controler</string> </value>
<value> <string>Checkbook Movements To Validate By Vault Controler</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/worklists/confirmed.xml
View file @ 7811f2cd
......@@ -24,19 +24,19 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Checkbooks Vault Transfers To Validate (%(count)s)</string> </value>
<value> <string>Checkbook Usual Cash Transfer To Validate (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
Base_viewWorklist?simulation_state=confirmed&reset=1&portal_type=Vault Transfer
Base_viewWorklist?simulation_state=confirmed&reset=1&portal_type=Checkbook Usual Cash Transfer
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Checkbooks Vault Transfers To Deliver</string> </value>
<value> <string>Checkbook Usual Cash Transfers To Deliver</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/scripts/liftPositionAccounting.xml
View file @ 7811f2cd
......@@ -79,10 +79,10 @@ if source is None:\n
msg = Message(domain=\'ui\', message=\'No counter defined.\')\n
raise ValidationFailed, (msg,)\n
\n
# check we are in an opened accounting day\n
if not transaction.Baobab_checkCounterDateOpen(site=source, date=date):\n
msg = Message(domain = "ui", message="Counter Date is not opened")\n
raise ValidationFailed, (msg,)\n
# No need to check the counter date for stop payment\n
#if not transaction.Baobab_checkCounterDateOpen(site=source, date=date):\n
# msg = Message(domain = "ui", message="Counter Date is not opened")\n
# raise ValidationFailed, (msg,)\n
\n
# First we have to look if we have some checks with some prices,\n
# if so, this means that we are saling such kinds of check, thus\n
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/scripts/validatePositionAccounting.xml
View file @ 7811f2cd
......@@ -81,10 +81,10 @@ if source is None:\n
msg = Message(domain=\'ui\', message=\'No counter defined.\')\n
raise ValidationFailed, (msg,)\n
\n
# check we are in an opened accounting day\n
if not transaction.Baobab_checkCounterDateOpen(site=source, date=date):\n
msg = Message(domain = "ui", message="Counter Date is not opened")\n
raise ValidationFailed, (msg,)\n
# No need for stop payment to check the counter date\n
#if not transaction.Baobab_checkCounterDateOpen(site=source, date=date):\n
# msg = Message(domain = "ui", message="Counter Date is not opened")\n
# raise ValidationFailed, (msg,)\n
\n
ref_min = transaction.getReferenceRangeMin()\n
ref_max = transaction.getReferenceRangeMax()\n
......
bt5/erp5_banking_check/bt/revision
View file @ 7811f2cd
51
\ No newline at end of file
55
\ No newline at end of file
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