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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xiaowu Zhang
erp5
Commits
2f5f781b
Commit
2f5f781b
authored
May 10, 2018
by
Arnaud Fontaine
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_real_time_inventory_accounting: Group Accounting Transaction Lines per parent PL Resource.
parent
5312f641
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
79 additions
and
12 deletions
+79
-12
bt5/erp5_real_time_inventory_accounting/PathTemplateItem/portal_deliveries/inventory_asset_price_accounting_transaction_builder/parent_delivery_resource_movement_group.xml
...ction_builder/parent_delivery_resource_movement_group.xml
+55
-0
bt5/erp5_real_time_inventory_accounting_test/TestTemplateItem/portal_components/test.erp5.testRealTimeInventoryAccounting.py
...l_components/test.erp5.testRealTimeInventoryAccounting.py
+24
-12
No files found.
bt5/erp5_real_time_inventory_accounting/PathTemplateItem/portal_deliveries/inventory_asset_price_accounting_transaction_builder/parent_delivery_resource_movement_group.xml
0 → 100644
View file @
2f5f781b
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Parent Delivery Property Movement Group"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
categories
</string>
</key>
<value>
<tuple>
<string>
divergence_scope/category
</string>
<string>
collect_order_group/line
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
parent_delivery_resource_movement_group
</string>
</value>
</item>
<item>
<key>
<string>
int_index
</string>
</key>
<value>
<int>
3
</int>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Parent Delivery Property Movement Group
</string>
</value>
</item>
<item>
<key>
<string>
tested_property
</string>
</key>
<value>
<tuple>
<string>
resource
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Parent Delivery Resource Movement Group
</string>
</value>
</item>
<item>
<key>
<string>
update_always
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_real_time_inventory_accounting_test/TestTemplateItem/portal_components/test.erp5.testRealTimeInventoryAccounting.py
View file @
2f5f781b
...
@@ -744,12 +744,16 @@ class TestRealTimeInventoryAccounting(ERP5TypeTestCase, TestRealTimeInventoryAcc
...
@@ -744,12 +744,16 @@ class TestRealTimeInventoryAccounting(ERP5TypeTestCase, TestRealTimeInventoryAcc
movement_property_dict_tuple
=
(
movement_property_dict_tuple
=
(
dict
(
portal_type
=
'Accounting Transaction Line'
,
dict
(
portal_type
=
'Accounting Transaction Line'
,
source_value
=
self
.
portal
.
account_module
.
stock_parts_port
,
source_value
=
self
.
portal
.
account_module
.
stock_parts_port
,
# sum(PPLL.price)
quantity
=-
6000
),
quantity
=-
14000
),
dict
(
portal_type
=
'Accounting Transaction Line'
,
dict
(
portal_type
=
'Accounting Transaction Line'
,
source_value
=
self
.
portal
.
account_module
.
variation_parts
,
source_value
=
self
.
portal
.
account_module
.
variation_parts
,
# sum(PPLL.price)
quantity
=
6000
),
quantity
=
14000
)))
dict
(
portal_type
=
'Accounting Transaction Line'
,
source_value
=
self
.
portal
.
account_module
.
stock_parts_port
,
quantity
=-
8000
),
dict
(
portal_type
=
'Accounting Transaction Line'
,
source_value
=
self
.
portal
.
account_module
.
variation_parts
,
quantity
=
8000
)))
elif
accounting_transaction
.
getLedgerValue
()
==
self
.
portal
.
portal_categories
.
ledger
.
stock
.
transit
.
entree
:
elif
accounting_transaction
.
getLedgerValue
()
==
self
.
portal
.
portal_categories
.
ledger
.
stock
.
transit
.
entree
:
self
.
_checkDelivery
(
self
.
_checkDelivery
(
...
@@ -763,12 +767,16 @@ class TestRealTimeInventoryAccounting(ERP5TypeTestCase, TestRealTimeInventoryAcc
...
@@ -763,12 +767,16 @@ class TestRealTimeInventoryAccounting(ERP5TypeTestCase, TestRealTimeInventoryAcc
movement_property_dict_tuple
=
(
movement_property_dict_tuple
=
(
dict
(
portal_type
=
'Accounting Transaction Line'
,
dict
(
portal_type
=
'Accounting Transaction Line'
,
source_value
=
self
.
portal
.
account_module
.
stock_parts_transit
,
source_value
=
self
.
portal
.
account_module
.
stock_parts_transit
,
# sum(PPLL.price)
quantity
=-
6000
),
quantity
=-
14000
),
dict
(
portal_type
=
'Accounting Transaction Line'
,
source_value
=
self
.
portal
.
account_module
.
variation_parts
,
quantity
=
6000
),
dict
(
portal_type
=
'Accounting Transaction Line'
,
source_value
=
self
.
portal
.
account_module
.
stock_parts_transit
,
quantity
=-
8000
),
dict
(
portal_type
=
'Accounting Transaction Line'
,
dict
(
portal_type
=
'Accounting Transaction Line'
,
source_value
=
self
.
portal
.
account_module
.
variation_parts
,
source_value
=
self
.
portal
.
account_module
.
variation_parts
,
# sum(PPLL.price)
quantity
=
8000
)))
quantity
=
14000
)))
# ledger/stock/transit/sortie
# ledger/stock/transit/sortie
else
:
else
:
...
@@ -784,12 +792,16 @@ class TestRealTimeInventoryAccounting(ERP5TypeTestCase, TestRealTimeInventoryAcc
...
@@ -784,12 +792,16 @@ class TestRealTimeInventoryAccounting(ERP5TypeTestCase, TestRealTimeInventoryAcc
movement_property_dict_tuple
=
(
movement_property_dict_tuple
=
(
dict
(
portal_type
=
'Accounting Transaction Line'
,
dict
(
portal_type
=
'Accounting Transaction Line'
,
source_value
=
self
.
portal
.
account_module
.
stock_parts_transit
,
source_value
=
self
.
portal
.
account_module
.
stock_parts_transit
,
# sum(PPLL.price)
quantity
=
6000
),
quantity
=
14000
),
dict
(
portal_type
=
'Accounting Transaction Line'
,
source_value
=
self
.
portal
.
account_module
.
variation_parts
,
quantity
=-
6000
),
dict
(
portal_type
=
'Accounting Transaction Line'
,
source_value
=
self
.
portal
.
account_module
.
stock_parts_transit
,
quantity
=
8000
),
dict
(
portal_type
=
'Accounting Transaction Line'
,
dict
(
portal_type
=
'Accounting Transaction Line'
,
source_value
=
self
.
portal
.
account_module
.
variation_parts
,
source_value
=
self
.
portal
.
account_module
.
variation_parts
,
# sum(PPLL.price)
quantity
=-
8000
)))
quantity
=-
14000
)))
def
testPurchasePackingList
(
self
):
def
testPurchasePackingList
(
self
):
sequence_list
=
SequenceList
()
sequence_list
=
SequenceList
()
...
...
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