From 001ffbe4c582d18a1a19545a05ac0f92b410bd4c Mon Sep 17 00:00:00 2001
From: Yoshinori Okuji <yo@nexedi.com>
Date: Wed, 8 Sep 2004 14:38:35 +0000
Subject: [PATCH] Updated.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@1735 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../BalanceTransactionLine_view.form | 14 +-
.../BalanceTransaction_view.form | 19 +-
.../erp5_accounting/PaySheetLine_view.form | 17 +-
.../PaySheetTransactionLine_view.form | 170 ++++--------------
.../PaySheetTransaction_calcul_OLD.py | 6 +-
.../PaySheetTransaction_checkParameters.py | 2 +-
.../PaySheetTransaction_getPreavis.py | 10 +-
.../PaySheetTransaction_pdf_template.pt | 26 +--
.../PaySheetTransaction_postCalculation.py | 9 +-
.../PaySheetTransaction_preCalculation.py | 2 +-
.../PaySheetTransaction_print_old.pt | 2 +-
.../PaySheetTransaction_view.form | 23 +--
.../PaymentTransaction_view.form | 25 +--
product/ERP5/skins/erp5_core/Base_redirect.py | 1 -
.../skins/erp5_core/Base_updateDialogForm.py | 10 +-
.../skins/erp5_core/ERP5Site_exportAll.py | 10 +-
.../erp5_core/ERP5Site_reindexCategory.py | 9 +-
.../erp5_core/ERP5Site_reindexSimulation.py | 9 +-
.../ERP5/skins/erp5_core/Folder_reindexAll.py | 9 +-
.../ERP5/skins/erp5_core/Predicate_edit.py | 9 +-
.../skins/erp5_core/base_workflow_action.form | 5 +-
.../base_workflow_action_comment.form | 3 +-
.../erp5_core/create_relation_dialog.form | 12 +-
product/ERP5/skins/erp5_core/search.form | 14 +-
.../ERP5/skins/erp5_crm/Assignment_view.form | 8 +-
.../skins/erp5_crm/Career_shiftDefault.py | 4 +-
product/ERP5/skins/erp5_crm/Career_view.form | 9 +-
.../skins/erp5_html_style/dialog_master.pt | 6 +-
.../ERP5/skins/erp5_html_style/form_dialog.pt | 4 +-
.../skins/erp5_html_style/form_list_dialog.pt | 4 +-
.../skins/erp5_html_style/form_view_dialog.pt | 4 +-
.../erp5_html_style/list_dialog_master.pt | 4 +-
.../skins/erp5_html_style/list_menu_box.pt | 16 +-
.../ERP5/skins/erp5_html_style/menu_box.pt | 8 +-
.../skins/erp5_html_style/navigation_box.pt | 12 +-
.../skins/erp5_html_style/view_menu_box.pt | 2 +-
.../erp5_trade/DeliveryLine_asCellRange.py | 6 +-
.../skins/erp5_trade/InvoiceLine_view.form | 11 +-
.../Invoice_zGetSourceSectionDescription.py | 12 +-
39 files changed, 247 insertions(+), 279 deletions(-)
diff --git a/product/ERP5/skins/erp5_accounting/BalanceTransactionLine_view.form b/product/ERP5/skins/erp5_accounting/BalanceTransactionLine_view.form
index 7444c72692..09bb34cbe7 100755
--- a/product/ERP5/skins/erp5_accounting/BalanceTransactionLine_view.form
+++ b/product/ERP5/skins/erp5_accounting/BalanceTransactionLine_view.form
@@ -5,7 +5,7 @@
<row_length>4</row_length>
<name>BalanceTransactionLine_view</name>
<pt>form_view</pt>
- <action>base_edit</action>
+ <action>Base_edit</action>
<update_action></update_action>
<method>POST</method>
<enctype></enctype>
@@ -38,7 +38,7 @@
<whitespace_preserve type="int">0</whitespace_preserve>
</values>
<tales>
- <items>python:here.getInvoiceTransactionLineSourceItemList()</items>
+ <items>python:here.InvoiceTransactionLine_getSourceItemList()</items>
</tales>
<messages>
<message name="external_validator_failed">The input failed the external validator.</message>
@@ -67,7 +67,7 @@
<whitespace_preserve type="int">0</whitespace_preserve>
</values>
<tales>
- <items>python: here.getBalanceTransactionLineSourcePaymentItemList()</items>
+ <items>python: here.AccountingTransactionLine_getSourcePaymentItemList()</items>
</tales>
<messages>
<message name="external_validator_failed">The input failed the external validator.</message>
@@ -91,15 +91,15 @@
<external_validator></external_validator>
<extra></extra>
<hidden type="int">0</hidden>
- <jump_method>base_jump_relation</jump_method>
+ <jump_method>Base_jumpToRelatedDocument</jump_method>
<max_length></max_length>
- <portal_type type="list">[('Person', 'Person'), ('Organisation', 'Organisation')]</portal_type>
+ <portal_type type="list">[('Organisation', 'Organisation'), ('Person', 'Person')]</portal_type>
<relation_setter_id></relation_setter_id>
<required type="int">0</required>
<title>Third Party</title>
<truncate type="int">0</truncate>
<unicode type="int">0</unicode>
- <update_method>base_update_relation</update_method>
+ <update_method>Base_updateRelation</update_method>
<whitespace_preserve type="int">0</whitespace_preserve>
</values>
<tales>
@@ -210,4 +210,4 @@
</fields>
</group>
</groups>
-</form>
+</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/BalanceTransaction_view.form b/product/ERP5/skins/erp5_accounting/BalanceTransaction_view.form
index fde47367bc..27ce601807 100755
--- a/product/ERP5/skins/erp5_accounting/BalanceTransaction_view.form
+++ b/product/ERP5/skins/erp5_accounting/BalanceTransaction_view.form
@@ -5,7 +5,7 @@
<row_length>4</row_length>
<name>BalanceTransaction_view</name>
<pt>form_view</pt>
- <action>base_edit</action>
+ <action>Base_edit</action>
<update_action></update_action>
<method>POST</method>
<enctype></enctype>
@@ -199,10 +199,11 @@
<field><id>listbox</id> <type>ListBox</type>
<values>
+ <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
<all_columns type="list">[]</all_columns>
<all_editable_columns type="list">[]</all_editable_columns>
<alternate_name></alternate_name>
- <columns type="list">[('id', 'id'), ('source', 'Account'), ('source_payment', 'Bank Account'), ('destination_section_title', 'Third Party'), ('resource', 'Currency'), ('source_debit', 'Debit'), ('source_credit', 'Credit')]</columns>
+ <columns type="list">[('id', 'id'), ('source', 'Account'), ('source_payment', 'Bank Account'), ('getDestinationSectionTitle', 'Third Party'), ('resource', 'Currency'), ('source_debit', 'Debit'), ('source_credit', 'Credit')]</columns>
<css_class></css_class>
<default></default>
<default_params type="list">[]</default_params>
@@ -219,22 +220,24 @@
<global_attributes type="list">[('source_section', 'source_section')]</global_attributes>
<hidden type="int">0</hidden>
<lines type="int">10</lines>
- <list_action>folder_contents</list_action>
- <list_method type="method">searchInvoiceTransaction</list_method>
+ <list_action>Folder_viewContentList</list_action>
+ <list_method type="method">AccountingTransaction_searchInvoiceTransactionLines</list_method>
<meta_types type="list">[]</meta_types>
<not_viewable type="int">0</not_viewable>
<portal_types type="list">[]</portal_types>
<read_only type="int">0</read_only>
<report_root_list type="list">[]</report_root_list>
<report_tree type="int">0</report_tree>
- <search type="int">0</search>
+ <search></search>
<search_columns type="list">[]</search_columns>
<select type="int">0</select>
<selection_name>balance_transaction_line_selection</selection_name>
<sort type="list">[('id', 'id')]</sort>
<sort_columns type="list">[]</sort_columns>
+ <stat_columns type="list">[]</stat_columns>
<stat_method></stat_method>
<title>Balance Transaction Lines</title>
+ <url_columns type="list">[]</url_columns>
<viewable_expression></viewable_expression>
<viewable_permission type="list">[]</viewable_permission>
<viewable_role type="list">[]</viewable_role>
@@ -272,7 +275,7 @@
<whitespace_preserve type="int">0</whitespace_preserve>
</values>
<tales>
- <items>python: cell.getObject().getBalanceTransactionLineSourcePaymentItemList()</items>
+ <items>python: cell.getObject().AccountingTransactionLine_getSourcePaymentItemList()</items>
</tales>
<messages>
<message name="external_validator_failed">The input failed the external validator.</message>
@@ -330,7 +333,7 @@
<whitespace_preserve type="int">0</whitespace_preserve>
</values>
<tales>
- <items>python:cell.getObject().getInvoiceTransactionLineSourceItemList()</items>
+ <items>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</items>
</tales>
<messages>
<message name="external_validator_failed">The input failed the external validator.</message>
@@ -419,4 +422,4 @@
</fields>
</group>
</groups>
-</form>
+</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetLine_view.form b/product/ERP5/skins/erp5_accounting/PaySheetLine_view.form
index 895bf0c80d..a619683e5c 100755
--- a/product/ERP5/skins/erp5_accounting/PaySheetLine_view.form
+++ b/product/ERP5/skins/erp5_accounting/PaySheetLine_view.form
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
<form>
- <title></title>
+ <title>Pay Sheet Line</title>
<row_length>4</row_length>
<name>pay_sheet_line_edit</name>
<pt>form_view</pt>
- <action>base_edit</action>
+ <action>Base_edit</action>
<update_action></update_action>
<method>POST</method>
<enctype></enctype>
@@ -111,16 +111,17 @@
<external_validator></external_validator>
<extra></extra>
<hidden type="int">0</hidden>
- <jump_method>base_jump_relation</jump_method>
+ <jump_method>Base_jumpToRelatedDocument</jump_method>
<max_length></max_length>
<not_viewable type="int">0</not_viewable>
<portal_type type="list">[('Service', 'Service'), ('Product', 'Product')]</portal_type>
<read_only type="int">0</read_only>
+ <relation_setter_id></relation_setter_id>
<required type="int">0</required>
<title>Produit</title>
<truncate type="int">0</truncate>
<unicode type="int">0</unicode>
- <update_method>base_update_relation</update_method>
+ <update_method>Base_updateRelation</update_method>
<viewable_expression></viewable_expression>
<viewable_permission type="list">[]</viewable_permission>
<viewable_role type="list">[]</viewable_role>
@@ -274,7 +275,7 @@
<whitespace_preserve type="int">0</whitespace_preserve>
</values>
<tales>
- <items>here/portal_categories/quantity_unit/getCategoryChildTitleItemList</items>
+ <items>here/portal_categories/quantity_unit/getCategoryChildLogicalPathItemList</items>
</tales>
<messages>
<message name="external_validator_failed">The input failed the external validator.</message>
@@ -334,14 +335,14 @@
<not_viewable type="int">0</not_viewable>
<read_only type="int">0</read_only>
<required type="int">0</required>
- <title>Quantité facturée</title>
+ <title>Invoiced Quantity</title>
<viewable_expression></viewable_expression>
<viewable_permission type="list">[]</viewable_permission>
<viewable_role type="list">[]</viewable_role>
<whitespace_preserve type="int">0</whitespace_preserve>
</values>
<tales>
- <title>python:'Quantité facturée : %.2f' % here.getTotalQuantity()</title>
+ <title>python:'Invoice Quantity : %.2f' % here.getTotalQuantity()</title>
</tales>
<messages>
<message name="external_validator_failed">The input failed the external validator.</message>
@@ -364,4 +365,4 @@
</fields>
</group>
</groups>
-</form>
+</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransactionLine_view.form b/product/ERP5/skins/erp5_accounting/PaySheetTransactionLine_view.form
index 33150f5e75..0fde66328c 100755
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransactionLine_view.form
+++ b/product/ERP5/skins/erp5_accounting/PaySheetTransactionLine_view.form
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
<form>
- <title></title>
+ <title>Purchase Invoice Transaction Line</title>
<row_length>4</row_length>
- <name>pay_sheet_list</name>
+ <name>purchase_invoice_list</name>
<pt>form_view</pt>
- <action>base_edit</action>
+ <action>Base_edit</action>
<update_action></update_action>
<method>POST</method>
<enctype></enctype>
@@ -17,34 +17,6 @@
<title>left</title>
<fields>
- <field><id>my_id</id> <type>StringField</type>
- <values>
- <alternate_name></alternate_name>
- <css_class></css_class>
- <default></default>
- <description></description>
- <display_maxwidth></display_maxwidth>
- <display_width type="int">20</display_width>
- <editable type="int">1</editable>
- <enabled type="int">1</enabled>
- <external_validator></external_validator>
- <extra></extra>
- <hidden type="int">0</hidden>
- <max_length></max_length>
- <required type="int">1</required>
- <title>ID</title>
- <truncate type="int">0</truncate>
- <unicode type="int">0</unicode>
- <whitespace_preserve type="int">0</whitespace_preserve>
- </values>
- <tales>
- </tales>
- <messages>
- <message name="external_validator_failed">The input failed the external validator.</message>
- <message name="required_not_found">Input is required but no input given.</message>
- <message name="too_long">Too much input was given.</message>
- </messages>
- </field>
<field><id>my_title</id> <type>StringField</type>
<values>
<alternate_name></alternate_name>
@@ -73,149 +45,65 @@
<message name="too_long">Too much input was given.</message>
</messages>
</field>
- <field><id>my_destination_section_title</id> <type>RelationStringField</type>
- <values>
- <alternate_name></alternate_name>
- <base_category>destination_section</base_category>
- <catalog_index>Title</catalog_index>
- <css_class></css_class>
- <default></default>
- <default_module>person</default_module>
- <description>Destination section</description>
- <display_maxwidth></display_maxwidth>
- <display_width type="int">20</display_width>
- <editable type="int">1</editable>
- <enabled type="int">1</enabled>
- <external_validator></external_validator>
- <extra></extra>
- <hidden type="int">0</hidden>
- <jump_method>base_jump_relation</jump_method>
- <max_length></max_length>
- <portal_type type="list">[('Person', 'Person'), ('Organisation', 'Organisation')]</portal_type>
- <required type="int">0</required>
- <title>Third party account</title>
- <truncate type="int">0</truncate>
- <unicode type="int">0</unicode>
- <update_method>base_update_relation</update_method>
- <whitespace_preserve type="int">0</whitespace_preserve>
- </values>
- <tales>
- </tales>
- <messages>
- <message name="external_validator_failed">The input failed the external validator.</message>
- <message name="required_not_found">Input is required but no input given.</message>
- <message name="too_long">Too much input was given.</message>
- </messages>
- </field>
- <field><id>my_destination_title</id> <type>RelationStringField</type>
+ <field><id>my_source</id> <type>ListField</type>
<values>
<alternate_name></alternate_name>
- <base_category>destination</base_category>
- <catalog_index>Title</catalog_index>
<css_class></css_class>
<default></default>
- <default_module>account</default_module>
- <description>Destination</description>
- <display_maxwidth></display_maxwidth>
- <display_width type="int">20</display_width>
- <editable type="int">1</editable>
- <enabled type="int">1</enabled>
- <external_validator></external_validator>
- <extra></extra>
- <hidden type="int">0</hidden>
- <jump_method>base_jump_relation</jump_method>
- <max_length></max_length>
- <portal_type type="list">[('Account', 'account')]</portal_type>
- <required type="int">0</required>
- <title>Mirror account</title>
- <truncate type="int">0</truncate>
- <unicode type="int">0</unicode>
- <update_method>base_update_relation</update_method>
- <whitespace_preserve type="int">0</whitespace_preserve>
- </values>
- <tales>
- </tales>
- <messages>
- <message name="external_validator_failed">The input failed the external validator.</message>
- <message name="required_not_found">Input is required but no input given.</message>
- <message name="too_long">Too much input was given.</message>
- </messages>
- </field>
- </fields>
- </group>
- <group>
- <title>center</title>
- <fields>
-
- <field><id>my_source_section_title</id> <type>RelationStringField</type>
- <values>
- <alternate_name></alternate_name>
- <base_category>source_section</base_category>
- <catalog_index>Title</catalog_index>
- <css_class></css_class>
- <default></default>
- <default_module>organisation</default_module>
- <description>Source section</description>
- <display_maxwidth></display_maxwidth>
- <display_width type="int">20</display_width>
+ <description></description>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator>
<extra></extra>
+ <extra_item></extra_item>
+ <first_item type="int">0</first_item>
<hidden type="int">0</hidden>
- <jump_method>base_jump_relation</jump_method>
- <max_length></max_length>
- <portal_type type="list">[('Organisation', 'Organisation'), ('Person', 'Person')]</portal_type>
+ <items type="list">[]</items>
<required type="int">0</required>
- <title>Analytical section</title>
- <truncate type="int">0</truncate>
+ <size type="int">1</size>
+ <title>Customer Account</title>
<unicode type="int">0</unicode>
- <update_method>base_update_relation</update_method>
<whitespace_preserve type="int">0</whitespace_preserve>
</values>
<tales>
+ <items>python:here.InvoiceTransactionLine_getSourceItemList()</items>
</tales>
<messages>
<message name="external_validator_failed">The input failed the external validator.</message>
<message name="required_not_found">Input is required but no input given.</message>
- <message name="too_long">Too much input was given.</message>
+ <message name="unknown_selection">You selected an item that was not in the list.</message>
</messages>
</field>
- <field><id>my_source_title</id> <type>RelationStringField</type>
+ <field><id>my_destination</id> <type>ListField</type>
<values>
<alternate_name></alternate_name>
- <base_category>source</base_category>
- <catalog_index>Title</catalog_index>
<css_class></css_class>
<default></default>
- <default_module>account</default_module>
- <description>Section</description>
- <display_maxwidth></display_maxwidth>
- <display_width type="int">20</display_width>
+ <description></description>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator>
<extra></extra>
+ <extra_item></extra_item>
+ <first_item type="int">0</first_item>
<hidden type="int">0</hidden>
- <jump_method>base_jump_relation</jump_method>
- <max_length></max_length>
- <portal_type type="list">[('Account', 'account')]</portal_type>
+ <items type="list">[]</items>
<required type="int">0</required>
- <title>Account</title>
- <truncate type="int">0</truncate>
+ <size type="int">1</size>
+ <title>Vendor Account</title>
<unicode type="int">0</unicode>
- <update_method>base_update_relation</update_method>
<whitespace_preserve type="int">0</whitespace_preserve>
</values>
<tales>
+ <items>python:here.InvoiceTransactionLine_getDestinationItemList()</items>
</tales>
<messages>
<message name="external_validator_failed">The input failed the external validator.</message>
<message name="required_not_found">Input is required but no input given.</message>
- <message name="too_long">Too much input was given.</message>
+ <message name="unknown_selection">You selected an item that was not in the list.</message>
</messages>
</field>
- <field><id>my_source_debit</id> <type>FloatField</type>
+ <field><id>my_source_credit</id> <type>FloatField</type>
<values>
<alternate_name></alternate_name>
<css_class></css_class>
@@ -229,7 +117,7 @@
<extra></extra>
<hidden type="int">0</hidden>
<required type="int">0</required>
- <title>Source debit (in euros)</title>
+ <title>Source Credit</title>
<whitespace_preserve type="int">0</whitespace_preserve>
</values>
<tales>
@@ -240,7 +128,7 @@
<message name="not_float">You did not enter a floating point number.</message>
</messages>
</field>
- <field><id>my_source_credit</id> <type>FloatField</type>
+ <field><id>my_source_debit</id> <type>FloatField</type>
<values>
<alternate_name></alternate_name>
<css_class></css_class>
@@ -254,7 +142,7 @@
<extra></extra>
<hidden type="int">0</hidden>
<required type="int">0</required>
- <title>Source credit (in euros)</title>
+ <title>Source Debit</title>
<whitespace_preserve type="int">0</whitespace_preserve>
</values>
<tales>
@@ -273,6 +161,12 @@
</fields>
</group>
+ <group>
+ <title>center</title>
+ <fields>
+
+ </fields>
+ </group>
<group>
<title>bottom</title>
<fields>
@@ -280,4 +174,4 @@
</fields>
</group>
</groups>
-</form>
+</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_calcul_OLD.py b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_calcul_OLD.py
index c51a0ad72e..20d0e0c78f 100755
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_calcul_OLD.py
+++ b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_calcul_OLD.py
@@ -29,7 +29,7 @@ paysheet_resource = 'currency/EUR'
# set the title if empty
-months = ['janvier', 'février', 'mars', 'avril', 'mai', 'juin', 'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre']
+months = ['janvier', 'février', 'mars', 'avril', 'mai', 'juin', 'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre']
if paysheet.getTitle() in ('', None):
paysheet.setTitle('Salaire ' + str(employee_object.getTitle()) + ' ' + months[int(str(paysheet.getStartDate())[5:7])-1] + ' ' + str(paysheet.getStartDate())[0:4])
@@ -217,7 +217,7 @@ createPaySheetItem( title = 'Versement au transport'
]
)
-# CSG = Contribution Sociale Generalisee (déductible / non déductible)
+# CSG = Contribution Sociale Generalisee (déductible / non déductible)
createPaySheetItem( title = 'CSG deductible'
, res = 'service/csg_deductible'
, dest_org = org_urssaf
@@ -532,7 +532,7 @@ createPaySheetItem( title = 'Convention SYNTEC'
#########################################################################
#get_transaction().commit()
-#context.PaySheetTransactionLine_generate()
+#context.PaySheetTransaction_generatePaySheetTransactionLineList()
# return to pay sheet
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '?portal_status_message=Pay+Sheet+Calculation+done.')
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_checkParameters.py b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_checkParameters.py
index 9947906b3f..8e22d3c6d2 100755
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_checkParameters.py
+++ b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_checkParameters.py
@@ -35,4 +35,4 @@ if employer_obj.getDefaultAddress().getZipCode() in ('', None):
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '?portal_status_message=The+employer+must+have+a+zip+code')
# parameters are OK, go to the pre-calculation form
-return context.REQUEST.RESPONSE.redirect(context.absolute_url() + "/PaySheetTransaction_previewForm?selection_name=default&dialog_category=object_action&form_id=PaySheetTransaction_view")
+return context.REQUEST.RESPONSE.redirect(context.absolute_url() + "/PaySheetTransaction_viewPreview?selection_name=default&dialog_category=object_action&form_id=PaySheetTransaction_view")
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getPreavis.py b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getPreavis.py
index 741cf86e6b..eba869c4db 100755
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getPreavis.py
+++ b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getPreavis.py
@@ -7,18 +7,18 @@
##parameters=
##title=
##
-# Définition des préavis selon le temps dans l'entreprise (en jours)
+# Définition des préavis selon le temps dans l'entreprise (en jours)
seuils = [ { 'limite':30 , 'preavis':'1 jour' }, # 1er mois d'essai
{ 'limite':60 , 'preavis':'1 semaine' }, # 2e mois d'essai
- { 'limite':730, 'preavis':'1 mois' }, # 2 premières années
- { 'limite':0, 'preavis':'2 mois' } ] # Après les 2 premières années
+ { 'limite':730, 'preavis':'1 mois' }, # 2 premières années
+ { 'limite':0, 'preavis':'2 mois' } ] # Après les 2 premières années
paysheet = context.getObject()
employee_object = paysheet.getDestinationSectionValue()
-# Récupération de l'entreprise actuelle
+# Récupération de l'entreprise actuelle
currentOrg = None
if hasattr(employee_object,"default_career"):
currentOrg = employee_object["default_career"].getSubordinationValue()
@@ -39,7 +39,7 @@ for step in steps:
totalTime = int( totalTime + (DateTime() - employee_object["default_career"].getStartDate()) )
-# Détermination du préavis
+# Détermination du préavis
for i in range(len(seuils)):
if i < len(seuils)-1:
if seuils[i]['limite'] >= totalTime:
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_pdf_template.pt b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_pdf_template.pt
index ca5123a05f..d2fbd18b7b 100755
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_pdf_template.pt
+++ b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_pdf_template.pt
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+
<tal:block tal:define="employee python: here.getDestinationSectionValue();
employer python: here.getSourceSectionValue();
paysheet_details python: here.PaySheetTransaction_getDetails();
@@ -16,7 +18,7 @@
<stylecmd expr="('LINEAFTER', (0,0), (-1,-1), 0.1, (0.4,0.4,0.4))"/>
<stylecmd expr="('LEFTPADDING', (0,0), (-1,-1), 4)"/>
- <!-- Entête -->
+ <!-- Entete -->
<stylecmd expr="('TEXTCOLOR', (0,0), (-1,0), colors.white)"/>
<stylecmd expr="('FONT', (0,0), (-1,0), 'Helvetica-Bold', 7)"/>
<stylecmd expr="('BACKGROUND', (0,0), (-1,0), (0.4,0.4,0.4))"/>
@@ -45,7 +47,7 @@
<stylecmd expr="('FONTSIZE', (0,0), (-1,-1), 7)"/>
<stylecmd expr="('LEFTPADDING', (0,0), (-1,-1), 4)"/>
- <!-- Entête gauche -->
+ <!-- Entete gauche -->
<stylecmd expr="('TEXTCOLOR', (0,0), (0,0), colors.white)"/>
<stylecmd expr="('FONT', (0,0), (0,0), 'Helvetica-Bold', 7)"/>
<stylecmd expr="('BACKGROUND', (0,0), (0,0), (0.4,0.4,0.4))"/>
@@ -55,7 +57,7 @@
<stylecmd expr="('VALIGN', (0,0), (0,0), 'MIDDLE')"/>
- <!-- <!- Première ligne de droite ->
+ <!-- Premiere ligne de droite
<stylecmd expr="('LINEABOVE', (-1,0), (-1,0), 0.1, (0.4,0.4,0.4))"/>
<stylecmd expr="('LINEBEFORE', (-1,0), (-1,0), 0.1, (0.4,0.4,0.4))"/>
<stylecmd expr="('LINEAFTER', (-1,0), (-1,0), 0.1, (0.4,0.4,0.4))"/>
@@ -72,7 +74,7 @@
<stylecmd expr="('ALIGNMENT', (0,0), (4,0), 'CENTER')"/>
<stylecmd expr="('ALIGNMENT', (0,1), (4,1), 'RIGHT')"/>
- <!-- Deuxième ligne de droite -->
+ <!-- Deuxieme ligne de droite -->
<!-- <stylecmd expr="('LINEBELOW', (-1,0), (-1,0), 0.1, (0.4,0.4,0.4))"/>
<stylecmd expr="('LINEBEFORE', (-1,0), (-1,0), 0.1, (0.4,0.4,0.4))"/>
<stylecmd expr="('LINEAFTER', (-1,0), (-1,0), 0.1, (0.4,0.4,0.4))"/>
@@ -87,7 +89,7 @@
<pagetemplate startframe='content' id='FirstPage'>
<static>
- <!-- ATTENTION : L'image ne doit pas être en format png -->
+ <!-- ATTENTION : L'image ne doit pas etre en format png -->
<fixedimage filename='zodb:logo.jpg' y='27.275cm' x='1.016cm'/>
<infostring z='' color='(0.0,0.0,0.0)' align='center' y='27.5160804cm' x='14.208cm' font='Helvetica' size='20'>FEUILLE DE SALAIRE</infostring>
@@ -101,7 +103,7 @@
<infostring z='' color='(0.0,0.0,0.0)' align='left' y='25.90483216cm' x='1.278cm' font='Helvetica-Bold' size='8'
tal:content="python: employer.getCorporateName()">Nexedi sarl</infostring>
<infostring z='' color='(0.0,0.0,0.0)' align='left' y='25.49483216cm' x='1.626cm' font='Helvetica' size='8'
- tal:content="python: employer.getDefaultAddress().getStreetAddress()">943 Avenue de la République</infostring>
+ tal:content="python: employer.getDefaultAddress().getStreetAddress()">943 Avenue de la République</infostring>
<infostring z='' color='(0.0,0.0,0.0)' align='left' y='25.21366432cm' x='1.626cm' font='Helvetica' size='8'
tal:content='python:employer.getDefaultAddress().getZipCode() + " " + employer.getDefaultAddress().getCity()'>59700 Marcq-en-Baroeul</infostring>
<infostring z='' color='(0.0,0.0,0.0)' align='left' y='24.70683216cm' x='1.27cm' font='Helvetica' size='8'
@@ -113,7 +115,7 @@
<infostring z='' color='(0.0,0.0,0.0)' align='left' y='24.14449648cm' x='1.27cm' font='Helvetica' size='8'
tal:content="python: 'NAF (ex APE) : %s' % employer.getActivityCode()">NAF (ex APE) : 722Z</infostring>
<infostring z='' color='(0.0,0.0,0.0)' align='left' y='23.23783216cm' x='1.27cm' font='Helvetica' size='8'
- tal:content="python: 'N°URSSAF : %s' % employer.getSocialCode()">N°URSSAF : 592 190071289 1013</infostring>
+ tal:content="python: 'N°URSSAF : %s' % employer.getSocialCode()">N°URSSAF : 592 190071289 1013</infostring>
<infostring z='' color='(0.0,0.0,0.0)' align='left' y='22.95666432cm' x='1.27cm' font='Helvetica' size='8'
tal:content="python:urssaf.getTitle()">URSSAF de Roubaix-Tourcoing</infostring>
<infostring z='' color='(0.0,0.0,0.0)' align='left' y='22.37383216cm' x='1.626cm' font='Helvetica' size='8'
@@ -126,20 +128,20 @@
</tal:block>
- <!-- Cadre employé -->
+ <!-- Cadre employé -->
<tal:block tal:condition="python: employee not in (None, '') and employee.getPortalType() == 'Person'">
<rectangle z='' height='5.239cm' width='7.038cm' stroke='(0.4,0.4,0.4)' y='21.074cm' x='12.065cm' linewidth='1'/>
<line y2='23.994cm' linewidth='1' z='' x2='19.099cm' stroke='(0.6,0.6,0.6)' y1='23.994cm' x1='12.073cm'/>
<line y2='22.165cm' linewidth='1' z='' x2='19.099cm' stroke='(0.6,0.6,0.6)' y1='22.165cm' x1='12.073cm'/>
<infostring z='' color='(0.0,0.0,0.0)' align='left' y='25.91383216cm' x='12.327cm' font='Helvetica-Bold' size='8'
- tal:content="python: employee.getTitle()">Sébastien Robin</infostring>
+ tal:content="python: employee.getTitle()">Sébastien Robin</infostring>
<infostring z='' color='(0.0,0.0,0.0)' align='left' y='25.50383216cm' x='12.675cm' font='Helvetica' size='8'
tal:content="python:employee.getDefaultAddress().getStreetAddress()">11, rue des chaudrons</infostring>
<infostring z='' color='(0.0,0.0,0.0)' align='left' y='25.22266432cm' x='12.675cm' font='Helvetica' size='8'
tal:content="python:employee.getDefaultAddress().getZipCode() + ' ' + employee.getDefaultAddress().getCity()">59300 Valenciennes</infostring>
<infostring z='' color='(0.0,0.0,0.0)' align='left' y='24.29683216cm' x='12.327cm' font='Helvetica' size='8'
- tal:content="python: 'N°Secu.Soc. : %s' % employee.getSocialCode()">N°Secu.Soc. : 1 80 04 85 047 027 25</infostring>
+ tal:content="python: 'N°Secu.Soc. : %s' % employee.getSocialCode()">N°Secu.Soc. : 1 80 04 85 047 027 25</infostring>
<infostring z='' color='(0.0,0.0,0.0)' align='left' y='23.58583216cm' x='12.327cm' font='Helvetica' size='8'
tal:content="python: 'Emploi : %s' % employee.getDefaultCareerTitle()">Emploi : Directeur Technique</infostring>
<infostring z='' color='(0.0,0.0,0.0)' align='left' y='23.30466432cm' x='12.327cm' font='Helvetica' size='8'
@@ -149,13 +151,13 @@
<infostring z='' color='(0.0,0.0,0.0)' align='left' y='22.74232864cm' x='12.327cm' font='Helvetica' size='8'
tal:content="python: 'Coefficient : %s' % employee.getDefaultCareerSalaryCoefficient()">Coefficient : 1</infostring>
<infostring z='' color='(0.0,0.0,0.0)' align='left' y='21.75683216cm' x='12.327cm' font='Helvetica' size='8'
- tal:content="python: 'Période : du %s au %s' % (start_date, here.getStopDate())">Période : du 2003/11/01 au 2003/11/30</infostring>
+ tal:content="python: 'Période : du %s au %s' % (start_date, here.getStopDate())">Période : du 2003/11/01 au 2003/11/30</infostring>
<infostring z='' color='(0.0,0.0,0.0)' align='left' y='21.47566432cm' x='12.327cm' font='Helvetica' size='8'
tal:content="python: 'Date de paiement : %s' % here.getTargetStopDate()">Date de paiement : 2003/11/04</infostring>
</tal:block>
<line y2='1.506cm' linewidth='1' z='' x2='19.075cm' stroke='(0.6,0.6,0.6)' y1='1.506cm' x1='1.905cm'/>
- <infostring z='' color='(0.0,0.0,0.0)' align='center' y='1.00183216cm' x='10.4855cm' font='Helvetica' size='8'>Dans votre intérêt et pour vous aider à faire valoir vos droits, conservez ce bulletin de paie sans limitation de durée.</infostring>
+ <infostring z='' color='(0.0,0.0,0.0)' align='center' y='1.00183216cm' x='10.4855cm' font='Helvetica' size='8'>Dans votre intérêt et pour vous aider à faire valoir vos droits, conservez ce bulletin de paie sans limitation de durée.</infostring>
</static>
<frame showBoundary='0' leftpadding='0.1cm' height='18.74cm' width='19.701cm' rightpadding='0.1cm' y='1.689cm' x='0.635cm' nextid='content' toppadding='0.2cm' id='content' bottompadding='0.5cm'/>
</pagetemplate>
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_postCalculation.py b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_postCalculation.py
index e89a8a5749..aad94e3010 100755
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_postCalculation.py
+++ b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_postCalculation.py
@@ -4,7 +4,7 @@
##bind namespace=
##bind script=script
##bind subpath=traverse_subpath
-##parameters=listbox=[],**kw
+##parameters=listbox=[], **kw
##title=
##
True = 1
@@ -64,7 +64,7 @@ def createPaySheetItem(title='', res='', dest_org='', cells=[]):
# set the title of the paysheet if empty
-months = ['janvier', 'février', 'mars', 'avril', 'mai', 'juin', 'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre']
+months = ['janvier', 'février', 'mars', 'avril', 'mai', 'juin', 'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre']
if paysheet.getTitle() in ('', None):
new_title = 'Salaire ' + str(employee_object.getTitle())
if paysheet.getStartDate() not in ('', None):
@@ -76,6 +76,7 @@ if paysheet.getTitle() in ('', None):
# get the ordered list of standard preview line objects
std_lines = context.PaySheetTransaction_initializePreview()
+
# this list contain all paysheet items, indexed by service
paysheet_items = {}
@@ -108,7 +109,7 @@ for std_line in std_lines:
user_line_index += 1
# get user paysheet parameters stored in user preview line (=listbox)
for user_line in listbox:
- # search the user preview line corresponding to the standard preview line
+ # Base_viewSearchResultList the user preview line corresponding to the standard preview line
if user_line.has_key('listbox_key') and int(user_line['listbox_key'])==user_line_index:
# got it ! we have the right line
# get the base salary
@@ -148,7 +149,7 @@ for item in paysheet_items:
# calculation of all paysheet transaction lines
#get_transaction().commit()
-#context.PaySheetTransactionLine_generate()
+#context.PaySheetTransaction_generatePaySheetTransactionLineList()
context.immediateReindexObject()
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_preCalculation.py b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_preCalculation.py
index 68e46c2774..65f3a366c9 100755
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_preCalculation.py
+++ b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_preCalculation.py
@@ -47,7 +47,7 @@ employer_region = employer_object.getDefaultAddress().getZipCode()[:2]
company_size = 3
-# limited salary = salaire plafonné
+# limited salary = salaire plafonné
if gross_salary < 2432: #!!! depending of the wage periodicity, 2432 euros is for a month
limited_salary = gross_salary
else:
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_print_old.pt b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_print_old.pt
index ae263bf690..492bdcc138 100755
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_print_old.pt
+++ b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_print_old.pt
@@ -7,7 +7,7 @@
urssaf python: here.restrictedTraverse(employer.getDestinationSection());
start_date python: here.getStartDate()">
<head>
- <meta http-equiv="content-type" content="text/html;charset=UTF-8">
+ <meta http-equiv="content-type" content="text/html;charset=ISO-8859-1">
<title tal:content="python: here.getTitleOrId()"/>
<style type="text/css">@import "PaySheet.css";</style>
</head>
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_view.form b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_view.form
index 529a552572..5d1dc3c930 100755
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_view.form
+++ b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_view.form
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
<form>
- <title></title>
+ <title>Pay Sheet Transaction</title>
<row_length>4</row_length>
- <name>pay_sheet_view</name>
+ <name>PaySheetTransaction_view</name>
<pt>form_view</pt>
- <action>base_edit</action>
+ <action>Base_edit</action>
<update_action></update_action>
<method>POST</method>
<enctype></enctype>
@@ -92,7 +92,7 @@
<external_validator></external_validator>
<extra></extra>
<hidden type="int">0</hidden>
- <jump_method>base_jump_relation</jump_method>
+ <jump_method>Base_jumpToRelatedDocument</jump_method>
<max_length></max_length>
<not_viewable type="int">0</not_viewable>
<portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
@@ -102,7 +102,7 @@
<title>Employer</title>
<truncate type="int">0</truncate>
<unicode type="int">0</unicode>
- <update_method>base_update_relation</update_method>
+ <update_method>Base_updateRelation</update_method>
<viewable_expression></viewable_expression>
<viewable_permission type="list">[]</viewable_permission>
<viewable_role type="list">[]</viewable_role>
@@ -135,7 +135,7 @@
<external_validator></external_validator>
<extra></extra>
<hidden type="int">0</hidden>
- <jump_method>base_jump_relation</jump_method>
+ <jump_method>Base_jumpToRelatedDocument</jump_method>
<max_length></max_length>
<not_viewable type="int">0</not_viewable>
<portal_type type="list">[('Person', 'Person')]</portal_type>
@@ -145,7 +145,7 @@
<title>Employee</title>
<truncate type="int">0</truncate>
<unicode type="int">0</unicode>
- <update_method>base_update_relation</update_method>
+ <update_method>Base_updateRelation</update_method>
<viewable_expression></viewable_expression>
<viewable_permission type="list">[]</viewable_permission>
<viewable_role type="list">[]</viewable_role>
@@ -299,6 +299,7 @@
<field><id>listbox</id> <type>ListBox</type>
<values>
+ <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
<all_columns type="list">[]</all_columns>
<all_editable_columns type="list">[]</all_editable_columns>
<alternate_name></alternate_name>
@@ -323,18 +324,20 @@
<list_method type="method">searchFolder</list_method>
<meta_types type="list">[]</meta_types>
<not_viewable type="int">0</not_viewable>
- <portal_types type="list">[]</portal_types>
+ <portal_types type="list">[('Pay Sheet Line', 'Pay Sheet Line')]</portal_types>
<read_only type="int">0</read_only>
<report_root_list type="list">[]</report_root_list>
<report_tree type="int">0</report_tree>
- <search type="int">0</search>
+ <search></search>
<search_columns type="list">[]</search_columns>
<select type="int">0</select>
<selection_name>paysheet_line_list_selection</selection_name>
<sort type="list">[]</sort>
<sort_columns type="list">[]</sort_columns>
+ <stat_columns type="list">[]</stat_columns>
<stat_method></stat_method>
<title>Pay Sheet Details</title>
+ <url_columns type="list">[]</url_columns>
<viewable_expression></viewable_expression>
<viewable_permission type="list">[]</viewable_permission>
<viewable_role type="list">[]</viewable_role>
@@ -348,4 +351,4 @@
</fields>
</group>
</groups>
-</form>
+</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/PaymentTransaction_view.form b/product/ERP5/skins/erp5_accounting/PaymentTransaction_view.form
index 5d8198ba11..9a0f232dfe 100755
--- a/product/ERP5/skins/erp5_accounting/PaymentTransaction_view.form
+++ b/product/ERP5/skins/erp5_accounting/PaymentTransaction_view.form
@@ -5,7 +5,7 @@
<row_length>4</row_length>
<name>PaymentTransaction_view</name>
<pt>form_view</pt>
- <action>base_edit</action>
+ <action>Base_edit</action>
<update_action></update_action>
<method>POST</method>
<enctype></enctype>
@@ -75,7 +75,7 @@
<whitespace_preserve type="int">0</whitespace_preserve>
</values>
<tales>
- <items>python: here.getAccountingTransactionSourcePaymentItemList()</items>
+ <items>python: here.AccountingTransaction_getSourcePaymentItemList()</items>
</tales>
<messages>
<message name="external_validator_failed">The input failed the external validator.</message>
@@ -155,7 +155,7 @@
<external_validator></external_validator>
<extra></extra>
<hidden type="int">0</hidden>
- <jump_method>base_jump_relation</jump_method>
+ <jump_method>Base_jumpToRelatedDocument</jump_method>
<max_length></max_length>
<portal_type type="list">[('Organisation', 'Organisation'), ('Person', 'Person')]</portal_type>
<relation_setter_id></relation_setter_id>
@@ -163,7 +163,7 @@
<title>Third Party</title>
<truncate type="int">0</truncate>
<unicode type="int">0</unicode>
- <update_method>base_update_relation</update_method>
+ <update_method>Base_updateRelation</update_method>
<whitespace_preserve type="int">0</whitespace_preserve>
</values>
<tales>
@@ -195,7 +195,7 @@
<whitespace_preserve type="int">0</whitespace_preserve>
</values>
<tales>
- <items>python: here.getAccountingTransactionDestinationPaymentItemList()</items>
+ <items>python: here.AccountingTransaction_getDestinationPaymentItemList()</items>
</tales>
<messages>
<message name="external_validator_failed">The input failed the external validator.</message>
@@ -413,6 +413,7 @@
<field><id>listbox</id> <type>ListBox</type>
<values>
+ <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
<all_columns type="list">[]</all_columns>
<all_editable_columns type="list">[]</all_editable_columns>
<alternate_name></alternate_name>
@@ -433,22 +434,24 @@
<global_attributes type="list">[('resource', 'resource')]</global_attributes>
<hidden type="int">0</hidden>
<lines type="int">10</lines>
- <list_action>folder_contents</list_action>
- <list_method type="method">searchInvoiceTransaction</list_method>
+ <list_action>Folder_viewContentList</list_action>
+ <list_method type="method">AccountingTransaction_searchInvoiceTransactionLines</list_method>
<meta_types type="list">[]</meta_types>
<not_viewable type="int">0</not_viewable>
<portal_types type="list">[]</portal_types>
<read_only type="int">0</read_only>
<report_root_list type="list">[]</report_root_list>
<report_tree type="int">0</report_tree>
- <search type="int">0</search>
+ <search></search>
<search_columns type="list">[]</search_columns>
<select type="int">0</select>
<selection_name>payment_transaction_line_selection</selection_name>
<sort type="list">[('id', 'id')]</sort>
<sort_columns type="list">[]</sort_columns>
+ <stat_columns></stat_columns>
<stat_method></stat_method>
<title>Payment Transaction Lines</title>
+ <url_columns></url_columns>
<viewable_expression></viewable_expression>
<viewable_permission type="list">[]</viewable_permission>
<viewable_role type="list">[]</viewable_role>
@@ -514,7 +517,7 @@
<whitespace_preserve type="int">0</whitespace_preserve>
</values>
<tales>
- <items>python:cell.getObject().getInvoiceTransactionLineSourceItemList()</items>
+ <items>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</items>
</tales>
<messages>
<message name="external_validator_failed">The input failed the external validator.</message>
@@ -543,7 +546,7 @@
<whitespace_preserve type="int">0</whitespace_preserve>
</values>
<tales>
- <items>python:cell.getObject().getInvoiceTransactionLineDestinationItemList()</items>
+ <items>python:cell.getObject().InvoiceTransactionLine_getDestinationItemList()</items>
</tales>
<messages>
<message name="external_validator_failed">The input failed the external validator.</message>
@@ -604,4 +607,4 @@
</fields>
</group>
</groups>
-</form>
+</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_core/Base_redirect.py b/product/ERP5/skins/erp5_core/Base_redirect.py
index 81c15b89b8..1e9f2bc65b 100755
--- a/product/ERP5/skins/erp5_core/Base_redirect.py
+++ b/product/ERP5/skins/erp5_core/Base_redirect.py
@@ -22,4 +22,3 @@ else:
redirect_url = '%s/%s/view' % (context.getPortalObject().absolute_url(), relative_url)
request[ 'RESPONSE' ].redirect( redirect_url )
-
diff --git a/product/ERP5/skins/erp5_core/Base_updateDialogForm.py b/product/ERP5/skins/erp5_core/Base_updateDialogForm.py
index c2983875c2..90fb3bca60 100755
--- a/product/ERP5/skins/erp5_core/Base_updateDialogForm.py
+++ b/product/ERP5/skins/erp5_core/Base_updateDialogForm.py
@@ -1,5 +1,12 @@
+## Script (Python) "Base_updateDialogForm"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind subpath=traverse_subpath
##parameters=**kw
-
+##title=
+##
from string import zfill
request = context.REQUEST
@@ -21,4 +28,3 @@ for k in kw.keys():
request.set('listbox',listbox)
else:
request.set('my_%s' % k, v)
-
diff --git a/product/ERP5/skins/erp5_core/ERP5Site_exportAll.py b/product/ERP5/skins/erp5_core/ERP5Site_exportAll.py
index 7e2c156c78..8793b5f8e5 100755
--- a/product/ERP5/skins/erp5_core/ERP5Site_exportAll.py
+++ b/product/ERP5/skins/erp5_core/ERP5Site_exportAll.py
@@ -1,3 +1,12 @@
+## Script (Python) "ERP5Site_exportAll"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind subpath=traverse_subpath
+##parameters=
+##title=
+##
for folder in context.objectValues(("ERP5 Folder",)):
print "#### Exporting the folder %s ####" % folder.id
folder.exportAll(dir='/var/lib/zope/')
@@ -13,4 +22,3 @@ context.manage_exportObject(id='portal_types')
print "work done"
return printed
-
diff --git a/product/ERP5/skins/erp5_core/ERP5Site_reindexCategory.py b/product/ERP5/skins/erp5_core/ERP5Site_reindexCategory.py
index 320579a288..cdc8fa77aa 100755
--- a/product/ERP5/skins/erp5_core/ERP5Site_reindexCategory.py
+++ b/product/ERP5/skins/erp5_core/ERP5Site_reindexCategory.py
@@ -1,5 +1,12 @@
+## Script (Python) "ERP5Site_reindexCategory"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind subpath=traverse_subpath
##parameters=request=None
-
+##title=
+##
error_list = []
return_list = []
diff --git a/product/ERP5/skins/erp5_core/ERP5Site_reindexSimulation.py b/product/ERP5/skins/erp5_core/ERP5Site_reindexSimulation.py
index d7af2022db..6457010524 100755
--- a/product/ERP5/skins/erp5_core/ERP5Site_reindexSimulation.py
+++ b/product/ERP5/skins/erp5_core/ERP5Site_reindexSimulation.py
@@ -1,5 +1,12 @@
+## Script (Python) "ERP5Site_reindexSimulation"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind subpath=traverse_subpath
##parameters=request=None
-
+##title=
+##
error_list = []
return_list = []
diff --git a/product/ERP5/skins/erp5_core/Folder_reindexAll.py b/product/ERP5/skins/erp5_core/Folder_reindexAll.py
index 7196fbe0a2..83c1df132a 100755
--- a/product/ERP5/skins/erp5_core/Folder_reindexAll.py
+++ b/product/ERP5/skins/erp5_core/Folder_reindexAll.py
@@ -1,5 +1,12 @@
+## Script (Python) "Folder_reindexAll"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind subpath=traverse_subpath
##parameters=request=None
-
+##title=
+##
error_list = []
return_list = []
diff --git a/product/ERP5/skins/erp5_core/Predicate_edit.py b/product/ERP5/skins/erp5_core/Predicate_edit.py
index 0e0d12370d..9a9d7e8177 100755
--- a/product/ERP5/skins/erp5_core/Predicate_edit.py
+++ b/product/ERP5/skins/erp5_core/Predicate_edit.py
@@ -1,5 +1,12 @@
+## Script (Python) "Predicate_edit"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind subpath=traverse_subpath
##parameters=form_id, selection_index=0, selection_name=''
-
+##title=
+##
# Updates attributes of an Zope document
# which is in a class inheriting from ERP5 Base
#
diff --git a/product/ERP5/skins/erp5_core/base_workflow_action.form b/product/ERP5/skins/erp5_core/base_workflow_action.form
index 1aa5a4ad34..deb185bd81 100755
--- a/product/ERP5/skins/erp5_core/base_workflow_action.form
+++ b/product/ERP5/skins/erp5_core/base_workflow_action.form
@@ -3,9 +3,10 @@
<form>
<title>Validate</title>
<row_length>4</row_length>
- <name>base_workflow_action</name>
+ <name>BaseWorkflow_action</name>
<pt>form_view_dialog</pt>
- <action>workflow_status_modify</action>
+ <action>Workflow_statusModify</action>
+ <update_action></update_action>
<method>POST</method>
<enctype></enctype>
<encoding>UTF-8</encoding>
diff --git a/product/ERP5/skins/erp5_core/base_workflow_action_comment.form b/product/ERP5/skins/erp5_core/base_workflow_action_comment.form
index 61a5ea983e..ae3a0637f6 100755
--- a/product/ERP5/skins/erp5_core/base_workflow_action_comment.form
+++ b/product/ERP5/skins/erp5_core/base_workflow_action_comment.form
@@ -5,7 +5,8 @@
<row_length>4</row_length>
<name>base_workflow_action_comment</name>
<pt>form_view_dialog</pt>
- <action>workflow_status_modify</action>
+ <action>Workflow_statusModify</action>
+ <update_action></update_action>
<method>POST</method>
<enctype></enctype>
<encoding>UTF-8</encoding>
diff --git a/product/ERP5/skins/erp5_core/create_relation_dialog.form b/product/ERP5/skins/erp5_core/create_relation_dialog.form
index 3d1dda610a..41677a9327 100755
--- a/product/ERP5/skins/erp5_core/create_relation_dialog.form
+++ b/product/ERP5/skins/erp5_core/create_relation_dialog.form
@@ -3,9 +3,9 @@
<form>
<title>Create New Document(s)</title>
<row_length>4</row_length>
- <name>create_relation_dialog</name>
+ <name>Base_viewCreateRelationDialog</name>
<pt>form_create_relation_dialog</pt>
- <action>base_create_relation</action>
+ <action>Base_createRelation</action>
<update_action></update_action>
<method>POST</method>
<enctype>multipart/form-data</enctype>
@@ -23,6 +23,8 @@
<css_class></css_class>
<default type="list">[]</default>
<description></description>
+ <editable type="int">1</editable>
+ <enabled type="int">1</enabled>
<external_validator></external_validator>
<extra></extra>
<height type="int">5</height>
@@ -32,6 +34,10 @@
<max_lines></max_lines>
<required type="int">1</required>
<title>relation_values</title>
+ <unicode type="int">0</unicode>
+ <view_separator><br />
+</view_separator>
+ <whitespace_preserve type="int">0</whitespace_preserve>
<width type="int">40</width>
</values>
<tales>
@@ -47,4 +53,4 @@
</fields>
</group>
</groups>
-</form>
+</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_core/search.form b/product/ERP5/skins/erp5_core/search.form
index 25fc3489bc..194de0af67 100755
--- a/product/ERP5/skins/erp5_core/search.form
+++ b/product/ERP5/skins/erp5_core/search.form
@@ -3,7 +3,7 @@
<form>
<title>Folder Contents</title>
<row_length>4</row_length>
- <name>folder_contents</name>
+ <name>Folder_viewContentList</name>
<pt>form_list</pt>
<action></action>
<update_action></update_action>
@@ -19,6 +19,7 @@
<field><id>search_list</id> <type>ListBox</type>
<values>
+ <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
<all_columns type="list">[]</all_columns>
<all_editable_columns type="list">[]</all_editable_columns>
<alternate_name></alternate_name>
@@ -29,14 +30,16 @@
<description></description>
<domain_root_list type="list">[]</domain_root_list>
<domain_tree type="int">0</domain_tree>
+ <editable type="int">1</editable>
<editable_columns type="list">[]</editable_columns>
+ <enabled type="int">1</enabled>
<external_validator></external_validator>
<extra></extra>
<global_attributes type="list">[]</global_attributes>
<height type="int">5</height>
<hidden type="int">0</hidden>
<lines type="int">30</lines>
- <list_action>search</list_action>
+ <list_action>Base_viewSearchResultList</list_action>
<list_cookie>SEARCH_LIST</list_cookie>
<list_method type="method">portal_catalog</list_method>
<meta_types type="list">[]</meta_types>
@@ -44,13 +47,16 @@
<report_root_list type="list">[]</report_root_list>
<report_tree type="int">0</report_tree>
<reverse type="int">0</reverse>
- <search type="int">0</search>
+ <search></search>
<search_columns type="list">[]</search_columns>
<select type="int">0</select>
<selection_name>search_selection</selection_name>
<sort type="list">[]</sort>
+ <sort_columns></sort_columns>
+ <stat_columns></stat_columns>
<stat_method></stat_method>
<title>Search Results</title>
+ <url_columns></url_columns>
<width type="int">40</width>
</values>
<tales>
@@ -62,4 +68,4 @@
</fields>
</group>
</groups>
-</form>
+</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Assignment_view.form b/product/ERP5/skins/erp5_crm/Assignment_view.form
index 19c90217a5..8964715dad 100755
--- a/product/ERP5/skins/erp5_crm/Assignment_view.form
+++ b/product/ERP5/skins/erp5_crm/Assignment_view.form
@@ -5,7 +5,7 @@
<row_length>4</row_length>
<name>General</name>
<pt>form_view</pt>
- <action>base_edit</action>
+ <action>Base_edit</action>
<update_action></update_action>
<method>POST</method>
<enctype></enctype>
@@ -54,6 +54,8 @@
<description></description>
<display_maxwidth></display_maxwidth>
<display_width type="int">20</display_width>
+ <editable type="int">1</editable>
+ <enabled type="int">1</enabled>
<external_validator></external_validator>
<extra></extra>
<hidden type="int">0</hidden>
@@ -61,6 +63,8 @@
<required type="int">1</required>
<title>Title</title>
<truncate type="int">0</truncate>
+ <unicode type="int">0</unicode>
+ <whitespace_preserve type="int">0</whitespace_preserve>
</values>
<tales>
</tales>
@@ -241,4 +245,4 @@
</fields>
</group>
</groups>
-</form>
+</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Career_shiftDefault.py b/product/ERP5/skins/erp5_crm/Career_shiftDefault.py
index 3d9dcffcf9..52f0e66645 100755
--- a/product/ERP5/skins/erp5_crm/Career_shiftDefault.py
+++ b/product/ERP5/skins/erp5_crm/Career_shiftDefault.py
@@ -22,7 +22,7 @@ for object in context.objectValues():
# No default career
if default_career == None:
- return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '/person_career_view' + '?portal_status_message=Current+career+need+to+be+defined')
+ return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '/Person_viewCareer' + '?portal_status_message=Current+career+need+to+be+defined')
# Inverse sort of the list by id
object_list.sort(lambda x, y: -cmp(int(x.getId()), int(y.getId())))
@@ -42,4 +42,4 @@ context.manage_renameObject(new_object[0]['new_id'], 'default_career')
context.setDefaultCareerStopDate(None)
context.setDefaultCareerStartDate(new_start_date)
-return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '/person_career_view' + '?portal_status_message=New+career+step+added')
+return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '/Person_viewCareer' + '?portal_status_message=New+career+step+added')
diff --git a/product/ERP5/skins/erp5_crm/Career_view.form b/product/ERP5/skins/erp5_crm/Career_view.form
index 09ca83f659..4e615224d2 100755
--- a/product/ERP5/skins/erp5_crm/Career_view.form
+++ b/product/ERP5/skins/erp5_crm/Career_view.form
@@ -5,7 +5,7 @@
<row_length>4</row_length>
<name>General</name>
<pt>form_view</pt>
- <action>base_edit</action>
+ <action>Base_edit</action>
<update_action></update_action>
<method>POST</method>
<enctype></enctype>
@@ -90,14 +90,15 @@
<external_validator></external_validator>
<extra></extra>
<hidden type="int">0</hidden>
- <jump_method>base_jump_relation</jump_method>
+ <jump_method>Base_jumpToRelatedDocument</jump_method>
<max_length></max_length>
<portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
+ <relation_setter_id></relation_setter_id>
<required type="int">0</required>
<title>Organisation</title>
<truncate type="int">0</truncate>
<unicode type="int">0</unicode>
- <update_method>base_update_relation</update_method>
+ <update_method>Base_updateRelation</update_method>
<whitespace_preserve type="int">0</whitespace_preserve>
</values>
<tales>
@@ -393,4 +394,4 @@
</fields>
</group>
</groups>
-</form>
+</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_html_style/dialog_master.pt b/product/ERP5/skins/erp5_html_style/dialog_master.pt
index d884140f59..d4270ced48 100755
--- a/product/ERP5/skins/erp5_html_style/dialog_master.pt
+++ b/product/ERP5/skins/erp5_html_style/dialog_master.pt
@@ -137,7 +137,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
tal:attributes="value cancel_url">
<input type="hidden" name="previous_form_id" value="previous_form_id"
tal:attributes="value previous_form_id">
- <input type="Submit" value="Cancel" name="base_cancel:method"
+ <input type="Submit" value="Cancel" name="Base_cancel:method"
i18n:attributes="value" i18n:domain="ui"
/>
<span tal:condition="python: form.update_action!=''">
@@ -145,10 +145,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
tal:attributes="value python: form.update_action"/>
<input type="Submit" value="Update"
i18n:attributes="value" i18n:domain="ui"
- name="base_update_dialog:method"/>
+ name="Base_showUpdateDialog:method"/>
</span>
<input type="Submit" value="Search"
- name="base_dialog:method"
+ name="Base_callDialogMethod:method"
tal:attributes="value form/title"/>
</td>
<td></td>
diff --git a/product/ERP5/skins/erp5_html_style/form_dialog.pt b/product/ERP5/skins/erp5_html_style/form_dialog.pt
index 1ee763ef6f..a295bb0414 100755
--- a/product/ERP5/skins/erp5_html_style/form_dialog.pt
+++ b/product/ERP5/skins/erp5_html_style/form_dialog.pt
@@ -57,7 +57,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<input type="hidden" name="dialog_category" value="dialog_category"
tal:attributes="value dialog_category" />
<select name="dialog_select" size="1"
- tal:attributes="onChange string:submitAction('${here/absolute_url}/doDialog')">
+ tal:attributes="onChange string:submitAction('${here/absolute_url}/Base_doDialog')">
<span tal:repeat="action actions">
<option value="1" tal:content="action/name"
tal:condition="python: action['url'].find(form.id) < 0"
@@ -72,7 +72,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
</select></td>
<td valign="bottom" align="left" nowrap>
<input type="image" src="/images/pro/images/exec16.png" title="Action"
- alt="Action" name="doDialog:method"
+ alt="Action" name="Base_doDialog:method"
i18n:attributes="title" i18n:domain="ui"
tal:attributes="src string:$portal_url/images/exec16.png"/>
</td>
diff --git a/product/ERP5/skins/erp5_html_style/form_list_dialog.pt b/product/ERP5/skins/erp5_html_style/form_list_dialog.pt
index 95f19b1bdd..4f3249109b 100755
--- a/product/ERP5/skins/erp5_html_style/form_list_dialog.pt
+++ b/product/ERP5/skins/erp5_html_style/form_list_dialog.pt
@@ -56,7 +56,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<input type="hidden" name="dialog_category" value="dialog_category"
tal:attributes="value dialog_category" />
<select name="dialog_select" size="1"
- tal:attributes="onChange string:submitAction('${here/absolute_url}/doDialog')">
+ tal:attributes="onChange string:submitAction('${here/absolute_url}/Base_doDialog')">
<span tal:repeat="action actions">
<option value="1" tal:content="action/name"
tal:condition="python: action['url'].find(form.id) < 0"
@@ -71,7 +71,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
</select></td>
<td valign="bottom" align="left" nowrap>
<input type="image" src="/images/pro/images/exec16.png" title="Action"
- alt="Action" name="doDialog:method"
+ alt="Action" name="Base_doDialog:method"
i18n:attributes="title" i18n:domain="ui"
tal:attributes="src string:$portal_url/images/exec16.png"/>
</td>
diff --git a/product/ERP5/skins/erp5_html_style/form_view_dialog.pt b/product/ERP5/skins/erp5_html_style/form_view_dialog.pt
index edfe428707..a7e27b9964 100755
--- a/product/ERP5/skins/erp5_html_style/form_view_dialog.pt
+++ b/product/ERP5/skins/erp5_html_style/form_view_dialog.pt
@@ -60,7 +60,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<input type="hidden" name="dialog_category" value="dialog_category"
tal:attributes="value dialog_category" />
<select name="dialog_select" size="1"
- tal:attributes="onChange string:submitAction('${here/absolute_url}/doDialog')">
+ tal:attributes="onChange string:submitAction('${here/absolute_url}/Base_doDialog')">
<span tal:repeat="action actions">
<option value="1" tal:content="action/name"
tal:condition="python: action['url'].find(form.id) < 0"
@@ -76,7 +76,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<td valign="bottom" align="left" nowrap>
<input type="image" src="/images/pro/images/exec16.png" title="Action"
i18n:attributes="title" i18n:domain="ui"
- alt="Action" name="doDialog:method" />
+ alt="Action" name="Base_doDialog:method" />
</td>
</tr>
</table>
diff --git a/product/ERP5/skins/erp5_html_style/list_dialog_master.pt b/product/ERP5/skins/erp5_html_style/list_dialog_master.pt
index 6163b6539b..8ab7d9c26a 100755
--- a/product/ERP5/skins/erp5_html_style/list_dialog_master.pt
+++ b/product/ERP5/skins/erp5_html_style/list_dialog_master.pt
@@ -135,11 +135,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
tal:attributes="value cancel_url">
<input type="hidden" name="previous_form_id" value="previous_form_id"
tal:attributes="value previous_form_id">
- <input type="Submit" value="Cancel" name="base_cancel:method"
+ <input type="Submit" value="Cancel" name="Base_cancel:method"
i18n:attributes="value" i18n:domain="ui"
/>
<input type="Submit" value="Search"
- name="base_list_dialog:method"
+ name="Base_callListDialogMethod:method"
i18n:attributes="value" i18n:domain="ui"
tal:attributes="value form/title"/>
</td>
diff --git a/product/ERP5/skins/erp5_html_style/list_menu_box.pt b/product/ERP5/skins/erp5_html_style/list_menu_box.pt
index fd62404df3..ac573d690f 100755
--- a/product/ERP5/skins/erp5_html_style/list_menu_box.pt
+++ b/product/ERP5/skins/erp5_html_style/list_menu_box.pt
@@ -52,17 +52,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
tal:attributes="src string:$portal_url/images/sepacla.png"/>
<input type="image" src="/images/pro/images/editcopy.png" title="Copy"
width="22" height="22"
- name="folder_copy:method" alt="Copy"
+ name="Folder_copy:method" alt="Copy"
i18n:attributes="title" i18n:domain="ui"
tal:attributes="src string:$portal_url/images/editcopy.png"/>
<input type="image" src="/images/pro/images/editcut.png" title="Cut"
width="22" height="22"
- name="folder_cut:method" alt="Cut"
+ name="Folder_cut:method" alt="Cut"
i18n:attributes="title" i18n:domain="ui"
tal:attributes="src string:$portal_url/images/editcut.png"/>
<input type="image" src="/images/pro/images/editpaste.png" title="Paste"
width="22" height="22"
- name="folder_paste:method" alt="Paste"
+ name="Folder_paste:method" alt="Paste"
i18n:attributes="title" i18n:domain="ui"
tal:attributes="src string:$portal_url/images/editpaste.png"/>
<img src="/images/pro/images/sepacla.png" alt="|"
@@ -70,18 +70,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<span tal:condition="print_actions">
<input type="image" src="/images/pro/images/print.png" title="Print"
width="22" height="22"
- name="folder_print:method" alt="Print"
+ name="Folder_print:method" alt="Print"
i18n:attributes="title" i18n:domain="ui"
tal:attributes="src string:$portal_url/images/print.png"/>
</span>
<input type="image" src="/images/pro/images/filenew.png" title="New"
width="22" height="22"
- name="folder_new:method" alt="New"
+ name="Folder_create:method" alt="New"
i18n:attributes="title" i18n:domain="ui"
tal:attributes="src string:$portal_url/images/filenew.png"/>
<input type="image" src="/images/pro/images/edittrash.png"
title="Delete" width="22" height="22"
- name="base_folder_delete:method" alt="Delete"
+ name="Folder_delete:method" alt="Delete"
i18n:attributes="title" i18n:domain="ui"
tal:attributes="src string:$portal_url/images/edittrash.png"/>
<img src="/images/pro/images/sepacla.png" alt="|"
@@ -100,11 +100,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<input type="image" src="/images/pro/images/toutsel.png" title="Show All"
width="22" height="22"
i18n:attributes="title" i18n:domain="ui"
- name="folder_show:method" alt="Show All"
+ name="Folder_show:method" alt="Show All"
tal:attributes="src string:$portal_url/images/toutsel.png"/>
<input type="image" src="/images/pro/images/filter.png" title="Filter"
width="22" height="22"
- name="folder_filter:method" alt="Filter"
+ name="Folder_filter:method" alt="Filter"
i18n:attributes="title" i18n:domain="ui"
tal:attributes="src string:$portal_url/images/filter.png"/>
<span tal:condition="sort_actions">
diff --git a/product/ERP5/skins/erp5_html_style/menu_box.pt b/product/ERP5/skins/erp5_html_style/menu_box.pt
index f0be196017..04d6c3d4b2 100755
--- a/product/ERP5/skins/erp5_html_style/menu_box.pt
+++ b/product/ERP5/skins/erp5_html_style/menu_box.pt
@@ -42,7 +42,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td valign="middle" align="left" nowrap>
- <select name="jump_select" size="1" tal:attributes="onChange string:submitAction(this.form,'${absolute_url}/doJump')">
+ <select name="jump_select" size="1" tal:attributes="onChange string:submitAction(this.form,'${absolute_url}/Base_doJump')">
<option selected value="1" disabled i18n:translate="" i18n:domain="ui">Jump...</option>
<span tal:repeat="action jump_actions">
<option value="1" tal:content="action/name"
@@ -52,14 +52,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
</select></td>
<td valign="bottom" align="center" nowrap>
<input type="image" src="/images/pro/images/jump.png" title="Jump"
- alt="Jump" name="doJump:method"
+ alt="Jump" name="Base_doJump:method"
i18n:attributes="title" i18n:domain="ui"
tal:attributes="src string:$portal_url/images/jump.png"/>
<img src="/images/pro/images/sepacla.png" alt="|"
tal:attributes="src string:$portal_url/images/sepacla.png"/>
</td>
<td valign="middle" align="right" nowrap>
- <select name="action_select" size="1" tal:attributes="onChange string:submitAction(this.form,'${absolute_url}/doAction')">
+ <select name="action_select" size="1" tal:attributes="onChange string:submitAction(this.form,'${absolute_url}/Base_doAction')">
<option selected value="" disabled i18n:translate="" i18n:domain="ui">Action...</option>
<span tal:repeat="content here/allowedContentTypes | nothing"
tal:on-error="nothing">
@@ -86,7 +86,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
</select></td>
<td valign="bottom" align="left" nowrap>
<input type="image" src="/images/pro/images/exec16.png" title="Action"
- alt="Action" name="doAction:method"
+ alt="Action" name="Base_doAction:method"
i18n:attributes="title" i18n:domain="ui"
tal:attributes="src string:$portal_url/images/exec16.png"/>
</td>
diff --git a/product/ERP5/skins/erp5_html_style/navigation_box.pt b/product/ERP5/skins/erp5_html_style/navigation_box.pt
index 7460dffe95..aa6c6dfe6b 100755
--- a/product/ERP5/skins/erp5_html_style/navigation_box.pt
+++ b/product/ERP5/skins/erp5_html_style/navigation_box.pt
@@ -42,12 +42,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<!-- Hidden button as explained in http://ppewww.ph.gla.ac.uk/~flavell/www/formquestion.html -->
<!-- We should probably call the default method instead -->
<input class="input_image" type="image" src="/images/pro/images/spacer.png" width="3" height="3" border="0"
- alt="dummy" name="doSelect:method"
+ alt="dummy" name="Base_doSelect:method"
tal:define="form_action form/action | form/id | template/id | script/id"
tal:attributes="name python:form_action + ':method';
src string:$portal_url/images/spacer.png">
<select name="favorite_select" size="1"
- tal:attributes="onChange string:submitAction(this.form,'${here/absolute_url}/doFavorite')">
+ tal:attributes="onChange string:submitAction(this.form,'${here/absolute_url}/Base_doFavorite')">
<option selected value="" i18n:translate="" i18n:domain="ui" disabled>My favourites</option>
<span tal:condition="ordered_global_actions">
<span tal:repeat="action ordered_global_actions">
@@ -105,7 +105,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
</td>
<td align="center" valign="middle" nowrap>
<select name="module_select" size="1"
- tal:attributes="onChange string:submitAction(this.form,'${here/absolute_url}/doModule')"
+ tal:attributes="onChange string:submitAction(this.form,'${here/absolute_url}/Base_doModule')"
tal:define="module_list here/ERP5Site_getModuleItemList">
<option selected value="" i18n:translate="" i18n:domain="ui" disabled>ERP5 Modules</option>
<span tal:repeat="module module_list">
@@ -119,7 +119,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<td align="left" valign="middle" nowrap>
<input class="input_image" type="image" src="/images/pro/images/appearance.png" title="Select Module"
i18n:attributes="title" i18n:domain="ui"
- alt="Select Module" name="doModule:method" tal:attributes="src string:$portal_url/images/appearance.png"/>
+ alt="Select Module" name="Base_doModule:method" tal:attributes="src string:$portal_url/images/appearance.png"/>
<!--img src="/images/pro/images/sepafon.png" alt="img" />
<a href="undo_form">
<img border="0" src="/images/pro/images/kmago.png" alt="img"/>
@@ -142,7 +142,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<td align="right" valign="middle">
<!-- XXX This part depends on Localizer because of get_languages_map -->
<select name="language_select" size="1"
- tal:attributes="onChange string:submitAction(this.form,'${here/absolute_url}/doLanguage')"
+ tal:attributes="onChange string:submitAction(this.form,'${here/absolute_url}/Base_doLanguage')"
tal:define="language_map python: here.Localizer.get_languages_map()">
<option selected value="" i18n:translate="" i18n:domain="ui" disabled>My language</option>
<tal:block tal:repeat="language language_map">
@@ -167,7 +167,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<td align="right" valign="middle" nowrap>
<input class="input_image" type="image"
src="/images/pro/images/info.png"
- title="Change Language" alt="Change Language" name="doLanguage:method"
+ title="Change Language" alt="Change Language" name="Base_doLanguage:method"
i18n:attributes="title" i18n:domain="ui"
tal:attributes="src string:$portal_url/images/language.png" />
<img src="/images/pro/images/sepafon.png" alt="|" tal:attributes="src string:$portal_url/images/sepafon.png"/>
diff --git a/product/ERP5/skins/erp5_html_style/view_menu_box.pt b/product/ERP5/skins/erp5_html_style/view_menu_box.pt
index eb6ccfa9d8..200b8cb613 100755
--- a/product/ERP5/skins/erp5_html_style/view_menu_box.pt
+++ b/product/ERP5/skins/erp5_html_style/view_menu_box.pt
@@ -87,7 +87,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
</a>
</span>
<input type="image" src="/images/pro/images/filenew.png" title="New"
- width="22" height="22" name="document_new:method" alt="New"
+ width="22" height="22" name="Base_createNewDocument:method" alt="New"
i18n:attributes="title" i18n:domain="ui"
tal:attributes="src string:$portal_url/images/filenew.png"/>
<span tal:condition="selection_index">
diff --git a/product/ERP5/skins/erp5_trade/DeliveryLine_asCellRange.py b/product/ERP5/skins/erp5_trade/DeliveryLine_asCellRange.py
index 18bcc4c5da..e566514d82 100755
--- a/product/ERP5/skins/erp5_trade/DeliveryLine_asCellRange.py
+++ b/product/ERP5/skins/erp5_trade/DeliveryLine_asCellRange.py
@@ -7,9 +7,9 @@
##parameters=
##title=
##
-line_ids = context.order_line_matrix_item_list(base_category_list = ('tax_category', 'coloris', 'variante'), base=1)
-column_ids = context.order_line_matrix_item_list(base_category_list = ('salary_range','taille',), base=1)
-tab_ids = context.order_line_matrix_item_list(base_category_list = ('salary_range','tax_category', 'taille','coloris','variante'),
+line_ids = context.OrderLine_getMatrixItemlist(base_category_list = ('tax_category', 'coloris', 'variante'), base=1)
+column_ids = context.OrderLine_getMatrixItemlist(base_category_list = ('salary_range','taille',), base=1)
+tab_ids = context.OrderLine_getMatrixItemlist(base_category_list = ('salary_range','tax_category', 'taille','coloris','variante'),
base=1, include=0)
line_ids = map(lambda x: x[0], line_ids)
diff --git a/product/ERP5/skins/erp5_trade/InvoiceLine_view.form b/product/ERP5/skins/erp5_trade/InvoiceLine_view.form
index 58a7404397..eaf0c2379c 100755
--- a/product/ERP5/skins/erp5_trade/InvoiceLine_view.form
+++ b/product/ERP5/skins/erp5_trade/InvoiceLine_view.form
@@ -5,7 +5,7 @@
<row_length>4</row_length>
<name>InvoiceLine_view</name>
<pt>form_view</pt>
- <action>base_edit</action>
+ <action>Base_edit</action>
<update_action></update_action>
<method>POST</method>
<enctype>multipart/form-data</enctype>
@@ -92,14 +92,15 @@
<external_validator></external_validator>
<extra></extra>
<hidden type="int">0</hidden>
- <jump_method>base_jump_relation</jump_method>
+ <jump_method>Base_jumpToRelatedDocument</jump_method>
<max_length></max_length>
<portal_type type="list">[('Product', 'Product'), ('Service', 'Service'), ('Category', 'Category')]</portal_type>
+ <relation_setter_id></relation_setter_id>
<required type="int">0</required>
<title>Product</title>
<truncate type="int">0</truncate>
<unicode type="int">0</unicode>
- <update_method>base_update_relation</update_method>
+ <update_method>Base_updateRelation</update_method>
<whitespace_preserve type="int">0</whitespace_preserve>
</values>
<tales>
@@ -266,7 +267,7 @@
<hidden type="int">1</hidden>
<max_length></max_length>
<required type="int">0</required>
- <title>Â </title>
+ <title>-</title>
<truncate type="int">0</truncate>
<unicode type="int">0</unicode>
<whitespace_preserve type="int">0</whitespace_preserve>
@@ -380,4 +381,4 @@
</fields>
</group>
</groups>
-</form>
+</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/Invoice_zGetSourceSectionDescription.py b/product/ERP5/skins/erp5_trade/Invoice_zGetSourceSectionDescription.py
index 0495701242..dea10aeb4a 100755
--- a/product/ERP5/skins/erp5_trade/Invoice_zGetSourceSectionDescription.py
+++ b/product/ERP5/skins/erp5_trade/Invoice_zGetSourceSectionDescription.py
@@ -12,19 +12,19 @@ source_section_title = context.getSourceSectionTitle()
case = {
'Coramy': ('Coramy',
- '5 bis, rue Denis Cordonnier - 59820 Gravelines - Tél. : 33(0)3 28 51 91 51 - Fax : 33(0)3 28 23 34 96',
+ '5 bis, rue Denis Cordonnier - 59820 Gravelines - Tél. : 33(0)3 28 51 91 51 - Fax : 33(0)3 28 23 34 96',
'MAILLOTS DE BAIN - GYM - SWIMSUITS - FITNESS',
- 'S.A.S. au capital de 435.200 € - T.V.A. FR 67 611 750 274 - R.C. Dunkerque 611 750 274 - SIRET 611 750 274 00023 - CNUF 15971',
+ 'S.A.S. au capital de 435.200 € - T.V.A. FR 67 611 750 274 - R.C. Dunkerque 611 750 274 - SIRET 611 750 274 00023 - CNUF 15971',
'40'),
'BLS': ('BLS' ,
- '5 bis, rue Denis Cordonnier - 59820 Gravelines - Tél. : 33(0)3 28 51 86 26 - Fax : 33(0)3 28 23 34 96',
+ '5 bis, rue Denis Cordonnier - 59820 Gravelines - Tél. : 33(0)3 28 51 86 26 - Fax : 33(0)3 28 23 34 96',
'LICENSE MAILLOTS DE BAIN DIM FEMME & HOMME',
- 'S.A.R.L. au capital de 10.000 € - T.V.A. FR 51 442 959 243 - R.C. Dunkerque 442 959 243 - SIRET 442 959 243 00019'
+ 'S.A.R.L. au capital de 10.000 € - T.V.A. FR 51 442 959 243 - R.C. Dunkerque 442 959 243 - SIRET 442 959 243 00019'
'60'),
'Houvenaegel':('Houvenaegel' ,
- '5 bis, rue Denis Cordonnier - 59820 Gravelines - Tél. : 33(0)3 28 51 91 55 - Fax : 33(0)3 28 23 34 96',
+ '5 bis, rue Denis Cordonnier - 59820 Gravelines - Tél. : 33(0)3 28 51 91 55 - Fax : 33(0)3 28 23 34 96',
'MAILLOTS DE BAIN - GYM - SWIMSUITS - FITNESS',
- 'S.A.R.L. au capital de 7.622,45 € - T.V.A. FR 07 422 769 810 - R.C. Dunkerque 422 769 810 - SIRET 422 769 810 00025',
+ 'S.A.R.L. au capital de 7.622,45 € - T.V.A. FR 07 422 769 810 - R.C. Dunkerque 422 769 810 - SIRET 422 769 810 00025',
'20')
}
--
2.30.9