Commit 68d8eee0 authored by Yoshinori Okuji's avatar Yoshinori Okuji

2005-12-08 yo

* Fix the LEFT JOIN syntax in Order_zSelectMovement.

2005-12-05 Seb
* Cleaned SaleOrder_applySaleTradeCondition


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4554 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent efc83109
......@@ -4,7 +4,7 @@
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.CMFCorePatch</string>
<string>Products.ERP5Type.patches.ActionInformation</string>
<string>PatchedActionInformation</string>
</tuple>
<none/>
......
......@@ -4,7 +4,7 @@
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.CMFCorePatch</string>
<string>Products.ERP5Type.patches.ActionInformation</string>
<string>PatchedActionInformation</string>
</tuple>
<none/>
......
......@@ -4,7 +4,7 @@
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.CMFCorePatch</string>
<string>Products.ERP5Type.patches.ActionInformation</string>
<string>PatchedActionInformation</string>
</tuple>
<none/>
......
......@@ -4,7 +4,7 @@
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.CMFCorePatch</string>
<string>Products.ERP5Type.patches.ActionInformation</string>
<string>PatchedActionInformation</string>
</tuple>
<none/>
......
......@@ -110,7 +110,7 @@
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.CMFCorePatch</string>
<string>Products.ERP5Type.patches.ActionInformation</string>
<string>PatchedActionInformation</string>
</tuple>
<none/>
......@@ -175,7 +175,7 @@
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.CMFCorePatch</string>
<string>Products.ERP5Type.patches.ActionInformation</string>
<string>PatchedActionInformation</string>
</tuple>
<none/>
......@@ -240,7 +240,7 @@
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.CMFCorePatch</string>
<string>Products.ERP5Type.patches.ActionInformation</string>
<string>PatchedActionInformation</string>
</tuple>
<none/>
......@@ -305,7 +305,7 @@
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.CMFCorePatch</string>
<string>Products.ERP5Type.patches.ActionInformation</string>
<string>PatchedActionInformation</string>
</tuple>
<none/>
......
......@@ -117,7 +117,7 @@ a manufactured product, like a pen, a bicycle...</string> </value>
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.CMFCorePatch</string>
<string>Products.ERP5Type.patches.ActionInformation</string>
<string>PatchedActionInformation</string>
</tuple>
<none/>
......@@ -182,7 +182,7 @@ a manufactured product, like a pen, a bicycle...</string> </value>
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.CMFCorePatch</string>
<string>Products.ERP5Type.patches.ActionInformation</string>
<string>PatchedActionInformation</string>
</tuple>
<none/>
......@@ -249,7 +249,7 @@ a manufactured product, like a pen, a bicycle...</string> </value>
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.CMFCorePatch</string>
<string>Products.ERP5Type.patches.ActionInformation</string>
<string>PatchedActionInformation</string>
</tuple>
<none/>
......@@ -316,7 +316,7 @@ a manufactured product, like a pen, a bicycle...</string> </value>
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.CMFCorePatch</string>
<string>Products.ERP5Type.patches.ActionInformation</string>
<string>PatchedActionInformation</string>
</tuple>
<none/>
......@@ -381,7 +381,7 @@ a manufactured product, like a pen, a bicycle...</string> </value>
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.CMFCorePatch</string>
<string>Products.ERP5Type.patches.ActionInformation</string>
<string>PatchedActionInformation</string>
</tuple>
<none/>
......@@ -446,7 +446,7 @@ a manufactured product, like a pen, a bicycle...</string> </value>
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.CMFCorePatch</string>
<string>Products.ERP5Type.patches.ActionInformation</string>
<string>PatchedActionInformation</string>
</tuple>
<none/>
......
......@@ -136,18 +136,16 @@ SELECT DISTINCT\n
catalog.id\n
\n
FROM\n
movement as simulation_movement,\n
<dtml-in from_table_list> \n
<dtml-var sequence-item> AS <dtml-var sequence-key>\n
<dtml-if sequence-end>\n
<dtml-else>,\n
movement as simulation_movement\n
<dtml-in prefix="table" expr="from_table_list"> \n
<dtml-if expr="table_key != \'catalog\'">\n
, <dtml-var table_item> AS <dtml-var table_key>\n
</dtml-if>\n
</dtml-in>\n
\n
LEFT JOIN catalog AS base_category ON base_category.relative_url = "delivery" \n
AND base_category.portal_type = "Base Category"\n
LEFT JOIN category ON catalog.uid=category.uid\n
AND base_category.uid=category.base_category_uid\n
, catalog\n
LEFT JOIN category \n
ON (catalog.uid = category.uid\n
AND category.base_category_uid = <dtml-sqlvar "portal_categories.delivery.getUid()" type="int">)\n
WHERE\n
1=1\n
<dtml-if where_expression>\n
......@@ -208,18 +206,16 @@ SELECT DISTINCT\n
catalog.id\n
\n
FROM\n
movement as simulation_movement,\n
<dtml-in from_table_list> \n
<dtml-var sequence-item> AS <dtml-var sequence-key>\n
<dtml-if sequence-end>\n
<dtml-else>,\n
movement as simulation_movement\n
<dtml-in prefix="table" expr="from_table_list"> \n
<dtml-if expr="table_key != \'catalog\'">\n
, <dtml-var table_item> AS <dtml-var table_key>\n
</dtml-if>\n
</dtml-in>\n
\n
LEFT JOIN catalog AS base_category ON base_category.relative_url = "delivery" \n
AND base_category.portal_type = "Base Category"\n
LEFT JOIN category ON catalog.uid=category.uid\n
AND base_category.uid=category.base_category_uid\n
, catalog\n
LEFT JOIN category \n
ON (catalog.uid = category.uid\n
AND category.base_category_uid = <dtml-sqlvar "portal_categories.delivery.getUid()" type="int">)\n
WHERE\n
1=1\n
<dtml-if where_expression>\n
......
......@@ -73,11 +73,11 @@ kw[\'simulation_state\'] = \'confirmed\'\n
\n
kw.update(context.portal_catalog.buildSQLQuery(**kw))\n
\n
context.log(\'SaleOrder_selectMovement\', \'SQL\\n%s\' % context.Order_zSelectMovement(src__=1, **kw))\n
#context.log(\'SaleOrder_selectMovement\', \'SQL\\n%s\' % context.Order_zSelectMovement(src__=1, **kw))\n
\n
if src__==0:\n
movement_list = [x.getObject() for x in context.Order_zSelectMovement(**kw)]\n
context.log(\'SaleOrder_selectMovement\', \'mvt : %s\' % movement_list)\n
#context.log(\'SaleOrder_selectMovement\', \'mvt : %s\' % movement_list)\n
return movement_list\n
else:\n
return context.Order_zSelectMovement(src__=1, **kw)\n
......@@ -86,27 +86,25 @@ else:\n
<item>
<key> <string>_code</string> </key>
<value> <string encoding="base64">YwAAAAAAAAAAAgAAAEAAAABzEAAAAGQBAGQCAIQBAFoAAGQAAFMoAwAAAE5pAAAAAGMBAAAACwAA
ABEAAABLAAAAc0ABAABkAQBkAgBnAgB0AAB8AQCDAQBkAwA8ZAQAdAAAfAEAgwEAZAUAPGQGAHQA
AA8AAABLAAAAc/QAAABkAQBkAgBnAgB0AAB8AQCDAQBkAwA8ZAQAdAAAfAEAgwEAZAUAPGQGAHQA
AHwBAIMBAGQHADxkCAB0AAB8AQCDAQBkCQA8dAIAfAEAZAoAgwIAdAMAdAIAdAIAdAQAZAsAgwIA
ZAwAgwIAfAEAjQEAgwEAAXQCAHQEAGQNAIMCAGQOAGQPAHQDAHQCAHQEAGQQAIMCAGQRAGQSAHwB
AI0BARaDAgABfAAAZBMAagIAb20AAWcAAARpBgB9BwB0CAB0AwB0AgB0BABkEACDAgB8AQCNAQCD
AQBEXRwAfQkAfAcAdAIAfAkAZBQAgwIAgwAAgwEAAXHZAH4HAH0KAHQCAHQEAGQNAIMCAGQOAGQV
AHwKABaDAgABfAoAU24dAAF0AwB0AgB0BABkEACDAgBkEQBkEgB8AQCNAQFTZAAAUygWAAAATnMK
AAAAT3JkZXIgUnVsZXMNAAAARGVsaXZlcnkgUnVsZXMdAAAAcGFyZW50X3NwZWNpYWxpc2VfcG9y
dGFsX3R5cGVzCgAAAFNhbGUgT3JkZXJzFwAAAGV4cGxhbmF0aW9uX3BvcnRhbF90eXBlcxMAAABT
aW11bGF0aW9uIE1vdmVtZW50cwsAAABwb3J0YWxfdHlwZXMJAAAAY29uZmlybWVkcxAAAABzaW11
bGF0aW9uX3N0YXRlcwYAAAB1cGRhdGVzDgAAAHBvcnRhbF9jYXRhbG9ncw0AAABidWlsZFNRTFF1
ZXJ5cwMAAABsb2dzGAAAAFNhbGVPcmRlcl9zZWxlY3RNb3ZlbWVudHMGAAAAU1FMCiVzcxUAAABP
cmRlcl96U2VsZWN0TW92ZW1lbnRzBQAAAHNyY19faQEAAABpAAAAAHMJAAAAZ2V0T2JqZWN0cwgA
AABtdnQgOiAlcygLAAAAcwcAAABfd3JpdGVfcwIAAABrd3MJAAAAX2dldGF0dHJfcwcAAABfYXBw
bHlfcwcAAABjb250ZXh0cwUAAABzcmNfX3MGAAAAYXBwZW5kcwgAAAAkYXBwZW5kMHMJAAAAX2dl
dGl0ZXJfcwEAAAB4cw0AAABtb3ZlbWVudF9saXN0KAsAAABzBQAAAHNyY19fcwIAAABrd3MHAAAA
X3dyaXRlX3MJAAAAX2dldGF0dHJfcwcAAABfYXBwbHlfcwcAAABjb250ZXh0cwYAAABhcHBlbmRz
CAAAACRhcHBlbmQwcwkAAABfZ2V0aXRlcl9zAQAAAHhzDQAAAG1vdmVtZW50X2xpc3QoAAAAACgA
AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzGAAAAFNhbGVPcmRlcl9zZWxlY3RNb3ZlbWVudAEAAABz
FgAAABYBEAEQARMCLgIvAg0BJgAoARcBCAIoAQAAAHMYAAAAU2FsZU9yZGVyX3NlbGVjdE1vdmVt
ZW50KAEAAABzGAAAAFNhbGVPcmRlcl9zZWxlY3RNb3ZlbWVudCgAAAAAKAAAAABzDwAAAFNjcmlw
dCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
ZAwAgwIAfAEAjQEAgwEAAXwAAGQNAGoCAG9TAAFnAAAEaQYAfQcAdAgAdAMAdAIAdAQAZA4AgwIA
fAEAjQEAgwEARF0cAH0JAHwHAHQCAHwJAGQPAIMCAIMAAIMBAAFxpwB+BwB9CgB8CgBTbh0AAXQD
AHQCAHQEAGQOAIMCAGQQAGQRAHwBAI0BAVNkAABTKBIAAABOcwoAAABPcmRlciBSdWxlcw0AAABE
ZWxpdmVyeSBSdWxlcx0AAABwYXJlbnRfc3BlY2lhbGlzZV9wb3J0YWxfdHlwZXMKAAAAU2FsZSBP
cmRlcnMXAAAAZXhwbGFuYXRpb25fcG9ydGFsX3R5cGVzEwAAAFNpbXVsYXRpb24gTW92ZW1lbnRz
CwAAAHBvcnRhbF90eXBlcwkAAABjb25maXJtZWRzEAAAAHNpbXVsYXRpb25fc3RhdGVzBgAAAHVw
ZGF0ZXMOAAAAcG9ydGFsX2NhdGFsb2dzDQAAAGJ1aWxkU1FMUXVlcnlpAAAAAHMVAAAAT3JkZXJf
elNlbGVjdE1vdmVtZW50cwkAAABnZXRPYmplY3RzBQAAAHNyY19faQEAAAAoCwAAAHMHAAAAX3dy
aXRlX3MCAAAAa3dzCQAAAF9nZXRhdHRyX3MHAAAAX2FwcGx5X3MHAAAAY29udGV4dHMFAAAAc3Jj
X19zBgAAAGFwcGVuZHMIAAAAJGFwcGVuZDBzCQAAAF9nZXRpdGVyX3MBAAAAeHMNAAAAbW92ZW1l
bnRfbGlzdCgLAAAAcwUAAABzcmNfX3MCAAAAa3dzBwAAAF93cml0ZV9zCQAAAF9nZXRhdHRyX3MH
AAAAX2FwcGx5X3MHAAAAY29udGV4dHMGAAAAYXBwZW5kcwgAAAAkYXBwZW5kMHMJAAAAX2dldGl0
ZXJfcwEAAAB4cw0AAABtb3ZlbWVudF9saXN0KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24p
cxgAAABTYWxlT3JkZXJfc2VsZWN0TW92ZW1lbnQBAAAAcxIAAAAWARABEAETAisEDQEmACUCCAIo
AQAAAHMYAAAAU2FsZU9yZGVyX3NlbGVjdE1vdmVtZW50KAEAAABzGAAAAFNhbGVPcmRlcl9zZWxl
Y3RNb3ZlbWVudCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAA
cwAAAAA=</string> </value>
</item>
<item>
<key> <string>_dav_writelocks</string> </key>
......
2005-12-08 yo
* Fix the LEFT JOIN syntax in Order_zSelectMovement.
2005-12-05 Seb
* Cleaned SaleOrder_applySaleTradeCondition
2005-11-30 aurel
* add aggregateMovementGroup in portal_deliveries/purchase_packing_list_builder
......
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