Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
c3215b74
Commit
c3215b74
authored
May 22, 2015
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Always update base contributions when setting a resource on a movement
parent
6af58790
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
15 deletions
+16
-15
bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/interactions/setBaseContribution.xml
...interaction_workflow/interactions/setBaseContribution.xml
+1
-1
product/ERP5/Document/DeliveryLine.py
product/ERP5/Document/DeliveryLine.py
+15
-14
No files found.
bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/interactions/setBaseContribution.xml
View file @
c3215b74
...
@@ -62,7 +62,7 @@
...
@@ -62,7 +62,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
once_per_transaction
</string>
</key>
<key>
<string>
once_per_transaction
</string>
</key>
<value>
<int>
1
</int>
</value>
<value>
<int>
0
</int>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
portal_type_filter
</string>
</key>
<key>
<string>
portal_type_filter
</string>
</key>
...
...
product/ERP5/Document/DeliveryLine.py
View file @
c3215b74
...
@@ -32,12 +32,15 @@ from AccessControl import ClassSecurityInfo
...
@@ -32,12 +32,15 @@ from AccessControl import ClassSecurityInfo
from
Products.ERP5Type
import
Permissions
,
PropertySheet
,
interfaces
from
Products.ERP5Type
import
Permissions
,
PropertySheet
,
interfaces
from
Products.ERP5Type.XMLMatrix
import
XMLMatrix
from
Products.ERP5Type.XMLMatrix
import
XMLMatrix
from
Products.ERP5Type.XMLObject
import
XMLObject
from
Products.ERP5.Document.Movement
import
Movement
from
Products.ERP5.Document.Movement
import
Movement
from
Products.ERP5.Document.ImmobilisationMovement
import
ImmobilisationMovement
from
Products.ERP5.Document.ImmobilisationMovement
import
ImmobilisationMovement
class
DeliveryLine
(
Movement
,
XMLObject
,
XMLMatrix
,
ImmobilisationMovement
):
from
inspect
import
getargspec
from
Products.ERP5Type.Base
import
Base
edit_args_list
=
getargspec
(
Base
.
_edit
).
args
class
DeliveryLine
(
Movement
,
XMLMatrix
,
ImmobilisationMovement
):
"""
"""
A DeliveryLine object allows to implement lines in
A DeliveryLine object allows to implement lines in
Deliveries (packing list, order, invoice, etc.)
Deliveries (packing list, order, invoice, etc.)
...
@@ -74,8 +77,7 @@ class DeliveryLine(Movement, XMLObject, XMLMatrix, ImmobilisationMovement):
...
@@ -74,8 +77,7 @@ class DeliveryLine(Movement, XMLObject, XMLMatrix, ImmobilisationMovement):
updateRelatedContent
=
XMLMatrix
.
updateRelatedContent
updateRelatedContent
=
XMLMatrix
.
updateRelatedContent
# Force in _edit to modify variation_base_category_list first
# Force in _edit to modify variation_base_category_list first
security
.
declarePrivate
(
'_edit'
)
def
_edit
(
self
,
edit_order
=
(),
**
kw
):
def
_edit
(
self
,
REQUEST
=
None
,
force_update
=
0
,
**
kw
):
# XXX FIXME For now, special cases are handled in _edit methods in many
# XXX FIXME For now, special cases are handled in _edit methods in many
# documents : DeliveryLine, DeliveryCell ... Ideally, to prevent code
# documents : DeliveryLine, DeliveryCell ... Ideally, to prevent code
# duplication, it should be handled in a _edit method present only in
# duplication, it should be handled in a _edit method present only in
...
@@ -83,16 +85,15 @@ class DeliveryLine(Movement, XMLObject, XMLMatrix, ImmobilisationMovement):
...
@@ -83,16 +85,15 @@ class DeliveryLine(Movement, XMLObject, XMLMatrix, ImmobilisationMovement):
# If variations and resources are set at the same time, resource must be
# If variations and resources are set at the same time, resource must be
# set before any variation.
# set before any variation.
if
kw
.
has_key
(
'resource_value'
):
before_order
=
(
'resource'
,
'resource_value'
,
self
.
_setResourceValue
(
kw
[
'resource_value'
]
)
'variation_base_category_list'
,
# We must first prepare the variation_base_category_list before we do the edit of the rest
'variation_category_list'
)
#LOG('in edit', 0, str(kw))
before_kw
=
{
k
:
kw
.
pop
(
k
)
for
k
in
before_order
if
k
in
kw
}
if
kw
.
has_key
(
'variation_base_category_list'
):
if
before_kw
:
self
.
_setVariationBaseCategoryList
(
kw
[
'variation_base_category_list'
]
)
before_kw
.
update
((
k
,
kw
[
k
])
for
k
in
edit_args_list
if
k
in
kw
)
if
kw
.
has_key
(
'variation_category_list'
):
Base
.
_edit
(
self
,
edit_order
=
before_order
,
**
before_kw
)
self
.
_setVariationCategoryList
(
kw
[
'variation_category_list'
]
)
if
kw
:
Movement
.
_edit
(
self
,
REQUEST
=
REQUEST
,
Movement
.
_edit
(
self
,
edit_order
=
edit_order
,
**
kw
)
force_update
=
force_update
,
**
kw
)
# We must check if the user has changed the resource of particular line
# We must check if the user has changed the resource of particular line
security
.
declareProtected
(
Permissions
.
ModifyPortalContent
,
'edit'
)
security
.
declareProtected
(
Permissions
.
ModifyPortalContent
,
'edit'
)
...
...
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