diff --git a/bt5/erp5_invoicing/PathTemplateItem/portal_categories/delivery_mode.xml b/bt5/erp5_invoicing/PathTemplateItem/portal_categories/delivery_mode.xml new file mode 100644 index 0000000000000000000000000000000000000000..54d587be735faf3e0c3bd75b8d9ab0cd9187f973 --- /dev/null +++ b/bt5/erp5_invoicing/PathTemplateItem/portal_categories/delivery_mode.xml @@ -0,0 +1,208 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_count</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>_mt_index</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>_tree</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>acquisition_append_value</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>acquisition_base_category</string> </key> + <value> + <tuple> + <string>delivery</string> + <string>order</string> + <string>parent</string> + <string>resource</string> + </tuple> + </value> + </item> + <item> + <key> <string>acquisition_copy_value</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>acquisition_mask_value</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>acquisition_object_id</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>acquisition_portal_type</string> </key> + <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList() + portal.getPortalResourceTypeList())</string> </value> + </item> + <item> + <key> <string>acquisition_sync_value</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>categories</string> </key> + <value> + <tuple> + <string>delivery_mode</string> + </tuple> + </value> + </item> + <item> + <key> <string>category_type</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>criterion_property</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>fallback_base_category</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>delivery_mode</string> </value> + </item> + <item> + <key> <string>id_generator</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id_group</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>last_id</string> </key> + <value> <string>3</string> </value> + </item> + <item> + <key> <string>membership_criterion_base_category</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>membership_criterion_category</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>multimembership_criterion_base_category</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Base Category</string> </value> + </item> + <item> + <key> <string>read_permission</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>rid</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>short_title</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>sid</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>test_method_id</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>write_permission</string> </key> + <value> + <none/> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="Length" module="BTrees.Length"/> + </pickle> + <pickle> <int>0</int> </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <global name="OOBTree" module="BTrees._OOBTree"/> + </pickle> + <pickle> + <none/> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <global name="OOBTree" module="BTrees._OOBTree"/> + </pickle> + <pickle> + <none/> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_invoicing/PathTemplateItem/portal_categories/incoterm.xml b/bt5/erp5_invoicing/PathTemplateItem/portal_categories/incoterm.xml new file mode 100644 index 0000000000000000000000000000000000000000..d8037d89b974b0a824c4ce79ab4a9c74e1c20014 --- /dev/null +++ b/bt5/erp5_invoicing/PathTemplateItem/portal_categories/incoterm.xml @@ -0,0 +1,216 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_count</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>_mt_index</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>_tree</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>acquisition_append_value</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>acquisition_base_category</string> </key> + <value> + <tuple> + <string>delivery</string> + <string>order</string> + <string>parent</string> + <string>resource</string> + </tuple> + </value> + </item> + <item> + <key> <string>acquisition_copy_value</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>acquisition_mask_value</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>acquisition_object_id</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>acquisition_portal_type</string> </key> + <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList() + portal.getPortalResourceTypeList())</string> </value> + </item> + <item> + <key> <string>acquisition_sync_value</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>categories</string> </key> + <value> + <tuple> + <string>incoterm</string> + <string>incoterm</string> + <string>incoterm</string> + <string>incoterm</string> + <string>incoterm</string> + <string>incoterm</string> + <string>incoterm</string> + <string>incoterm</string> + <string>incoterm</string> + </tuple> + </value> + </item> + <item> + <key> <string>category_type</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>criterion_property</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>fallback_base_category</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>incoterm</string> </value> + </item> + <item> + <key> <string>id_generator</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id_group</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>last_id</string> </key> + <value> <string>4</string> </value> + </item> + <item> + <key> <string>membership_criterion_base_category</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>membership_criterion_category</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>multimembership_criterion_base_category</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Base Category</string> </value> + </item> + <item> + <key> <string>read_permission</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>rid</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>short_title</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>sid</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>test_method_id</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>write_permission</string> </key> + <value> + <none/> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="Length" module="BTrees.Length"/> + </pickle> + <pickle> <int>0</int> </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <global name="OOBTree" module="BTrees._OOBTree"/> + </pickle> + <pickle> + <none/> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <global name="OOBTree" module="BTrees._OOBTree"/> + </pickle> + <pickle> + <none/> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_delivery.xml b/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_delivery.xml index 8692b686dd08b9d88da9192187b9553e0361566e..45a3ce09f22f454c0eb84b75376b9ae8a012414e 100644 --- a/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_delivery.xml +++ b/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_delivery.xml @@ -40,6 +40,8 @@ <key> <string>tested_property</string> </key> <value> <tuple> + <string>delivery_mode</string> + <string>incoterm</string> <string>source</string> <string>destination</string> <string>source_section</string> diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml index 11500768960cd16deb1d407ffa0d99fa4a0c5d9e..c1f6cab1158f1279ecdcec85a89f4d848e926007 100644 --- a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml +++ b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml @@ -65,7 +65,6 @@ if related_simulation_movement_path_list is None:\n invoice = context\n packing_list = invoice.getCausalityValue()\n if packing_list is not None:\n - invoice.setDeliveryMode(packing_list.getDeliveryMode())\n order = packing_list.getCausalityValue()\n if order is not None:\n invoice.setSpecialise(order.getSpecialise())\n diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml index c277ec762b7a129af286d222d5e6ff44a971c331..8c338fddef2e18b9e82a263500f15a5c064e78d8 100644 --- a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml +++ b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml @@ -80,6 +80,7 @@ related_packing_list = invoice.getDefaultCausalityValue()\n \n # XXX this use of currency is completly bogus, it should be set on simulation movements.\n # get a price_currency from the packing list, or the order\n +context.log(related_packing_list)\n price_currency = related_packing_list.getPriceCurrency()\n if price_currency:\n invoice.edit(\n diff --git a/bt5/erp5_invoicing/bt/revision b/bt5/erp5_invoicing/bt/revision index 2bab4226fc3d27e9a3034dc5c0cd22f5b9b30888..9da06a18339c312235ed2a16c054f2bb70981398 100644 --- a/bt5/erp5_invoicing/bt/revision +++ b/bt5/erp5_invoicing/bt/revision @@ -1 +1 @@ -157 \ No newline at end of file +160 \ No newline at end of file