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
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
Thomas Gambier
erp5
Commits
f11c6953
Commit
f11c6953
authored
Feb 17, 2015
by
Sebastien Robin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mrp: conflicting code was not solved properly
parent
69bf1c30
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
11 deletions
+0
-11
product/ERP5/tests/testMRP.py
product/ERP5/tests/testMRP.py
+0
-11
No files found.
product/ERP5/tests/testMRP.py
View file @
f11c6953
...
...
@@ -131,17 +131,6 @@ class TestMRPMixin(TestBPMMixin):
resource
=
transformation
.
getResource
(),
specialise_value
=
transformation
)
return
order
<<<<<<<
HEAD
@
reindex
def
createDefaultTransformation
(
self
):
resource1
=
self
.
createProduct
(
id
=
'1'
,
quantity_unit_list
=
[
'weight/kg'
])
resource2
=
self
.
createProduct
(
id
=
'2'
,
quantity_unit_list
=
[
'weight/kg'
])
resource3
=
self
.
createProduct
(
id
=
'3'
,
quantity_unit_list
=
[
'weight/kg'
])
resource4
=
self
.
createProduct
(
id
=
'4'
,
quantity_unit_list
=
[
'weight/kg'
])
resource5
=
self
.
createProduct
(
id
=
'5'
,
quantity_unit_list
=
[
'weight/kg'
])
=======
>>>>>>>
f2130ed
...
Reimplement
MRP
for
new
simulation
def
createDefaultTransformation
(
self
):
resource
=
lambda
:
self
.
createProduct
(
quantity_unit_list
=
[
'weight/kg'
])
...
...
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