Commit 08865572 authored by Gabriel Monnerat's avatar Gabriel Monnerat

Remove code duplicated and add payment_request_uid to possible add payment_request in the query

parent bcd76dcf
...@@ -74,36 +74,23 @@ if kw.get(\'node_uid\'):\n ...@@ -74,36 +74,23 @@ if kw.get(\'node_uid\'):\n
params[\'node_uid\'] = kw[\'node_uid\']\n params[\'node_uid\'] = kw[\'node_uid\']\n
if kw.get(\'mirror_section_uid\'):\n if kw.get(\'mirror_section_uid\'):\n
params[\'mirror_section_uid\'] = kw[\'mirror_section_uid\']\n params[\'mirror_section_uid\'] = kw[\'mirror_section_uid\']\n
payment_uid = kw.get(\'payment_uid\')\n \n
if payment_uid:\n category_uid_list = (\'payment_uid\', \'project_uid\', \'funding_uid\',\n
if payment_uid == \'None\':\n \'function_uid\', \'payment_request_uid\')\n
params[\'payment_uid\'] = Query(payment_uid=None)\n for category_uid in category_uid_list:\n
else:\n category_uid_value = kw.get(category_uid)\n
params[\'payment_uid\'] = payment_uid\n if category_uid_value:\n
project_uid = kw.get(\'project_uid\')\n if category_uid_value == \'None\':\n
if project_uid:\n params[category_uid] = Query(None=None)\n
if project_uid == \'None\':\n
params[\'project_uid\'] = Query(project_uid=None)\n
else:\n
params[\'project_uid\'] = project_uid\n
funding_uid = kw.get(\'funding_uid\')\n
if funding_uid:\n
if funding_uid == \'None\':\n
params[\'funding_uid\'] = Query(funding_uid=None)\n
else:\n else:\n
params[\'funding_uid\'] = funding_uid\n params[category_uid] = category_uid_value\n
\n
funding_category = kw.get(\'funding_category\')\n funding_category = kw.get(\'funding_category\')\n
if funding_category:\n if funding_category:\n
if funding_category == \'None\':\n if funding_category == \'None\':\n
params[\'funding_uid\'] = Query(funding_uid=None)\n params[\'funding_uid\'] = Query(funding_uid=None)\n
else:\n else:\n
params[\'funding_category\'] = funding_category\n params[\'funding_category\'] = funding_category\n
function_uid = kw.get(\'function_uid\')\n
if function_uid:\n
if function_uid == \'None\':\n
params[\'function_uid\'] = Query(function_uid=None)\n
else:\n
params[\'function_uid\'] = function_uid\n
function_category = kw.get(\'function_category\')\n function_category = kw.get(\'function_category\')\n
if function_category:\n if function_category:\n
if function_category == \'None\':\n if function_category == \'None\':\n
......
...@@ -67,36 +67,24 @@ if kw.get(\'node_uid\'):\n ...@@ -67,36 +67,24 @@ if kw.get(\'node_uid\'):\n
if kw.get(\'mirror_section_uid\'):\n if kw.get(\'mirror_section_uid\'):\n
params[\'mirror_section_uid\'] = kw[\'mirror_section_uid\']\n params[\'mirror_section_uid\'] = kw[\'mirror_section_uid\']\n
\n \n
payment_uid = kw.get(\'payment_uid\')\n category_uid_list = (\'payment_uid\', \'project_uid\', \'funding_uid\',\n
if payment_uid:\n \'function_uid\', \'payment_request_uid\')\n
if payment_uid == \'None\':\n for category_uid in category_uid_list:\n
params[\'payment_uid\'] = Query(payment_uid=None)\n category_uid_value = kw.get(category_uid)\n
if category_uid_value:\n
if category_uid_value == \'None\':\n
# XXX This query needs some clarification\n
# This query will be translated as stock.project_uid IS NULL\n
params[category_uid] = Query(None=None)\n
else:\n else:\n
params[\'payment_uid\'] = payment_uid\n params[category_uid] = category_uid_value\n
project_uid = kw.get(\'project_uid\')\n \n
if project_uid:\n
if project_uid == \'None\':\n
params[\'project_uid\'] = Query(project_uid=None)\n
else:\n
params[\'project_uid\'] = project_uid\n
funding_uid = kw.get(\'funding_uid\')\n
if funding_uid:\n
if funding_uid == \'None\':\n
params[\'funding_uid\'] = Query(funding_uid=None)\n
else:\n
params[\'funding_uid\'] = funding_uid\n
funding_category = kw.get(\'funding_category\')\n funding_category = kw.get(\'funding_category\')\n
if funding_category:\n if funding_category:\n
if funding_category == \'None\':\n if funding_category == \'None\':\n
params[\'funding_uid\'] = Query(funding_uid=None)\n params[\'funding_uid\'] = Query(funding_uid=None)\n
else:\n else:\n
params[\'funding_category\'] = funding_category\n params[\'funding_category\'] = funding_category\n
function_uid = kw.get(\'function_uid\')\n
if function_uid:\n
if function_uid == \'None\':\n
params[\'function_uid\'] = Query(function_uid=None)\n
else:\n
params[\'function_uid\'] = function_uid\n
function_category = kw.get(\'function_category\')\n function_category = kw.get(\'function_category\')\n
if function_category:\n if function_category:\n
if function_category == \'None\':\n if function_category == \'None\':\n
......
1563 1564
\ 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