Skip to content

erp5
erp5
Commit fa335e63 authored by Mame Coumba Sall's avatar Mame Coumba Sall
Browse files
Options

2009-06-09 mame 

*modified scripts so that invoices can be generated even when a packing list is created without an order
*add price_currency on Packing List

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27477 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 87f2e8de
Hide whitespace changes
Inline Side-by-side
Showing with 253 additions and 5 deletions
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view.xml
View file @ fa335e63
......@@ -103,6 +103,7 @@
<string>my_destination_section_title</string>
<string>my_destination_title</string>
<string>my_destination_decision_title</string>
<string>my_price_currency</string>
<string>my_incoterm</string>
<string>my_delivery_mode</string>
<string>my_causality_title</string>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/my_price_currency.xml 0 → 100644
View file @ fa335e63
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>items</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_price_currency</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_list_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewTradeFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Currency</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python:here.CurrencyModule_getCurrencyItemList()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view.xml
View file @ fa335e63
......@@ -102,6 +102,7 @@
<string>my_source_section_title</string>
<string>my_source_title</string>
<string>my_source_administration_title</string>
<string>my_price_currency</string>
<string>my_incoterm</string>
<string>my_delivery_mode</string>
<string>my_causality_title</string>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/my_price_currency.xml 0 → 100644
View file @ fa335e63
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>items</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_price_currency</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_list_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewTradeFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Currency</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python:here.CurrencyModule_getCurrencyItemList()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PurchasePackingList_buildInvoice.xml
View file @ fa335e63
......@@ -61,7 +61,8 @@ if packing_list.getPortalType() == \'Purchase Packing List\':\n
explanation_uid = packing_list.getCausalityUid(portal_type=\'Purchase Order\')\n
if explanation_uid:\n
explanation_uid = (explanation_uid, packing_list.getUid())\n
\n
elif explanation_uid == None:\n
explanation_uid = packing_list.getUid()\n
tag = \'build_invoice_%s\' % packing_list.getRelativeUrl()\n
# WARNING: this tag is also used in InvoiceTransaction_postGeneration script\n
tax_tag = \'build_invoice_tax_%s\' % packing_list.getRelativeUrl()\n
......@@ -136,10 +137,10 @@ if packing_list.getPortalType() == \'Purchase Packing List\':\n
<string>_getattr_</string>
<string>delivery_tool</string>
<string>explanation_uid</string>
<string>None</string>
<string>tag</string>
<string>tax_tag</string>
<string>getattr</string>
<string>None</string>
<string>invoice_line_builder</string>
<string>dict</string>
<string>invoice_tax_builder</string>
......
bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/SalePackingList_buildInvoice.xml
View file @ fa335e63
......@@ -61,7 +61,8 @@ if packing_list.getPortalType() == \'Sale Packing List\':\n
explanation_uid = packing_list.getCausalityUid(portal_type=\'Sale Order\')\n
if explanation_uid:\n
explanation_uid = (explanation_uid, packing_list.getUid())\n
\n
elif explanation_uid == None:\n
explanation_uid = packing_list.getUid()\n
tag = \'build_invoice_%s\' % packing_list.getRelativeUrl()\n
# WARNING: this tag is also used in InvoiceTransaction_postGeneration script\n
tax_tag = \'build_invoice_tax_%s\' % packing_list.getRelativeUrl()\n
......@@ -136,10 +137,10 @@ if packing_list.getPortalType() == \'Sale Packing List\':\n
<string>_getattr_</string>
<string>delivery_tool</string>
<string>explanation_uid</string>
<string>None</string>
<string>tag</string>
<string>tax_tag</string>
<string>getattr</string>
<string>None</string>
<string>invoice_line_builder</string>
<string>dict</string>
<string>invoice_tax_builder</string>
......
bt5/erp5_trade/bt/revision
View file @ fa335e63
666
\ No newline at end of file
668
\ 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