Skip to content

erp5
erp5
Commit 1778719e authored by Vincent Desmares's avatar Vincent Desmares
Browse files
Options

2008-09-10 vincentd 

* Fix the Quantity input and remove the total price input

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23537 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b44f745e
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 141 deletions
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_createTask.xml
View file @ 1778719e
...@@ -84,7 +84,6 @@ task = context.task_module.newContent(\n ...@@ -84,7 +84,6 @@ task = context.task_module.newContent(\n
task_line_quantity=task_line_quantity,\n task_line_quantity=task_line_quantity,\n
task_line_price=task_line_price,\n task_line_price=task_line_price,\n
task_line_quantity_unit=task_line_quantity_unit,\n task_line_quantity_unit=task_line_quantity_unit,\n
total_price=total_price,\n
price_currency=price_currency,\n price_currency=price_currency,\n
description=description,\n description=description,\n
)\n )\n
...@@ -114,7 +113,7 @@ return task.Base_redirect(\'view\', \n ...@@ -114,7 +113,7 @@ return task.Base_redirect(\'view\', \n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>title=None, reference=None, source=None, source_section=None, destination_decision=None, destination_section=None, source_project=None, destination=None, start_date=None, stop_date=None, task_line_resource=None, task_line_quantity=None, task_line_price=None, task_line_quantity_unit=None, total_price=None, price_currency=None, description=None, **kw</string> </value> <value> <string>title=None, reference=None, source=None, source_section=None, destination_decision=None, destination_section=None, source_project=None, destination=None, start_date=None, stop_date=None, task_line_resource=None, task_line_quantity=None, task_line_price=None, task_line_quantity_unit=None, price_currency=None, description=None, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -134,7 +133,7 @@ return task.Base_redirect(\'view\', \n ...@@ -134,7 +133,7 @@ return task.Base_redirect(\'view\', \n
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>17</int> </value> <value> <int>16</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
...@@ -154,7 +153,6 @@ return task.Base_redirect(\'view\', \n ...@@ -154,7 +153,6 @@ return task.Base_redirect(\'view\', \n
<string>task_line_quantity</string> <string>task_line_quantity</string>
<string>task_line_price</string> <string>task_line_price</string>
<string>task_line_quantity_unit</string> <string>task_line_quantity_unit</string>
<string>total_price</string>
<string>price_currency</string> <string>price_currency</string>
<string>description</string> <string>description</string>
<string>kw</string> <string>kw</string>
...@@ -192,7 +190,6 @@ return task.Base_redirect(\'view\', \n ...@@ -192,7 +190,6 @@ return task.Base_redirect(\'view\', \n
<none/> <none/>
<none/> <none/>
<none/> <none/>
<none/>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog.xml
View file @ 1778719e
...@@ -128,10 +128,9 @@ ...@@ -128,10 +128,9 @@
<string>your_start_date</string> <string>your_start_date</string>
<string>your_stop_date</string> <string>your_stop_date</string>
<string>your_task_line_resource</string> <string>your_task_line_resource</string>
<string>your_task_line_quantity</string>
<string>your_task_line_price</string> <string>your_task_line_price</string>
<string>your_task_line_quantity</string>
<string>your_task_line_quantity_unit</string> <string>your_task_line_quantity_unit</string>
<string>your_total_price</string>
<string>your_price_currency</string> <string>your_price_currency</string>
</list> </list>
</value> </value>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_task_line_quantity.xml
View file @ 1778719e
...@@ -9,12 +9,18 @@ ...@@ -9,12 +9,18 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>title</string> <string>title</string>
<string>display_width</string> <string>input_style</string>
<string>default</string> <string>default</string>
</list> </list>
</value> </value>
...@@ -82,18 +88,18 @@ ...@@ -82,18 +88,18 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>display_width</string> </key>
<value> <int>20</int> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_string_field</string> </value> <value> <string>my_money_quantity</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value> <value> <string>Base_viewFieldLibrary</string> </value>
</item> </item>
<item>
<key> <string>input_style</string> </key>
<value> <string>-1234.5</string> </value>
</item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_total_price.xml deleted 100644 → 0
View file @ b44f745e
<?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>input_style</string>
<string>default</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_total_price</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>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<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>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_money_quantity</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>input_style</string> </key>
<value> <string>-1234.5</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>Total Price</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>here/getTotalPrice</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_project/bt/change_log
View file @ 1778719e
2008-09-10 vincentd
* Fix the Quantity input and remove the total price input
2008-09-09 vincentd 2008-09-09 vincentd
* Fix the Create Task action condition * Fix the Create Task action condition
......
bt5/erp5_project/bt/revision
View file @ 1778719e
587 588
\ No newline at end of file \ 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