Skip to content

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

Sync with trunk@34913 

Conflicts:
	products/ERP5/Document/TradeCondition.py

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@34922 20353a03-c40f-0410-a6d1-a30d3c3de9de
parents 53f7b6df e5f844c0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4109 additions and 1369 deletions
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_view.xml
View file @ 2f68c5fd
......@@ -88,6 +88,7 @@
<string>my_source_title</string>
<string>my_source_section_title</string>
<string>my_source_payment</string>
<string>my_payment_mode</string>
</list>
</value>
</item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_view/my_payment_mode.xml 0 → 100644
View file @ 2f68c5fd
<?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>enabled</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_payment_mode</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</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>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_payment_mode</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>AccountingTransaction_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<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.getSourceValue(portal_type = \'Account\') is not None and here.getSourceValue(portal_type = \'Account\').isMemberOf(\'account_type/asset/cash\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_viewDestination.xml
View file @ 2f68c5fd
......@@ -88,6 +88,7 @@
<string>my_destination_title</string>
<string>my_destination_section_title</string>
<string>my_destination_payment</string>
<string>my_payment_mode</string>
</list>
</value>
</item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_viewDestination/my_payment_mode.xml 0 → 100644
View file @ 2f68c5fd
<?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>enabled</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_payment_mode</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</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>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_payment_mode</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>AccountingTransaction_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<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.getDestinationValue(portal_type = \'Account\') is not None and here.getDestinationValue(portal_type = \'Account\').isMemberOf(\'account_type/asset/cash\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_accounting/bt/revision
View file @ 2f68c5fd
1193
\ No newline at end of file
1194
\ No newline at end of file
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.xml
View file @ 2f68c5fd
......@@ -86,7 +86,7 @@ Grouping from account transaction view\n
<td>//label[contains(text(),"Total Selected Amount")]/../div[1]/</td>\n
<td>0.00</td>\n
</tr>\n
<tr tal:condition="is_selenium_0_8">\n
<tr>\n
<td>verifySelectedLabel</td>\n
<td>field_your_node</td>\n
<td>41 - Receivable</td>\n
......@@ -243,7 +243,7 @@ Grouping from account transaction view\n
<td>on</td>\n
</tr>\n
\n
<tr tal:condition="is_selenium_0_8">\n
<tr>\n
<td>verifySelectedLabel</td>\n
<td>field_your_node</td>\n
<td>41 - Receivable</td>\n
......
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.xml
View file @ 2f68c5fd
......@@ -97,7 +97,7 @@ Grouping from entity transaction view\n
<td>//label[contains(text(),"Total Selected Amount")]/../div[1]/</td>\n
<td>0.00</td>\n
</tr>\n
<tr tal:condition="is_selenium_0_8">\n
<tr>\n
<td>verifySelectedLabel</td>\n
<td>field_your_node</td>\n
<td></td>\n
......@@ -226,7 +226,7 @@ Grouping from entity transaction view\n
<td>on</td>\n
</tr>\n
\n
<tr tal:condition="is_selenium_0_8">\n
<tr>\n
<td>verifySelectedLabel</td>\n
<td>field_your_node</td>\n
<td>41 - Receivable</td>\n
......
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_multi_pages.html.xml
View file @ 2f68c5fd
......@@ -97,7 +97,7 @@ Grouping with multiple pages\n
<td>//label[contains(text(),"Total Selected Amount")]/../div[1]/</td>\n
<td>0.00</td>\n
</tr>\n
<tr tal:condition="is_selenium_0_8">\n
<tr>\n
<td>verifySelectedLabel</td>\n
<td>field_your_node</td>\n
<td></td>\n
......@@ -236,7 +236,7 @@ Grouping with multiple pages\n
<td>on</td>\n
</tr>\n
\n
<tr tal:condition="is_selenium_0_8">\n
<tr>\n
<td>verifySelectedLabel</td>\n
<td>field_your_node</td>\n
<td>41 - Receivable</td>\n
......
bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml
View file @ 2f68c5fd
......@@ -41,10 +41,9 @@
<tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
xmlns:metal="http://xml.zope.org/namespaces/metal">\n
<tal:block metal:define-macro="init"\n
tal:define="global is_selenium_0_8 python: here.getPortalObject().portal_tests.getZeleniumVersion() &gt; \'Zelenium-0.8\'">\n
<tal:block metal:define-macro="init">\n
<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n
<tr tal:condition="is_selenium_0_8">\n
<tr>\n
<td>setTimeout</td>\n
<td>600000</td>\n
<td></td>\n
......
bt5/erp5_accounting_ui_test/bt/revision
View file @ 2f68c5fd
155
\ No newline at end of file
156
\ No newline at end of file
bt5/erp5_advanced_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice/detail.xml deleted 100644 → 0
View file @ 53f7b6df
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_view</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_view</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>detail</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>7.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Details</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/PurchaseInvoiceTransaction_viewDetails</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_advanced_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice/view_invoice.xml
View file @ 2f68c5fd
......@@ -33,7 +33,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
......@@ -77,7 +79,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/PurchaseInvoiceTransaction_viewInvoice</string> </value>
<value> <string>string:${object_url}/PurchaseInvoice_viewInvoice</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoiceModule_viewPurchaseInvoiceList/listbox.xml
View file @ 2f68c5fd
......@@ -13,9 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>selection_name</string>
<string>columns</string>
<string>search_columns</string>
<string>selection_name</string>
<string>sort</string>
<string>sort_columns</string>
<string>title</string>
</list>
</value>
</item>
......@@ -85,25 +88,21 @@
<string>Title</string>
</tuple>
<tuple>
<string>delivery_mirror_section_title</string>
<string>Third Party</string>
<string>source_section_title</string>
<string>Client</string>
</tuple>
<tuple>
<string>translated_portal_type</string>
<string>Transaction Type</string>
<string>destination_section_title</string>
<string>Supplier</string>
</tuple>
<tuple>
<string>operation_date</string>
<string>Accounting Operation Date</string>
<string>delivery.start_date</string>
<string>Invoice Date</string>
</tuple>
<tuple>
<string>reference</string>
<string>Document Reference</string>
</tuple>
<tuple>
<string>specific_reference</string>
<string>Transaction Reference</string>
</tuple>
<tuple>
<string>translated_simulation_state_title</string>
<string>State</string>
......@@ -119,10 +118,83 @@
<key> <string>form_id</string> </key>
<value> <string>Base_viewAdvancedInvoicingFieldLibrary</string> </value>
</item>
<item>
<key> <string>search_columns</string> </key>
<value>
<list>
<tuple>
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>source_section_title</string>
<string>Client</string>
</tuple>
<tuple>
<string>destination_section_title</string>
<string>Supplier</string>
</tuple>
<tuple>
<string>delivery.start_date</string>
<string>Invoice Date</string>
</tuple>
<tuple>
<string>reference</string>
<string>Document Reference</string>
</tuple>
<tuple>
<string>translated_simulation_state_title</string>
<string>State</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>purchase_invoice_module_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
<value>
<list>
<tuple>
<string>delivery.start_date</string>
<string>ASC</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>sort_columns</string> </key>
<value>
<list>
<tuple>
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>source_section_title</string>
<string>Client</string>
</tuple>
<tuple>
<string>destination_section_title</string>
<string>Supplier</string>
</tuple>
<tuple>
<string>delivery.start_date</string>
<string>Invoice Date</string>
</tuple>
<tuple>
<string>reference</string>
<string>Document Reference</string>
</tuple>
<tuple>
<string>translated_simulation_state_title</string>
<string>State</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
......
bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoiceModule_viewSaleInvoiceList/listbox.xml
View file @ 2f68c5fd
......@@ -13,9 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>selection_name</string>
<string>columns</string>
<string>search_columns</string>
<string>selection_name</string>
<string>sort</string>
<string>sort_columns</string>
<string>title</string>
</list>
</value>
</item>
......@@ -85,25 +88,21 @@
<string>Title</string>
</tuple>
<tuple>
<string>delivery_mirror_section_title</string>
<string>Third Party</string>
<string>source_section_title</string>
<string>Supplier</string>
</tuple>
<tuple>
<string>translated_portal_type</string>
<string>Transaction Type</string>
<string>destination_section_title</string>
<string>Client</string>
</tuple>
<tuple>
<string>operation_date</string>
<string>Accounting Operation Date</string>
<string>delivery.start_date</string>
<string>Invoice Date</string>
</tuple>
<tuple>
<string>reference</string>
<string>Document Reference</string>
</tuple>
<tuple>
<string>specific_reference</string>
<string>Transaction Reference</string>
</tuple>
<tuple>
<string>translated_simulation_state_title</string>
<string>State</string>
......@@ -119,10 +118,83 @@
<key> <string>form_id</string> </key>
<value> <string>Base_viewAdvancedInvoicingFieldLibrary</string> </value>
</item>
<item>
<key> <string>search_columns</string> </key>
<value>
<list>
<tuple>
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>source_section_title</string>
<string>Supplier</string>
</tuple>
<tuple>
<string>destination_section_title</string>
<string>Client</string>
</tuple>
<tuple>
<string>delivery.start_date</string>
<string>Invoice Date</string>
</tuple>
<tuple>
<string>reference</string>
<string>Document Reference</string>
</tuple>
<tuple>
<string>translated_simulation_state_title</string>
<string>State</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>sale_invoice_module_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
<value>
<list>
<tuple>
<string>delivery.start_date</string>
<string>ASC</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>sort_columns</string> </key>
<value>
<list>
<tuple>
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>source_section_title</string>
<string>Supplier</string>
</tuple>
<tuple>
<string>destination_section_title</string>
<string>Client</string>
</tuple>
<tuple>
<string>delivery.start_date</string>
<string>Invoice Date</string>
</tuple>
<tuple>
<string>reference</string>
<string>Document Reference</string>
</tuple>
<tuple>
<string>translated_simulation_state_title</string>
<string>State</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
......
bt5/erp5_advanced_invoicing/bt/change_log
View file @ 2f68c5fd
2010-04-27 yusei
* Fix list view forms for sale/purchase invoice module.
* Fix purchase invoice default view action. View form for purchase invoice transaction was used.
* Remove detail action from purchase invoice portal type. It was not an action for purchase invoice.
2010-04-08 yusuke
* Reverted previous change.
......
bt5/erp5_advanced_invoicing/bt/revision
View file @ 2f68c5fd
86
\ No newline at end of file
88
\ No newline at end of file
bt5/erp5_advanced_invoicing/bt/template_action_path_list
View file @ 2f68c5fd
......@@ -4,7 +4,6 @@ Purchase Invoice Transaction | jump_related_purchase_invoice_advanced
Purchase Invoice Transaction | jump_related_purchase_packing_list_advanced
Purchase Invoice | apply_trade_condition
Purchase Invoice | create_new_file
Purchase Invoice | detail
Purchase Invoice | document_list
Purchase Invoice | jump_related_order
Purchase Invoice | jump_related_purchase_invoice_transaction
......
bt5/erp5_base/CategoryTemplateItem/portal_categories/specialise.xml deleted 100644 → 0
View file @ 53f7b6df
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>acquisition_append_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>acquisition_copy_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>acquisition_mask_value</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>acquisition_object_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>acquisition_portal_type</string> </key>
<value> <string>python: []</string> </value>
</item>
<item>
<key> <string>acquisition_sync_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>category_type</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>criterion_property</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>fallback_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>specialise</string> </value>
</item>
<item>
<key> <string>id_generator</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id_group</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>last_id</string> </key>
<value> <string>1</string> </value>
</item>
<item>
<key> <string>membership_criterion_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>membership_criterion_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>multimembership_criterion_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Base Category</string> </value>
</item>
<item>
<key> <string>read_permission</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>rid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>sid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Specialise</string> </value>
</item>
<item>
<key> <string>write_permission</string> </key>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="OOBTree" module="BTrees._OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees._OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
bt5/erp5_base/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
View file @ 2f68c5fd
......@@ -49,11 +49,11 @@
</chain>
<chain>
<type>File</type>
<workflow>edit_workflow</workflow>
<workflow>cached_convertible_interaction_workflow, edit_workflow</workflow>
</chain>
<chain>
<type>Image</type>
<workflow>edit_workflow</workflow>
<workflow>cached_convertible_interaction_workflow, edit_workflow</workflow>
</chain>
<chain>
<type>Link</type>
......@@ -61,7 +61,7 @@
</chain>
<chain>
<type>Notification Message</type>
<workflow>edit_workflow, notification_message_workflow</workflow>
<workflow>cached_convertible_interaction_workflow, edit_workflow, notification_message_workflow</workflow>
</chain>
<chain>
<type>Organisation</type>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view.xml
View file @ 2f68c5fd
......@@ -119,6 +119,7 @@
<string>my_branch</string>
<string>my_bank_account_number</string>
<string>my_bank_account_key</string>
<string>my_bank_account_holder_name</string>
<string>my_comment</string>
<string>my_translated_validation_state_title</string>
</list>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_account_holder_name.xml 0 → 100644
View file @ 2f68c5fd
<?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>description</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_bank_account_holder_name</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string>The name of the bank account holder.</string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_bank_account_holder_name</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>BankAccount_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>Bank Account Holder Name</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/clearCacheUponUpload.xml → bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_isSplitAndDeferPossible.xml
View file @ 2f68c5fd
......@@ -53,10 +53,9 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>document = state_change[\'object\']\n
# if file uploaded, then:\n
if getattr(document, \'clearConversionCache\', None) is not None: # e.g. File doesn\'t have it\n
document.clearConversionCache()\n
<value> <string># By default, \'Split and Defer\' is possible for all portal types \\\n
# that uses delivery_causality_workflow.\n
return True\n
</string> </value>
</item>
<item>
......@@ -67,7 +66,7 @@ if getattr(document, \'clearConversionCache\', None) is not None: # e.g. File do
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>state_change</string> </value>
<value> <string></string> </value>
</item>
<item>
<key> <string>errors</string> </key>
......@@ -87,18 +86,13 @@ if getattr(document, \'clearConversionCache\', None) is not None: # e.g. File do
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>1</int> </value>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>state_change</string>
<string>_getitem_</string>
<string>document</string>
<string>getattr</string>
<string>None</string>
<string>_getattr_</string>
<string>True</string>
</tuple>
</value>
</item>
......@@ -115,7 +109,7 @@ if getattr(document, \'clearConversionCache\', None) is not None: # e.g. File do
</item>
<item>
<key> <string>id</string> </key>
<value> <string>clearCacheUponUpload</string> </value>
<value> <string>Delivery_isSplitAndDeferPossible</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
......
bt5/erp5_base/WorkflowTemplateItem/portal_workflow/cached_convertible_interaction_workflow.xml 0 → 100644
View file @ 2f68c5fd
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="InteractionWorkflowDefinition" module="Products.ERP5.InteractionWorkflow"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>groups</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>cached_convertible_interaction_workflow</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_base/WorkflowTemplateItem/portal_workflow/cached_convertible_interaction_workflow/interactions.xml 0 → 100644
View file @ 2f68c5fd
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="Interaction" module="Products.ERP5.Interaction"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_mapping</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>interactions</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/interactions/TextDocument_setTextContent.xml → bt5/erp5_base/WorkflowTemplateItem/portal_workflow/cached_convertible_interaction_workflow/interactions/Document_updateContentMd5.xml
View file @ 2f68c5fd
......@@ -31,13 +31,19 @@
<key> <string>after_script_name</string> </key>
<value>
<list>
<string>clearCacheUponUpload</string>
<string>updateContentMd5</string>
</list>
</value>
</item>
<item>
<key> <string>before_commit_script_name</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>This interaction clears the conversion cache of Text Document each time the text content is changed.</string> </value>
<value> <string></string> </value>
</item>
<item>
<key> <string>guard</string> </key>
......@@ -47,26 +53,25 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>TextDocument_setTextContent</string> </value>
<value> <string>Document_updateContentMd5</string> </value>
</item>
<item>
<key> <string>method_id</string> </key>
<value>
<list>
<string>_setFile,</string>
<string>_setTextContent</string>
</list>
</value>
</item>
<item>
<key> <string>once_per_transaction</string> </key>
<value> <int>1</int> </value>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>portal_type_filter</string> </key>
<value>
<list>
<string>Web Page</string>
</list>
<none/>
</value>
</item>
<item>
......@@ -77,7 +82,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Update Text Content</string> </value>
<value> <string></string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
......
bt5/erp5_base/WorkflowTemplateItem/portal_workflow/cached_convertible_interaction_workflow/scripts.xml 0 → 100644
View file @ 2f68c5fd
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="Scripts" module="Products.DCWorkflow.Scripts"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_mapping</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>scripts</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_base/WorkflowTemplateItem/portal_workflow/cached_convertible_interaction_workflow/variables.xml 0 → 100644
View file @ 2f68c5fd
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="Variables" module="Products.DCWorkflow.Variables"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_mapping</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>variables</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_base/WorkflowTemplateItem/portal_workflow/cached_convertible_interaction_workflow/worklists.xml 0 → 100644
View file @ 2f68c5fd
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="Worklists" module="Products.DCWorkflow.Worklists"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_mapping</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>worklists</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/split_and_defer_action.xml
View file @ 2f68c5fd
......@@ -97,7 +97,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python: here.getSimulationState() not in here.getPortalDraftOrderStateList()</string> </value>
<value> <string>python:here.getSimulationState() not in here.getPortalDraftOrderStateList() and here.Delivery_isSplitAndDeferPossible()</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_base/bt/change_log
View file @ 2f68c5fd
2010-04-29 kazuhiko
* Remove specialise base category because it already exists in erp5_core.
2010-04-27 yusei
* Add bank account holder name field to bank account view.
2010-04-26 kazuhiko
* Add Delivery_isSplitAndDeferPossible script, that should be just a temporary implementation before merging new simulation API, where we can control more flexibly.
2010-04-02 yusei
* Add precision field to rounding model view.
......
bt5/erp5_base/bt/revision
View file @ 2f68c5fd
719
\ No newline at end of file
725
\ No newline at end of file
bt5/erp5_base/bt/template_base_category_list
View file @ 2f68c5fd
......@@ -36,7 +36,6 @@ social_form
source_carrier
source_referral
source_region
specialise
subordination
successor
trade_phase
......
bt5/erp5_base/bt/template_portal_type_workflow_chain_list
View file @ 2f68c5fd
......@@ -16,9 +16,12 @@ Currency | edit_workflow
Currency | validation_workflow
Email | edit_workflow
Fax | edit_workflow
File | cached_convertible_interaction_workflow
File | edit_workflow
Image | cached_convertible_interaction_workflow
Image | edit_workflow
Link | edit_workflow
Notification Message | cached_convertible_interaction_workflow
Notification Message | edit_workflow
Notification Message | notification_message_workflow
Organisation | edit_workflow
......
bt5/erp5_base/bt/template_workflow_id_list
View file @ 2f68c5fd
assignment_workflow
cached_convertible_interaction_workflow
career_workflow
currency_exchange_line_interaction_workflow
delivery_causality_interaction_workflow
......
bt5/erp5_crm/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
View file @ 2f68c5fd
......@@ -9,15 +9,15 @@
</chain>
<chain>
<type>Fax Message</type>
<workflow>edit_workflow, event_interaction_workflow, event_workflow, pricing_interaction_workflow</workflow>
<workflow>cached_convertible_interaction_workflow, edit_workflow, event_interaction_workflow, event_workflow, pricing_interaction_workflow</workflow>
</chain>
<chain>
<type>Letter</type>
<workflow>edit_workflow, event_interaction_workflow, event_workflow, pricing_interaction_workflow</workflow>
<workflow>cached_convertible_interaction_workflow, edit_workflow, event_interaction_workflow, event_workflow, pricing_interaction_workflow</workflow>
</chain>
<chain>
<type>Mail Message</type>
<workflow>edit_workflow, event_interaction_workflow, event_workflow, pricing_interaction_workflow</workflow>
<workflow>cached_convertible_interaction_workflow, edit_workflow, event_interaction_workflow, event_workflow, pricing_interaction_workflow</workflow>
</chain>
<chain>
<type>Meeting</type>
......@@ -25,11 +25,11 @@
</chain>
<chain>
<type>Note</type>
<workflow>edit_workflow, event_interaction_workflow, event_workflow, pricing_interaction_workflow</workflow>
<workflow>cached_convertible_interaction_workflow, edit_workflow, event_interaction_workflow, event_workflow, pricing_interaction_workflow</workflow>
</chain>
<chain>
<type>Phone Call</type>
<workflow>edit_workflow, event_interaction_workflow, event_workflow, pricing_interaction_workflow</workflow>
<workflow>cached_convertible_interaction_workflow, edit_workflow, event_interaction_workflow, event_workflow, pricing_interaction_workflow</workflow>
</chain>
<chain>
<type>Sale Opportunity</type>
......@@ -37,7 +37,7 @@
</chain>
<chain>
<type>Site Message</type>
<workflow>edit_workflow, event_interaction_workflow, event_workflow</workflow>
<workflow>cached_convertible_interaction_workflow, edit_workflow, event_interaction_workflow, event_workflow</workflow>
</chain>
<chain>
<type>Support Request</type>
......@@ -45,10 +45,10 @@
</chain>
<chain>
<type>Visit</type>
<workflow>edit_workflow, event_interaction_workflow, event_workflow, pricing_interaction_workflow</workflow>
<workflow>cached_convertible_interaction_workflow, edit_workflow, event_interaction_workflow, event_workflow, pricing_interaction_workflow</workflow>
</chain>
<chain>
<type>Web Message</type>
<workflow>edit_workflow, event_interaction_workflow, event_workflow, pricing_interaction_workflow</workflow>
<workflow>cached_convertible_interaction_workflow, edit_workflow, event_interaction_workflow, event_workflow, pricing_interaction_workflow</workflow>
</chain>
</workflow_chain>
\ No newline at end of file
bt5/erp5_crm/bt/revision
View file @ 2f68c5fd
460
\ No newline at end of file
462
\ No newline at end of file
bt5/erp5_crm/bt/template_portal_type_workflow_chain_list
View file @ 2f68c5fd
......@@ -3,14 +3,17 @@ Campaign | edit_workflow
Campaign | pricing_interaction_workflow
Campaign | ticket_interaction_workflow
Campaign | ticket_workflow
Fax Message | cached_convertible_interaction_workflow
Fax Message | edit_workflow
Fax Message | event_interaction_workflow
Fax Message | event_workflow
Fax Message | pricing_interaction_workflow
Letter | cached_convertible_interaction_workflow
Letter | edit_workflow
Letter | event_interaction_workflow
Letter | event_workflow
Letter | pricing_interaction_workflow
Mail Message | cached_convertible_interaction_workflow
Mail Message | edit_workflow
Mail Message | event_interaction_workflow
Mail Message | event_workflow
......@@ -19,10 +22,12 @@ Meeting | edit_workflow
Meeting | pricing_interaction_workflow
Meeting | ticket_interaction_workflow
Meeting | ticket_workflow
Note | cached_convertible_interaction_workflow
Note | edit_workflow
Note | event_interaction_workflow
Note | event_workflow
Note | pricing_interaction_workflow
Phone Call | cached_convertible_interaction_workflow
Phone Call | edit_workflow
Phone Call | event_interaction_workflow
Phone Call | event_workflow
......@@ -31,6 +36,7 @@ Sale Opportunity | edit_workflow
Sale Opportunity | pricing_interaction_workflow
Sale Opportunity | sale_opportunity_workflow
Sale Opportunity | ticket_interaction_workflow
Site Message | cached_convertible_interaction_workflow
Site Message | edit_workflow
Site Message | event_interaction_workflow
Site Message | event_workflow
......@@ -38,10 +44,12 @@ Support Request | edit_workflow
Support Request | pricing_interaction_workflow
Support Request | ticket_interaction_workflow
Support Request | ticket_workflow
Visit | cached_convertible_interaction_workflow
Visit | edit_workflow
Visit | event_interaction_workflow
Visit | event_workflow
Visit | pricing_interaction_workflow
Web Message | cached_convertible_interaction_workflow
Web Message | edit_workflow
Web Message | event_interaction_workflow
Web Message | event_workflow
......
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_createNewDiscussionThread.xml
View file @ 2f68c5fd
......@@ -93,6 +93,36 @@ portal_status_message = "New discussion created. Your post will be reviewed for
discussion_thread.submit()\n
discussion_post.submit()\n
\n
if send_notification_text not in (\'\', None):\n
# we can send notifications\n
email_list = []\n
notification_list = send_notification_text.split(\'\\r\\n\')\n
for notification in notification_list:\n
if \'@\' in notification:\n
# user specified an email\n
email_list.append(notification)\n
else:\n
# we can assume user wanted to specify Person\'s title\n
person_list = portal.portal_catalog(portal_type=\'Person\',\n
title=notification)\n
email_list.extend([x.getDefaultEmailText() for x in person_list])\n
email_from = portal.email_from_address\n
email_subject = "New forum post"\n
email_template = """\n
\n
New forum post has been created at this url:\n
\n
${url}""" \n
email_body = context.Base_translateString(email_template, mapping={\'url\':discussion_thread.absolute_url()})\n
for email_to in email_list:\n
mail_headers = """\n
To: %s\n
From: %s\n
Subject: %s\n
Date: %s""" %(email_to, email_from, email_subject, DateTime().rfc822())\n
mail_source =\'%s\\n\\n%s\' %(mail_headers, email_body)\n
context.MailHost.send(mail_source)\n
\n
return discussion_thread.Base_redirect(form_id,\n
keep_items = dict(portal_status_message=context.Base_translateString(portal_status_message)))\n
</string> </value>
......@@ -105,7 +135,7 @@ return discussion_thread.Base_redirect(form_id,\n
</item>
<item>
<key> <string>_params</string> </key>
<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>
<value> <string>title, text_content, form_id=\'view\', predecessor=None, description=None, subject_list=None, classification=None, group_list=None, site_list=None, send_notification_text=None, reference=None,**kw</string> </value>
</item>
<item>
<key> <string>_proxy_roles</string> </key>
......@@ -131,7 +161,7 @@ return discussion_thread.Base_redirect(form_id,\n
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>10</int> </value>
<value> <int>11</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
......@@ -146,6 +176,7 @@ return discussion_thread.Base_redirect(form_id,\n
<string>classification</string>
<string>group_list</string>
<string>site_list</string>
<string>send_notification_text</string>
<string>reference</string>
<string>kw</string>
<string>None</string>
......@@ -161,6 +192,22 @@ return discussion_thread.Base_redirect(form_id,\n
<string>discussion_thread</string>
<string>discussion_post</string>
<string>portal_status_message</string>
<string>email_list</string>
<string>notification_list</string>
<string>_getiter_</string>
<string>notification</string>
<string>person_list</string>
<string>append</string>
<string>$append0</string>
<string>x</string>
<string>email_from</string>
<string>email_subject</string>
<string>email_template</string>
<string>email_body</string>
<string>email_to</string>
<string>DateTime</string>
<string>mail_headers</string>
<string>mail_source</string>
<string>dict</string>
</tuple>
</value>
......@@ -182,6 +229,7 @@ return discussion_thread.Base_redirect(form_id,\n
<none/>
<none/>
<none/>
<none/>
</tuple>
</value>
</item>
......
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_viewCreateNewDiscussionThreadDialog.xml
View file @ 2f68c5fd
......@@ -114,6 +114,7 @@
<value>
<list>
<string>my_subject_list</string>
<string>your_send_notification_text</string>
</list>
</value>
</item>
......
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_viewCreateNewDiscussionThreadDialog/my_classification.xml
View file @ 2f68c5fd
......@@ -12,7 +12,9 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
<list/>
<list>
<string>enabled</string>
</list>
</value>
</item>
<item>
......@@ -72,6 +74,10 @@
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>enabled</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_classification</string> </value>
......
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_viewCreateNewDiscussionThreadDialog/my_description.xml
View file @ 2f68c5fd
......@@ -12,7 +12,9 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
<list/>
<list>
<string>enabled</string>
</list>
</value>
</item>
<item>
......@@ -72,6 +74,10 @@
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>enabled</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_description</string> </value>
......
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewCreateNewDiscussionPostDialog/your_send_notification_text.xml → bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_viewCreateNewDiscussionThreadDialog/your_send_notification_text.xml
View file @ 2f68c5fd
......@@ -15,7 +15,6 @@
<list>
<string>description</string>
<string>editable</string>
<string>enabled</string>
<string>title</string>
</list>
</value>
......@@ -101,10 +100,6 @@
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_text_area_field</string> </value>
......
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_createNewDiscussionPost.xml
View file @ 2f68c5fd
......@@ -74,35 +74,6 @@ discussion_post = context.newContent(\n
# depending on security model Post can be submited for review\n
portal_status_message = "New post created."\n
discussion_post.release()\n
if send_notification_text not in (\'\', None):\n
# we can send notifications\n
email_list = []\n
notification_list = send_notification_text.split(\'\\r\\n\')\n
for notification in notification_list:\n
if \'@\' in notification:\n
# user specified an email\n
email_list.append(notification)\n
else:\n
# we can assume user wanted to specify Person\'s title\n
person_list = portal.portal_catalog(portal_type=\'Person\',\n
title=notification)\n
email_list.extend([x.getDefaultEmailText() for x in person_list])\n
email_from = portal.email_from_address\n
email_subject = "New forum post"\n
email_template = """\n
\n
New forum post has been created at this url:\n
\n
${url}""" \n
email_body = context.Base_translateString(email_template, mapping={\'url\':discussion_post.absolute_url()})\n
for email_to in email_list:\n
mail_headers = """\n
To: %s\n
From: %s\n
Subject: %s\n
Date: %s""" %(email_to, email_from, email_subject, DateTime().rfc822())\n
mail_source =\'%s\\n\\n%s\' %(mail_headers, email_body)\n
context.MailHost.send(mail_source)\n
\n
return context.Base_redirect(form_id,\n
keep_items = dict(portal_status_message=context.Base_translateString(portal_status_message)))\n
......@@ -116,7 +87,7 @@ return context.Base_redirect(form_id,\n
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>title, text_content, form_id=\'view\', send_notification_text=None, predecessor=None,**kw</string> </value>
<value> <string>title, text_content, form_id=\'view\', predecessor=None,**kw</string> </value>
</item>
<item>
<key> <string>_proxy_roles</string> </key>
......@@ -145,7 +116,7 @@ return context.Base_redirect(form_id,\n
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>5</int> </value>
<value> <int>4</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
......@@ -154,7 +125,6 @@ return context.Base_redirect(form_id,\n
<string>title</string>
<string>text_content</string>
<string>form_id</string>
<string>send_notification_text</string>
<string>predecessor</string>
<string>kw</string>
<string>DateTime</string>
......@@ -166,22 +136,6 @@ return context.Base_redirect(form_id,\n
<string>language</string>
<string>discussion_post</string>
<string>portal_status_message</string>
<string>None</string>
<string>email_list</string>
<string>notification_list</string>
<string>_getiter_</string>
<string>notification</string>
<string>person_list</string>
<string>append</string>
<string>$append0</string>
<string>x</string>
<string>email_from</string>
<string>email_subject</string>
<string>email_template</string>
<string>email_body</string>
<string>email_to</string>
<string>mail_headers</string>
<string>mail_source</string>
<string>dict</string>
</tuple>
</value>
......@@ -197,7 +151,6 @@ return context.Base_redirect(form_id,\n
<tuple>
<string>view</string>
<none/>
<none/>
</tuple>
</value>
</item>
......
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewCreateNewDiscussionPostDialog.xml
View file @ 2f68c5fd
......@@ -100,7 +100,6 @@
<value>
<list>
<string>your_title</string>
<string>your_send_notification_text</string>
</list>
</value>
</item>
......
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/erp5_discussion.css.xml
View file @ 2f68c5fd
......@@ -15,7 +15,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts70557220.29</string> </value>
<value> <string>ts72458028.86</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
......@@ -89,7 +89,7 @@ a.discussion-post-creator-title-link{\n
}\n
\n
div.discussion-post-body-container{\n
float: left;\n
/*float: left;*/\n
margin-left: 10px;\n
margin-top: 10px;\n
margin-bottom: 10px;\n
......@@ -117,7 +117,7 @@ button.discussion-post-action-button{\n
</item>
<item>
<key> <string>size</string> </key>
<value> <int>1329</int> </value>
<value> <int>1333</int> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_discussion/bt/revision
View file @ 2f68c5fd
45
\ No newline at end of file
47
\ No newline at end of file
bt5/erp5_dms/PathTemplateItem/portal_alarms/document_update_content_alarm.xml
View file @ 2f68c5fd
......@@ -155,25 +155,13 @@
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>BTrees.Length</string>
<string>Length</string>
</tuple>
<none/>
</tuple>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<tuple>
<string>BTrees.OOBTree</string>
<string>OOBTree</string>
</tuple>
<none/>
</tuple>
<global name="OOBTree" module="BTrees._OOBTree"/>
</pickle>
<pickle>
<none/>
......@@ -181,13 +169,7 @@
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
<tuple>
<string>BTrees.OOBTree</string>
<string>OOBTree</string>
</tuple>
<none/>
</tuple>
<global name="OOBTree" module="BTrees._OOBTree"/>
</pickle>
<pickle>
<none/>
......
bt5/erp5_dms/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
View file @ 2f68c5fd
<allowed_content_type_list>
<portal_type id="Contribution Tool">
<item>Spreadsheet</item>
<item>File</item>
<item>Text</item>
<item>Document Ingestion Message</item>
<item>Web Page</item>
<item>Presentation</item>
<item>Drawing</item>
<item>PDF</item>
<item>File</item>
<item>Image</item>
<item>PDF</item>
<item>Presentation</item>
<item>Spreadsheet</item>
<item>Text</item>
<item>Web Page</item>
</portal_type>
<portal_type id="Document Ingestion Module">
<item>Document Ingestion Message</item>
</portal_type>
<portal_type id="Document Module">
<item>File</item>
<item>Drawing</item>
<item>File</item>
<item>PDF</item>
<item>Text</item>
<item>Presentation</item>
<item>Spreadsheet</item>
<item>Text</item>
</portal_type>
<portal_type id="Drawing">
<item>Web Page</item>
<item>Role Definition</item>
<item>Image</item>
<item>Role Definition</item>
<item>Web Page</item>
</portal_type>
<portal_type id="External Source Module">
<item>RSS Feed</item>
......@@ -43,28 +43,28 @@
<item>Role Definition</item>
</portal_type>
<portal_type id="Presentation">
<item>Web Page</item>
<item>Role Definition</item>
<item>Image</item>
<item>Role Definition</item>
<item>Web Page</item>
</portal_type>
<portal_type id="Spreadsheet">
<item>Image</item>
<item>Role Definition</item>
<item>Web Page</item>
<item>Image</item>
</portal_type>
<portal_type id="Text">
<item>Image</item>
<item>Web Page</item>
<item>Role Definition</item>
<item>Web Page</item>
</portal_type>
<portal_type id="URL Crawler">
<item>Presentation</item>
<item>Web Page</item>
<item>Spreadsheet</item>
<item>Image</item>
<item>Drawing</item>
<item>Text</item>
<item>File</item>
<item>Image</item>
<item>PDF</item>
<item>Presentation</item>
<item>Spreadsheet</item>
<item>Text</item>
<item>Web Page</item>
</portal_type>
</allowed_content_type_list>
\ No newline at end of file
bt5/erp5_dms/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
View file @ 2f68c5fd
......@@ -6,9 +6,9 @@
<item>business_application</item>
</portal_type>
<portal_type id="Web Page">
<item>site</item>
<item>function</item>
<item>follow_up</item>
<item>function</item>
<item>group</item>
<item>site</item>
</portal_type>
</base_category_list>
\ No newline at end of file
bt5/erp5_dms/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
View file @ 2f68c5fd
<hidden_content_type_list>
<portal_type id="Contribution Tool">
<item>Text</item>
<item>Document Ingestion Message</item>
<item>Web Page</item>
<item>Drawing</item>
<item>PDF</item>
<item>Spreadsheet</item>
<item>File</item>
<item>Image</item>
<item>PDF</item>
<item>Presentation</item>
<item>Spreadsheet</item>
<item>Text</item>
<item>Web Page</item>
</portal_type>
<portal_type id="Drawing">
<item>Web Page</item>
<item>Image</item>
<item>Web Page</item>
</portal_type>
<portal_type id="Presentation">
<item>Image</item>
......
bt5/erp5_dms/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
View file @ 2f68c5fd
<workflow_chain>
<chain>
<type>Document Ingestion Message</type>
<workflow>document_ingestion_interaction_workflow, document_ingestion_workflow, edit_workflow</workflow>
<workflow>cached_convertible_interaction_workflow, document_ingestion_interaction_workflow, document_ingestion_workflow, edit_workflow</workflow>
</chain>
<chain>
<type>Drawing</type>
<workflow>local_permission_interaction_workflow, edit_workflow, processing_status_workflow, document_interaction_workflow, document_publication_workflow</workflow>
<workflow>document_interaction_workflow, document_publication_workflow, edit_workflow, local_permission_interaction_workflow, processing_status_workflow</workflow>
</chain>
<chain>
<type>File</type>
<workflow>document_publication_workflow, document_interaction_workflow, local_permission_interaction_workflow, processing_status_workflow</workflow>
<workflow>document_interaction_workflow, document_publication_workflow, local_permission_interaction_workflow, processing_status_workflow</workflow>
</chain>
<chain>
<type>Image</type>
<workflow>document_interaction_workflow, document_publication_workflow, processing_status_workflow, local_permission_interaction_workflow</workflow>
<workflow>document_interaction_workflow, document_publication_workflow, local_permission_interaction_workflow, processing_status_workflow</workflow>
</chain>
<chain>
<type>PDF</type>
<workflow>local_permission_interaction_workflow, edit_workflow, processing_status_workflow, document_interaction_workflow, document_publication_workflow</workflow>
<workflow>cached_convertible_interaction_workflow, document_interaction_workflow, document_publication_workflow, edit_workflow, local_permission_interaction_workflow, processing_status_workflow</workflow>
</chain>
<chain>
<type>Person</type>
......@@ -25,26 +25,26 @@
</chain>
<chain>
<type>Presentation</type>
<workflow>document_publication_workflow, local_permission_interaction_workflow, processing_status_workflow, document_interaction_workflow, edit_workflow</workflow>
<workflow>cached_convertible_interaction_workflow, document_interaction_workflow, document_publication_workflow, edit_workflow, local_permission_interaction_workflow, processing_status_workflow</workflow>
</chain>
<chain>
<type>RSS Feed</type>
<workflow>document_publication_workflow, edit_workflow, local_permission_interaction_workflow</workflow>
<workflow>cached_convertible_interaction_workflow, document_publication_workflow, edit_workflow, local_permission_interaction_workflow</workflow>
</chain>
<chain>
<type>Spreadsheet</type>
<workflow>edit_workflow, document_interaction_workflow, processing_status_workflow, document_publication_workflow, local_permission_interaction_workflow</workflow>
<workflow>cached_convertible_interaction_workflow, document_interaction_workflow, document_publication_workflow, edit_workflow, local_permission_interaction_workflow, processing_status_workflow</workflow>
</chain>
<chain>
<type>Text</type>
<workflow>processing_status_workflow, local_permission_interaction_workflow, document_publication_workflow, edit_workflow, document_interaction_workflow</workflow>
<workflow>document_interaction_workflow, document_publication_workflow, edit_workflow, local_permission_interaction_workflow, processing_status_workflow</workflow>
</chain>
<chain>
<type>URL Crawler</type>
<workflow>edit_workflow, document_publication_workflow, local_permission_interaction_workflow</workflow>
<workflow>document_publication_workflow, edit_workflow, local_permission_interaction_workflow</workflow>
</chain>
<chain>
<type>Web Page</type>
<workflow>-publication_workflow, document_interaction_workflow, local_permission_interaction_workflow, document_publication_workflow</workflow>
<workflow>-publication_workflow, document_interaction_workflow, document_publication_workflow, local_permission_interaction_workflow</workflow>
</chain>
</workflow_chain>
\ No newline at end of file
bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/interactions/Document_setFile.xml
View file @ 2f68c5fd
......@@ -32,8 +32,6 @@
<value>
<list>
<string>Document_guessMimeType</string>
<string>clearCacheUponUpload</string>
<string>updateContentMd5</string>
<string>upload</string>
</list>
</value>
......
bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/worklists/draft_to_review.xml → bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/worklists/draft_to_submit.xml
View file @ 2f68c5fd
......@@ -15,7 +15,7 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Documents to review (%(count)s)</string> </value>
<value> <string>Documents to Submit (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
......@@ -27,7 +27,7 @@ ERP5Site_viewDocumentList?validation_state=draft&local_roles=%(local_roles)s&por
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Documents to review</string> </value>
<value> <string>Documents to Submit</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
......@@ -37,7 +37,7 @@ ERP5Site_viewDocumentList?validation_state=draft&local_roles=%(local_roles)s&por
</item>
<item>
<key> <string>id</string> </key>
<value> <string>draft_to_review</string> </value>
<value> <string>draft_to_submit</string> </value>
</item>
<item>
<key> <string>var_matches</string> </key>
......
bt5/erp5_dms/bt/revision
View file @ 2f68c5fd
1118
\ No newline at end of file
1124
\ No newline at end of file
bt5/erp5_dms/bt/template_portal_type_workflow_chain_list
View file @ 2f68c5fd
Document Ingestion Message | cached_convertible_interaction_workflow
Document Ingestion Message | document_ingestion_interaction_workflow
Document Ingestion Message | document_ingestion_workflow
Document Ingestion Message | edit_workflow
......@@ -14,20 +15,25 @@ Image | document_interaction_workflow
Image | document_publication_workflow
Image | local_permission_interaction_workflow
Image | processing_status_workflow
PDF | cached_convertible_interaction_workflow
PDF | document_interaction_workflow
PDF | document_publication_workflow
PDF | edit_workflow
PDF | local_permission_interaction_workflow
PDF | processing_status_workflow
Person | local_permission_interaction_workflow
Presentation | cached_convertible_interaction_workflow
Presentation | document_interaction_workflow
Presentation | document_publication_workflow
Presentation | edit_workflow
Presentation | local_permission_interaction_workflow
Presentation | processing_status_workflow
RSS Feed | cached_convertible_interaction_workflow
RSS Feed | document_publication_workflow
RSS Feed | edit_workflow
RSS Feed | local_permission_interaction_workflow
Spreadsheet | cached_convertible_interaction_workflow
Spreadsheet | cached_convertible_interaction_workflow
Spreadsheet | document_interaction_workflow
Spreadsheet | document_publication_workflow
Spreadsheet | edit_workflow
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BaseType_copyRoleList.xml
View file @ 2f68c5fd
......@@ -57,6 +57,15 @@
cb_data = context.manage_copyObjects(\n
ids=[r.getId() for r in context.contentValues(portal_type=\'Role Information\')])\n
\n
if portal_type_group_list:\n
for ti in context.portal_types.contentValues():\n
if ti == context or ti.getId() in portal_type_list:\n
continue\n
for group in ti.getTypeGroupList():\n
if group in portal_type_group_list:\n
portal_type_list.append(ti.getId())\n
break\n
\n
for ti in portal_type_list:\n
destination_portal_type = context.portal_types[ti]\n
if remove_existing_roles:\n
......@@ -66,7 +75,8 @@ for ti in portal_type_list:\n
destination_portal_type.manage_pasteObjects(cb_data)\n
\n
return context.Base_redirect(form_id,\n
keep_items=dict(portal_status_message=translateString(\'Roles copied\')))\n
keep_items=dict(portal_status_message=translateString(\'Roles copied in ${type_list}\',\n
mapping=dict(type_list=\', \'.join(portal_type_list)))))\n
</string> </value>
</item>
<item>
......@@ -77,7 +87,7 @@ return context.Base_redirect(form_id,\n
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>remove_existing_roles, portal_type_list, form_id=\'view\'</string> </value>
<value> <string>remove_existing_roles, portal_type_list, portal_type_group_list, form_id=\'view\', **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
......@@ -97,7 +107,7 @@ return context.Base_redirect(form_id,\n
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>3</int> </value>
<value> <int>4</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
......@@ -105,7 +115,9 @@ return context.Base_redirect(form_id,\n
<tuple>
<string>remove_existing_roles</string>
<string>portal_type_list</string>
<string>portal_type_group_list</string>
<string>form_id</string>
<string>kw</string>
<string>Products.ERP5Type.Message</string>
<string>translateString</string>
<string>_getattr_</string>
......@@ -116,6 +128,7 @@ return context.Base_redirect(form_id,\n
<string>r</string>
<string>cb_data</string>
<string>ti</string>
<string>group</string>
<string>_getitem_</string>
<string>destination_portal_type</string>
<string>dict</string>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BaseType_viewCopyRoleListDialog.xml
View file @ 2f68c5fd
......@@ -96,6 +96,7 @@
<key> <string>left</string> </key>
<value>
<list>
<string>your_portal_type_group_list</string>
<string>your_portal_type_list</string>
<string>your_remove_existing_roles</string>
</list>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BaseType_viewCopyRoleListDialog/your_portal_type_list.xml
View file @ 2f68c5fd
......@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>required</string> </key>
<value> <int>1</int> </value>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>size</string> </key>
......
bt5/erp5_forge/bt/revision
View file @ 2f68c5fd
579
\ No newline at end of file
580
\ No newline at end of file
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Base_viewKnowledgeManagementMacroLibrary.xml
View file @ 2f68c5fd
......@@ -42,22 +42,26 @@
<tal:block metal:define-macro="renderer">\n
<ul class="first_level">\n
<li>\n
<a tal:content="section/Base_getTitle"\n
<a class="section-link"\n
tal:content="section/Base_getTitle"\n
tal:attributes="href section/absolute_url;\n
title section/Base_getTitle;"/></li>\n
<ul class="second_level">\n
\n
<li tal:repeat="root_section python: filter(lambda x:x.isVisible(), section.contentValues(portal_type=\'Web Section\', sort_on=\'int_index\'))">\n
<tal:block tal:repeat="root_section python: filter(lambda x:x.isVisible(), section.contentValues(portal_type=\'Web Section\', sort_on=\'int_index\'))">\n
<tal:block \n
tal:define="section_dom_id python: root_section.getRelativeUrl().replace(\'/\', \'_\');\n
image_dom_id python: \'image_%s\' %section_dom_id;\n
siblings python: filter(lambda x:x.isVisible(), root_section.contentValues(portal_type=\'Web Section\', sort_on=\'int_index\'))">\n
\n
<a tal:content="root_section/Base_getTitle"\n
tal:condition="python:not len(siblings)"\n
tal:attributes="href root_section/absolute_url;\n
title section/Base_getTitle;"/>\n
<tal:block tal:condition="python:len(siblings)">\n
siblings python: filter(lambda x:x.isVisible(), root_section.contentValues(portal_type=\'Web Section\', sort_on=\'int_index\'));\n
exists_siblings python: len(siblings)">\n
<li class="empty-list-node"\n
tal:condition="not: exists_siblings">\n
<a tal:content="root_section/Base_getTitle"\n
tal:attributes="href root_section/absolute_url;\n
title section/Base_getTitle;"/>\n
</li>\n
<li class="non-empty-list-node"\n
tal:condition="exists_siblings">\n
<img src="images/tree_closed.png" \n
alt=""\n
tal:attributes="id image_dom_id"/>\n
......@@ -74,10 +78,10 @@
</li>\n
</ul>\n
</div>\n
</tal:block> \n
</li>\n
\n
</tal:block>\n
</li>\n
</tal:block>\n
\n
</ul>\n
</ul>\n
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/form_render.xml
View file @ 2f68c5fd
......@@ -57,8 +57,6 @@ Breaks strict compatibility:\n
* Groups must be named one of "left", "right", "center", "bottom" otherwise they will not\n
be rendered.\n
* Group order doesn\'t matter. Case is sensitive.\n
* Groups names becomes "left_group", "right_group", "left1_group", "right1_group",\n
"bottom_group" for quad_form_view macro.\n
\n
It is possible to specify a group id and a group title by naming a group following the\n
"group id (Group Title)" pattern. In this case the group id will be used as fieldset css\n
......@@ -79,8 +77,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:define="gid group/gid;">\n
<fieldset tal:condition="python: gid.find(\'hidden\') &lt; 0"\n
tal:attributes="class python:gid + test(request.get(\'editable_mode\', 0), \' editable\', \' viewable\');\n
id python: \'fieldset_%s\' % (gid.replace(\' \', \'_\'), );">\n
tal:attributes="class python:gid + test(request.get(\'editable_mode\', 0), \' editable\', \' viewable\');">\n
<div class="box">\n
<div class="text">\n
<h4 i18n:translate="" i18n:domain="ui" tal:condition="group/gtitle" tal:content="group/gtitle" class="group_title"></h4>\n
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/gadget_tab_view.xml
View file @ 2f68c5fd
......@@ -71,8 +71,7 @@
<tal:block tal:define="gid group/gid;">\n
<fieldset tal:condition="python: gid.find(\'hidden\') &lt; 0"\n
tal:attributes="class python:gid + \n
(\' editable\' * request.get(\'editable_mode\', 0) or \' viewable\');\n
id python: \'fieldset_%s\' % (gid.replace(\' \', \'_\'), );">\n
(\' editable\' * request.get(\'editable_mode\', 0) or \' viewable\');">\n
\n
<div class="inner">\n
<h4 i18n:translate="" i18n:domain="ui" tal:condition="group/gtitle" tal:content="group/gtitle" class="group_title"></h4>\n
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/color.css.xml
View file @ 2f68c5fd
......@@ -134,9 +134,9 @@ body {\n
\n
}\n
\n
#fieldset_left h4,\n
#fieldset_center h4,\n
#fieldset_right h4 {\n
fieldset.left h4,\n
fieldset.center h4,\n
fieldset.right h4 {\n
\n
\tbackground-color:#efeee8;\n
\n
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/erp5_knowledge_box.css.xml
View file @ 2f68c5fd
......@@ -15,7 +15,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts70214048.17</string> </value>
<value> <string>ts72636776.07</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
......@@ -462,7 +462,10 @@ div.block .right{\n
\n
div.block div.box_inner_content div.worklist_list ul {\n
list-style-image:url(bullet.png);\n
margin-left:8px\n
margin:0;\n
padding-bottom:0.5em;\n
padding-left: 0.5em;\n
padding-top:0.5em;\n
\n
}\n
\n
......@@ -492,34 +495,58 @@ div.block div.worklist_list ul li a:hover{\n
}\n
\n
/* Gadget Browser */\n
div.gadget_browser ul {\n
div.gadget-website-browser {\n
margin-top: 0.5em;\n
}\n
div.gadget-website-browser ul {\n
margin: 0em;\n
padding: 0em;\n
}\n
\n
div.gadget_browser li {\n
div.gadget-website-browser li {\n
padding-left: 0em;\n
}\n
\n
div.gadget_browser ul.first_level, ul.second_level{\n
div.gadget-website-browser ul.first_level, ul.second_level{\n
list-style-type: none!important;\n
}\n
\n
div.gadget_browser ul.first_level {\n
div.gadget-website-browser ul.first_level {\n
padding-bottom: 0.5em;\n
}\n
\n
div.gadget_browser ul.second_level{\n
padding-left: 0.3em;\n
div.gadget-website-browser .section-link{\n
font-size: 115%;\n
}\n
\n
div.gadget_browser ul.third_level{\n
div.gadget-website-browser ul.second_level{\n
padding-left: 0.7em;\n
}\n
\n
div.gadget_browser a {\n
font-weight:normal;\n
div.gadget-website-browser ul.third_level{\n
padding-left: 1.4em;\n
}\n
\n
div.gadget-website-browser a, a:link, a:active, a:visited {\n
font-weight: normal;\n
color: inherit;\n
}\n
div.gadget-website-browser .empty-list-node{\n
list-style-type: square;\n
margin-left: 1.4em;\n
}\n
\n
/* Gadget SubSection */\n
div.gadget-subsection {\n
margin-top: 0.5em;\n
}\n
div.gadget-subsection ul{\n
list-style-position: outside!important;\n
list-style-type:square!important;\n
margin: 0.5em;\n
margin-top: 0em;\n
padding: 0.5em;\n
}\n
\n
</string> </value>
</item>
<item>
......@@ -528,7 +555,7 @@ div.gadget_browser a {\n
</item>
<item>
<key> <string>size</string> </key>
<value> <int>8829</int> </value>
<value> <int>9442</int> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml
View file @ 2f68c5fd
......@@ -149,7 +149,7 @@ div {\n
width: 936px; /* XXX-JPS Related to front splash and page width - should become dynamic */\n
}\n
\n
div.document div.content fieldset#fieldset_bottom div.input {\n
div.document div.content fieldset.bottom div.input {\n
\n
margin-left:0;\n
margin-top:0.2em;\n
......@@ -162,20 +162,20 @@ div.document div.content fieldset#fieldset_bottom div.input {\n
\n
}\n
\n
.content #fieldset_left .field .input,\n
.content #fieldset_right .field .input,\n
.content #fieldset_center .field .input,\n
.content #fieldset_bottom .field .input{\n
.content fieldset.left .field .input,\n
.content fieldset.right .field .input,\n
.content fieldset.center .field .input,\n
.content fieldset.bottom .field .input{\n
\n
float: left;\n
\n
}\n
\n
.content .field label, .content #fieldset_right .field .input,\n
.content .field label, .content #fieldset_left .field .input,\n
.content .field label, .content #fieldset_center .field .input,\n
.content .field label, .content #fieldset_center_right .field .input,\n
.content .field label, .content #fieldset_center_left .field .input {\n
.content .field label, .content fieldset.right .field .input,\n
.content .field label, .content fieldset.left .field .input,\n
.content .field label, .content fieldset.center .field .input,\n
.content .field label, .content fieldset.center_right .field .input,\n
.content .field label, .content fieldset.center_left .field .input {\n
\n
width: auto;\n
\n
......@@ -208,8 +208,8 @@ width:30%;\n
\n
}\n
\n
#fieldset_left,\n
#fieldset_right {\n
fieldset.left,\n
fieldset.right {\n
\toverflow: hidden;\n
\n
\n
......@@ -260,9 +260,9 @@ a img {\n
\n
}\n
\n
#fieldset_left h4,\n
#fieldset_right h4,\n
#fieldset_center h4{\n
fieldset.left h4,\n
fieldset.right h4,\n
fieldset.center h4{\n
\n
\tmargin:0 0 20px 0;\n
\tpadding:10px;\n
......@@ -291,7 +291,7 @@ div#wrapper_headline span.header_title {\n
}\n
\n
div.headline,\n
#fieldset_webcontent_header_bottom{\n
fieldset.webcontent_header_bottom{\n
\n
display:none;\n
\n
......@@ -898,17 +898,17 @@ table .right {\n
\n
}\n
\n
#fieldset_left .field,\n
#fieldset_right .field,\n
#fieldset_center .field,\n
#fieldset_bottom .field {\n
fieldset.left .field,\n
fieldset.right .field,\n
fieldset.center .field,\n
fieldset.bottom .field {\n
\n
width: 98%;\n
\n
}\n
\n
#fieldset_left .gadget,\n
#fieldset_right .gadget {\n
fieldset.left .gadget,\n
fieldset.right .gadget {\n
\n
margin-top:10px;\n
\n
......@@ -1048,8 +1048,8 @@ margin-top:11px;\n
\n
}\n
\n
#fieldset_left .field,\n
#fieldset_right .field {\n
fieldset.left .field,\n
fieldset.right .field {\n
\n
margin: 5px 0;\n
float: left;\n
......@@ -1257,20 +1257,20 @@ button.bt-med span img {\n
}\n
\n
/* Login form CSS */\n
fieldset#fieldset_left_registration, \n
fieldset#fieldset_right_registration {\n
fieldset.left_registration, \n
fieldset.right_registration {\n
width:50%;\n
float: left;\n
background-color: #D1D1D1;\n
}\n
\n
fieldset#fieldset_left_registration {\n
fieldset.left_registration {\n
width: 49%;\n
margin-right: 0.5em;\n
}\n
\n
fieldset#fieldset_left_registration h4, \n
fieldset#fieldset_right_registration h4 {\n
fieldset.left_registration h4, \n
fieldset.right_registration h4 {\n
margin: 0 0 10px 0;\n
font-weight: bold;\n
padding: 0.1em 0.5em;\n
......@@ -1280,21 +1280,21 @@ fieldset#fieldset_right_registration h4 {\n
font-size: 1.2em;\n
}\n
\n
fieldset#fieldset_left_registration > div,\n
fieldset#fieldset_right_registration > div {\n
fieldset.left_registration > div,\n
fieldset.right_registration > div {\n
clear:both;\n
margin:0.1em 0pt;\n
position:relative;\n
}\n
\n
fieldset#fieldset_left_registration div.input, \n
fieldset#fieldset_right_registration div.input {\n
fieldset.left_registration div.input, \n
fieldset.right_registration div.input {\n
display:block;\n
width: auto;\n
}\n
\n
fieldset#fieldset_left_registration label, \n
fieldset#fieldset_right_registration label {\n
fieldset.left_registration label, \n
fieldset.right_registration label {\n
display:block;\n
float:left;\n
margin:0pt;\n
......@@ -1303,18 +1303,18 @@ fieldset#fieldset_right_registration label {\n
padding-right: 0.1em;\n
}\n
\n
fieldset#fieldset_right_registration div.required label {\n
fieldset.right_registration div.required label {\n
background-image:url(km_img/required_mark.png) !important;\n
background-position:left center !important;\n
background-repeat:no-repeat !important;\n
}\n
\n
fieldset#fieldset_left_registration input,\n
fieldset#fieldset_left_registration textarea,\n
fieldset#fieldset_left_registration select,\n
fieldset#fieldset_right_registration input,\n
fieldset#fieldset_right_registration textarea,\n
fieldset#fieldset_right_registration select {\n
fieldset.left_registration input,\n
fieldset.left_registration textarea,\n
fieldset.left_registration select,\n
fieldset.right_registration input,\n
fieldset.right_registration textarea,\n
fieldset.right_registration select {\n
border:1px solid #999999;\n
color:#333333;\n
font-family:Sans,Verdana,Tahoma,Georgia,Geneva,Arial,sans-serif;\n
......
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/quad_form_view.xml → bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/splash.css.xml
View file @ 2f68c5fd
......@@ -9,6 +9,10 @@
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Cacheable__manager_id</string> </key>
<value> <string>http_cache</string> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
......@@ -39,7 +43,155 @@
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
<tal:block metal:use-macro="here/form_view/macros/master"/>
/****************************************************************/\n
/* TODO: make it dynamic from website layout configuration */\n
/* Must be removed from bt5 */\n
/****************************************************************/\n
\n
<tal:block define="dummy python: request.RESPONSE.setHeader(\'Content-Type\', \'text/css;; charset=utf-8\')"/>\n
\n
/* ########## */\n
/* ## Type ## */\n
/* ########## */\n
\n
.homebanner { font-family: Helvetica, Arial, Verdana, Sans;font-size:10pt; }\n
.homebanner h2 { font-size:26pt; }\n
.homebanner h4 { font-size:14pt; }\n
\n
/* ############ */\n
/* ## Layout ## */\n
/* ############ */\n
\n
/* ## home banner #################################### start ## */\n
\n
.homebanner {\n
\n
\tposition:relative;\n
\tdisplay: block;\n
\twidth: 924px;\n
\theight: 283px;\n
\tmargin: 0 10px 10px 10px; \n
\n
}\n
\n
.homebanner h2 {\n
\n
\tpadding:25px;\n
\tmargin:0;\n
\n
}\n
\n
.homebanner h4 {\n
\n
\tposition: absolute;\n
\tbottom: 20px;\n
\tright:25px;\n
\tpadding:0;\n
\tmargin:0;\n
\n
}\n
\n
.homebanner img {\n
\n
\tposition: absolute;\n
\ttop: 89px;\n
\tright:1px;\n
\n
}\n
\n
.homebanner ul {\n
\n
\tposition: absolute;\n
\ttop:101px;\n
\tleft:5px;\n
\tmargin:0;\n
\tpadding:0 30px;\n
\twidth: 200px;\n
\n
}\n
\n
.document > .content .homebanner ul li {\n
\n
\tmargin:0;\n
\tpadding: 7px 10px 7px 30px;\n
\tdisplay: block;\n
\t\n
}\n
\n
.button-why:link, .button-why:active, .button-why:visited, .button-try:link, .button-try:active, .button-try:visited {\n
\n
\twidth:158px;\n
\theight:47px;\n
\tdisplay: block;\n
\tposition: absolute;\n
\tbottom:0;\n
\tleft:25px;\n
\ttext-indent: -999999px;\n
\n
}\n
\n
.button-try:link, .button-try:active, .button-try:visited {\n
\n
\tleft: 180px;\n
\n
}\n
\n
/* ## home banner ##################################### end ### */\n
\n
/* ########### */\n
/* ## Color ## */\n
/* ########### */\n
\n
/* ## home banner #################################### start ## */\n
\n
.homebanner {\n
\n
\tbackground: url(../km_img/homebanner.jpg) no-repeat transparent;\n
\tcolor:#fff;\n
\ttext-shadow: 0 1px 0 #006686;\n
\n
}\n
\n
.homebanner h2 {\n
\n
\ttext-shadow: 0 3px 0 #0d7dab;\n
\n
}\n
\n
.document > .content .homebanner ul li {\n
\t\n
\tlist-style-image: none;\n
\tlist-style-type: none;\n
\tbackground: url(../km_img/bannerbullet.png) no-repeat transparent;\n
\n
}\n
\n
.button-why:link, .button-why:active, .button-why:visited {\n
\n
\tbackground: url(../km_img/bannerbuttons.png) no-repeat transparent;\n
\n
}\n
.button-why:hover {\n
\n
\tbackground-position: 0 100%;\n
\n
}\n
\n
.button-try:link, .button-try:active, .button-try:visited {\n
\n
\tbackground: url(../km_img/bannerbuttons.png) no-repeat transparent;\n
\tbackground-position: -158px 0;\n
\n
}\n
.button-try:hover {\n
\n
\tbackground-position: -158px 100%;\n
\n
}\n
\n
/* ## home banner ##################################### end ### */\n
\n
]]></string> </value>
</item>
......@@ -53,7 +205,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>quad_form_view</string> </value>
<value> <string>splash.css</string> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_img/bannerbullet.png.xml 0 → 100644
View file @ 2f68c5fd
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="Image" module="OFS.Image"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts72547291.02</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
<value> <string>bannerbullet.png</string> </value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>image/png</string> </value>
</item>
<item>
<key> <string>data</string> </key>
<value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAAIsAAAAbCAIAAADDHevrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
bWFnZVJlYWR5ccllPAAAAQhJREFUeNrs2r0RwjAMhmHl66hZgG1omY1R6GjYgQ1YgB3IXQp+AkGx
Lbl5VUcq8vgSS/ZwOF3NF+fb3Yh2sd9tPY/Jb+OsSLRd8XIWAqkXkvwlQOqCpFXJIOUjaW0aSMlI
KlAFKRNJZb8vkNKQVNz0gJSDpJqeFKQEJFWODECKRlIND0gJSLIWAzeQ4pCGzfHSquIkxIC1bajV
wocnIsa3qiZfJ3iCeJ47hRokeOJ43nbbZUjwhPJ8dqxrkeCJ5rH51MePBE8Cj32dnHqQ4MnhsV+n
D8tI8KTx2MIJ3q8EeDJ5bPkUfJ4GTzKP/b1J8poMTz6PeW5jTSXg6cJjzhuN8PTiGeMhwAAJBZpV
+sVpBgAAAABJRU5ErkJggg==</string> </value>
</item>
<item>
<key> <string>height</string> </key>
<value> <int>27</int> </value>
</item>
<item>
<key> <string>precondition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <int>358</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>width</string> </key>
<value> <int>139</int> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml
View file @ 2f68c5fd
......@@ -111,6 +111,7 @@
global header_title python:\'%s | %s\' % (here.getTranslatedTitleOrId(), website.getTranslatedTitleOrId());\n
global css_list_template python:[\n
\'%s/km_css/layout.css\' % portal_path,\n
\'%s/km_css/splash.css\' % portal_path,\n
\'%s/km_css/color.css\' % portal_path,\n
\'%s/km_css/pulldown.css\' % portal_path,\n
\'%s/km_css/type.css\' % portal_path,\n
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSection_viewSubsectionGadget/subsection_list.xml
View file @ 2f68c5fd
......@@ -77,7 +77,7 @@
<dictionary>
<item>
<key> <string>css_class</string> </key>
<value> <string>hidden_label subsectionGadget</string> </value>
<value> <string>hidden_label gadget-subsection</string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_viewWebSiteBrowserGadget.xml
View file @ 2f68c5fd
......@@ -43,12 +43,10 @@
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
<div class="gadget_browser"\n
<div class="gadget-website-browser"\n
tal:define="section_list python:here.contentValues(portal_type=\'Web Section\', sort_on=\'int_index\');\n
section_list python:filter(lambda x:x.isVisible(), section_list);\n
half_count python:len(section_list) / 2">\n
\n
<h4 value="" i18n:translate="" i18n:domain="ui">Browse Site</h4>\n
\n
<tal:block tal:repeat="section python:section_list[0:half_count]">\n
<tal:block metal:use-macro="container/Base_viewKnowledgeManagementMacroLibrary/macros/renderer">Macro goes here</tal:block> \n
......
bt5/erp5_km/bt/change_log
View file @ 2f68c5fd
2010-04-29 Jacques
* Created CSS style for splash styling
2010-02-16 ivan
* Update Gadget instances to use new file system based Gadget class and default image property
......
bt5/erp5_km/bt/revision
View file @ 2f68c5fd
1342
\ No newline at end of file
1355
\ No newline at end of file
bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.css.xml
View file @ 2f68c5fd
......@@ -15,7 +15,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts70214058.35</string> </value>
<value> <string>ts72636595.17</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
......@@ -544,8 +544,10 @@ div.block .right{\n
\n
div.block div.box_inner_content div.worklist_list ul {\n
list-style-image:url(bullet.png);\n
margin-left:8px\n
\n
margin:0;\n
padding-bottom:0.5em;\n
padding-left:2em;\n
padding-top:0.5em;\n
}\n
\n
div.block div.worklist_list ul li{\n
......@@ -580,7 +582,7 @@ div.block div.worklist_list ul li a:hover{\n
</item>
<item>
<key> <string>size</string> </key>
<value> <int>9614</int> </value>
<value> <int>9672</int> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_knowledge_pad/bt/revision
View file @ 2f68c5fd
509
\ No newline at end of file
510
\ No newline at end of file
bt5/erp5_l10n_fr/MessageTranslationTemplateItem/fr/erp5_ui/translation.po
View file @ 2f68c5fd
......@@ -810,10 +810,10 @@ msgstr "Il existe déjà une devise avec ce code devise."
msgid ""
"Another document ${document_reference} - ${document_language} - "
"${document_version} already exists."
"${document_version} already exists"
msgstr ""
"Un document ${document_reference} - ${document_language} - "
"${document_version} existe déjà."
"${document_version} existe déjà"
msgid "Answer"
msgstr "Réponse"
......@@ -11726,8 +11726,8 @@ msgstr "Type d'écriture"
msgid "Transaction With Grouping Reference"
msgstr "Écritures lettrées"
msgid "Transaction is not balanced."
msgstr "L'écriture n'est pas équilibrée."
msgid "Transaction is not balanced"
msgstr "L'écriture n'est pas équilibrée"
msgid "Transactions"
msgstr "Transactions"
......
bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/form_render.xml
View file @ 2f68c5fd
......@@ -75,8 +75,6 @@ Breaks strict compatibility:\n
* Groups must be named one of "left", "right", "center", "bottom" otherwise they will not\n
be rendered.\n
* Group order doesn\'t matter. Case is sensitive.\n
* Groups names becomes "left_group", "right_group", "left1_group", "right1_group",\n
"bottom_group" for quad_form_view macro.\n
\n
It is possible to specify a group id and a group title by naming a group following the\n
"group id (Group Title)" pattern. In this case the group id will be used as fieldset css\n
......
bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/navigation_arrows.xml
View file @ 2f68c5fd
......@@ -75,8 +75,6 @@ Breaks strict compatibility:\n
* Groups must be named one of "left", "right", "center", "bottom" otherwise they will not\n
be rendered.\n
* Group order doesn\'t matter. Case is sensitive.\n
* Groups names becomes "left_group", "right_group", "left1_group", "right1_group",\n
"bottom_group" for quad_form_view macro.\n
\n
It is possible to specify a group id and a group title by naming a group following the\n
"group id (Group Title)" pattern. In this case the group id will be used as fieldset css\n
......
bt5/erp5_mobile/bt/revision
View file @ 2f68c5fd
56
\ No newline at end of file
58
\ No newline at end of file
bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_interaction_workflow/scripts/ProductionOrderLine_setTransformationFromResource.xml
View file @ 2f68c5fd
......@@ -54,16 +54,18 @@
<item>
<key> <string>_body</string> </key>
<value> <string>production_order_line = state_change[\'object\']\n
portal = production_order_line.getPortalObject()\n
\n
transformation = None\n
resource = production_order_line.getResourceValue()\n
if resource is not None:\n
transformation_list = [q for q in resource.getResourceRelatedValueList(portal_type=portal.getPortalTransformationTypeList()) \\\n
if q.getProperty(\'validation_state\',\'default\') != \'invalidated\']\n
if len(transformation_list) == 1:\n
transformation = transformation_list[0].getRelativeUrl()\n
production_order_line.setSpecialise(transformation)\n
if not production_order_line.hasSpecialise():\n
portal = production_order_line.getPortalObject()\n
resource = production_order_line.getResourceValue()\n
if resource is not None:\n
transformation_list = portal.portal_catalog(\n
portal_type=portal.getPortalTransformationTypeList(),\n
validation_state="!=invalidated",\n
resource_relative_url=resource.getRelativeUrl())\n
if len(transformation_list) == 1:\n
transformation = transformation_list[0].getRelativeUrl()\n
production_order_line.setSpecialise(transformation)\n
</string> </value>
</item>
<item>
......@@ -105,15 +107,11 @@ production_order_line.setSpecialise(transformation)\n
<string>production_order_line</string>
<string>_getattr_</string>
<string>portal</string>
<string>None</string>
<string>transformation</string>
<string>resource</string>
<string>append</string>
<string>$append0</string>
<string>_getiter_</string>
<string>q</string>
<string>None</string>
<string>transformation_list</string>
<string>len</string>
<string>transformation</string>
</tuple>
</value>
</item>
......
bt5/erp5_mrp/bt/revision
View file @ 2f68c5fd
435
\ No newline at end of file
440
\ No newline at end of file
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view.xml
View file @ 2f68c5fd
......@@ -97,6 +97,7 @@
<value>
<list>
<string>my_quantity_unit</string>
<string>my_inverse</string>
</list>
</value>
</item>
......
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_inverse.xml 0 → 100644
View file @ 2f68c5fd
<?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>description</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_inverse</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string>Define an inverted quantity: if checked, the Quantity Unit will be defined as 1/quantity of the reference unit.</string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_checkbox</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>Inverse Ratio</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_quantity.xml
View file @ 2f68c5fd
......@@ -13,6 +13,7 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>default</string>
<string>description</string>
<string>input_style</string>
</list>
......@@ -56,6 +57,16 @@
<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>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
......@@ -64,6 +75,10 @@
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>input_style</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
......@@ -75,6 +90,10 @@
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Amount of standard Quantity Unit</string> </value>
......@@ -101,4 +120,20 @@
</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>python: context.getProperty(\'quantity\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_getUniversalDefinitionDict.xml
View file @ 2f68c5fd
......@@ -77,11 +77,11 @@
if unit_uid is None:\n
continue\n
\n
quantity = definition.getQuantity()\n
if not quantity:\n
definition_ratio = definition.getConversionRatio()\n
if not definition_ratio:\n
continue\n
\n
result[unit_uid] = (definition.getUid(), quantity)\n
result[unit_uid] = (definition.getUid(), definition_ratio)\n
\n
return result\n
\n
......
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_resource_title.xml
View file @ 2f68c5fd
......@@ -13,9 +13,10 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>description</string>
<string>portal_type</string>
<string>proxy_listbox_ids</string>
<string>title</string>
</list>
</value>
</item>
......@@ -75,6 +76,12 @@
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>proxy_listbox_ids</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
......@@ -117,6 +124,17 @@
</list>
</value>
</item>
<item>
<key> <string>proxy_listbox_ids</string> </key>
<value>
<list>
<tuple>
<string>Base_viewRelatedObjectListBase/listbox</string>
<string>All</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
......@@ -147,4 +165,20 @@
</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: field.get_orig_value(\'proxy_listbox_ids\') + [(\'%sModule_view%sList/listbox\' % (x.replace(\' \',\'\'), x.replace(\' \', \'\')), x) for x in zip(*field.get_value(\'portal_type\'))[0] if context.Base_checkPermission(context.getDefaultModuleId(x), \'View\')]</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_pdm/WorkflowTemplateItem/portal_workflow/transformation_interaction_workflow.xml
View file @ 2f68c5fd
......@@ -15,6 +15,16 @@
<tuple/>
</value>
</item>
<item>
<key> <string>creation_guard</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>groups</string> </key>
<value>
......@@ -25,6 +35,14 @@
<key> <string>id</string> </key>
<value> <string>transformation_interaction_workflow</string> </value>
</item>
<item>
<key> <string>manager_bypass</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Transformation Interaction Workflow</string> </value>
</item>
</dictionary>
</pickle>
</record>
......
bt5/erp5_pdm/bt/revision
View file @ 2f68c5fd
492
\ No newline at end of file
495
\ No newline at end of file
bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_internal_supply_line_price_quantity_step.xml
View file @ 2f68c5fd
......@@ -62,13 +62,7 @@ Test quantity steps for price on internal supply line\n
<tr>\n
<td>type</td>\n
<td>field_my_internal_supply_line_quantity_step_list</td>\n
<tal:block tal:condition="is_selenium_0_8">\n
<td>10<br />20</td>\n
</tal:block>\n
<tal:block tal:condition="not:is_selenium_0_8">\n
<td>10\n
20</td>\n
</tal:block>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
......@@ -141,13 +135,7 @@ Test quantity steps for price on internal supply line\n
<tr>\n
<td>type</td>\n
<td>field_my_internal_supply_line_quantity_step_list</td>\n
<tal:block tal:condition="is_selenium_0_8">\n
<td>foo<br />bar</td>\n
</tal:block>\n
<tal:block tal:condition="not:is_selenium_0_8">\n
<td>foo\n
bar</td>\n
</tal:block>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
......
bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_purchase_supply_line_price_quantity_step.xml
View file @ 2f68c5fd
......@@ -62,13 +62,7 @@ Test quantity steps for price on purchase supply line\n
<tr>\n
<td>type</td>\n
<td>field_my_purchase_supply_line_quantity_step_list</td>\n
<tal:block tal:condition="is_selenium_0_8">\n
<td>10<br />20</td>\n
</tal:block>\n
<tal:block tal:condition="not:is_selenium_0_8">\n
<td>10\n
20</td>\n
</tal:block>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
......@@ -141,13 +135,7 @@ Test quantity steps for price on purchase supply line\n
<tr>\n
<td>type</td>\n
<td>field_my_purchase_supply_line_quantity_step_list</td>\n
<tal:block tal:condition="is_selenium_0_8">\n
<td>foo<br />bar</td>\n
</tal:block>\n
<tal:block tal:condition="not:is_selenium_0_8">\n
<td>foo\n
bar</td>\n
</tal:block>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
......
bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_sale_supply_line_price_quantity_step.xml
View file @ 2f68c5fd
......@@ -62,13 +62,7 @@ Test quantity steps for price on sale supply line\n
<tr>\n
<td>type</td>\n
<td>field_my_sale_supply_line_quantity_step_list</td>\n
<tal:block tal:condition="is_selenium_0_8">\n
<td>10<br />20</td>\n
</tal:block>\n
<tal:block tal:condition="not:is_selenium_0_8">\n
<td>10\n
20</td>\n
</tal:block>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
......@@ -141,13 +135,7 @@ Test quantity steps for price on sale supply line\n
<tr>\n
<td>type</td>\n
<td>field_my_sale_supply_line_quantity_step_list</td>\n
<tal:block tal:condition="is_selenium_0_8">\n
<td>foo<br />bar</td>\n
</tal:block>\n
<tal:block tal:condition="not:is_selenium_0_8">\n
<td>foo\n
bar</td>\n
</tal:block>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
......
bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml
View file @ 2f68c5fd
......@@ -41,10 +41,9 @@
<tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
xmlns:metal="http://xml.zope.org/namespaces/metal">\n
<tal:block metal:define-macro="init"\n
tal:define="global is_selenium_0_8 python: here.getPortalObject().portal_tests.getZeleniumVersion() &gt; \'Zelenium-0.8\'">\n
<tal:block metal:define-macro="init">\n
<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n
<tr tal:condition="is_selenium_0_8">\n
<tr>\n
<td>setTimeout</td>\n
<td>600000</td>\n
<td></td>\n
......
bt5/erp5_pdm_ui_test/bt/revision
View file @ 2f68c5fd
21
\ No newline at end of file
23
\ No newline at end of file
bt5/erp5_project_ui_test/SkinTemplateItem/portal_skins/erp5_project_ui_test/Zuite_CommonTemplateForProjectZuite.xml
View file @ 2f68c5fd
......@@ -41,10 +41,9 @@
<tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
xmlns:metal="http://xml.zope.org/namespaces/metal">\n
<tal:block metal:define-macro="init"\n
tal:define="global is_selenium_0_8 python: here.getPortalObject().portal_tests.getZeleniumVersion() &gt; \'Zelenium-0.8\'">\n
<tal:block metal:define-macro="init">\n
<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n
<tr tal:condition="is_selenium_0_8">\n
<tr>\n
<td>setTimeout</td>\n
<td>600000</td>\n
<td></td>\n
......
bt5/erp5_project_ui_test/bt/revision
View file @ 2f68c5fd
3
\ No newline at end of file
4
\ No newline at end of file
bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_ppimj_web_theme/erp5_web_editable_content.css.xml
View file @ 2f68c5fd
......@@ -13,12 +13,6 @@
<key> <string>_Cacheable__manager_id</string> </key>
<value> <string>style_cache</string> </value>
</item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
......@@ -45,12 +39,6 @@
</object>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
......@@ -448,7 +436,7 @@ div#main_content > fieldset.webcontent {\n
/* TODO: redo webcontent header spacing policy because lack of consistency\n
(not tested with huge titles) */\n
\n
div#main_content > fieldset#fieldset_webcontent {padding: 2em}\n
div#main_content > fieldset.webcontent {padding: 2em}\n
\n
div#main_content > fieldset.header {\n
padding-bottom: 1em;\n
......
bt5/erp5_registry_ohada/bt/revision
View file @ 2f68c5fd
925
\ No newline at end of file
926
\ No newline at end of file
bt5/erp5_trade_ui_test/bt/revision
View file @ 2f68c5fd
This diff is collapsed.
bt5/erp5_ui_test/bt/revision
View file @ 2f68c5fd
This diff is collapsed.
bt5/erp5_web/bt/revision
View file @ 2f68c5fd
This diff is collapsed.
bt5/erp5_wizard/bt/revision
View file @ 2f68c5fd
This diff is collapsed.
buildout/Makefile
View file @ 2f68c5fd
This diff is collapsed.
buildout/instance-profiles/apache.cfg
View file @ 2f68c5fd
This diff is collapsed.
buildout/profiles/deployment.cfg
View file @ 2f68c5fd
This diff is collapsed.
buildout/profiles/versions-2.12.cfg
View file @ 2f68c5fd
This diff is collapsed.
buildout/profiles/versions.cfg
View file @ 2f68c5fd
This diff is collapsed.
buildout/software-profiles/memcached.cfg
View file @ 2f68c5fd
This diff is collapsed.
buildout/templates/httpd.conf.in
View file @ 2f68c5fd
This diff is collapsed.
product/CMFActivity/Activity/SQLBase.py
View file @ 2f68c5fd
This diff is collapsed.
product/CMFActivity/Activity/SQLDict.py
View file @ 2f68c5fd
This diff is collapsed.
product/CMFActivity/Activity/SQLQueue.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5/Document/Alarm.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5/Document/Document.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5/Document/File.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5/Document/IdGenerator.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5/Document/OrderBuilder.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5/Document/Resource.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5/Document/TextDocument.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5/ERP5Site.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5/PropertySheet/Movement.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5/PropertySheet/QuantityUnitConversionDefinition.py 0 → 100644
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5/TargetSolver/SplitAndDefer.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5/Tool/ContributionTool.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5/Tool/DomainTool.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5/Tool/IdTool.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5/bootstrap/bt5list 0 → 100644
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5/interfaces/document.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5/mixin/cached_convertable.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5/tests/testAlarm.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5/tests/testERP5Base.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5/tests/testProductionOrder.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5OOo/Document/OOoDocument.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5OOo/tests/testDms.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5OOo/tests/test_document/Forty-Two.Pages-en-001.pdf 0 → 100644
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5SyncML/tests/testERP5SyncML.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5Type/Base.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5Type/Constraint/Constraint.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5Type/Core/Folder.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5Type/ERP5Type.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5Type/Tool/CacheTool.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5Type/Tool/MemcachedTool.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5Type/interfaces/constraint.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5Type/patches/memcache_client.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5Type/tests/testCacheTool.py
View file @ 2f68c5fd
This diff is collapsed.
product/ERP5Type/tests/testMemcachedTool.py
View file @ 2f68c5fd
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