Skip to content

erp5
erp5
Commit 9839798c authored by Łukasz Nowak's avatar Łukasz Nowak
Browse files
Options

- extend list of selected movements used to create Accounting Transaction... 

 - extend list of selected movements used to create Accounting Transaction Lines by those, which are under Trade Model Rule
 - move catalog keys used in new queries from erp5_bpm
 - remove updated functionality from development erp5_bpm business template


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27854 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 7074cdcb
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 461 deletions
bt5/erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/InvoiceTransaction_selectInvoiceMovement.xml deleted 100644 → 0
View file @ 7074cdcb
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>invoice_portal_type_mapping = {\n
\'Sale Invoice Transaction\': [\'Sale Order\', \'Sale Invoice Transaction\', \'Sale Packing List\'],\n
\'Purchase Invoice Transaction\': [\'Purchase Order\', \'Purchase Invoice Transaction\', \'Purchase Packing List\'],\n
}\n
src__ = kw.get(\'src__\',0)\n
search_kw = kw.copy()\n
\n
search_kw[\'parent_specialise_portal_type\'] = \'Invoice Transaction Rule\'\n
search_kw[\'explanation_portal_type\'] = invoice_portal_type_mapping[invoice_portal_type]\n
search_kw[\'portal_type\'] = \'Simulation Movement\'\n
search_kw[\'grand_parent_simulation_state\'] = [\'started\']\n
\n
search_kw.update(context.portal_catalog.buildSQLQuery(**search_kw))\n
result = context.InvoiceTransaction_zSelectMovement(**search_kw)\n
if src__:\n
normal_movement_list = result\n
else:\n
normal_movement_list = [q for q in result]\n
\n
search_kw = kw.copy()\n
\n
search_kw[\'grand_grand_parent_specialise_portal_type\'] = \'Trade Model Rule\'\n
search_kw[\'parent_specialise_portal_type\'] = \'Invoice Transaction Rule\'\n
search_kw[\'explanation_portal_type\'] = invoice_portal_type_mapping[invoice_portal_type]\n
search_kw[\'portal_type\'] = \'Simulation Movement\'\n
search_kw[\'grand_grand_grand_parent_simulation_state\'] = [\'started\']\n
\n
search_kw.update(context.portal_catalog.buildSQLQuery(**search_kw))\n
\n
result = context.InvoiceTransaction_zSelectMovement(**search_kw)\n
\n
if src__:\n
trade_model_movement_list = result\n
else:\n
trade_model_movement_list = [q for q in result]\n
\n
if src__:\n
return \'\\n\'.join((normal_movement_list, trade_model_movement_list))\n
movement_list = []\n
for movement in normal_movement_list + trade_model_movement_list:\n
movement = movement.getObject()\n
if movement.getDeliveryValue() is None :\n
if movement not in movement_list:\n
movement_list.append(movement)\n
else :\n
from Products.ERP5Type.Log import log\n
log(script.getId(), "simulation movement %s should not have been selected !" % movement.getPath())\n
\n
return movement_list\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>invoice_portal_type, **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>invoice_portal_type</string>
<string>kw</string>
<string>invoice_portal_type_mapping</string>
<string>_getattr_</string>
<string>src__</string>
<string>search_kw</string>
<string>_write_</string>
<string>_getitem_</string>
<string>_apply_</string>
<string>context</string>
<string>result</string>
<string>normal_movement_list</string>
<string>append</string>
<string>$append0</string>
<string>_getiter_</string>
<string>q</string>
<string>trade_model_movement_list</string>
<string>movement_list</string>
<string>movement</string>
<string>None</string>
<string>Products.ERP5Type.Log</string>
<string>log</string>
<string>script</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>InvoiceTransaction_selectInvoiceMovement</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/PurchaseInvoiceTransaction_selectInvoiceMovement.xml deleted 100644 → 0
View file @ 7074cdcb
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>return context.InvoiceTransaction_selectInvoiceMovement(\'Purchase Invoice Transaction\',**kw)\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>**kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>kw</string>
<string>_apply_</string>
<string>_getattr_</string>
<string>context</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>PurchaseInvoiceTransaction_selectInvoiceMovement</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/SaleInvoiceTransaction_selectInvoiceMovement.xml deleted 100644 → 0
View file @ 7074cdcb
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>return context.InvoiceTransaction_selectInvoiceMovement(\'Sale Invoice Transaction\',**kw)\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>**kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>kw</string>
<string>_apply_</string>
<string>_getattr_</string>
<string>context</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>SaleInvoiceTransaction_selectInvoiceMovement</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_bpm/bt/revision
View file @ 9839798c
197 198
\ No newline at end of file \ No newline at end of file
bt5/erp5_bpm/bt/template_catalog_method_id_list
View file @ 9839798c
erp5_mysql_innodb/z_related_grand_grand_grand_parent
erp5_mysql_innodb/z_related_grand_grand_parent_specialise
\ No newline at end of file
bt5/erp5_bpm/bt/template_catalog_related_key_list
View file @ 9839798c
grand_grand_grand_parent_simulation_state | catalog,catalog,catalog,catalog/simulation_state/z_related_grand_grand_grand_parent
grand_grand_parent_specialise_portal_type | category,catalog,catalog,catalog/portal_type/z_related_grand_grand_parent_specialise
\ No newline at end of file
bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectInvoiceMovement.xml
View file @ 9839798c
...@@ -53,7 +53,13 @@ ...@@ -53,7 +53,13 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>kw[\'parent_specialise_portal_type\'] = \'Invoice Transaction Rule\'\n <value> <string>"""Returns Simulation Movements for invoice\n
\n
Simulation Movements can come from normal Invoice Transaction Rule\n
and same rule which is children of Trade Model Rule """\n
\n
# search for normal movements\n
kw[\'parent_specialise_portal_type\'] = \'Invoice Transaction Rule\'\n
if context.Invoice_isAdvanced():\n if context.Invoice_isAdvanced():\n
kw[\'explanation_portal_type\'] = [\'%s Order\' % trade_type,\n kw[\'explanation_portal_type\'] = [\'%s Order\' % trade_type,\n
\'%s Invoice\' % trade_type,\n \'%s Invoice\' % trade_type,\n
...@@ -65,10 +71,24 @@ else:\n ...@@ -65,10 +71,24 @@ else:\n
kw[\'portal_type\'] = \'Simulation Movement\'\n kw[\'portal_type\'] = \'Simulation Movement\'\n
kw[\'grand_parent_simulation_state\'] = [\'started\']\n kw[\'grand_parent_simulation_state\'] = [\'started\']\n
\n \n
kw.update(context.portal_catalog.buildSQLQuery(**kw))\n search_kw = kw.copy()\n
search_kw.update(context.portal_catalog.buildSQLQuery(**search_kw))\n
\n
normal_movement_list = [movement for movement in context.InvoiceTransaction_zSelectMovement(**search_kw)]\n
\n
# update query to search for movements which are children of Trade Model Rule\n
kw.pop(\'grand_parent_simulation_state\')\n
kw[\'grand_grand_parent_specialise_portal_type\'] = \'Trade Model Rule\'\n
kw[\'grand_grand_grand_parent_simulation_state\'] = [\'started\']\n
\n
search_kw = kw.copy()\n
\n
search_kw.update(context.portal_catalog.buildSQLQuery(**kw))\n
\n
trade_model_movement_list = [movement for movement in context.InvoiceTransaction_zSelectMovement(**search_kw)]\n
\n \n
movement_list = [] \n movement_list = [] \n
for movement in context.InvoiceTransaction_zSelectMovement(**kw) :\n for movement in normal_movement_list + trade_model_movement_list:\n
movement = movement.getObject()\n movement = movement.getObject()\n
if movement.getDeliveryValue() is None :\n if movement.getDeliveryValue() is None :\n
movement_list.append(movement)\n movement_list.append(movement)\n
...@@ -118,10 +138,15 @@ return movement_list\n ...@@ -118,10 +138,15 @@ return movement_list\n
<string>_write_</string> <string>_write_</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>search_kw</string>
<string>_apply_</string> <string>_apply_</string>
<string>movement_list</string> <string>append</string>
<string>$append0</string>
<string>_getiter_</string> <string>_getiter_</string>
<string>movement</string> <string>movement</string>
<string>normal_movement_list</string>
<string>trade_model_movement_list</string>
<string>movement_list</string>
<string>None</string> <string>None</string>
<string>Products.ERP5Type.Log</string> <string>Products.ERP5Type.Log</string>
<string>log</string> <string>log</string>
......
bt5/erp5_invoicing/bt/revision
View file @ 9839798c
250 251
\ No newline at end of file \ No newline at end of file
bt5/erp5_invoicing/bt/template_catalog_method_id_list
View file @ 9839798c
erp5_mysql_innodb/z_related_grand_grand_grand_parent
erp5_mysql_innodb/z_related_grand_grand_parent_specialise
\ No newline at end of file
bt5/erp5_invoicing/bt/template_catalog_related_key_list
View file @ 9839798c
grand_grand_grand_parent_simulation_state | catalog,catalog,catalog,catalog/simulation_state/z_related_grand_grand_grand_parent
grand_grand_parent_specialise_portal_type | category,catalog,catalog,catalog/portal_type/z_related_grand_grand_parent_specialise
\ 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