Skip to content

erp5
erp5
Commit e1d50308 authored by Julien Muchembled's avatar Julien Muchembled
Browse files
Options

Sync with trunk@34763 

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@34770 20353a03-c40f-0410-a6d1-a30d3c3de9de
parents 5833251c 43fb24ec
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2185 additions and 853 deletions
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction/add_accounting_transaction_line.xml
View file @ e1d50308
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>string:${object_url}/AccountingTransaction_viewAccountingTransactionLineDialog?portal_type=Accounting+Transaction+Line</string> </value> <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?portal_type=Accounting+Transaction+Line</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_accounting/ActionTemplateItem/portal_types/Payment%20Transaction/add_accounting_transaction_line.xml
View file @ e1d50308
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>string:${object_url}/AccountingTransaction_viewAccountingTransactionLineDialog?portal_type=Accounting+Transaction+Line</string> </value> <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?portal_type=Accounting+Transaction+Line</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_accounting/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/add_purchase_invoice_transaction_line.xml
View file @ e1d50308
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>string:${object_url}/AccountingTransaction_viewAccountingTransactionLineDialog?portal_type=Purchase+Invoice+Transaction+Line</string> </value> <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?portal_type=Purchase+Invoice+Transaction+Line</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_accounting/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/add_sale_invoice_transaction_line.xml
View file @ e1d50308
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>string:${object_url}/AccountingTransaction_viewAccountingTransactionLineDialog?portal_type=Sale+Invoice+Transaction+Line</string> </value> <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?portal_type=Sale+Invoice+Transaction+Line</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewAccountingTransactionLineDialog.xml → bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewAddAccountingTransactionLineDialog.xml
View file @ e1d50308
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>AccountingTransaction_viewAccountingTransactionLineDialog</string> </value> <value> <string>AccountingTransaction_viewAddAccountingTransactionLineDialog</string> </value>
</item> </item>
<item> <item>
<key> <string>method</string> </key> <key> <string>method</string> </key>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_getAccountingPeriodStartDateForSectionCategory.xml
View file @ e1d50308
...@@ -67,12 +67,14 @@ def getAccountingPeriodStartDateForSectionCategory(section_category, date):\n ...@@ -67,12 +67,14 @@ def getAccountingPeriodStartDateForSectionCategory(section_category, date):\n
section_uid.extend(portal.Base_getSectionUidListForSectionCategory(\n section_uid.extend(portal.Base_getSectionUidListForSectionCategory(\n
section_category, strict_membership=False))\n section_category, strict_membership=False))\n
period_start_date = None\n period_start_date = None\n
valid_accounting_period = dict(portal_type=\'Accounting Period\',\n
simulation_state=(\'planned\', \'confirmed\',\n
\'started\', \'stopped\', \'closing\', \'delivered\'))\n
for uid in section_uid:\n for uid in section_uid:\n
section = portal.portal_catalog.getObject(uid)\n section = portal.portal_catalog.getObject(uid)\n
for ap in section.contentValues(filter=valid_accounting_period):\n for ap in section.contentValues(portal_type=\'Accounting Period\',\n
checked_permission=\'Access contents information\'):\n
if ap.getSimulationState() not in (\'planned\', \'confirmed\',\n
\'started\', \'stopped\',\n
\'closing\', \'delivered\'):\n
continue\n
if ap.getStartDate() <= date <= ap.getStopDate():\n if ap.getStartDate() <= date <= ap.getStopDate():\n
period_start_date = ap.getStartDate().earliestTime()\n period_start_date = ap.getStartDate().earliestTime()\n
if period_start_date:\n if period_start_date:\n
......
bt5/erp5_accounting/bt/revision
View file @ e1d50308
1190 1193
\ No newline at end of file \ No newline at end of file
bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewSecurity.xml
View file @ e1d50308
...@@ -96,6 +96,14 @@ return printed\n ...@@ -96,6 +96,14 @@ return printed\n
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>_proxy_roles</string> </key>
<value>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
<value> <value>
......
bt5/erp5_administration/bt/revision
View file @ e1d50308
97 98
\ No newline at end of file \ No newline at end of file
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/InternalMoneyPayment_init.xml
View file @ e1d50308
...@@ -65,7 +65,6 @@ transaction.setResource(\'currency_module/\' + context.Baobab_getPortalReference ...@@ -65,7 +65,6 @@ transaction.setResource(\'currency_module/\' + context.Baobab_getPortalReference
\n \n
movement = context.newContent(portal_type=\'Banking Operation Line\',\n movement = context.newContent(portal_type=\'Banking Operation Line\',\n
id=\'movement\',\n id=\'movement\',\n
immediate_reindex=1,\n
source=\'account_module/bank_account\', # Set default source\n source=\'account_module/bank_account\', # Set default source\n
destination=\'account_module/bank_account\', # Set default destination\n destination=\'account_module/bank_account\', # Set default destination\n
)\n )\n
......
bt5/erp5_banking_cash/bt/revision
View file @ e1d50308
682 683
\ No newline at end of file \ No newline at end of file
bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/jump_to_persons.xml
View file @ e1d50308
...@@ -33,7 +33,9 @@ ...@@ -33,7 +33,9 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>icon</string> </key> <key> <string>icon</string> </key>
...@@ -79,7 +81,7 @@ ...@@ -79,7 +81,7 @@
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
string:${portal_url}/person_module/view?reset:int=1&subordination_uid=${object/getUid} string:${object_url}/Base_jumpToRelatedObject?base_category=subordination&portal_type=Person
]]></string> </value> ]]></string> </value>
</item> </item>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_initIntIndex.xml 0 → 100644
View file @ e1d50308
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</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>"""Initialise int_index of object\n
"""\n
\n
parent = context.getParentValue()\n
portal_type = context.getPortalType()\n
\n
index = len(parent.contentValues(filter={"portal_type": portal_type}))\n
\n
context.edit(int_index=index)\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>*args, **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>args</string>
<string>kw</string>
<string>_getattr_</string>
<string>context</string>
<string>parent</string>
<string>portal_type</string>
<string>len</string>
<string>index</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_initIntIndex</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Movement_getDivergenceListMessage.xml 0 → 100644
View file @ e1d50308
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</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>message_list = []\n
\n
for m in context.getDivergenceList():\n
message_list.append(str(m.getTranslatedMessage()))\n
return \', \'.join(message_list)\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>message_list</string>
<string>_getiter_</string>
<string>_getattr_</string>
<string>context</string>
<string>m</string>
<string>str</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Movement_getDivergenceListMessage</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts/Career_checkUniqueActiveCareer.xml → bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts/Career_checkConsistency.xml
View file @ e1d50308
...@@ -53,28 +53,8 @@ ...@@ -53,28 +53,8 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string>state_change[\'object\'].Base_checkConsistency()\n
</string> </value>
from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
\n
# Get the career object and its parent\n
career_object = state_change[\'object\']\n
person_object = career_object.getParentValue()\n
\n
active_careers = []\n
\n
# Count the number of opened career\n
for career in person_object.contentValues(filter={\'portal_type\': \'Career\'}):\n
if career.getValidationState() == \'open\':\n
active_careers.append(career.getTitleOrId())\n
\n
# There is at least one open career, so we can\'t open a new one until the current one is inactive (closed or cancelled)\n
# XXX is this check really needed ?\n
if len(active_careers) > 0:\n
raise ValidationFailed, "Error : current active career (\'" + "\', \'".join(active_careers) + "\') must be inactive"\n
]]></string> </value>
</item> </item>
<item> <item>
<key> <string>_code</string> </key> <key> <string>_code</string> </key>
...@@ -111,16 +91,8 @@ if len(active_careers) > 0:\n ...@@ -111,16 +91,8 @@ if len(active_careers) > 0:\n
<value> <value>
<tuple> <tuple>
<string>state_change</string> <string>state_change</string>
<string>Products.DCWorkflow.DCWorkflow</string>
<string>ValidationFailed</string>
<string>_getitem_</string>
<string>career_object</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>person_object</string> <string>_getitem_</string>
<string>active_careers</string>
<string>_getiter_</string>
<string>career</string>
<string>len</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -137,7 +109,7 @@ if len(active_careers) > 0:\n ...@@ -137,7 +109,7 @@ if len(active_careers) > 0:\n
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>Career_checkUniqueActiveCareer</string> </value> <value> <string>Career_checkConsistency</string> </value>
</item> </item>
<item> <item>
<key> <string>warnings</string> </key> <key> <string>warnings</string> </key>
......
bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/states/cancelled.xml
View file @ e1d50308
...@@ -45,23 +45,22 @@ ...@@ -45,23 +45,22 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="PersistentMapping" module="Persistence.mapping"/>
<string>Persistence</string> <tuple/>
<string>PersistentMapping</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>_container</string> </key> <key> <string>data</string> </key>
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>Access contents information</string> </key> <key> <string>Access contents information</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Auditor</string> <string>Auditor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string> <string>Owner</string>
...@@ -80,6 +79,8 @@ ...@@ -80,6 +79,8 @@
<key> <string>View</string> </key> <key> <string>View</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Auditor</string> <string>Auditor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string> <string>Owner</string>
......
bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/states/draft.xml
View file @ e1d50308
...@@ -50,24 +50,23 @@ ...@@ -50,24 +50,23 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="PersistentMapping" module="Persistence.mapping"/>
<string>Persistence</string> <tuple/>
<string>PersistentMapping</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>_container</string> </key> <key> <string>data</string> </key>
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>Access contents information</string> </key> <key> <string>Access contents information</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Auditor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string> <string>Owner</string>
</tuple> </tuple>
...@@ -77,6 +76,7 @@ ...@@ -77,6 +76,7 @@
<key> <string>Modify portal content</string> </key> <key> <string>Modify portal content</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string> <string>Owner</string>
...@@ -87,7 +87,9 @@ ...@@ -87,7 +87,9 @@
<key> <string>View</string> </key> <key> <string>View</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Auditor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string> <string>Owner</string>
</tuple> </tuple>
......
bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/start_action.xml
View file @ e1d50308
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
</item> </item>
<item> <item>
<key> <string>script_name</string> </key> <key> <string>script_name</string> </key>
<value> <string>Career_checkUniqueActiveCareer</string> </value> <value> <string>Career_checkConsistency</string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
bt5/erp5_base/bt/revision
View file @ e1d50308
714 719
\ No newline at end of file \ No newline at end of file
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_multiflex_layout/mf54_commerce.css.xml
View file @ e1d50308
...@@ -80,18 +80,18 @@ ...@@ -80,18 +80,18 @@
.main_content h3 {font-size:120% !important; color:#FF0000;}\n .main_content h3 {font-size:120% !important; color:#FF0000;}\n
div.portal_status_message h3 {margin:0px;}\n div.portal_status_message h3 {margin:0px;}\n
\n \n
#fieldset_left {padding:10px;}\n fieldset.left {padding:10px;}\n
#fieldset_left div.field {margin-top:5px; margin-bottom: 10px;}\n fieldset.left div.field {margin-top:5px; margin-bottom: 10px;}\n
#fieldset_left label {width: 135px !important; font-size: 120% !important; color:#505050; float:left; width: <tal:block tal:replace="python: main_content_width / 5"/>px;}\n fieldset.left label {width: 135px !important; font-size: 120% !important; color:#505050; float:left; width: <tal:block tal:replace="python: main_content_width / 5"/>px;}\n
#fieldset_left label a {display:none;}\n fieldset.left label a {display:none;}\n
#fieldset_right {padding:10px;}\n fieldset.right {padding:10px;}\n
#fieldset_right div.field {margin-top:5px; margin-bottom: 10px;}\n fieldset.right div.field {margin-top:5px; margin-bottom: 10px;}\n
#fieldset_right label {width: 135px !important; font-size: 120% !important; color:#505050; float:left; width:<tal:block tal:replace="python: main_content_width / 5"/>px;}\n fieldset.right label {width: 135px !important; font-size: 120% !important; color:#505050; float:left; width:<tal:block tal:replace="python: main_content_width / 5"/>px;}\n
#fieldset_right label a {display:none;}\n fieldset.right label a {display:none;}\n
#fieldset_center {padding:10px;}\n fieldset.center {padding:10px;}\n
#fieldset_center div.field {margin-top:5px; margin-bottom: 10px;}\n fieldset.center div.field {margin-top:5px; margin-bottom: 10px;}\n
#fieldset_center label {font-size: 120% !important; color:#505050; float:left; width:<tal:block tal:replace="python: main_content_width / 5"/>px;}\n fieldset.center label {font-size: 120% !important; color:#505050; float:left; width:<tal:block tal:replace="python: main_content_width / 5"/>px;}\n
#fieldset_center label a {display:none;}\n fieldset.center label a {display:none;}\n
\n \n
div.subcontent-box.cartbox fieldset.widget div.field label {display: none;}\n div.subcontent-box.cartbox fieldset.widget div.field label {display: none;}\n
div.subcontent-box.cartbox h1.group_title {background: url(./mf54_image/icon_celltitle_cart.png) no-repeat; background-position:229px 5px;}\n div.subcontent-box.cartbox h1.group_title {background: url(./mf54_image/icon_celltitle_cart.png) no-repeat; background-position:229px 5px;}\n
...@@ -208,7 +208,8 @@ fieldset.editable div.input {padding:0px;}\n ...@@ -208,7 +208,8 @@ fieldset.editable div.input {padding:0px;}\n
.main_content table tr.shopping_cart_end_lines td.used {border-bottom:solid 1px #CCC;}\n .main_content table tr.shopping_cart_end_lines td.used {border-bottom:solid 1px #CCC;}\n
\n \n
\n \n
</tal:block> </tal:block>\n
]]></string> </value> ]]></string> </value>
</item> </item>
......
bt5/erp5_commerce/bt/revision
View file @ e1d50308
251 252
\ No newline at end of file \ No newline at end of file
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_createNewDiscussionThread.xml
View file @ e1d50308
...@@ -105,7 +105,7 @@ return discussion_thread.Base_redirect(form_id,\n ...@@ -105,7 +105,7 @@ return discussion_thread.Base_redirect(form_id,\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>title, text_content, form_id, predecessor=None, description=None, subject_list=None, classification=None, group_list=None, site_list=None, reference=None,**kw</string> </value> <value> <string>title, text_content, form_id=\'view\', predecessor=None, description=None, subject_list=None, classification=None, group_list=None, site_list=None, reference=None,**kw</string> </value>
</item> </item>
<item> <item>
<key> <string>_proxy_roles</string> </key> <key> <string>_proxy_roles</string> </key>
...@@ -174,6 +174,7 @@ return discussion_thread.Base_redirect(form_id,\n ...@@ -174,6 +174,7 @@ return discussion_thread.Base_redirect(form_id,\n
<key> <string>func_defaults</string> </key> <key> <string>func_defaults</string> </key>
<value> <value>
<tuple> <tuple>
<string>view</string>
<none/> <none/>
<none/> <none/>
<none/> <none/>
......
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_createNewDiscussionPost.xml
View file @ e1d50308
...@@ -116,7 +116,7 @@ return context.Base_redirect(form_id,\n ...@@ -116,7 +116,7 @@ return context.Base_redirect(form_id,\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>title, text_content, form_id, send_notification_text=None, predecessor=None,**kw</string> </value> <value> <string>title, text_content, form_id=\'view\', send_notification_text=None, predecessor=None,**kw</string> </value>
</item> </item>
<item> <item>
<key> <string>_proxy_roles</string> </key> <key> <string>_proxy_roles</string> </key>
...@@ -195,6 +195,7 @@ return context.Base_redirect(form_id,\n ...@@ -195,6 +195,7 @@ return context.Base_redirect(form_id,\n
<key> <string>func_defaults</string> </key> <key> <string>func_defaults</string> </key>
<value> <value>
<tuple> <tuple>
<string>view</string>
<none/> <none/>
<none/> <none/>
</tuple> </tuple>
......
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ERP5Site_viewDiscussionThreadGadget.xml
View file @ e1d50308
...@@ -63,10 +63,9 @@ ...@@ -63,10 +63,9 @@
<value> <value>
<list> <list>
<string>left</string> <string>left</string>
<string>right</string>
<string>center</string> <string>center</string>
<string>bottom</string>
<string>hidden</string> <string>hidden</string>
<string>bottom</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -102,12 +101,6 @@ ...@@ -102,12 +101,6 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>right</string> </key>
<value>
<list/>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ERP5Site_viewDiscussionThreadGadget/your_add_new_thread_link.xml
View file @ e1d50308
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<string>css_class</string> <string>css_class</string>
<string>default</string> <string>default</string>
<string>editable</string> <string>editable</string>
<string>enabled</string>
<string>title</string> <string>title</string>
</list> </list>
</value> </value>
...@@ -72,6 +73,12 @@ ...@@ -72,6 +73,12 @@
<key> <string>editable</string> </key> <key> <string>editable</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -107,6 +114,10 @@ ...@@ -107,6 +114,10 @@
<key> <string>editable</string> </key> <key> <string>editable</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_editor_field</string> </value> <value> <string>my_editor_field</string> </value>
...@@ -149,4 +160,20 @@ python: \'<a class="bt-small" style="width:250px;" href="%s/discussion_thread_mo ...@@ -149,4 +160,20 @@ python: \'<a class="bt-small" style="width:250px;" href="%s/discussion_thread_mo
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.Base_checkPermission(\'discussion_thread_module\', \'Add portal content\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_discussion/bt/revision
View file @ e1d50308
43 45
\ No newline at end of file \ No newline at end of file
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms.xml
View file @ e1d50308
...@@ -9,12 +9,33 @@ ...@@ -9,12 +9,33 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>business_template_skin_layer_priority</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>float</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item> <item>
<key> <string>_objects</string> </key> <key> <string>_objects</string> </key>
<value> <value>
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>business_template_skin_layer_priority</string> </key>
<value> <float>10.0</float> </value>
</item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>erp5_dms</string> </value> <value> <string>erp5_dms</string> </value>
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_viewFieldLibrary/my_function_list.xml
View file @ e1d50308
...@@ -13,9 +13,8 @@ ...@@ -13,9 +13,8 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>title</string>
<string>description</string> <string>description</string>
<string>items</string> <string>title</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -69,12 +68,6 @@ ...@@ -69,12 +68,6 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -102,12 +95,6 @@ ...@@ -102,12 +95,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>items</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
...@@ -122,20 +109,4 @@ ...@@ -122,20 +109,4 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.portal_categories[field.getId().replace(\'my_\', \'\', 1).replace(\'_list\', \'\')].getCategoryChildTranslatedCompactLogicalPathItemList(display_none_category=1,local_sort_id="translated_short_title",checked_permission=\'View\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_viewFieldLibrary/my_group_list.xml
View file @ e1d50308
...@@ -13,9 +13,8 @@ ...@@ -13,9 +13,8 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>title</string>
<string>description</string> <string>description</string>
<string>items</string> <string>title</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -69,12 +68,6 @@ ...@@ -69,12 +68,6 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -94,10 +87,6 @@ ...@@ -94,10 +87,6 @@
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>A document can be associated to one or multiple entities in the group classification tree.</string> </value> <value> <string>A document can be associated to one or multiple entities in the group classification tree.</string> </value>
</item> </item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_category_list</string> </value> <value> <string>my_category_list</string> </value>
...@@ -106,12 +95,6 @@ ...@@ -106,12 +95,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>items</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
...@@ -126,20 +109,4 @@ ...@@ -126,20 +109,4 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.portal_categories[field.getId().replace(\'my_\', \'\', 1).replace(\'_list\', \'\')].getCategoryChildCompactLogicalPathItemList(display_none_category=1,local_sort_id="compact_title",checked_permission=\'View\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_viewFieldLibrary/my_site_list.xml
View file @ e1d50308
...@@ -13,9 +13,8 @@ ...@@ -13,9 +13,8 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>title</string>
<string>description</string> <string>description</string>
<string>items</string> <string>title</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -69,12 +68,6 @@ ...@@ -69,12 +68,6 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -94,10 +87,6 @@ ...@@ -94,10 +87,6 @@
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>A document can be associated to one or multiple entities in the site classification tree.</string> </value> <value> <string>A document can be associated to one or multiple entities in the site classification tree.</string> </value>
</item> </item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_category_list</string> </value> <value> <string>my_category_list</string> </value>
...@@ -106,12 +95,6 @@ ...@@ -106,12 +95,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>items</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
...@@ -126,20 +109,4 @@ ...@@ -126,20 +109,4 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.portal_categories[field.getId().replace(\'my_\', \'\', 1).replace(\'_list\', \'\')].getCategoryChildCompactLogicalPathItemList(display_none_category=1,local_sort_id="compact_title",checked_permission=\'View\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/PDF_renderHTMLPreviewAsImage.xml
View file @ e1d50308
...@@ -44,9 +44,9 @@ ...@@ -44,9 +44,9 @@
python:here.PDF_getPageNumberFromSelectionIndex(request.get(\'selection_index\', 0));\n python:here.PDF_getPageNumberFromSelectionIndex(request.get(\'selection_index\', 0));\n
display request/display|string:xlarge;\n display request/display|string:xlarge;\n
format request/format|string:png;">\n format request/format|string:png;">\n
<img src="" style="margin:0pt 5%;width:90%;"\n <img src="" style="margin:0pt 5%" alt=""\n
tal:attributes="src\n tal:attributes="src\n
string:${here/absolute_url}/index_html?display=${display}&format=${format}&frame=${frame}&resolution:int=300">\n string:${here/absolute_url}/index_html?display=${display}&format=${format}&frame=${frame}&resolution:int=300"/>\n
</div> </div>
]]></string> </value> ]]></string> </value>
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/PDF_renderHTMLPreviewNavigation.xml
View file @ e1d50308
...@@ -66,11 +66,11 @@ ...@@ -66,11 +66,11 @@
</a>\n </a>\n
</tal:block>\n </tal:block>\n
<tal:block tal:condition="python:current_thumbnail_index < 1">\n <tal:block tal:condition="python:current_thumbnail_index < 1">\n
<img src="images/2leftarrowb.png" style="opacity:0.2"\n <img src="images/2leftarrowb.png" style="opacity:0.2; vertical-align:middle"\n
i18n:attributes="alt"\n i18n:attributes="alt"\n
i18n:domain="ui"\n i18n:domain="ui"\n
alt="First"/>\n alt="First"/>\n
<img src="images/1leftarrowb.png" style="opacity:0.2"\n <img src="images/1leftarrowb.png" style="opacity:0.2; vertical-align:middle"\n
i18n:attributes="alt"\n i18n:attributes="alt"\n
i18n:domain="ui"\n i18n:domain="ui"\n
alt="Previous"/>\n alt="Previous"/>\n
...@@ -93,11 +93,11 @@ ...@@ -93,11 +93,11 @@
</a>\n </a>\n
</tal:block>\n </tal:block>\n
<tal:block tal:condition="python:all_thunmbnails <= next_thunmbnail_index">\n <tal:block tal:condition="python:all_thunmbnails <= next_thunmbnail_index">\n
<img src="images/1rightarrowb.png" style="opacity:0.1"\n <img src="images/1rightarrowb.png" style="opacity:0.2; vertical-align:middle"\n
i18n:attributes="alt"\n i18n:attributes="alt"\n
i18n:domain="ui"\n i18n:domain="ui"\n
alt="Next"/>\n alt="Next"/>\n
<img src="images/2rightarrowb.png" style="opacity:0.1"\n <img src="images/2rightarrowb.png" style="opacity:0.2; vertical-align:middle"\n
i18n:attributes="alt"\n i18n:attributes="alt"\n
i18n:domain="ui"\n i18n:domain="ui"\n
alt="Last"/>\n alt="Last"/>\n
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/PDF_viewHTMLPreviewAsImage/download_pdf.xml
View file @ e1d50308
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
python:\'<button class="bt-med right" name="Base_download:method" title="%(title)s" alt="%(title)s"><span>%(title)s</span></button>\' % {\'title\':here.Base_translateString("Download as PDF")} python:\'<button class="bt-med right" name="Base_download:method" title="%(title)s"><span>%(title)s</span></button>\' % {\'title\':here.Base_translateString("Download as PDF")}
]]></string> </value> ]]></string> </value>
</item> </item>
......
bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/worklists/draft_to_review.xml 0 → 100644
View file @ e1d50308
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>global</string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Documents to review (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
ERP5Site_viewDocumentList?validation_state=draft&local_roles=%(local_roles)s&portal_type=%(portal_type)s&reset=1
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Documents to review</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>draft_to_review</string> </value>
</item>
<item>
<key> <string>var_matches</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Guard" module="Products.DCWorkflow.Guard"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Owner</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>validation_state</string> </key>
<value>
<tuple>
<string>draft</string>
</tuple>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_dms/bt/revision
View file @ e1d50308
1110 1118
\ No newline at end of file \ No newline at end of file
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/erp5_egov_content.css.xml
View file @ e1d50308
...@@ -449,7 +449,7 @@ div#main_content > fieldset.webcontent {\n ...@@ -449,7 +449,7 @@ div#main_content > fieldset.webcontent {\n
/* TODO: redo webcontent header spacing policy because lack of consistency\n /* TODO: redo webcontent header spacing policy because lack of consistency\n
(not tested with huge titles) */\n (not tested with huge titles) */\n
\n \n
div#main_content > fieldset#fieldset_webcontent {padding: 2em}\n div#main_content > fieldset.webcontent {padding: 2em}\n
\n \n
div#main_content > fieldset.header {\n div#main_content > fieldset.header {\n
padding-bottom: 1em;\n padding-bottom: 1em;\n
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/erp5_egov_dgid_form_layout.css.xml
View file @ e1d50308
...@@ -382,7 +382,7 @@ div#main_content > fieldset.webcontent {\n ...@@ -382,7 +382,7 @@ div#main_content > fieldset.webcontent {\n
/* TODO: redo webcontent header spacing policy because lack of consistency\n /* TODO: redo webcontent header spacing policy because lack of consistency\n
(not tested with huge titles) */\n (not tested with huge titles) */\n
\n \n
div#main_content > fieldset#fieldset_webcontent {padding: 2em}\n div#main_content > fieldset.webcontent {padding: 2em}\n
\n \n
div#main_content > fieldset.header {\n div#main_content > fieldset.header {\n
padding-bottom: 1em;\n padding-bottom: 1em;\n
...@@ -418,7 +418,8 @@ div#main_content fieldset.webcontent span.headline {\n ...@@ -418,7 +418,8 @@ div#main_content fieldset.webcontent span.headline {\n
text-shadow: .1em .1em .1em #eee;\n text-shadow: .1em .1em .1em #eee;\n
line-height: 140%;\n line-height: 140%;\n
text-align: left;\n text-align: left;\n
} }\n
]]></string> </value> ]]></string> </value>
</item> </item>
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/template_erp5_egov.css.xml
View file @ e1d50308
...@@ -529,14 +529,14 @@ div#main_content fieldset {\n ...@@ -529,14 +529,14 @@ div#main_content fieldset {\n
border:none;\n border:none;\n
}\n }\n
\n \n
.content #fieldset_center,\n .content fieldset.center,\n
.content #fieldset_left,\n .content fieldset.left,\n
.content #fieldset_bottom{\n .content fieldset.bottom{\n
margin-left: 3em;\n margin-left: 3em;\n
margin-right: 3em;\n margin-right: 3em;\n
}\n }\n
\n \n
.content #fieldset_left{\n .content fieldset.left{\n
margin-top: 3em;\n margin-top: 3em;\n
}\n }\n
\n \n
...@@ -653,12 +653,12 @@ fieldset.register_informations{\n ...@@ -653,12 +653,12 @@ fieldset.register_informations{\n
}\n }\n
\n \n
\n \n
#main_form #main_content #fieldset_bottom .input .ListSummary{\n #main_form #main_content fieldset.bottom .input .ListSummary{\n
margin-top: 100px;\n margin-top: 100px;\n
}\n }\n
\n \n
#main_form #main_content #fieldset_bottom .input .ListSummary,\n #main_form #main_content fieldset.bottom .input .ListSummary,\n
#main_form #main_content #fieldset_bottom .input .ListContent{\n #main_form #main_content fieldset.bottom .input .ListContent{\n
margin-right: 10%;\n margin-right: 10%;\n
margin-left: 10%;\n margin-left: 10%;\n
}\n }\n
......
bt5/erp5_egov/bt/revision
View file @ e1d50308
461 462
\ No newline at end of file \ No newline at end of file
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewNavigationMenuWidget.xml
View file @ e1d50308
...@@ -107,6 +107,27 @@ ...@@ -107,6 +107,27 @@
</a>\n </a>\n
</li>\n </li>\n
</tal:block>\n </tal:block>\n
<tal:block tal:condition="python: here.Base_checkPermission(\'person_module\', \'Add portal content\')">\n
<li>\n
<a href="#" i18n:translate="" i18n:domain="ui" tal:attributes="href string:${current_web_section_url}/PersonModule_createNewPerson">\n
New Contact\n
</a>\n
</li>\n
</tal:block>\n
<tal:block tal:condition="python: here.Base_checkPermission(\'project_module\', \'Add portal content\')">\n
<li>\n
<a href="#" i18n:translate="" i18n:domain="ui" tal:attributes="href string:${current_web_section_url}/ProjectModule_createNewProject">\n
New Project\n
</a>\n
</li>\n
</tal:block>\n
<tal:block tal:condition="python: here.Base_checkPermission(\'task_module\', \'Add portal content\')">\n
<li>\n
<a href="#" i18n:translate="" i18n:domain="ui" tal:attributes="href string:${current_web_section_url}/TaskModule_createNewTask">\n
New Task\n
</a>\n
</li>\n
</tal:block>\n
</ul>\n </ul>\n
<!--[if lte IE 6]></td></tr></table></a><![endif]-->\n <!--[if lte IE 6]></td></tr></table></a><![endif]-->\n
</li>\n </li>\n
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/PersonModule_createNewPerson.xml 0 → 100644
View file @ e1d50308
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</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>"""\n
Create new Person object and redirect to it.\n
"""\n
\n
person = context.person_module.newContent(portal_type = \'Person\')\n
keep_items = dict(editable_mode=1,\n
portal_status_message=context.Base_translateString("New Person Created"))\n
return person.Base_redirect(\'view\', keep_items)\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>_getattr_</string>
<string>context</string>
<string>person</string>
<string>dict</string>
<string>keep_items</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>PersonModule_createNewPerson</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/PersonModule_viewMyContactListGadget.xml
View file @ e1d50308
...@@ -62,7 +62,9 @@ ...@@ -62,7 +62,9 @@
<key> <string>group_list</string> </key> <key> <string>group_list</string> </key>
<value> <value>
<list> <list>
<string>gadget</string> <string>center</string>
<string>left</string>
<string>bottom</string>
<string>hidden</string> <string>hidden</string>
</list> </list>
</value> </value>
...@@ -72,19 +74,33 @@ ...@@ -72,19 +74,33 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>gadget</string> </key> <key> <string>bottom</string> </key>
<value> <value>
<list> <list>
<string>listbox</string> <string>listbox</string>
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <value>
<list/> <list/>
</value> </value>
</item> </item>
<item>
<key> <string>left</string> </key>
<value>
<list>
<string>your_add_new_person_link</string>
</list>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/PersonModule_viewMyContactListGadget/your_add_new_person_link.xml 0 → 100644
View file @ e1d50308
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>css_class</string>
<string>default</string>
<string>editable</string>
<string>enabled</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_add_new_person_link</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>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</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>target</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>css_class</string> </key>
<value> <string>hidden_label button</string> </value>
</item>
<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>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_editor_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>Editor Field</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
python: \'<a class="bt-small" style="width:250px;" href="%s/person_module/PersonModule_createNewPerson?cancel_url=%s"><span><img src="km_img/icon-add.png" alt="+"/> Add New Contact</span></a>\' %(here.getWebSiteValue().absolute_url(), here.absolute_url())
]]></string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.Base_checkPermission(\'project_module\', \'Add portal content\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/ProjectModule_createNewProject.xml 0 → 100644
View file @ e1d50308
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</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>"""\n
Create new Project object and redirect to it.\n
"""\n
\n
project = context.project_module.newContent(portal_type = \'Project\')\n
keep_items = dict(editable_mode=1,\n
portal_status_message=context.Base_translateString("New Project Created"))\n
return project.Base_redirect(\'view\', keep_items)\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>_getattr_</string>
<string>context</string>
<string>project</string>
<string>dict</string>
<string>keep_items</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ProjectModule_createNewProject</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/TaskModule_createNewTask.xml 0 → 100644
View file @ e1d50308
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</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>"""\n
Create new Task object and redirect to it.\n
"""\n
\n
task = context.task_module.newContent(portal_type = \'Task\')\n
keep_items = dict(editable_mode=1,\n
portal_status_message=context.Base_translateString("New Task Created"))\n
return task.Base_redirect(\'view\', keep_items)\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>_getattr_</string>
<string>context</string>
<string>task</string>
<string>dict</string>
<string>keep_items</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>TaskModule_createNewTask</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_km/TestTemplateItem/testKMGadget.py
View file @ e1d50308
...@@ -69,7 +69,6 @@ class TestGadgets(ERP5TypeTestCase, ZopeTestCase.Functional): ...@@ -69,7 +69,6 @@ class TestGadgets(ERP5TypeTestCase, ZopeTestCase.Functional):
portal = self.getPortal() portal = self.getPortal()
web_site_module = portal.web_site_module web_site_module = portal.web_site_module
self.website = web_site_module.newContent(portal_type='Web Site') self.website = web_site_module.newContent(portal_type='Web Site')
#self.website.setSkinSelectionName('KM')
self.websection = self.website.newContent(portal_type='Web Section') self.websection = self.website.newContent(portal_type='Web Section')
self.app.REQUEST.set('current_web_section', self.websection) self.app.REQUEST.set('current_web_section', self.websection)
self.webpage = portal.web_page_module.newContent( self.webpage = portal.web_page_module.newContent(
...@@ -610,6 +609,7 @@ class TestGadgets(ERP5TypeTestCase, ZopeTestCase.Functional): ...@@ -610,6 +609,7 @@ class TestGadgets(ERP5TypeTestCase, ZopeTestCase.Functional):
subsection = self.websection.newContent(portal_type='Web Section', subsection = self.websection.newContent(portal_type='Web Section',
title='Sub Section 12345') title='Sub Section 12345')
self.stepTic() self.stepTic()
self.changeSkin('KM')
self.failUnless(subsection.getTitle() in self.failUnless(subsection.getTitle() in
self.publish(self.base_url_pattern %(self.web_section_url, self.publish(self.base_url_pattern %(self.web_section_url,
gadget_view_form_id, gadget_view_form_id,
......
bt5/erp5_km/bt/revision
View file @ e1d50308
1332 1342
\ No newline at end of file \ No newline at end of file
bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testTopSearchBoxClicking.xml
View file @ e1d50308
...@@ -87,10 +87,19 @@ ...@@ -87,10 +87,19 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyText</td>\n <td>verifyText</td>\n
<td>//ul[@class=\'breadcrumb\']</td>\n <td>//ul[@class=\'breadcrumb\']/li[1]/a</td>\n
<td>Home Web Pages test page</td>\n <td>Home</td>\n
</tr>\n
<tr>\n
<td>verifyText</td>\n
<td>//ul[@class=\'breadcrumb\']/li[2]/a</td>\n
<td>Web Pages</td>\n
</tr>\n
<tr>\n
<td>verifyText</td>\n
<td>//ul[@class=\'breadcrumb\']/li[3]/a</td>\n
<td>test page</td>\n
</tr>\n </tr>\n
\n
<tal:block metal:use-macro="here/KMZuite_CommonTemplate/macros/deleteKMWebSite" />\n <tal:block metal:use-macro="here/KMZuite_CommonTemplate/macros/deleteKMWebSite" />\n
\n \n
</tbody></table>\n </tbody></table>\n
......
bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testTopSearchBoxHittingEnter.xml
View file @ e1d50308
...@@ -105,8 +105,18 @@ ...@@ -105,8 +105,18 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyText</td>\n <td>verifyText</td>\n
<td>//ul[@class=\'breadcrumb\']</td>\n <td>//ul[@class=\'breadcrumb\']/li[1]/a</td>\n
<td>Home Web Pages test page</td>\n <td>Home</td>\n
</tr>\n
<tr>\n
<td>verifyText</td>\n
<td>//ul[@class=\'breadcrumb\']/li[2]/a</td>\n
<td>Web Pages</td>\n
</tr>\n
<tr>\n
<td>verifyText</td>\n
<td>//ul[@class=\'breadcrumb\']/li[3]/a</td>\n
<td>test page</td>\n
</tr>\n </tr>\n
<tal:block metal:use-macro="here/KMZuite_CommonTemplate/macros/deleteKMWebSite" />\n <tal:block metal:use-macro="here/KMZuite_CommonTemplate/macros/deleteKMWebSite" />\n
\n \n
......
bt5/erp5_km_ui_test/SkinTemplateItem/portal_skins/erp5_km_ui_test/WebSiteModule_createKMSite.xml
View file @ e1d50308
...@@ -84,8 +84,8 @@ km_preference = portal_preferences.newContent(\n ...@@ -84,8 +84,8 @@ km_preference = portal_preferences.newContent(\n
preferred_document_file_name_regular_expression = \'(?P<node_reference>[a-zA-Z0-9_-]+)-(?P<local_reference>[a-zA-Z0-9_.]+)-(?P<version>[0-9a-zA-Z.]+)-(?P<language>[a-z]{2})[^-]*?\',\n preferred_document_file_name_regular_expression = \'(?P<node_reference>[a-zA-Z0-9_-]+)-(?P<local_reference>[a-zA-Z0-9_.]+)-(?P<version>[0-9a-zA-Z.]+)-(?P<language>[a-z]{2})[^-]*?\',\n
preferred_synchronous_metadata_discovery = False,\n preferred_synchronous_metadata_discovery = False,\n
preferred_redirect_to_document = False,\n preferred_redirect_to_document = False,\n
preferred_ooodoc_server_address = \'localhost\',\n preferred_ooodoc_server_address = context.Zuite_getConversionServerDict()["oood_hostname"],\n
preferred_ooodoc_server_port_number = 8008)\n preferred_ooodoc_server_port_number = context.Zuite_getConversionServerDict()["oood_port"])\n
km_preference.enable()\n km_preference.enable()\n
\n \n
return "Created Successfully."\n return "Created Successfully."\n
...@@ -144,6 +144,7 @@ return "Created Successfully."\n ...@@ -144,6 +144,7 @@ return "Created Successfully."\n
<string>km_preference_id</string> <string>km_preference_id</string>
<string>portal_preferences</string> <string>portal_preferences</string>
<string>False</string> <string>False</string>
<string>_getitem_</string>
<string>km_preference</string> <string>km_preference</string>
</tuple> </tuple>
</value> </value>
......
bt5/erp5_km_ui_test/SkinTemplateItem/portal_skins/erp5_km_ui_test/Zuite_getConversionServerDict.xml 0 → 100644
View file @ e1d50308
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</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>"""\n
Return the configuration for use into\n
preferences.\n
"""\n
return dict(oood_hostname="localhost",\n
oood_port=8008)\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>dict</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Zuite_getConversionServerDict</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_km_ui_test/bt/revision
View file @ e1d50308
41 44
\ No newline at end of file \ No newline at end of file
bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/Base_getWorklistParameters.xml
View file @ e1d50308
...@@ -88,6 +88,14 @@ return parameters\n ...@@ -88,6 +88,14 @@ return parameters\n
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>_proxy_roles</string> </key>
<value>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
<value> <value>
......
bt5/erp5_knowledge_pad/bt/revision
View file @ e1d50308
506 509
\ No newline at end of file \ No newline at end of file
bt5/erp5_l10n_fr/MessageTranslationTemplateItem/fr/erp5_ui/translation.po
View file @ e1d50308
...@@ -6546,14 +6546,8 @@ msgstr "Numéro" ...@@ -6546,14 +6546,8 @@ msgstr "Numéro"
msgid "Number of Lines Displayed in List Mode ListBoxes" msgid "Number of Lines Displayed in List Mode ListBoxes"
msgstr "Nombre de lignes affichées en mode liste" msgstr "Nombre de lignes affichées en mode liste"
msgid "Number of Lines Displayed in List Mode ListBoxs"
msgstr "Nombre de lignes affichées dans une listbox en mode liste"
msgid "Number of Lines Displayed in View Mode ListBoxes" msgid "Number of Lines Displayed in View Mode ListBoxes"
msgstr "Nombre de lignes affichées en mode général" msgstr "Nombre de lignes affichées en mode vue"
msgid "Number of Lines Displayed in View Mode ListBoxs"
msgstr "Nombre de lignes affichées dans une listbox en mode view"
msgid "Number of Lines to Add" msgid "Number of Lines to Add"
msgstr "Nombre de lignes à ajouter" msgstr "Nombre de lignes à ajouter"
......
bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/erp5.css.xml
View file @ e1d50308
...@@ -1176,22 +1176,23 @@ body {\n ...@@ -1176,22 +1176,23 @@ body {\n
font-weight: bold;\n font-weight: bold;\n
}\n }\n
\n \n
#fieldset_left,\n fieldset.left,\n
#fieldset_right,\n fieldset.right,\n
#fieldset_center,\n fieldset.center,\n
#fieldset_bottom {\n fieldset.bottom {\n
border-width: 1px;\n border-width: 1px;\n
border-style: solid;\n border-style: solid;\n
}\n }\n
\n \n
#fieldset_left legend,\n fieldset.left legend,\n
#fieldset_right legend,\n fieldset.right legend,\n
#fieldset_center legend,\n fieldset.center legend,\n
#fieldset_bottom legend {\n fieldset.bottom legend {\n
display: none;\n display: none;\n
}\n }\n
\n \n
</dtml-let> </dtml-let>\n
]]></string> </value> ]]></string> </value>
</item> </item>
......
bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/form_dialog.xml
View file @ e1d50308
...@@ -107,8 +107,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -107,8 +107,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
<tal:block tal:repeat="group group_list">\n <tal:block tal:repeat="group group_list">\n
<tal:block tal:define="gid group/gid">\n <tal:block tal:define="gid group/gid">\n
<fieldset tal:condition="python: \'hidden\' not in gid and \'bottom\' not in gid"\n <fieldset tal:condition="python: \'hidden\' not in gid and \'bottom\' not in gid"\n
tal:attributes="class gid;\n tal:attributes="class gid;"\n
id python: \'fieldset_\' + gid.replace(\' \', \'_\');"\n
tal:define="gtitle group/gtitle">\n tal:define="gtitle group/gtitle">\n
<legend tal:condition="python: gtitle != \'bottom\' and gtitle != \'left\' and gtitle != \'right\' and gtitle != \'center\'" tal:content="group/gtitle" class="group_title"/>\n <legend tal:condition="python: gtitle != \'bottom\' and gtitle != \'left\' and gtitle != \'right\' and gtitle != \'center\'" tal:content="group/gtitle" class="group_title"/>\n
<tal:block tal:repeat="field python: form.get_fields_in_group(group[\'goid\'])">\n <tal:block tal:repeat="field python: form.get_fields_in_group(group[\'goid\'])">\n
......
bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/form_render.xml
View file @ e1d50308
...@@ -96,8 +96,7 @@ It is possible to specify a group id and a group title by naming a group followi ...@@ -96,8 +96,7 @@ It is possible to specify a group id and a group title by naming a group followi
<tal:block tal:repeat="group group_list">\n <tal:block tal:repeat="group group_list">\n
<tal:block tal:define="gid group/gid;">\n <tal:block tal:define="gid group/gid;">\n
<fieldset tal:condition="python: gid.find(\'hidden\') < 0"\n <fieldset tal:condition="python: gid.find(\'hidden\') < 0"\n
tal:attributes="class gid;\n tal:attributes="class gid;"\n
id python: \'fieldset_%s\' % (gid.replace(\' \', \'_\'), );"\n
tal:define="gtitle group/gtitle"\n tal:define="gtitle group/gtitle"\n
class="border">\n class="border">\n
<legend tal:condition="python: gtitle != \'bottom\' and gtitle != \'left\' and gtitle != \'right\' and gtitle != \'center\'" tal:content="group/gtitle" class="group_title"/>\n <legend tal:condition="python: gtitle != \'bottom\' and gtitle != \'left\' and gtitle != \'right\' and gtitle != \'center\'" tal:content="group/gtitle" class="group_title"/>\n
...@@ -115,7 +114,8 @@ It is possible to specify a group id and a group title by naming a group followi ...@@ -115,7 +114,8 @@ It is possible to specify a group id and a group title by naming a group followi
<a class="link_white" tal:attributes="href python: \'%s%s%s%s\' % (context.REQUEST.URL0,\'?\', context.REQUEST.QUERY_STRING,\'#TOP\')" i18n:translate="" i18n:domain="ui">////////// Top of page \\\\\\\\\\\\\\\\\\\\</a>\n <a class="link_white" tal:attributes="href python: \'%s%s%s%s\' % (context.REQUEST.URL0,\'?\', context.REQUEST.QUERY_STRING,\'#TOP\')" i18n:translate="" i18n:domain="ui">////////// Top of page \\\\\\\\\\\\\\\\\\\\</a>\n
</div>\n </div>\n
</tal:block>\n </tal:block>\n
</tal:block> </tal:block>\n
]]></string> </value> ]]></string> </value>
</item> </item>
......
bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/login_form.xml
View file @ e1d50308
...@@ -89,7 +89,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -89,7 +89,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
type="hidden" name="came_from"\n type="hidden" name="came_from"\n
tal:attributes="value request/came_from" />\n tal:attributes="value request/came_from" />\n
\n \n
<fieldset id="fieldset_left" class="fielset_login">\n <fieldset class="left fielset_login">\n
<div class="field">\n <div class="field">\n
<label for="name" class="required" i18n:translate="" i18n:domain="ui">Name</label>\n <label for="name" class="required" i18n:translate="" i18n:domain="ui">Name</label>\n
<div class="input"><input type="text" name="__ac_name" id="name" tal:attributes="value python: request.get(\'__ac_name\') or \'\'"/></div>\n <div class="input"><input type="text" name="__ac_name" id="name" tal:attributes="value python: request.get(\'__ac_name\') or \'\'"/></div>\n
...@@ -132,7 +132,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -132,7 +132,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
</div>\n </div>\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
</tal:block> </tal:block>\n
]]></string> </value> ]]></string> </value>
</item> </item>
......
bt5/erp5_mobile/bt/revision
View file @ e1d50308
55 56
\ No newline at end of file \ No newline at end of file
bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml
View file @ e1d50308
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<!-- if the group bottom there isn\'t a title -->\n <!-- if the group bottom there isn\'t a title -->\n
<table:table-cell table:number-rows-spanned=\'1\'\n <table:table-cell table:number-rows-spanned=\'1\'\n
table:style-name=\'report-content-heading2-with-lines\'\n table:style-name=\'report-content-heading2-with-lines\'\n
tal:attributes="table:number-columns-spanned python:group == \'bottom\' and column_len or column_len-1"\n tal:attributes="table:number-columns-spanned python:group == \'bottom\' and column_len or max(column_len-1, 1)"\n
office:value-type=\'string\'\n office:value-type=\'string\'\n
tal:define="value python: field.get_value(\'default\')">\n tal:define="value python: field.get_value(\'default\')">\n
<tal:block tal:condition="python: same_type(value, []) or same_type(value, ())">\n <tal:block tal:condition="python: same_type(value, []) or same_type(value, ())">\n
......
bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml
View file @ e1d50308
...@@ -103,6 +103,8 @@ dQEAAAAA</string> </value> ...@@ -103,6 +103,8 @@ dQEAAAAA</string> </value>
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
\n \n
<!-- save the context for the macros -->\n
<tal:block tal:define="dummy python: request.set(\'here\', here)">\n
<!-- Calculating by group the max length of columns to merge -->\n <!-- Calculating by group the max length of columns to merge -->\n
<tal:block tal:repeat="group python: [g for g in group_list if g not in (\'hidden\', )]">\n <tal:block tal:repeat="group python: [g for g in group_list if g not in (\'hidden\', )]">\n
<!-- if we have other fields to display, calculate max column len, which will be used \n <!-- if we have other fields to display, calculate max column len, which will be used \n
...@@ -110,16 +112,14 @@ dQEAAAAA</string> </value> ...@@ -110,16 +112,14 @@ dQEAAAAA</string> </value>
<tal:block tal:define="global field_list python: form.get_fields_in_group(group)"/>\n <tal:block tal:define="global field_list python: form.get_fields_in_group(group)"/>\n
<tal:block tal:condition="python:len(field_list) &gt; 0">\n <tal:block tal:condition="python:len(field_list) &gt; 0">\n
<tal:block tal:define="global column_len python: 5"/>\n <tal:block tal:define="global column_len python: 5"/>\n
<tal:block tal:condition="report_item | nothing">\n
<tal:block tal:define="global column_len python: report_item.selection_columns and len(report_item.selection_columns) or 0;"/>\n
</tal:block>\n
<tal:block tal:condition="python: column_len &lt; 6">\n
<tal:block tal:repeat="field python:field_list">\n <tal:block tal:repeat="field python:field_list">\n
<tal:block tal:condition="python:field.meta_type == \'ListBox\' or (field.meta_type == \'ProxyField\' and field.getRecursiveTemplateField().meta_type == \'ListBox\')">\n <tal:block tal:condition="python:field.meta_type == \'ListBox\' or (field.meta_type == \'ProxyField\' and field.getRecursiveTemplateField().meta_type == \'ListBox\')">\n
<tal:block tal:define="column_list python: field.get_value(\'columns\');\n <tal:block tal:define="column_list python: field.get_value(\'columns\');\n
global column_len python: max(column_len, len(column_list))" />\n global column_len python: max(column_len, len(column_list))" />\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
<tal:block tal:condition="report_item | nothing">\n
<tal:block tal:define="global column_len python: report_item.selection_columns and len(report_item.selection_columns) or column_len;"/>\n
</tal:block>\n </tal:block>\n
<!-- Display field -->\n <!-- Display field -->\n
<tal:block tal:repeat="field python:field_list">\n <tal:block tal:repeat="field python:field_list">\n
...@@ -131,6 +131,7 @@ dQEAAAAA</string> </value> ...@@ -131,6 +131,7 @@ dQEAAAAA</string> </value>
</table:table-row>\n </table:table-row>\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
</tal:block>\n
</table:table>\n </table:table>\n
</office:spreadsheet>\n </office:spreadsheet>\n
</office:body>\n </office:body>\n
......
bt5/erp5_ods_style/bt/revision
View file @ e1d50308
231 233
\ No newline at end of file
bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Operation.xml
View file @ e1d50308
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</item> </item>
<item> <item>
<key> <string>init_script</string> </key> <key> <string>init_script</string> </key>
<value> <string>Base_initIntIndexAndReference</string> </value> <value> <string>Base_initIntIndex</string> </value>
</item> </item>
<item> <item>
<key> <string>permission</string> </key> <key> <string>permission</string> </key>
......
bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Optional%20Resource.xml
View file @ e1d50308
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</item> </item>
<item> <item>
<key> <string>init_script</string> </key> <key> <string>init_script</string> </key>
<value> <string>Base_initIntIndexAndReference</string> </value> <value> <string>Base_initIntIndex</string> </value>
</item> </item>
<item> <item>
<key> <string>permission</string> </key> <key> <string>permission</string> </key>
......
bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Transformed%20Resource.xml
View file @ e1d50308
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</item> </item>
<item> <item>
<key> <string>init_script</string> </key> <key> <string>init_script</string> </key>
<value> <string>Base_initIntIndexAndReference</string> </value> <value> <string>Base_initIntIndex</string> </value>
</item> </item>
<item> <item>
<key> <string>permission</string> </key> <key> <string>permission</string> </key>
......
bt5/erp5_pdm/WorkflowTemplateItem/portal_workflow/conversion_interaction_workflow/scripts/Measure_reindexResource.xml
View file @ e1d50308
...@@ -53,8 +53,15 @@ ...@@ -53,8 +53,15 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>state_change[\'object\'].getResourceValue().reindexObject()\n <value> <string encoding="cdata"><![CDATA[
</string> </value>
resource = state_change[\'object\'].getResourceValue()\n
if len(context.portal_catalog(uid=resource.getUid())) > 0:\n
# Reindex resource only when resource is not unindexed.\n
resource.reindexObject()\n
]]></string> </value>
</item> </item>
<item> <item>
<key> <string>_code</string> </key> <key> <string>_code</string> </key>
...@@ -93,6 +100,9 @@ ...@@ -93,6 +100,9 @@
<string>state_change</string> <string>state_change</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>_getitem_</string> <string>_getitem_</string>
<string>resource</string>
<string>len</string>
<string>context</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_pdm/bt/change_log
View file @ e1d50308
2010-04-22 yusei
* Fix Measure_reindexResource in conversion_interaction_workflow. Reindex resource only when measure is unindexed but resource is not.
2010-03-09 Nicolas Dumazet 2010-03-09 Nicolas Dumazet
* Merge measure & quantity_unit_conversion interaction workflows into conversion_interaction_workflow * Merge measure & quantity_unit_conversion interaction workflows into conversion_interaction_workflow
......
bt5/erp5_pdm/bt/revision
View file @ e1d50308
490 492
\ No newline at end of file \ No newline at end of file
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_destination_project_title.xml
View file @ e1d50308
...@@ -68,6 +68,10 @@ ...@@ -68,6 +68,10 @@
<key> <string>catalog_index</string> </key> <key> <string>catalog_index</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
<value> <value>
...@@ -167,7 +171,7 @@ ...@@ -167,7 +171,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python:portal.getDefaultModuleId(\'Project Module\', None)</string> </value> <value> <string>python: here.getPortalObject().getDefaultModuleId(\'Project Module\', None)</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_project/bt/revision
View file @ e1d50308
760 761
\ No newline at end of file \ No newline at end of file
bt5/erp5_simulation/DocumentTemplateItem/InvoiceSimulationRule.py
View file @ e1d50308
...@@ -95,10 +95,8 @@ class InvoicingRuleMovementGenerator(MovementGeneratorMixin): ...@@ -95,10 +95,8 @@ class InvoicingRuleMovementGenerator(MovementGeneratorMixin):
def getGeneratedMovementList(self, context, movement_list=None, def getGeneratedMovementList(self, context, movement_list=None,
rounding=False): rounding=False):
""" """
Input movement list comes from order In Invoice Simulation Rule, source should be source_administration
of the input movement or its order's source. Same for destination.
XXX This implementation is very primitive, and does not support BPM,
i.e. business paths are not taken into account.
""" """
ret = [] ret = []
rule = context.getSpecialiseValue() rule = context.getSpecialiseValue()
...@@ -106,7 +104,13 @@ class InvoicingRuleMovementGenerator(MovementGeneratorMixin): ...@@ -106,7 +104,13 @@ class InvoicingRuleMovementGenerator(MovementGeneratorMixin):
._getInputMovementAndPathTupleList(context): ._getInputMovementAndPathTupleList(context):
kw = self._getPropertyAndCategoryList(input_movement, business_path, kw = self._getPropertyAndCategoryList(input_movement, business_path,
rule) rule)
kw.update({'order':None,'delivery':None}) root_simulation_movement = input_movement.getRootSimulationMovement()
source = input_movement.getSourceAdministration() or \
root_simulation_movement.getSource()
destination = input_movement.getDestinationAdministration() or \
root_simulation_movement.getDestination()
kw.update({'order':None, 'delivery':None,
'source':source, 'destination':destination})
simulation_movement = context.newContent( simulation_movement = context.newContent(
portal_type=RuleMixin.movement_type, portal_type=RuleMixin.movement_type,
temp_object=True, temp_object=True,
......
bt5/erp5_simulation/bt/revision
View file @ e1d50308
81 82
\ No newline at end of file \ No newline at end of file
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_amortisation_method.xml
View file @ e1d50308
...@@ -58,6 +58,10 @@ ...@@ -58,6 +58,10 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
<value> <value>
...@@ -82,6 +86,10 @@ ...@@ -82,6 +86,10 @@
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -152,7 +160,7 @@ ...@@ -152,7 +160,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: getattr(here.portal_categories[field.getId().replace(\'my_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> <value> <string>python: getattr(here, \'Immobilisation_getAmortisationMethodDisplayList\', lambda a: [])()</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox.xml
View file @ e1d50308
...@@ -13,15 +13,16 @@ ...@@ -13,15 +13,16 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>editable_columns</string> <string>columns</string>
<string>domain_tree</string> <string>count_method</string>
<string>default_params</string>
<string>domain_root_list</string> <string>domain_root_list</string>
<string>title</string> <string>domain_tree</string>
<string>editable_columns</string>
<string>list_action</string> <string>list_action</string>
<string>selection_name</string>
<string>default_params</string>
<string>list_method</string> <string>list_method</string>
<string>columns</string> <string>selection_name</string>
<string>title</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -63,6 +64,28 @@ ...@@ -63,6 +64,28 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default_params</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>domain_root_list</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>domain_tree</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable_columns</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -71,10 +94,26 @@ ...@@ -71,10 +94,26 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>list_action</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>list_method</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -125,23 +164,16 @@ ...@@ -125,23 +164,16 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>count_method</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>default_params</string> </key> <key> <string>default_params</string> </key>
<value> <value>
<list> <list/>
<tuple>
<string>group_by_node</string>
<string>1</string>
</tuple>
<tuple>
<string>group_by_variation</string>
<string>1</string>
</tuple>
<tuple>
<string>group_by_section</string>
<string>0</string>
</tuple>
</list>
</value> </value>
</item> </item>
<item> <item>
...@@ -189,7 +221,7 @@ ...@@ -189,7 +221,7 @@
<item> <item>
<key> <string>list_method</string> </key> <key> <string>list_method</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -202,7 +234,7 @@ ...@@ -202,7 +234,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Stock by Variation</string> </value> <value> <string>Stock per Variation</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
...@@ -211,6 +243,38 @@ ...@@ -211,6 +243,38 @@
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python:[(\'group_by_section\', 0), (\'group_by_node\', 1), (\'group_by_variation\', 1)]</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="Method" module="Products.Formulator.MethodField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>getFutureInventoryCount</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle> <pickle>
<tuple> <tuple>
<global name="Method" module="Products.Formulator.MethodField"/> <global name="Method" module="Products.Formulator.MethodField"/>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/my_delivery_mode.xml
View file @ e1d50308
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_dialog_mode_delivery_mode</string> </value> <value> <string>my_view_mode_delivery_mode</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
......
bt5/erp5_trade/bt/revision
View file @ e1d50308
907 910
\ No newline at end of file \ No newline at end of file
bt5/erp5_trade_proxy_field_legacy/bt/description
View file @ e1d50308
This business template holds obsolete fields libraries. It is only usefull for custom projects that still use old libraries. This business template holds obsolete fields libraries. It is only useful for custom projects that still use old libraries.
\ No newline at end of file \ No newline at end of file
bt5/erp5_trade_proxy_field_legacy/bt/revision
View file @ e1d50308
7 8
\ No newline at end of file \ No newline at end of file
bt5/erp5_ui_test/PathTemplateItem/portal_tests/float_field_zuite/testFloatField.xml
View file @ e1d50308
...@@ -43,12 +43,12 @@ ...@@ -43,12 +43,12 @@
xmlns:metal="http://xml.zope.org/namespaces/metal">\n xmlns:metal="http://xml.zope.org/namespaces/metal">\n
<head>\n <head>\n
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\n <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\n
<title>Test Float Value with Integer Fields</title>\n <title>Test Float Value with Float Fields</title>\n
</head>\n </head>\n
<body>\n <body>\n
<table cellpadding="1" cellspacing="1" border="1">\n <table cellpadding="1" cellspacing="1" border="1">\n
<thead>\n <thead>\n
<tr><td rowspan="1" colspan="3">Test Float Value with Integer Fields</td></tr>\n <tr><td rowspan="1" colspan="3">Test Float Value with Float Fields</td></tr>\n
</thead><tbody>\n </thead><tbody>\n
<tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/init" />\n <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/init" />\n
<tr>\n <tr>\n
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyText</td>\n <td>verifyText</td>\n
<td>//fieldset[@id="fieldset_right"]//div[@class="field"][2]//div</td>\n <td>//fieldset[@class="right editable"]//div[@class="field"][2]//div</td>\n
<td>10.0</td>\n <td>10.0</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
...@@ -114,11 +114,11 @@ ...@@ -114,11 +114,11 @@
<tr>\n <tr>\n
<td>verifyValue</td>\n <td>verifyValue</td>\n
<td>field_my_quantity</td>\n <td>field_my_quantity</td>\n
<td>1000000000000.000000</td>\n <td>1000000000000.0</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyText</td>\n <td>verifyText</td>\n
<td>//fieldset[@id="fieldset_right"]//div[@class="field"][2]//div</td>\n <td>//fieldset[@class="right editable"]//div[@class="field"][2]//div</td>\n
<td>1 000 000 000 000.0</td>\n <td>1 000 000 000 000.0</td>\n
</tr>\n </tr>\n
</tbody></table>\n </tbody></table>\n
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/integer_field_zuite/testFloatValue.xml
View file @ e1d50308
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyText</td>\n <td>verifyText</td>\n
<td>//fieldset[@id="fieldset_left"]//span[@class="foo"]</td>\n <td>//fieldset[@class="left editable"]//span[@class="foo"]</td>\n
<td>10</td>\n <td>10</td>\n
</tr>\n </tr>\n
\n \n
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/matrixbox_zuite/testValidationOnEditableCell.xml
View file @ e1d50308
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyText</td>\n <td>verifyText</td>\n
<td>//fieldset[@id=\'fieldset_bottom\']/div[1]/div/div/table/tbody/tr[2]/td[2]</td>\n <td>//fieldset[@class=\'bottom editable\']/div[1]/div/div/table/tbody/tr[2]/td[2]</td>\n
<td>*You did not enter a floating point*</td>\n <td>*You did not enter a floating point*</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyText</td>\n <td>verifyText</td>\n
<td>//fieldset[@id=\'fieldset_bottom\']/div[1]/div/div/table/tbody/tr[2]/td[2]</td>\n <td>//fieldset[@class=\'bottom editable\']/div[1]/div/div/table/tbody/tr[2]/td[2]</td>\n
<td>*You did not enter a floating point*</td>\n <td>*You did not enter a floating point*</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldJump.xml
View file @ e1d50308
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>clickAndWait</td>\n <td>clickAndWait</td>\n
<td>//fieldset[@id=\'fieldset_left\']/div[4]/div/a/img[@alt="jump"]</td>\n <td>//fieldset[@class=\'left editable\']/div[4]/div/a/img[@alt="jump"]</td>\n
<td></td>\n <td></td>\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
...@@ -145,7 +145,7 @@ bar_category/foo_module/1</td>\n ...@@ -145,7 +145,7 @@ bar_category/foo_module/1</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>clickAndWait</td>\n <td>clickAndWait</td>\n
<td>//fieldset[@id=\'fieldset_left\']/div[4]/div/a/img[@alt="jump"]</td>\n <td>//fieldset[@class=\'left editable\']/div[4]/div/a/img[@alt="jump"]</td>\n
<td></td>\n <td></td>\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldWheelWithListbox.xml
View file @ e1d50308
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
<tr>\n <tr>\n
<td>verifyElementPresent</td>\n <td>verifyElementPresent</td>\n
<td>//fieldset[@id=\'fieldset_right\']/div[@class=\'field error\']/span[@class=\'error\']</td>\n <td>//fieldset[@class=\'right editable\']/div[@class=\'field error\']/span[@class=\'error\']</td>\n
<td/>\n <td/>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
<tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
<tr>\n <tr>\n
<td>verifyElementPresent</td>\n <td>verifyElementPresent</td>\n
<td>//fieldset[@id=\'fieldset_right\']/div[1]/div[@class=\'field error\']/span[@class=\'error\']</td>\n <td>//fieldset[@class=\'right editable\']/div[1]/div[@class=\'field error\']/span[@class=\'error\']</td>\n
<td/>\n <td/>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldWithListbox.xml
View file @ e1d50308
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
<tr>\n <tr>\n
<td>verifyElementPresent</td>\n <td>verifyElementPresent</td>\n
<td>//fieldset[@id=\'fieldset_right\']/div[@class=\'field error\']/span[@class=\'error\']</td>\n <td>//fieldset[@class=\'right editable\']/div[@class=\'field error\']/span[@class=\'error\']</td>\n
<td/>\n <td/>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
<tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
<tr>\n <tr>\n
<td>verifyElementPresent</td>\n <td>verifyElementPresent</td>\n
<td>//fieldset[@id=\'fieldset_right\']/div[1]/div[@class=\'field error\']/span[@class=\'error\']</td>\n <td>//fieldset[@class=\'right editable\']/div[1]/div[@class=\'field error\']/span[@class=\'error\']</td>\n
<td/>\n <td/>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
......
bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Foo_view/my_quantity.xml
View file @ e1d50308
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
</item> </item>
<item> <item>
<key> <string>precision</string> </key> <key> <string>precision</string> </key>
<value> <string></string> </value> <value> <int>1</int> </value>
</item> </item>
<item> <item>
<key> <string>required</string> </key> <key> <string>required</string> </key>
......
bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Foo_viewFieldLibrary.xml
View file @ e1d50308
...@@ -87,6 +87,7 @@ ...@@ -87,6 +87,7 @@
<value> <value>
<list> <list>
<string>listbox_title</string> <string>listbox_title</string>
<string>my_constant_string_field</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Foo_viewFieldLibrary/my_constant_string_field.xml 0 → 100644
View file @ e1d50308
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>default</string>
<string>display_width</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_constant_string_field</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>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>display_width</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>target</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</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>display_width</string> </key>
<value> <int>20</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_string_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>my_constant_string_field</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>string:a constant of forty-two is still the answer</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Foo_viewListBoxProxyField.xml
View file @ e1d50308
...@@ -95,6 +95,7 @@ ...@@ -95,6 +95,7 @@
<string>listbox_title</string> <string>listbox_title</string>
<string>listbox_id</string> <string>listbox_id</string>
<string>listbox_quantity</string> <string>listbox_quantity</string>
<string>listbox_constant_string_field</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_ui_test/bt/revision
View file @ e1d50308
556 561
\ No newline at end of file \ No newline at end of file
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_viewFieldLibrary/my_publication_section_list.xml
View file @ e1d50308
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<value> <value>
<list> <list>
<string>title</string> <string>title</string>
<string>items</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -64,12 +63,6 @@ ...@@ -64,12 +63,6 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -93,12 +86,6 @@ ...@@ -93,12 +86,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>items</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
...@@ -113,20 +100,4 @@ ...@@ -113,20 +100,4 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.portal_categories[field.getId().replace(\'my_\', \'\', 1).replace(\'_list\', \'\')].getCategoryChildTranslatedCompactLogicalPathItemList(display_none_category=1, local_sort_id="translated_short_title",checked_permission=\'View\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_minimal_theme/erp5_web_editable_content.css.xml
View file @ e1d50308
...@@ -470,7 +470,7 @@ div#main_content > fieldset.webcontent {\n ...@@ -470,7 +470,7 @@ div#main_content > fieldset.webcontent {\n
/* TODO: redo webcontent header spacing policy because lack of consistency\n /* TODO: redo webcontent header spacing policy because lack of consistency\n
(not tested with huge titles) */\n (not tested with huge titles) */\n
\n \n
div#main_content > fieldset#fieldset_webcontent {padding: 2em}\n div#main_content > fieldset.webcontent {padding: 2em}\n
\n \n
div#main_content > fieldset.header {\n div#main_content > fieldset.header {\n
padding-bottom: 1em;\n padding-bottom: 1em;\n
...@@ -509,7 +509,8 @@ div#main_content fieldset.webcontent span.headline {\n ...@@ -509,7 +509,8 @@ div#main_content fieldset.webcontent span.headline {\n
text-align: left;\n text-align: left;\n
}\n }\n
\n \n
</tal:block> </tal:block>\n
]]></string> </value> ]]></string> </value>
</item> </item>
......
bt5/erp5_web/bt/revision
View file @ e1d50308
930 933
\ No newline at end of file \ No newline at end of file
bt5/erp5_web/bt/short_title deleted 100644 → 0
View file @ 5833251c
None
\ No newline at end of file
bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_content.css.xml
View file @ e1d50308
...@@ -486,7 +486,7 @@ div.input select, div.input textarea {\n ...@@ -486,7 +486,7 @@ div.input select, div.input textarea {\n
margin:5px 0;\n margin:5px 0;\n
}\n }\n
\n \n
#fieldset_bottom > div.field > div.input > textarea {\n fieldset.bottom > div.field > div.input > textarea {\n
width:<tal:block tal:replace="python:main_content_width-2"/>px;\n width:<tal:block tal:replace="python:main_content_width-2"/>px;\n
}\n }\n
\n \n
......
bt5/erp5_web_multiflex5_theme/bt/revision
View file @ e1d50308
178 179
\ No newline at end of file \ No newline at end of file
buildout/instance-profiles/apache.cfg
View file @ e1d50308
...@@ -7,6 +7,8 @@ httpd_port = 8181 ...@@ -7,6 +7,8 @@ httpd_port = 8181
httpd_datadir = ${buildout:var-directory}/httpd httpd_datadir = ${buildout:var-directory}/httpd
httpd_htdocs = ${:httpd_datadir}/htdocs httpd_htdocs = ${:httpd_datadir}/htdocs
httpd_cgibin = ${:httpd_datadir}/cgi-bin httpd_cgibin = ${:httpd_datadir}/cgi-bin
httpd_vhost_rewrite_rules =
RewriteRule ^/static(.*) ${configuration:httpd_htdocs}$1 [L]
[apache-httpd] [apache-httpd]
recipe = collective.recipe.template recipe = collective.recipe.template
...@@ -14,6 +16,11 @@ input = ${software_definition:software_home}/templates/httpd.in ...@@ -14,6 +16,11 @@ input = ${software_definition:software_home}/templates/httpd.in
output = ${buildout:data-bin-directory}/httpd output = ${buildout:data-bin-directory}/httpd
config-path = ${apache-conf:output} config-path = ${apache-conf:output}
[apache-vhost]
recipe = collective.recipe.template
input = ${software_definition:software_home}/templates/httpd.vhost.conf.in
output = ${buildout:var-directory}/etc/httpd.vhost.conf
[apache-conf] [apache-conf]
recipe = collective.recipe.template recipe = collective.recipe.template
input = ${software_definition:software_home}/templates/httpd.conf.in input = ${software_definition:software_home}/templates/httpd.conf.in
...@@ -24,6 +31,7 @@ depends = ...@@ -24,6 +31,7 @@ depends =
${create-directories:command} ${create-directories:command}
${apache-httpd:output} ${apache-httpd:output}
${apache-conf:output} ${apache-conf:output}
${apache-vhost:output}
recipe = plone.recipe.command recipe = plone.recipe.command
command = command =
......
buildout/profiles/deployment.cfg
View file @ e1d50308
...@@ -27,7 +27,7 @@ supervisor_programs = ...@@ -27,7 +27,7 @@ supervisor_programs =
recipe = plone.recipe.command recipe = plone.recipe.command
command = command =
ln -sf ${software_definition:software_home}/bin/python2.4 ${buildout:bin-directory}/python2.4 ln -sf ${software_definition:software_home}/bin/python2.4 ${buildout:bin-directory}/python2.4
#ln -sf ${software_definition:software_home}/bin/ipython2.4 ${buildout:bin-directory}/ipython2.4 ln -sf ${software_definition:software_home}/bin/ipython2.4 ${buildout:bin-directory}/ipython2.4
update-command = ${:command} update-command = ${:command}
[software_definition] [software_definition]
......
buildout/profiles/versions.cfg
View file @ e1d50308
This diff is collapsed.
buildout/software-profiles/erp5.cfg
View file @ e1d50308
This diff is collapsed.
buildout/software-profiles/python-2.4.cfg
View file @ e1d50308
This diff is collapsed.
buildout/templates/httpd.conf.in
View file @ e1d50308
This diff is collapsed.
buildout/templates/httpd.vhost.conf.in 0 → 100644
View file @ e1d50308
This diff is collapsed.
buildout/tests/assertSoftware.py
View file @ e1d50308
This diff is collapsed.
product/CMFActivity/bin/wait_activities
View file @ e1d50308
This diff is collapsed.
product/ERP5/Document/BusinessPath.py
View file @ e1d50308
This diff is collapsed.
product/ERP5/ERP5Site.py
View file @ e1d50308
This diff is collapsed.
product/ERP5/tests/testBPMCore.py
View file @ e1d50308
This diff is collapsed.
product/ERP5/tests/testERP5Core.py
View file @ e1d50308
This diff is collapsed.
product/ERP5/tests/testInvoice.py
View file @ e1d50308
This diff is collapsed.
product/ERP5Form/tests/testFields.py
View file @ e1d50308
This diff is collapsed.
product/ERP5Form/tests/testPreferences.py
View file @ e1d50308
This diff is collapsed.
product/ERP5Legacy/Document/Rule.py
View file @ e1d50308
This diff is collapsed.
product/ERP5OOo/OOoTemplate.py
View file @ e1d50308
This diff is collapsed.
product/ERP5Type/Accessor/Value.py
View file @ e1d50308
This diff is collapsed.
product/ERP5Type/Base.py
View file @ e1d50308
This diff is collapsed.
product/ERP5Type/tests/runUnitTest.py
View file @ e1d50308
This diff is collapsed.
product/ERP5Type/tests/testERP5Type.py
View file @ e1d50308
This diff is collapsed.
product/Formulator/Widget.py
View file @ e1d50308
This diff is collapsed.
product/ZMySQLDA/db.py
View file @ e1d50308
This diff is collapsed.
product/ZSQLCatalog/Query/EntireQuery.py
View file @ e1d50308
This diff is collapsed.
product/ZSQLCatalog/tests/testSQLCatalog.py
View file @ e1d50308
This diff is collapsed.
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