Skip to content

erp5
erp5
Commit 06fd978c authored by Leonardo Rochael Almeida's avatar Leonardo Rochael Almeida
Browse files
Options

Merge commit '31c502de' into catalog_join

parents 9cd33359 31c502de
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2010 additions and 131 deletions
bt5/erp5_dhtml_style/SkinTemplateItem/portal_skins/erp5_dhtml_style/live_test.js.xml
View file @ 06fd978c
......@@ -12,7 +12,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts00095498.85</string> </value>
<value> <string>ts20671633.65</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
......@@ -25,9 +25,13 @@
<item>
<key> <string>data</string> </key>
<value> <string>$(document).ready(function(){\n
\n
var my_url_run_test = $(document)[0].baseURI + \'runLiveTest\'\n
var my_url_read_test = $(document)[0].baseURI + \'readTestOutput\'\n
if (jQuery("*[name=\'field_your_test\']").length==0){\n
// not in proper page no need to continue\n
return ;\n
}\n
\n
var test = jQuery("*[name=\'field_your_test\']")[0].defaultValue\n
var run_only = jQuery("*[name=\'field_your_run_only\']")[0].defaultValue\n
var debug = 0\n
......@@ -86,7 +90,7 @@
</item>
<item>
<key> <string>size</string> </key>
<value> <int>1813</int> </value>
<value> <int>1938</int> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_dhtml_style/bt/revision
View file @ 06fd978c
11
\ No newline at end of file
12
\ No newline at end of file
bt5/erp5_jquery/PathTemplateItem/portal_skins/erp5_jquery/jquery/core/jquery.js.xml
View file @ 06fd978c
This source diff could not be displayed because it is too large. You can view the blob instead.
bt5/erp5_jquery/bt/change_log
View file @ 06fd978c
201111-07 kazuhiko
* jQuery Core 1.7.
201110-19 kazuhiko
* jQuery Core 1.6.4.
......
bt5/erp5_jquery/bt/description
View file @ 06fd978c
This Business Template contains jQuery Core.
Current version is jquery-1.6.4.
Current version is jQuery 1.7.
\ No newline at end of file
bt5/erp5_jquery/bt/revision
View file @ 06fd978c
12
\ No newline at end of file
13
\ No newline at end of file
bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui.xml
View file @ 06fd978c
......@@ -31,7 +31,7 @@
</item>
<item>
<key> <string>business_template_skin_layer_priority</string> </key>
<value> <float>250.0</float> </value>
<value> <float>10.0</float> </value>
</item>
<item>
<key> <string>id</string> </key>
......
bt5/erp5_mobile/bt/revision
View file @ 06fd978c
66
\ No newline at end of file
67
\ No newline at end of file
bt5/erp5_payment_mean/PortalTypeTemplateItem/portal_types/Payment%20Transaction%20Group.xml
View file @ 06fd978c
......@@ -69,7 +69,7 @@
</item>
<item>
<key> <string>type_class</string> </key>
<value> <string>Item</string> </value>
<value> <string>Delivery</string> </value>
</item>
<item>
<key> <string>type_interface</string> </key>
......
bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroupModule_viewPaymentTransactionGroupList.xml
View file @ 06fd978c
......@@ -88,7 +88,9 @@
<item>
<key> <string>hidden</string> </key>
<value>
<list/>
<list>
<string>listbox_delivery_stop_date</string>
</list>
</value>
</item>
<item>
......
bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroupModule_viewPaymentTransactionGroupList/listbox.xml
View file @ 06fd978c
......@@ -89,7 +89,7 @@
<string>Title</string>
</tuple>
<tuple>
<string>delivery_start_date</string>
<string>delivery.stop_date</string>
<string>Date</string>
</tuple>
<tuple>
......@@ -120,9 +120,13 @@
<string>Title</string>
</tuple>
<tuple>
<string>delivery_start_date</string>
<string>delivery.stop_date</string>
<string>Date</string>
</tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>payment_mode_translated_title</string>
<string>Payment Mode</string>
......
bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroupModule_viewPaymentTransactionGroupList/listbox_delivery_stop_date.xml 0 → 100644
View file @ 06fd978c
<?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>date_only</string>
<string>editable</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_delivery_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>date_only</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>your_date</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_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getGroupablePaymentTransactionLineList.xml
View file @ 06fd978c
......@@ -54,12 +54,16 @@
\n
search_kw = dict(\n
parent_portal_type=\'Payment Transaction\',\n
limit=None,\n
simulation_state=(\'delivered\', \'stopped\'),\n
section_uid=context.getSourceSectionUid(),\n
payment_uid=context.getSourcePaymentUid(),\n
resource_uid=context.getPriceCurrencyUid(),\n
node_category=\'account_type/asset/cash/bank\',\n
# group_by=(\'parent_uid\', ), # The limit is not applied on the number of payment transactions, but on the number of lines (to simplify setting aggregate relation).\n
\n
# For better performance, add \'payment_transaction_group_aggregate_uid\' column in stock table\n
# and use payment_transaction_group_aggregate_uid=None here\n
where_expression= """\n
NOT EXISTS (\n
SELECT * FROM\n
......@@ -74,28 +78,40 @@ NOT EXISTS (\n
""" % portal.portal_categories.aggregate.getUid()\n
)\n
\n
if context.isMemberOf(\'payment_transaction_group_type/incoming\'):\n
search_kw[\'omit_asset_decrease\'] = True\n
if context.isMemberOf(\'payment_transaction_group_type/outgoing\'):\n
search_kw[\'omit_asset_increase\'] = True\n
\n
if context.getPaymentMode():\n
search_kw[\'payment_transaction_line_payment_mode_uid\'] = context.getPaymentModeUid()\n
\n
if context.getQuantityRangeMax():\n
search_kw[\'limit\'] = int(context.getQuantityRangeMax())\n
if limit:\n
search_kw[\'limit\'] = limit\n
\n
if start_date_range_max:\n
search_kw[\'at_date\'] = start_date_range_max.latestTime()\n
if start_date_range_min:\n
search_kw[\'from_date\'] = start_date_range_min\n
\n
if sign == \'out\':\n
search_kw[\'omit_asset_increase\'] = True\n
elif sign == \'in\':\n
search_kw[\'omit_asset_decrease\'] = True\n
\n
movement_history_list = portal.portal_simulation.getMovementHistoryList(**search_kw)\n
\n
if context.getStartDateRangeMax():\n
search_kw[\'at_date\'] = context.getStartDateRangeMax().latestTime()\n
if context.getStartDateRangeMin():\n
search_kw[\'from_date\'] = context.getStartDateRangeMin()\n
# XXX this will be read by PaymentTransactionGroup_statGroupablePaymentTransactionLineList\n
# ( we could be using getInventoryStat there but this does not support limit\n
# parameter )\n
stat_total_quantity = 0\n
if movement_history_list:\n
stat_total_quantity = movement_history_list[-1].running_total_quantity\n
container.REQUEST.set(\n
\'PaymentTransactionGroup_statGroupablePaymentTransactionLineList.total_quantity\',\n
stat_total_quantity)\n
\n
return portal.portal_simulation.getMovementHistoryList(**search_kw)\n
return movement_history_list\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>**kw</string> </value>
<value> <string>limit=None, start_date_range_min=None, start_date_range_max=None, sign=None, **kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
......
bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getGroupedPaymentTransactionLineList.xml → bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getPaymentTransactionLineList.xml
View file @ 06fd978c
......@@ -68,7 +68,7 @@ return portal.portal_simulation.getMovementHistoryList(**search_kw)\n
</item>
<item>
<key> <string>id</string> </key>
<value> <string>PaymentTransactionGroup_getGroupedPaymentTransactionLineList</string> </value>
<value> <string>PaymentTransactionGroup_getPaymentTransactionLineList</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_selectPaymentTransactionLineList.xml 0 → 100644
View file @ 06fd978c
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<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_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<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>_body</string> </key>
<value> <string>from Products.ERP5Type.Message import translateString\n
tag = \'PaymentTransactionGroup_selectPaymentTransactionList\'\n
\n
context.serialize()\n
\n
if context.getPortalObject().portal_activities.countMessageWithTag(tag,):\n
return context.Base_redirect(form_id, keep_items=dict(portal_status_message=translateString(\n
"Some payments are still beeing processed in the background, please retry later")))\n
\n
context.activate(tag=tag).PaymentTransactionGroup_selectPaymentTransactionLineListActive(\n
limit=limit,\n
start_date_range_min=start_date_range_min,\n
start_date_range_max=start_date_range_max,\n
sign=sign,\n
tag=tag)\n
\n
return context.Base_redirect(form_id,\n
keep_items=dict(portal_status_message=translateString(\'Payment selection in progress.\')))\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>form_id=\'view\', limit=None, start_date_range_min=None, start_date_range_max=None, sign=None, **kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>PaymentTransactionGroup_selectPaymentTransactionLineList</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_selectPaymentTransactionLineListActive.xml 0 → 100644
View file @ 06fd978c
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<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_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<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>_body</string> </key>
<value> <string>batch_size = 100\n
priority = 1\n
\n
activate_kw = dict(tag=tag, priority=priority)\n
\n
aggregate = context.getRelativeUrl()\n
\n
payment_relative_url_list = [brain.relative_url for brain\n
in context.PaymentTransactionGroup_getGroupablePaymentTransactionLineList(\n
limit=limit,\n
start_date_range_min=start_date_range_min,\n
start_date_range_max=start_date_range_max,\n
sign=sign,)]\n
\n
object_list_len = len(payment_relative_url_list)\n
activate = context.getPortalObject().portal_activities.activate\n
for i in xrange(0, object_list_len, batch_size):\n
current_path_list = payment_relative_url_list[i:i+batch_size]\n
activate(activity=\'SQLQueue\', activate_kw=activate_kw,).callMethodOnObjectList(\n
current_path_list,\n
\'PaymentTransactionLine_setAggregate\',\n
aggregate=aggregate,\n
activate_kw=activate_kw)\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>limit=None, start_date_range_min=None, start_date_range_max=None, sign=None, tag=\'\'</string> </value>
</item>
<item>
<key> <string>_proxy_roles</string> </key>
<value>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>PaymentTransactionGroup_selectPaymentTransactionLineListActive</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payment_mean/WorkflowTemplateItem/portal_workflow/payment_transaction_group_validation_workflow/scripts/DCWorkflow_close.xml → bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_statGroupablePaymentTransactionLineList.xml
View file @ 06fd978c
......@@ -50,17 +50,18 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>tag=\'PaymentTransactionGroup_close\'\n
sci[\'object\'].activate(tag=tag).PaymentTransactionGroup_close(tag=tag)\n
<value> <string># request is filled by PaymentTransactionGroup_getGroupablePaymentTransactionLineList\n
from Products.PythonScripts.standard import Object\n
return Object(total_quantity=container.REQUEST[\'PaymentTransactionGroup_statGroupablePaymentTransactionLineList.total_quantity\']),\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>sci</string> </value>
<value> <string>**kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>DCWorkflow_close</string> </value>
<value> <string>PaymentTransactionGroup_statGroupablePaymentTransactionLineList</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_statPaymentTransactionLineList.xml
View file @ 06fd978c
......@@ -51,12 +51,16 @@
<item>
<key> <string>_body</string> </key>
<value> <string>from Products.PythonScripts.standard import Object\n
if context.getValidationState() == \'open\':\n
line_list = context.PaymentTransactionGroup_getGroupablePaymentTransactionLineList()\n
else:\n
line_list = context.PaymentTransactionGroup_getGroupedPaymentTransactionLineList()\n
portal = context.getPortalObject()\n
\n
return Object(total_quantity=sum([line.total_quantity for line in line_list])),\n
search_kw = dict(\n
parent_portal_type=\'Payment Transaction\',\n
section_uid=context.getSourceSectionUid(),\n
default_aggregate_uid=context.getUid(),\n
node_category=\'account_type/asset/cash/bank\',\n
)\n
\n
return Object(total_quantity=portal.portal_simulation.getInventory(**search_kw)),\n
</string> </value>
</item>
<item>
......
bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_view.xml
View file @ 06fd978c
......@@ -104,7 +104,6 @@
<string>my_reference</string>
<string>my_source_section</string>
<string>my_source_payment</string>
<string>my_stop_date</string>
</list>
</value>
</item>
......@@ -112,12 +111,10 @@
<key> <string>right</string> </key>
<value>
<list>
<string>my_stop_date</string>
<string>my_payment_transaction_group_type</string>
<string>my_payment_mode</string>
<string>my_price_currency</string>
<string>my_quantity_range_max</string>
<string>my_start_date_range_min</string>
<string>my_start_date_range_max</string>
<string>my_translated_validation_state_title</string>
</list>
</value>
......
bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_view/listbox.xml
View file @ 06fd978c
......@@ -75,9 +75,7 @@
</item>
<item>
<key> <string>list_method</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
<value> <string></string> </value>
</item>
<item>
<key> <string>selection_name</string> </key>
......@@ -89,15 +87,11 @@
</item>
<item>
<key> <string>target</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
<value> <string></string> </value>
</item>
</dictionary>
</value>
......@@ -167,7 +161,7 @@
<item>
<key> <string>list_method</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
......@@ -177,7 +171,7 @@
<item>
<key> <string>stat_method</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
......@@ -195,45 +189,6 @@
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: context.getValidationState() == \'open\' and \'PaymentTransactionGroup_getGroupablePaymentTransactionLineList\' or \'PaymentTransactionGroup_getGroupedPaymentTransactionLineList\'</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>789456789ujiojo</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.getValidationState() == \'open\' and \'Selected Payment Transactions\' or \'Payment Transactions\'</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="5" aka="AAAAAAAAAAU=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle>
......@@ -246,7 +201,7 @@
</dictionary>
</pickle>
</record>
<record id="6" aka="AAAAAAAAAAY=">
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle>
......
bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_viewSelectPaymentTransactionLineListDialog.xml 0 → 100644
View file @ 06fd978c
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ERP5Form" module="Products.ERP5Form.Form"/>
</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/>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value> <string>PaymentTransactionGroup_selectPaymentTransactionLineList</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>edit_order</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>enctype</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
</item>
<item>
<key> <string>groups</string> </key>
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
</list>
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
<list>
<string>listbox_date</string>
<string>listbox_total_quantity</string>
</list>
</value>
</item>
<item>
<key> <string>left</string> </key>
<value>
<list>
<string>your_limit</string>
<string>your_start_date_range_min</string>
<string>your_start_date_range_max</string>
<string>your_sign</string>
</list>
</value>
</item>
<item>
<key> <string>right</string> </key>
<value>
<list>
<string>my_payment_mode</string>
<string>my_price_currency</string>
</list>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>PaymentTransactionGroup_viewSelectPaymentTransactionLineListDialog</string> </value>
</item>
<item>
<key> <string>method</string> </key>
<value> <string>POST</string> </value>
</item>
<item>
<key> <string>name</string> </key>
<value> <string>Base_viewWorkflowActionDialog</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
<value> <string>form_dialog</string> </value>
</item>
<item>
<key> <string>row_length</string> </key>
<value> <int>4</int> </value>
</item>
<item>
<key> <string>stored_encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Select Payments</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>update_action</string> </key>
<value> <string>PaymentTransactionGroup_viewSelectPaymentTransactionLineListDialog</string> </value>
</item>
<item>
<key> <string>update_action_title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_view/my_start_date_range_min.xml → bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_viewSelectPaymentTransactionLineListDialog/listbox_date.xml
View file @ 06fd978c
......@@ -10,13 +10,13 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>editable</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_start_date_range_min</string> </value>
<value> <string>listbox_date</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
......@@ -71,6 +71,10 @@
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_date_time_field</string> </value>
......@@ -83,10 +87,6 @@
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Minimum Date</string> </value>
</item>
</dictionary>
</value>
</item>
......
bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_viewSelectPaymentTransactionLineListDialog/listbox_total_quantity.xml 0 → 100644
View file @ 06fd978c
<?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>default</string>
<string>editable</string>
<string>precision</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_total_quantity</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>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<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>precision</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</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>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_money_quantity</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>precision</string> </key>
<value> <string></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>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.getQuantityPrecisionFromResource(here.getPriceCurrency())</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_viewSelectPaymentTransactionLineListDialog/my_payment_mode.xml 0 → 100644
View file @ 06fd978c
<?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>editable</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_payment_mode</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>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_view_mode_category</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>Payment Mode</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_viewSelectPaymentTransactionLineListDialog/my_price_currency.xml 0 → 100644
View file @ 06fd978c
<?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>editable</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_price_currency</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>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_view_mode_price_currency</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewTradeFieldLibrary</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_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_viewSelectPaymentTransactionLineListDialog/your_limit.xml 0 → 100644
View file @ 06fd978c
<?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>start</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_limit</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_integer_value</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>start</string> </key>
<value> <int>0</int> </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>Maximum number of payments</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_view/my_start_date_range_max.xml → bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_viewSelectPaymentTransactionLineListDialog/your_start_date_range_max.xml
View file @ 06fd978c
......@@ -10,13 +10,14 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>description</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_start_date_range_max</string> </value>
<value> <string>your_start_date_range_max</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
......@@ -71,6 +72,10 @@
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_date_time_field</string> </value>
......
bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_view/my_quantity_range_max.xml → bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_viewSelectPaymentTransactionLineListDialog/your_start_date_range_min.xml
View file @ 06fd978c
......@@ -17,7 +17,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_quantity_range_max</string> </value>
<value> <string>your_start_date_range_min</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
......@@ -74,11 +74,11 @@
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string>The maximum number of payment transactions that will be aggregated in this payment transaction group</string> </value>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_integer_field</string> </value>
<value> <string>my_date_time_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
......@@ -90,7 +90,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Maximum Transactions Count</string> </value>
<value> <string>Minimum Date</string> </value>
</item>
</dictionary>
</value>
......
bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_close.xml → bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionLine_setAggregate.xml
View file @ 06fd978c
......@@ -50,18 +50,13 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>if REQUEST is not None:\n
return\n
\n
for payment_transaction_line in\\\n
context.PaymentTransactionGroup_getGroupablePaymentTransactionLineList():\n
payment_transaction_line.setDefaultActivateParameters(tag=tag)\n
payment_transaction_line.setAggregateValue(context)\n
<value> <string>context.setDefaultActivateParameters(activate_kw=activate_kw)\n
context.setAggregate(aggregate)\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>tag="", REQUEST=None</string> </value>
<value> <string>aggregate, activate_kw</string> </value>
</item>
<item>
<key> <string>_proxy_roles</string> </key>
......@@ -73,7 +68,7 @@ for payment_transaction_line in\\\n
</item>
<item>
<key> <string>id</string> </key>
<value> <string>PaymentTransactionGroup_close</string> </value>
<value> <string>PaymentTransactionLine_setAggregate</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_payment_mean/WorkflowTemplateItem/portal_workflow/payment_transaction_group_validation_workflow/transitions/cancel.xml
View file @ 06fd978c
......@@ -10,6 +10,10 @@
<key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value>
</item>
<item>
<key> <string>actbox_icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string></string> </value>
......@@ -20,7 +24,7 @@
</item>
<item>
<key> <string>after_script_name</string> </key>
<value> <string></string> </value>
<value> <string>DCWorkflow_cancel</string> </value>
</item>
<item>
<key> <string>description</string> </key>
......
bt5/erp5_payment_mean/WorkflowTemplateItem/portal_workflow/payment_transaction_group_validation_workflow/transitions/close.xml
View file @ 06fd978c
......@@ -24,7 +24,7 @@
</item>
<item>
<key> <string>after_script_name</string> </key>
<value> <string>DCWorkflow_close</string> </value>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
......
bt5/erp5_payment_mean/bt/revision
View file @ 06fd978c
9
\ No newline at end of file
10
\ No newline at end of file
bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService.xml
View file @ 06fd978c
......@@ -34,10 +34,6 @@
<key> <string>id</string> </key>
<value> <string>PayzenService</string> </value>
</item>
<item>
<key> <string>last_id</string> </key>
<value> <string>16</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Property Sheet</string> </value>
......
bt5/erp5_payzen_secure_payment/bt/revision
View file @ 06fd978c
46
\ No newline at end of file
47
\ No newline at end of file
bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/user-extensions.js.xml
View file @ 06fd978c
......@@ -8,7 +8,7 @@
<dictionary>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts79620529.1</string> </value>
<value> <string>ts20417149.43</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
......@@ -88,6 +88,12 @@ Selenium.prototype.doType = function(locator, newText) {\n
Selenium.prototype.getAbsoluteLocation = function() {\n
return this.page().location || this.browserbot.getCurrentWindow().location;\n
};\n
\n
Selenium.prototype.doPhantomRender = function(filename) {\n
if (window.page && window.page.render) {\n
page.render(filename);\n
}\n
};\n
]]></string> </value>
......@@ -98,7 +104,7 @@ Selenium.prototype.getAbsoluteLocation = function() {\n
</item>
<item>
<key> <string>size</string> </key>
<value> <int>2278</int> </value>
<value> <int>2422</int> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_ui_test_core/bt/change_log
View file @ 06fd978c
2011-11-01 Cedric
* Add phantomRender Selenium user extension.
2010-06-07 yusei
* Remove short title.
......
bt5/erp5_ui_test_core/bt/revision
View file @ 06fd978c
44
\ No newline at end of file
45
\ No newline at end of file
product/ERP5/tests/testCRM.py
View file @ 06fd978c
......@@ -1547,7 +1547,7 @@ class TestCRMMailSend(BaseTestCRM):
### Incoming on Person ###
# Submit the dialog on person
title = 'Incoming email'
direction = 'in'
direction = 'incoming'
portal_type = 'Note'
resource = resource['1'].getCategoryRelativeUrl()
person.Base_addEvent(title, direction, portal_type, resource)
......@@ -1570,7 +1570,7 @@ class TestCRMMailSend(BaseTestCRM):
### Outgoing on Person ###
# Check another direction
title = 'Outgoing email'
direction = 'out'
direction = 'outgoing'
another_person.Base_addEvent(title, direction, portal_type, resource)
# Index Event
......
product/ERP5/tests/testERP5Core.py
View file @ 06fd978c
......@@ -82,6 +82,8 @@ if 1: # BBB
portal = Acquisition.aq_parent(sm)
ui_domain = getattr(portal, '_save_ui_domain', [None]).pop()
if ui_domain is not None:
# aq_base() to remove acquisition wrapping
ui_domain = Acquisition.aq_base(ui_domain)
sm.registerUtility(ui_domain, ITranslationDomain, 'ui')
del portal._save_ui_domain
......
product/ERP5Type/tests/testConstraint.py
View file @ 06fd978c
......@@ -1408,7 +1408,7 @@ class TestConstraint(PropertySheetTestCase):
message = consistency_message_list[0]
from Products.ERP5Type.ConsistencyMessage import ConsistencyMessage
self.assertTrue(isinstance(message, ConsistencyMessage))
self.assertEquals(message.class_name, 'Temporary Attribute Equality Constraint')
self.assertEquals(message.class_name, 'Attribute Equality Constraint')
obj.setTitle('a')
self.assertEquals(obj.checkConsistency(), [])
......
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