Skip to content

erp5
erp5
Commit f425149e authored by Nicolas Delaby's avatar Nicolas Delaby
Browse files
Options

Same OOoTemplate is used for both Purchase Order and Sale Order, so rename Scripts and forms 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20563 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 9eafd29b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 341 additions and 37 deletions
bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/order_print.xml
View file @ f425149e
......@@ -75,7 +75,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/PurchaseOrder_viewODTPrintDialog</string> </value>
<value> <string>string:${object_url}/Order_viewODTPrintDialog</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/order_print.xml 0 → 100644
View file @ f425149e
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_print</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>order_print</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>1.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Print Order</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/Order_viewODTPrintDialog</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_getODTDataDict.xml → bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_getODTDataDict.xml
View file @ f425149e
......@@ -121,7 +121,10 @@ def getOrderedDate(date):\n
\n
def getSourceReference(line):\n
category_list = line.getAcquiredCategoryList()\n
portal_type_list = [\'Purchase Supply Line\', \'Purchase Supply Cell\']\n
portal_type_list = (\'Purchase Supply Line\',\n
\'Purchase Supply Cell\',\n
\'Sale Supply Line\',\n
\'Sale Supply Cell\',)\n
tmp_context = line.asContext(context=line, categories=category_list)\n
predicate_list = context.portal_domains.searchPredicateList(tmp_context, portal_type=portal_type_list)\n
for predicate in predicate_list:\n
......@@ -199,9 +202,13 @@ data_dict = {\n
\'source_section_email\': getEmail(context.getSourceSection() and context.getSourceSectionValue().getEmailText() or \'\'),\n
\n
\'source_decision_title\': context.getSourceDecisionTitle() or \'\',\n
\'source_decision_address\': unicode(getOneLineAddress(\n
context.getSourceDecision() and context.getSourceDecisionValue().getDefaultAddressText() or \'\',\n
context.getSourceDecision() and context.getSourceDecisionValue().getDefaultAddressRegionTitle() or \'\'), \'utf8\'),\n
\'source_decision_telfax\': getPhoneAndFax(context.getSourceDecision() and context.getSourceDecisionValue().getTelephoneText() or \'\',\n
context.getSourceDecision() and context.getSourceDecisionValue().getFaxText() or \'\'),\n
\'source_decision_email\': getEmail(context.getSourceDecision() and context.getSourceDecisionValue().getEmailText() or \'\'),\n
\'source_decision_vatid\': unicode(getVatId(context.getSourceDecision() and context.getSourceDecisionValue().getVatCode() or \'\'), \'utf8\'),\n
\n
\'destination_title\': context.getDestinationTitle() or \'\',\n
\'destination_address\': getOneLineAddress(\n
......@@ -229,6 +236,7 @@ data_dict = {\n
\n
\'reference\': context.getReference() or \'\',\n
\'start_date\': getOrderedDate(context.getStartDate()) or \'\',\n
\'stop_date\': getOrderedDate(context.getStopDate()) or \'\',\n
\'currency\': context.getPriceCurrencyReference() or \'\',\n
\'payment_condition\': getPaymentConditionText(context),\n
\'delivery_mode\': context.getDeliveryModeTitle() or \'\',\n
......@@ -236,7 +244,6 @@ data_dict = {\n
\n
\'total_price_novat\': total_price,\n
\'vat_list\': context.searchFolder(portal_type=context.getPortalTaxMovementTypeList(), order_by=\'title\'),\n
\'total_price_vat\': total_price + total_vat,\n
\'description\': getFieldAsString(context.getDescription()),\n
\n
\'line_list\': line_list,\n
......@@ -334,7 +341,7 @@ return data_dict\n
</item>
<item>
<key> <string>id</string> </key>
<value> <string>PurchaseOrder_getODTDataDict</string> </value>
<value> <string>Order_getODTDataDict</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_getODTStyleSheet.xml → bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_getODTStyleSheet.xml
View file @ f425149e
......@@ -21,7 +21,7 @@
</item>
<item>
<key> <string>__name__</string> </key>
<value> <string>PurchaseOrder_getODTStyleSheet</string> </value>
<value> <string>Order_getODTStyleSheet</string> </value>
</item>
<item>
<key> <string>_owner</string> </key>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewODTPrintDialog.xml 0 → 100644
View file @ f425149e
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ERP5Form" module="Products.ERP5Form.Form"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</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/>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value> <string>Order_viewAsODT</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>edit_order</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>enctype</string> </key>
<value> <string>multipart/form-data</string> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
<string>right</string>
</list>
</value>
</item>
<item>
<key> <string>groups</string> </key>
<value>
<dictionary>
<item>
<key> <string>left</string> </key>
<value>
<list>
<string>your_target_language</string>
</list>
</value>
</item>
<item>
<key> <string>right</string> </key>
<value>
<list>
<string>your_format</string>
</list>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Order_viewODTPrintDialog</string> </value>
</item>
<item>
<key> <string>method</string> </key>
<value> <string>POST</string> </value>
</item>
<item>
<key> <string>name</string> </key>
<value> <string>Base_viewODTPrintDialog</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
<value> <string>form_dialog</string> </value>
</item>
<item>
<key> <string>row_length</string> </key>
<value> <int>4</int> </value>
</item>
<item>
<key> <string>stored_encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Print Order</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>update_action</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_trade/bt/revision
View file @ f425149e
280
\ No newline at end of file
282
\ No newline at end of file
bt5/erp5_trade/bt/template_action_path_list
View file @ f425149e
......@@ -90,6 +90,7 @@ Sale Order Module | view
Sale Order Module | workflow_report
Sale Order | apply_trade_condition
Sale Order | jump_to_related_sale_packing_list
Sale Order | order_print
Sale Order | payment_condition
Sale Order | profile_view
Sale Order | reference_generate
......
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