Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lu Xu
slapos.core
Commits
3b3e9609
Commit
3b3e9609
authored
Dec 14, 2012
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Unused stop_date variable.
parent
07f138ec
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
37 deletions
+33
-37
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Person_getOpenSaleOrderDifference.xml
...s/slapos_accounting/Person_getOpenSaleOrderDifference.xml
+29
-31
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Person_storeOpenSaleOrderJournal.xml
...ns/slapos_accounting/Person_storeOpenSaleOrderJournal.xml
+2
-3
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Person_updateOpenSaleOrder.xml
...al_skins/slapos_accounting/Person_updateOpenSaleOrder.xml
+1
-2
master/bt5/slapos_accounting/bt/revision
master/bt5/slapos_accounting/bt/revision
+1
-1
No files found.
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Person_getOpenSaleOrderDifference.xml
View file @
3b3e9609
...
...
@@ -64,8 +64,6 @@ if add_kw_list is None:\n
add_kw_list = []\n
if start_date_tuple_list is None:\n
start_date_tuple_list = []\n
if stop_date is not None:\n
stop_date = DateTime(stop_date)\n
\n
previous_open_sale_order = portal.portal_catalog.getResultValue(\n
default_destination_uid=person.getUid(),\n
...
...
@@ -109,12 +107,12 @@ if previous_open_sale_order is not None:\n
for line in previous_open_sale_order.contentValues(portal_type=\'Open Sale Order Line\'):\n
old_stop_date = line.getStopDate()\n
if old_stop_date is not None:\n
if stop_date is not None and old_stop_date
< stop_date:
\n
modify_kw_kw.setdefault(line.getAggregate(
portal_type=
\'Hosting
Subscription\'),
{})\n
modify_kw_kw[line.getAggregate(
portal_type=
\'Hosting
Subscription\')].setdefault(\'explanation\',
[])\n
modify_kw_kw[line.getAggregate(
portal_type=
\'Hosting
Subscription\')][\'stop_date\']
=
stop_date\n
modify_kw_kw[line.getAggregate(
portal_type=
\'Hosting
Subscription\')][\'explanation\'].append(\'Set
stop
date
because
of
stop_date
%s\'
%
stop_date)\n
el
if
old_stop_date
<
now:\n
#
if stop_date is not None and old_stop_date
< stop_date:
\n
#
modify_kw_kw.setdefault(line.getAggregate(
portal_type=
\'Hosting
Subscription\'),
{})\n
#
modify_kw_kw[line.getAggregate(
portal_type=
\'Hosting
Subscription\')].setdefault(\'explanation\',
[])\n
#
modify_kw_kw[line.getAggregate(
portal_type=
\'Hosting
Subscription\')][\'stop_date\']
=
stop_date\n
#
modify_kw_kw[line.getAggregate(
portal_type=
\'Hosting
Subscription\')][\'explanation\'].append(\'Set
stop
date
because
of
stop_date
%s\'
%
stop_date)\n
if
old_stop_date
<
now:\n
new_stop_date =
addToDate(old_stop_date,
to_add=
{\'month\':
1})\n
while
new_stop_date
<
now:\n
new_stop_date =
addToDate(new_stop_date,
to_add=
{\'month\':
1})\n
...
...
@@ -125,10 +123,10 @@ if previous_open_sale_order is not None:\n
modify_kw_kw[line.getAggregate(
portal_type=
\'Hosting
Subscription\')][\'explanation\'].append(\'Set
stop
date
becase
of
new_stop_date
%s\'
%
new_stop_date)\n
\n
for
(key,
value)
in
add_kw_kw.copy().iteritems():\n
if
stop_date
is
not
None:\n
add_kw_kw[key][\'stop_date\']
=
stop_date\n
add_kw_kw[key][\'explanation\'].append(\'Set
stop
date
beacuse
of
stop_date
%s
\'
%
stop_date)\n
else:\n
#
if
stop_date
is
not
None:\n
#
add_kw_kw[key][\'stop_date\']
=
stop_date\n
#
add_kw_kw[key][\'explanation\'].append(\'Set
stop
date
beacuse
of
stop_date
%s
\'
%
stop_date)\n
#
else:\n
start_date =
add_kw_kw[key].get(\'start_date\')\n
if
start_date
is
not
None:\n
new_stop_date =
addToDate(start_date,
to_add=
{\'month\':
1})\n
...
...
@@ -138,10 +136,10 @@ for (key, value) in add_kw_kw.copy().iteritems():\n
add_kw_kw[key][\'explanation\'].append(\'Set
stop
date
because
of
new_stop_date
%s\'
%
new_stop_date)\n
\n
for
(key,
value)
in
modify_kw_kw.copy().iteritems():\n
if
stop_date
is
not
None:\n
modify_kw_kw[key][\'stop_date\']
=
stop_date\n
modify_kw_kw[key][\'explanation\'].append(\'Set
stop
date
because
of
stop_date
%s\'
%
stop_date)\n
else:\n
#
if
stop_date
is
not
None:\n
#
modify_kw_kw[key][\'stop_date\']
=
stop_date\n
#
modify_kw_kw[key][\'explanation\'].append(\'Set
stop
date
because
of
stop_date
%s\'
%
stop_date)\n
#
else:\n
start_date =
modify_kw_kw[key].get(\'start_date\')\n
if
start_date
is
not
None:\n
new_stop_date =
addToDate(start_date,
to_add=
{\'month\':
1})\n
...
...
@@ -170,7 +168,7 @@ return add_kw_kw, modify_kw_kw, list(remove_id_list)\n
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
remove_hosting_list=None, add_kw_list=None, st
op_date=None, st
art_date_tuple_list=None
</string>
</value>
<value>
<string>
remove_hosting_list=None, add_kw_list=None, start_date_tuple_list=None
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Person_storeOpenSaleOrderJournal.xml
View file @
3b3e9609
...
...
@@ -90,15 +90,14 @@ result = context.Person_updateOpenSaleOrder(\n
src__=src__,\n
remove_hosting_list=remove_hosting_list,\n
add_kw_list=add_kw_list,\n
start_date_tuple_list=start_date_tuple_list,\n
stop_date=stop_date)\n
start_date_tuple_list=start_date_tuple_list)\n
from pprint import pformat\n
return pformat(result)\n
</string>
</value>
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
src__=0
, stop_date=None
</string>
</value>
<value>
<string>
src__=0
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Person_updateOpenSaleOrder.xml
View file @
3b3e9609
...
...
@@ -68,7 +68,6 @@ def storeWorkflowComment(document, comment):\n
add_kw_kw, modify_kw_kw, remove_id_list = context.Person_getOpenSaleOrderDifference(\n
remove_hosting_list=remove_hosting_list,\n
add_kw_list=add_kw_list,\n
stop_date=stop_date,\n
start_date_tuple_list=start_date_tuple_list)\n
\n
if src__== 1:\n
...
...
@@ -133,7 +132,7 @@ return add_kw_kw, modify_kw_kw, remove_id_list\n
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
src__=0, remove_hosting_list=None, add_kw_list=None, st
op_date=None, st
art_date_tuple_list=None
</string>
</value>
<value>
<string>
src__=0, remove_hosting_list=None, add_kw_list=None, start_date_tuple_list=None
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
master/bt5/slapos_accounting/bt/revision
View file @
3b3e9609
222
\ No newline at end of file
223
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment