Skip to content

E
erp5_workflow
Commit b676f653 authored by Jean-Paul Smets's avatar Jean-Paul Smets
Browse files
Options

updated by yo on real use server 


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@1164 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 654533d2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1221 additions and 550 deletions
product/ERP5/skins/erp5_accounting/account_list.form
View file @ b676f653
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0"?>
<form> <form>
<title>Account List</title> <title>Account List</title>
<name>accounting_transaction_list</name> <row_length>4</row_length>
<action>base_edit</action> <name>account_list</name>
<enctype></enctype>
<method>POST</method>
<pt>form_list</pt> <pt>form_list</pt>
<action>doSelect</action>
<update_action></update_action>
<method>POST</method>
<enctype></enctype>
<encoding>UTF-8</encoding>
<stored_encoding>ISO-8859-1</stored_encoding>
<unicode_mode>false</unicode_mode>
<groups> <groups>
<group> <group>
<title>left</title> <title>left</title>
...@@ -15,32 +19,36 @@ ...@@ -15,32 +19,36 @@
<field><id>listbox</id> <type>ListBox</type> <field><id>listbox</id> <type>ListBox</type>
<values> <values>
<all_columns type="list">[]</all_columns> <all_columns type="list">[('id', 'id'), ('pcg_title', 'PCG'), ('Title', 'Title'), ('default_destination_title', 'Mirror'), ('Account_countAccountingTransactions', 'Count'), ('Account_getTotalSourceCredit', 'Credit'), ('Account_getTotalSourceDebit', 'Debit'), ('accounting_transaction_line_currency', 'Currency')]</all_columns>
<all_editable_columns type="list">[]</all_editable_columns> <all_editable_columns type="list">[]</all_editable_columns>
<alternate_name></alternate_name> <alternate_name></alternate_name>
<columns type="list">[('id', 'id'), ('pcg_title', 'PCG'), ('title', 'Title'), ('destination', 'Mirror')]</columns> <columns type="list">[('id', 'id'), ('pcg_title', 'PCG'), ('Title', 'Title'), ('default_destination_title', 'Mirror'), ('Account_countAccountingTransactions', 'Count'), ('Account_getTotalSourceCredit', 'Credit'), ('Account_getTotalSourceDebit', 'Debit'), ('accounting_transaction_line_currency', 'Currency')]</columns>
<css_class></css_class> <css_class></css_class>
<default></default> <default></default>
<default_params type="list">[]</default_params> <default_params type="list">[('id', "''"), ('pcg_title', "''"), ('Title', "''"), ('default_destination_title', "''")]</default_params>
<description></description> <description></description>
<domain_root_list type="list">[]</domain_root_list> <domain_root_list type="list">[('portal_categories/pcg', 'PCG'), ('portal_categories/account_type', 'Account Type'), ('portal_categories/financial_section', 'Balance Sheet')]</domain_root_list>
<domain_tree type="int">0</domain_tree> <domain_tree type="int">0</domain_tree>
<editable type="int">1</editable>
<editable_columns type="list">[]</editable_columns> <editable_columns type="list">[]</editable_columns>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<global_attributes type="list">[]</global_attributes> <global_attributes type="list">[]</global_attributes>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
<lines type="int">25</lines> <lines type="int">25</lines>
<list_action>list</list_action> <list_action>list</list_action>
<list_method type="method">portal_catalog</list_method> <list_method type="method">Account_search</list_method>
<meta_types type="list">[]</meta_types> <meta_types type="list">[]</meta_types>
<portal_types type="list">[('Account', 'Account')]</portal_types> <portal_types type="list">[('Account', 'Account')]</portal_types>
<report_root_list type="list">[]</report_root_list> <report_root_list type="list">[('portal_categories/pcg', 'PCG'), ('portal_categories/account_type', 'Account Type')]</report_root_list>
<report_tree type="int">0</report_tree> <report_tree type="int">0</report_tree>
<search type="int">1</search> <search type="int">1</search>
<search_columns type="list">[]</search_columns>
<select type="int">1</select> <select type="int">1</select>
<selection_name>account_selection</selection_name> <selection_name>account_selection</selection_name>
<sort type="list">[('id', 'id')]</sort> <sort type="list">[('id', 'id')]</sort>
<stat_method></stat_method> <sort_columns type="list">[]</sort_columns>
<stat_method type="method">portal_catalog</stat_method>
<title>Account Listbox</title> <title>Account Listbox</title>
</values> </values>
<tales> <tales>
......
product/ERP5/skins/erp5_accounting/account_view.form
View file @ b676f653
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0"?>
<form> <form>
<title>Account</title> <title>Account</title>
<row_length>4</row_length>
<name>accounting_transaction_list</name> <name>accounting_transaction_list</name>
<pt>form_view</pt>
<action>base_edit</action> <action>base_edit</action>
<enctype></enctype> <update_action></update_action>
<method>POST</method> <method>POST</method>
<pt>form_view</pt> <enctype></enctype>
<encoding>UTF-8</encoding>
<stored_encoding>ISO-8859-1</stored_encoding>
<unicode_mode>false</unicode_mode>
<groups> <groups>
<group> <group>
<title>left</title> <title>left</title>
...@@ -21,6 +25,8 @@ ...@@ -21,6 +25,8 @@
<description></description> <description></description>
<display_maxwidth></display_maxwidth> <display_maxwidth></display_maxwidth>
<display_width type="int">20</display_width> <display_width type="int">20</display_width>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
...@@ -28,6 +34,8 @@ ...@@ -28,6 +34,8 @@
<required type="int">1</required> <required type="int">1</required>
<title>Id</title> <title>Id</title>
<truncate type="int">0</truncate> <truncate type="int">0</truncate>
<unicode type="int">0</unicode>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
</tales> </tales>
...@@ -45,6 +53,8 @@ ...@@ -45,6 +53,8 @@
<description></description> <description></description>
<display_maxwidth></display_maxwidth> <display_maxwidth></display_maxwidth>
<display_width type="int">20</display_width> <display_width type="int">20</display_width>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
...@@ -52,6 +62,8 @@ ...@@ -52,6 +62,8 @@
<required type="int">1</required> <required type="int">1</required>
<title>Title</title> <title>Title</title>
<truncate type="int">0</truncate> <truncate type="int">0</truncate>
<unicode type="int">0</unicode>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
</tales> </tales>
...@@ -67,6 +79,8 @@ ...@@ -67,6 +79,8 @@
<css_class></css_class> <css_class></css_class>
<default type="int">0</default> <default type="int">0</default>
<description></description> <description></description>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
...@@ -85,17 +99,22 @@ ...@@ -85,17 +99,22 @@
<css_class></css_class> <css_class></css_class>
<default></default> <default></default>
<description></description> <description></description>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<extra_item></extra_item>
<first_item type="int">0</first_item> <first_item type="int">0</first_item>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
<items type="list">[]</items> <items type="list">[]</items>
<required type="int">1</required> <required type="int">1</required>
<size type="int">1</size> <size type="int">1</size>
<title>PCG</title> <title>PCG</title>
<unicode type="int">0</unicode>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
<items>here/portal_categories/pcg/getCategoryChildTitleItemList</items> <items>python: here.getAccountPcgItemList()</items>
</tales> </tales>
<messages> <messages>
<message name="external_validator_failed">The input failed the external validator.</message> <message name="external_validator_failed">The input failed the external validator.</message>
...@@ -109,14 +128,19 @@ ...@@ -109,14 +128,19 @@
<css_class></css_class> <css_class></css_class>
<default></default> <default></default>
<description></description> <description></description>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<extra_item></extra_item>
<first_item type="int">0</first_item> <first_item type="int">0</first_item>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
<items type="list">[]</items> <items type="list">[]</items>
<required type="int">1</required> <required type="int">1</required>
<size type="int">1</size> <size type="int">1</size>
<title>Account Type</title> <title>Account Type</title>
<unicode type="int">0</unicode>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
<items>here/portal_categories/account_type/getCategoryChildTitleItemList</items> <items>here/portal_categories/account_type/getCategoryChildTitleItemList</items>
...@@ -133,14 +157,19 @@ ...@@ -133,14 +157,19 @@
<css_class></css_class> <css_class></css_class>
<default></default> <default></default>
<description></description> <description></description>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<extra_item></extra_item>
<first_item type="int">0</first_item> <first_item type="int">0</first_item>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
<items type="list">[]</items> <items type="list">[]</items>
<required type="int">1</required> <required type="int">1</required>
<size type="int">1</size> <size type="int">1</size>
<title>Financial Section</title> <title>Financial Section</title>
<unicode type="int">0</unicode>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
<items>here/portal_categories/financial_section/getCategoryChildTitleItemList</items> <items>here/portal_categories/financial_section/getCategoryChildTitleItemList</items>
...@@ -155,11 +184,13 @@ ...@@ -155,11 +184,13 @@
<values> <values>
<alternate_name></alternate_name> <alternate_name></alternate_name>
<base_category>destination</base_category> <base_category>destination</base_category>
<catalog_index>Title</catalog_index> <catalog_index>relative_url</catalog_index>
<css_class></css_class> <css_class></css_class>
<default type="list">[]</default> <default type="list">[]</default>
<default_module>account</default_module> <default_module>account</default_module>
<description></description> <description></description>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<height type="int">5</height> <height type="int">5</height>
...@@ -169,9 +200,13 @@ ...@@ -169,9 +200,13 @@
<max_linelength></max_linelength> <max_linelength></max_linelength>
<max_lines></max_lines> <max_lines></max_lines>
<portal_type type="list">[('Account', 'account')]</portal_type> <portal_type type="list">[('Account', 'account')]</portal_type>
<relation_setter_id></relation_setter_id>
<required type="int">0</required> <required type="int">0</required>
<title>Mirror account</title> <title>Mirror account</title>
<unicode type="int">0</unicode>
<update_method>base_update_relation</update_method> <update_method>base_update_relation</update_method>
<view_separator>&lt;br /&gt;</view_separator>
<whitespace_preserve type="int">0</whitespace_preserve>
<width type="int">40</width> <width type="int">40</width>
</values> </values>
<tales> <tales>
...@@ -202,6 +237,8 @@ ...@@ -202,6 +237,8 @@
<css_class></css_class> <css_class></css_class>
<default></default> <default></default>
<description></description> <description></description>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<height type="int">5</height> <height type="int">5</height>
...@@ -211,6 +248,8 @@ ...@@ -211,6 +248,8 @@
<max_lines></max_lines> <max_lines></max_lines>
<required type="int">0</required> <required type="int">0</required>
<title>Description</title> <title>Description</title>
<unicode type="int">0</unicode>
<whitespace_preserve type="int">0</whitespace_preserve>
<width type="int">80</width> <width type="int">80</width>
</values> </values>
<tales> <tales>
......
product/ERP5/skins/erp5_accounting/accounting_transaction_line_view.form
View file @ b676f653
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0"?>
<form> <form>
<title>Accounting Transaction Line</title> <title>Accounting Transaction Line</title>
<row_length>4</row_length>
<name>accounting_transaction_list</name> <name>accounting_transaction_list</name>
<pt>form_view</pt>
<action>base_edit</action> <action>base_edit</action>
<enctype></enctype> <update_action></update_action>
<method>POST</method> <method>POST</method>
<pt>form_view</pt> <enctype></enctype>
<encoding>UTF-8</encoding>
<stored_encoding>ISO-8859-1</stored_encoding>
<unicode_mode>false</unicode_mode>
<groups> <groups>
<group> <group>
<title>left</title> <title>left</title>
...@@ -19,14 +23,19 @@ ...@@ -19,14 +23,19 @@
<css_class></css_class> <css_class></css_class>
<default></default> <default></default>
<description></description> <description></description>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<extra_item></extra_item>
<first_item type="int">0</first_item> <first_item type="int">0</first_item>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
<items type="list">[]</items> <items type="list">[]</items>
<required type="int">0</required> <required type="int">0</required>
<size type="int">1</size> <size type="int">1</size>
<title>Currency</title> <title>Currency</title>
<unicode type="int">0</unicode>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
<items>python:map(lambda x: (x.id,'currency/%s' % x.id),here.currency.objectValues())</items> <items>python:map(lambda x: (x.id,'currency/%s' % x.id),here.currency.objectValues())</items>
...@@ -48,6 +57,8 @@ ...@@ -48,6 +57,8 @@
<description></description> <description></description>
<display_maxwidth></display_maxwidth> <display_maxwidth></display_maxwidth>
<display_width type="int">20</display_width> <display_width type="int">20</display_width>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
...@@ -57,7 +68,9 @@ ...@@ -57,7 +68,9 @@
<required type="int">0</required> <required type="int">0</required>
<title>Destination</title> <title>Destination</title>
<truncate type="int">0</truncate> <truncate type="int">0</truncate>
<unicode type="int">0</unicode>
<update_method>base_update_relation</update_method> <update_method>base_update_relation</update_method>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
</tales> </tales>
...@@ -78,6 +91,8 @@ ...@@ -78,6 +91,8 @@
<description></description> <description></description>
<display_maxwidth></display_maxwidth> <display_maxwidth></display_maxwidth>
<display_width type="int">20</display_width> <display_width type="int">20</display_width>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
...@@ -87,7 +102,9 @@ ...@@ -87,7 +102,9 @@
<required type="int">0</required> <required type="int">0</required>
<title>Source</title> <title>Source</title>
<truncate type="int">0</truncate> <truncate type="int">0</truncate>
<unicode type="int">0</unicode>
<update_method>base_update_relation</update_method> <update_method>base_update_relation</update_method>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
</tales> </tales>
...@@ -105,11 +122,14 @@ ...@@ -105,11 +122,14 @@
<description></description> <description></description>
<display_maxwidth></display_maxwidth> <display_maxwidth></display_maxwidth>
<display_width type="int">20</display_width> <display_width type="int">20</display_width>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
<required type="int">0</required> <required type="int">0</required>
<title>Source Credit</title> <title>Source Credit</title>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
</tales> </tales>
...@@ -127,11 +147,14 @@ ...@@ -127,11 +147,14 @@
<description></description> <description></description>
<display_maxwidth></display_maxwidth> <display_maxwidth></display_maxwidth>
<display_width type="int">20</display_width> <display_width type="int">20</display_width>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
<required type="int">0</required> <required type="int">0</required>
<title>Source Debit</title> <title>Source Debit</title>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
</tales> </tales>
......
product/ERP5/skins/erp5_accounting/addPurchaseInvoice.py
View file @ b676f653
...@@ -16,17 +16,19 @@ product = my_transaction.manage_addProduct[ 'ERP5' ] ...@@ -16,17 +16,19 @@ product = my_transaction.manage_addProduct[ 'ERP5' ]
context.portal_types.constructContent(type_name= 'Purchase Invoice Transaction Line', context.portal_types.constructContent(type_name= 'Purchase Invoice Transaction Line',
container=my_transaction, container=my_transaction,
id='l0') id='expense')
context.portal_types.constructContent(type_name= 'Purchase Invoice Transaction Line', context.portal_types.constructContent(type_name= 'Purchase Invoice Transaction Line',
container=my_transaction, container=my_transaction,
id='l1') id='payable')
context.portal_types.constructContent(type_name= 'Purchase Invoice Transaction Line', context.portal_types.constructContent(type_name= 'Purchase Invoice Transaction Line',
container=my_transaction, container=my_transaction,
id='l2') id='collected_vat')
fournisseur=my_transaction.l0 context.portal_types.constructContent(type_name= 'Purchase Invoice Transaction Line',
charge=my_transaction.l1 container=my_transaction,
tva=my_transaction.l2 id='refundable_vat')
expense=my_transaction.expense
#fournisseur.setSource('account/capital') payable=my_transaction.payable
collected_vat=my_transaction.collected_vat
refundable_vat=my_transaction.refundable_vat
return my_transaction return my_transaction
product/ERP5/skins/erp5_accounting/addSaleInvoice.py
View file @ b676f653
...@@ -16,17 +16,15 @@ product = my_transaction.manage_addProduct[ 'ERP5' ] ...@@ -16,17 +16,15 @@ product = my_transaction.manage_addProduct[ 'ERP5' ]
context.portal_types.constructContent(type_name= 'Sale Invoice Transaction Line', context.portal_types.constructContent(type_name= 'Sale Invoice Transaction Line',
container=my_transaction, container=my_transaction,
id='l0') id='income')
context.portal_types.constructContent(type_name= 'Sale Invoice Transaction Line', context.portal_types.constructContent(type_name= 'Sale Invoice Transaction Line',
container=my_transaction, container=my_transaction,
id='l1') id='receivable')
context.portal_types.constructContent(type_name= 'Sale Invoice Transaction Line', context.portal_types.constructContent(type_name= 'Sale Invoice Transaction Line',
container=my_transaction, container=my_transaction,
id='l2') id='collected_vat')
client=my_transaction.l0 income=my_transaction.income
charge=my_transaction.l1 receivable=my_transaction.receivable
tva=my_transaction.l2 collected_vat=my_transaction.collected_vat
return my_transaction return my_transaction
product/ERP5/skins/erp5_accounting/currency_list.form
View file @ b676f653
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0"?>
<form> <form>
<title>Currency List</title> <title>Currency List</title>
<row_length>4</row_length>
<name>currency_list</name> <name>currency_list</name>
<action>base_edit</action>
<enctype></enctype>
<method>POST</method>
<pt>form_list</pt> <pt>form_list</pt>
<action>doSelect</action>
<update_action></update_action>
<method>POST</method>
<enctype></enctype>
<encoding>UTF-8</encoding>
<stored_encoding>ISO-8859-1</stored_encoding>
<unicode_mode>false</unicode_mode>
<groups> <groups>
<group> <group>
<title>left</title> <title>left</title>
...@@ -25,7 +29,9 @@ ...@@ -25,7 +29,9 @@
<description></description> <description></description>
<domain_root_list type="list">[]</domain_root_list> <domain_root_list type="list">[]</domain_root_list>
<domain_tree type="int">0</domain_tree> <domain_tree type="int">0</domain_tree>
<editable type="int">1</editable>
<editable_columns type="list">[]</editable_columns> <editable_columns type="list">[]</editable_columns>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<global_attributes type="list">[]</global_attributes> <global_attributes type="list">[]</global_attributes>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
...@@ -37,6 +43,7 @@ ...@@ -37,6 +43,7 @@
<report_root_list type="list">[]</report_root_list> <report_root_list type="list">[]</report_root_list>
<report_tree type="int">0</report_tree> <report_tree type="int">0</report_tree>
<search type="int">1</search> <search type="int">1</search>
<search_columns></search_columns>
<select type="int">1</select> <select type="int">1</select>
<selection_name>currency_selection</selection_name> <selection_name>currency_selection</selection_name>
<sort type="list">[('id', 'id')]</sort> <sort type="list">[('id', 'id')]</sort>
......
product/ERP5/skins/erp5_accounting/currency_view.form
View file @ b676f653
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0"?>
<form> <form>
<title>Currency</title> <title>Currency</title>
<row_length>4</row_length>
<name>currency_view</name> <name>currency_view</name>
<pt>form_view</pt>
<action>base_edit</action> <action>base_edit</action>
<enctype></enctype> <update_action></update_action>
<method>POST</method> <method>POST</method>
<pt>form_view</pt> <enctype></enctype>
<encoding>UTF-8</encoding>
<stored_encoding>ISO-8859-1</stored_encoding>
<unicode_mode>false</unicode_mode>
<groups> <groups>
<group> <group>
<title>left</title> <title>left</title>
...@@ -21,13 +25,17 @@ ...@@ -21,13 +25,17 @@
<description></description> <description></description>
<display_maxwidth></display_maxwidth> <display_maxwidth></display_maxwidth>
<display_width type="int">20</display_width> <display_width type="int">20</display_width>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
<max_length></max_length> <max_length></max_length>
<required type="int">1</required> <required type="int">1</required>
<title>Id</title> <title>ID</title>
<truncate type="int">0</truncate> <truncate type="int">0</truncate>
<unicode type="int">0</unicode>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
</tales> </tales>
...@@ -45,6 +53,8 @@ ...@@ -45,6 +53,8 @@
<description></description> <description></description>
<display_maxwidth></display_maxwidth> <display_maxwidth></display_maxwidth>
<display_width type="int">20</display_width> <display_width type="int">20</display_width>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
...@@ -52,6 +62,8 @@ ...@@ -52,6 +62,8 @@
<required type="int">1</required> <required type="int">1</required>
<title>Title</title> <title>Title</title>
<truncate type="int">0</truncate> <truncate type="int">0</truncate>
<unicode type="int">0</unicode>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
</tales> </tales>
......
product/ERP5/skins/erp5_accounting/getInvoiceTransactionLineDestinationItemList.py
View file @ b676f653
...@@ -7,23 +7,38 @@ ...@@ -7,23 +7,38 @@
##parameters= ##parameters=
##title= ##title=
## ##
if context.id == 'l0': from Products.ERP5Type.Cache import CachingMethod
if context.portal_type == 'Purchase Invoice Transaction Line':
compte = '41' category_dict = {'income': 'portal_categories/pcg/6',
compte2 = '410' 'expense': 'portal_categories/pcg/7',
elif context.portal_type == 'Sale Invoice Transaction Line': 'payable': 'portal_categories/pcg/4/41/410',
compte2 = '409' 'receivable': 'portal_categories/pcg/4/40/409',
compte = '40' 'collected_vat': 'portal_categories/pcg/4/44',
return context.portal_categories.pcg['4'][compte][compte2].getCategoryMemberTitleItemList() 'refundable_vat': 'portal_categories/pcg/4/44',
elif context.id == 'l1': 'bank': 'portal_categories/pcg/5',
if context.portal_type == 'Purchase Invoice Transaction Line': }
compte = '7'
elif context.portal_type == 'Sale Invoice Transaction Line': if context.id in category_dict:
compte = '6' category = category_dict[context.id]
return context.portal_categories.pcg[compte].getCategoryMemberTitleItemList()
elif context.id == 'l2':
return context.portal_categories.pcg['4']['44'].getCategoryMemberTitleItemList()
else: else:
return context.portal_categories.pcg.getCategoryMemberTitleItemList() category = 'portal_categories/pcg'
display_dict = {}
def display(x):
if x not in display_dict:
pcg_id = x.getPcgId()
account_title = x.getTitle()
display_dict[x] = "%s - %s" % (pcg_id, account_title)
return display_dict[x]
def sort(x,y):
return cmp(display(x), display(y))
def getItemList(category=None):
obj = context.restrictedTraverse(category)
item_list = obj.getCategoryMemberItemList(portal_type='Account', base=0,
display_method=display, sort_method=sort)
return item_list
return () getItemList = CachingMethod(getItemList, id=('getInvoiceTransactionLineItemList', 'getItemList'))
return getItemList(category=category)
product/ERP5/skins/erp5_accounting/getInvoiceTransactionLineSourceItemList.py
View file @ b676f653
...@@ -7,23 +7,38 @@ ...@@ -7,23 +7,38 @@
##parameters= ##parameters=
##title= ##title=
## ##
if context.id == 'l0': from Products.ERP5Type.Cache import CachingMethod
if context.portal_type == 'Purchase Invoice Transaction Line':
compte2 = '409' category_dict = {'income': 'portal_categories/pcg/7',
compte = '40' 'expense': 'portal_categories/pcg/6',
elif context.portal_type == 'Sale Invoice Transaction Line': 'payable': 'portal_categories/pcg/4/40/409',
compte = '41' 'receivable': 'portal_categories/pcg/4/41/410',
compte2 = '410' 'collected_vat': 'portal_categories/pcg/4/44',
return context.portal_categories.pcg['4'][compte][compte2].getCategoryMemberTitleItemList() 'refundable_vat': 'portal_categories/pcg/4/44',
elif context.id == 'l1': 'bank': 'portal_categories/pcg/5',
if context.portal_type == 'Purchase Invoice Transaction Line': }
compte = '6'
elif context.portal_type == 'Sale Invoice Transaction Line': if context.id in category_dict:
compte = '7' category = category_dict[context.id]
return context.portal_categories.pcg[compte].getCategoryMemberTitleItemList()
elif context.id == 'l2':
return context.portal_categories.pcg['4']['44'].getCategoryMemberTitleItemList()
else: else:
return context.portal_categories.pcg.getCategoryMemberTitleItemList() category = 'portal_categories/pcg'
display_dict = {}
def display(x):
if x not in display_dict:
pcg_id = x.getPcgId()
account_title = x.getTitle()
display_dict[x] = "%s - %s" % (pcg_id, account_title)
return display_dict[x]
def sort(x,y):
return cmp(display(x), display(y))
def getItemList(category=None):
obj = context.restrictedTraverse(category)
item_list = obj.getCategoryMemberItemList(portal_type='Account', base=0,
display_method=display, sort_method=sort)
return item_list
return () getItemList = CachingMethod(getItemList, id=('getInvoiceTransactionLineItemList', 'getItemList'))
return getItemList(category=category)
product/ERP5/skins/erp5_accounting/purchase_invoice_transaction_line_view.form
View file @ b676f653
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0"?>
<form> <form>
<title>Purchase Invoice Transaction Line</title> <title>Purchase Invoice Transaction Line</title>
<row_length>4</row_length>
<name>purchase_invoice_list</name> <name>purchase_invoice_list</name>
<pt>form_view</pt>
<action>base_edit</action> <action>base_edit</action>
<enctype></enctype> <update_action></update_action>
<method>POST</method> <method>POST</method>
<pt>form_view</pt> <enctype></enctype>
<encoding>UTF-8</encoding>
<stored_encoding>ISO-8859-1</stored_encoding>
<unicode_mode>false</unicode_mode>
<groups> <groups>
<group> <group>
<title>left</title> <title>left</title>
...@@ -21,13 +25,17 @@ ...@@ -21,13 +25,17 @@
<description></description> <description></description>
<display_maxwidth></display_maxwidth> <display_maxwidth></display_maxwidth>
<display_width type="int">20</display_width> <display_width type="int">20</display_width>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
<max_length></max_length> <max_length></max_length>
<required type="int">1</required> <required type="int">0</required>
<title>Title</title> <title>Title</title>
<truncate type="int">0</truncate> <truncate type="int">0</truncate>
<unicode type="int">0</unicode>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
</tales> </tales>
...@@ -43,17 +51,22 @@ ...@@ -43,17 +51,22 @@
<css_class></css_class> <css_class></css_class>
<default></default> <default></default>
<description></description> <description></description>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<extra_item></extra_item>
<first_item type="int">0</first_item> <first_item type="int">0</first_item>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
<items type="list">[]</items> <items type="list">[]</items>
<required type="int">1</required> <required type="int">0</required>
<size type="int">1</size> <size type="int">1</size>
<title>Source</title> <title>Customer Account</title>
<unicode type="int">0</unicode>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
<items>python:here.portal_categories.pcg.getCategoryMemberTitleItemList()</items> <items>python:here.getInvoiceTransactionLineSourceItemList()</items>
</tales> </tales>
<messages> <messages>
<message name="external_validator_failed">The input failed the external validator.</message> <message name="external_validator_failed">The input failed the external validator.</message>
...@@ -67,17 +80,22 @@ ...@@ -67,17 +80,22 @@
<css_class></css_class> <css_class></css_class>
<default></default> <default></default>
<description></description> <description></description>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<extra_item></extra_item>
<first_item type="int">0</first_item> <first_item type="int">0</first_item>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
<items type="list">[]</items> <items type="list">[]</items>
<required type="int">1</required> <required type="int">0</required>
<size type="int">1</size> <size type="int">1</size>
<title>Destination</title> <title>Vendor Account</title>
<unicode type="int">0</unicode>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
<items>python:here.portal_categories.pcg.getCategoryMemberTitleItemList()</items> <items>python:here.getInvoiceTransactionLineDestinationItemList()</items>
</tales> </tales>
<messages> <messages>
<message name="external_validator_failed">The input failed the external validator.</message> <message name="external_validator_failed">The input failed the external validator.</message>
...@@ -93,11 +111,14 @@ ...@@ -93,11 +111,14 @@
<description></description> <description></description>
<display_maxwidth></display_maxwidth> <display_maxwidth></display_maxwidth>
<display_width type="int">20</display_width> <display_width type="int">20</display_width>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
<required type="int">1</required> <required type="int">0</required>
<title>Source Debit</title> <title>Source Debit</title>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
</tales> </tales>
...@@ -115,11 +136,14 @@ ...@@ -115,11 +136,14 @@
<description></description> <description></description>
<display_maxwidth></display_maxwidth> <display_maxwidth></display_maxwidth>
<display_width type="int">20</display_width> <display_width type="int">20</display_width>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
<required type="int">1</required> <required type="int">0</required>
<title>Source Credit</title> <title>Source Credit</title>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
</tales> </tales>
......
product/ERP5/skins/erp5_accounting/sale_invoice_transaction_line_view.form
View file @ b676f653
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0"?>
<form> <form>
<title>Sale Invoice Transaction Line</title> <title>Sale Invoice Transaction Line</title>
<row_length>4</row_length>
<name>sale_invoice_list</name> <name>sale_invoice_list</name>
<pt>form_view</pt>
<action>base_edit</action> <action>base_edit</action>
<enctype></enctype> <update_action></update_action>
<method>POST</method> <method>POST</method>
<pt>form_view</pt> <enctype></enctype>
<encoding>UTF-8</encoding>
<stored_encoding>ISO-8859-1</stored_encoding>
<unicode_mode>false</unicode_mode>
<groups> <groups>
<group> <group>
<title>left</title> <title>left</title>
...@@ -21,13 +25,17 @@ ...@@ -21,13 +25,17 @@
<description></description> <description></description>
<display_maxwidth></display_maxwidth> <display_maxwidth></display_maxwidth>
<display_width type="int">20</display_width> <display_width type="int">20</display_width>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
<max_length></max_length> <max_length></max_length>
<required type="int">1</required> <required type="int">0</required>
<title>Title</title> <title>Title</title>
<truncate type="int">0</truncate> <truncate type="int">0</truncate>
<unicode type="int">0</unicode>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
</tales> </tales>
...@@ -43,17 +51,22 @@ ...@@ -43,17 +51,22 @@
<css_class></css_class> <css_class></css_class>
<default></default> <default></default>
<description></description> <description></description>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<extra_item></extra_item>
<first_item type="int">0</first_item> <first_item type="int">0</first_item>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
<items type="list">[]</items> <items type="list">[]</items>
<required type="int">1</required> <required type="int">0</required>
<size type="int">1</size> <size type="int">1</size>
<title>Source</title> <title>Vendor Account</title>
<unicode type="int">0</unicode>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
<items>python:here.portal_categories.pcg.getCategoryMemberTitleItemList()</items> <items>python:here.getInvoiceTransactionLineSourceItemList()</items>
</tales> </tales>
<messages> <messages>
<message name="external_validator_failed">The input failed the external validator.</message> <message name="external_validator_failed">The input failed the external validator.</message>
...@@ -67,17 +80,22 @@ ...@@ -67,17 +80,22 @@
<css_class></css_class> <css_class></css_class>
<default></default> <default></default>
<description></description> <description></description>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<extra_item></extra_item>
<first_item type="int">0</first_item> <first_item type="int">0</first_item>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
<items type="list">[]</items> <items type="list">[]</items>
<required type="int">1</required> <required type="int">0</required>
<size type="int">1</size> <size type="int">1</size>
<title>Destination</title> <title>Customer Account</title>
<unicode type="int">0</unicode>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
<items>python:here.portal_categories.pcg.getCategoryMemberTitleItemList()</items> <items>python:here.getInvoiceTransactionLineDestinationItemList()</items>
</tales> </tales>
<messages> <messages>
<message name="external_validator_failed">The input failed the external validator.</message> <message name="external_validator_failed">The input failed the external validator.</message>
...@@ -93,11 +111,14 @@ ...@@ -93,11 +111,14 @@
<description></description> <description></description>
<display_maxwidth></display_maxwidth> <display_maxwidth></display_maxwidth>
<display_width type="int">20</display_width> <display_width type="int">20</display_width>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
<required type="int">1</required> <required type="int">0</required>
<title>Source Debit</title> <title>Vendor Debit</title>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
</tales> </tales>
...@@ -115,11 +136,14 @@ ...@@ -115,11 +136,14 @@
<description></description> <description></description>
<display_maxwidth></display_maxwidth> <display_maxwidth></display_maxwidth>
<display_width type="int">20</display_width> <display_width type="int">20</display_width>
<editable type="int">1</editable>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<extra></extra> <extra></extra>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
<required type="int">1</required> <required type="int">0</required>
<title>Source Credit</title> <title>Vendor Credit</title>
<whitespace_preserve type="int">0</whitespace_preserve>
</values> </values>
<tales> <tales>
</tales> </tales>
......
product/ERP5/skins/erp5_accounting/transaction_list.form
View file @ b676f653
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0"?>
<form> <form>
<title></title> <title></title>
<name>accounting_transaction_list</name> <row_length>4</row_length>
<action></action> <name>transaction_list</name>
<enctype></enctype>
<method>POST</method>
<pt>form_list</pt> <pt>form_list</pt>
<action>doSelect</action>
<update_action></update_action>
<method>POST</method>
<enctype></enctype>
<encoding>UTF-8</encoding>
<stored_encoding>ISO-8859-1</stored_encoding>
<unicode_mode>false</unicode_mode>
<groups> <groups>
<group> <group>
<title>Default</title> <title>left</title>
<fields> <fields>
<field><id>accounting_transaction_list</id> <type>ListBox</type> <field><id>listbox</id> <type>ListBox</type>
<values> <values>
<all_columns type="list">[]</all_columns> <all_columns type="list">[]</all_columns>
<all_editable_columns type="list">[]</all_editable_columns> <all_editable_columns type="list">[]</all_editable_columns>
<alternate_name></alternate_name> <alternate_name></alternate_name>
<columns type="list">[('id', 'id'), ('Type', 'Type'), ('getStopDate', 'Stop Date'), ('title', 'Title')]</columns> <columns type="list">[('id', 'id'), ('Type', 'Type'), ('getStopDate', 'Stop Date'), ('Title', 'Title'), ('simulation_state', 'State'), ('default_destination_section_title', 'Destination'), ('source_reference', 'Source Reference'), ('destination_reference', 'Destination Reference'), ('reference', 'Invoice Reference')]</columns>
<css_class></css_class> <css_class></css_class>
<default></default> <default></default>
<default_params type="list">[]</default_params> <default_params type="list">[]</default_params>
<description></description> <description></description>
<domain_root_list type="list">[]</domain_root_list> <domain_root_list type="list">[]</domain_root_list>
<domain_tree type="int">0</domain_tree> <domain_tree type="int">0</domain_tree>
<editable type="int">1</editable>
<editable_columns type="list">[]</editable_columns> <editable_columns type="list">[]</editable_columns>
<editable_expression></editable_expression>
<editable_permission type="list">[]</editable_permission>
<editable_role type="list">[]</editable_role>
<enabled type="int">1</enabled>
<external_validator></external_validator> <external_validator></external_validator>
<global_attributes type="list">[]</global_attributes> <global_attributes type="list">[]</global_attributes>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
...@@ -33,15 +42,22 @@ ...@@ -33,15 +42,22 @@
<list_action>list</list_action> <list_action>list</list_action>
<list_method type="method">portal_catalog</list_method> <list_method type="method">portal_catalog</list_method>
<meta_types type="list">[]</meta_types> <meta_types type="list">[]</meta_types>
<portal_types type="list">[('Accounting Transaction', 'Accounting Transaction'), ('Purchase Invoice Transaction', 'Purchase Invoice Transaction'), ('Sale Invoice Transaction', 'Sale Invoice Transaction')]</portal_types> <not_viewable type="int">0</not_viewable>
<portal_types type="list">[('Accounting Transaction', 'Accounting Transaction'), ('Balance Transaction', 'Balance Transaction'), ('Purchase Invoice Transaction', 'Purchase Invoice Transaction'), ('Sale Invoice Transaction', 'Sale Invoice Transaction'), ('Pay Sheet Transaction', 'Pay Sheet Transaction'), ('Payment Transaction', 'Payment Transaction')]</portal_types>
<read_only type="int">0</read_only>
<report_root_list type="list">[]</report_root_list> <report_root_list type="list">[]</report_root_list>
<report_tree type="int">0</report_tree> <report_tree type="int">0</report_tree>
<search type="int">1</search> <search type="int">1</search>
<search_columns type="list">[]</search_columns>
<select type="int">1</select> <select type="int">1</select>
<selection_name>accounting_selection</selection_name> <selection_name>accounting_selection</selection_name>
<sort type="list">[('id', 'id')]</sort> <sort type="list">[('id', 'id')]</sort>
<sort_columns type="list">[]</sort_columns>
<stat_method></stat_method> <stat_method></stat_method>
<title>Accounting Transaction List</title> <title>Accounting Transaction List</title>
<viewable_expression></viewable_expression>
<viewable_permission type="list">[]</viewable_permission>
<viewable_role type="list">[]</viewable_role>
</values> </values>
<tales> <tales>
</tales> </tales>
...@@ -51,5 +67,23 @@ ...@@ -51,5 +67,23 @@
</field> </field>
</fields> </fields>
</group> </group>
<group>
<title>right</title>
<fields>
</fields>
</group>
<group>
<title>center</title>
<fields>
</fields>
</group>
<group>
<title>bottom</title>
<fields>
</fields>
</group>
</groups> </groups>
</form> </form>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7