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
Ekaterina
erp5
Commits
b24039c3
Commit
b24039c3
authored
Feb 01, 2013
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make related keys against stock instead of movement when possible
parent
9279e90f
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
18 additions
and
21 deletions
+18
-21
bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_stock_line.xml
...ql_innodb/z_related_accounting_transaction_stock_line.xml
+2
-4
bt5/erp5_accounting_alternate_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml
...atalog/CatalogRelatedKeyTemplateItem/related_key_list.xml
+2
-2
bt5/erp5_accounting_alternate_catalog/bt/revision
bt5/erp5_accounting_alternate_catalog/bt/revision
+1
-1
bt5/erp5_accounting_alternate_catalog/bt/template_catalog_related_key_list
...ng_alternate_catalog/bt/template_catalog_related_key_list
+2
-2
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getBySiteCurrentStockList.xml
...ortal_skins/erp5_trade/Base_getBySiteCurrentStockList.xml
+0
-1
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_from_stock.catalog_keys.xml
...sql_innodb/z_related_resource_from_stock.catalog_keys.xml
+0
-0
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_from_stock.xml
...talog/erp5_mysql_innodb/z_related_resource_from_stock.xml
+1
-1
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml
...atalog/CatalogRelatedKeyTemplateItem/related_key_list.xml
+4
-4
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
+1
-1
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list
...5_mysql_innodb_catalog/bt/template_catalog_method_id_list
+1
-1
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_related_key_list
...mysql_innodb_catalog/bt/template_catalog_related_key_list
+4
-4
No files found.
bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_stock_line.xml
View file @
b24039c3
...
@@ -8,8 +8,7 @@
...
@@ -8,8 +8,7 @@
<dictionary>
<dictionary>
<item>
<item>
<key>
<string>
arguments_src
</string>
</key>
<key>
<string>
arguments_src
</string>
</key>
<value>
<string>
table_0\r\n
<value>
<string>
table_0
</string>
</value>
table_1
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
connection_id
</string>
</key>
<key>
<string>
connection_id
</string>
</key>
...
@@ -23,8 +22,7 @@ table_1</string> </value>
...
@@ -23,8 +22,7 @@ table_1</string> </value>
<key>
<string>
src
</string>
</key>
<key>
<string>
src
</string>
</key>
<value>
<string
encoding=
"cdata"
>
<![CDATA[
<value>
<string
encoding=
"cdata"
>
<![CDATA[
accounting_transaction.uid = <dtml-var table_0>
.explanation_uid\n
accounting_transaction.uid = <dtml-var table_0>
.explanation_uid
AND
<dtml-var
table_0
>
.uid =
<dtml-var
table_1
>
.uid
]]>
</string>
</value>
]]>
</string>
</value>
</item>
</item>
...
...
bt5/erp5_accounting_alternate_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml
View file @
b24039c3
<key_list>
<key_list>
<key>
accounting_transaction_line_node_uid |
movement,
stock/node_uid/z_related_accounting_transaction_stock_line
</key>
<key>
accounting_transaction_line_node_uid | stock/node_uid/z_related_accounting_transaction_stock_line
</key>
<key>
accounting_transaction_line_total_price |
movement,
stock/total_price/z_related_accounting_transaction_stock_line
</key>
<key>
accounting_transaction_line_total_price | stock/total_price/z_related_accounting_transaction_stock_line
</key>
<key>
accounting_transaction_mirror_section_title | catalog/title/z_related_accounting_transaction_mirror_section
</key>
<key>
accounting_transaction_mirror_section_title | catalog/title/z_related_accounting_transaction_mirror_section
</key>
<key>
accounting_transaction_payment_title | catalog/title/z_related_accounting_transaction_payment
</key>
<key>
accounting_transaction_payment_title | catalog/title/z_related_accounting_transaction_payment
</key>
<key>
accounting_transaction_project_title | catalog/title/z_related_accounting_transaction_project
</key>
<key>
accounting_transaction_project_title | catalog/title/z_related_accounting_transaction_project
</key>
...
...
bt5/erp5_accounting_alternate_catalog/bt/revision
View file @
b24039c3
3
4
\ No newline at end of file
\ No newline at end of file
bt5/erp5_accounting_alternate_catalog/bt/template_catalog_related_key_list
View file @
b24039c3
accounting_transaction_mirror_section_title | catalog/title/z_related_accounting_transaction_mirror_section
accounting_transaction_mirror_section_title | catalog/title/z_related_accounting_transaction_mirror_section
accounting_transaction_project_title | catalog/title/z_related_accounting_transaction_project
accounting_transaction_project_title | catalog/title/z_related_accounting_transaction_project
accounting_transaction_payment_title | catalog/title/z_related_accounting_transaction_payment
accounting_transaction_payment_title | catalog/title/z_related_accounting_transaction_payment
accounting_transaction_line_node_uid | movement,stock/node_uid/z_related_accounting_transaction_stock_line
accounting_transaction_line_node_uid | stock/node_uid/z_related_accounting_transaction_stock_line
accounting_transaction_line_total_price | movement,stock/total_price/z_related_accounting_transaction_stock_line
accounting_transaction_line_total_price | stock/total_price/z_related_accounting_transaction_stock_line
\ No newline at end of file
\ No newline at end of file
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getBySiteCurrentStockList.xml
View file @
b24039c3
...
@@ -80,7 +80,6 @@ for x in context.portal_simulation.getCurrentInventoryList(\n
...
@@ -80,7 +80,6 @@ for x in context.portal_simulation.getCurrentInventoryList(\n
group_by_variation=1,\n
group_by_variation=1,\n
group_by_node=0,\n
group_by_node=0,\n
at_date=at_date,\n
at_date=at_date,\n
# XXX resourceType= uses movement table.\n
# resource_portal_type= does not work with cells (because resource is acquired from line)\n
# resource_portal_type= does not work with cells (because resource is acquired from line)\n
resourceType=context.getPortalProductTypeList(), **kw):\n
resourceType=context.getPortalProductTypeList(), **kw):\n
if positive_stock and negative_stock and not zero_stock and x.inventory == 0:\n
if positive_stock and negative_stock and not zero_stock and x.inventory == 0:\n
...
...
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_from_
movement
.catalog_keys.xml
→
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_from_
stock
.catalog_keys.xml
View file @
b24039c3
File moved
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_from_
movement
.xml
→
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_from_
stock
.xml
View file @
b24039c3
...
@@ -41,7 +41,7 @@ table_1</string> </value>
...
@@ -41,7 +41,7 @@ table_1</string> </value>
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
z_related_resource_from_
movement
</string>
</value>
<value>
<string>
z_related_resource_from_
stock
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
max_cache_
</string>
</key>
<key>
<string>
max_cache_
</string>
</key>
...
...
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml
View file @
b24039c3
...
@@ -3,9 +3,9 @@
...
@@ -3,9 +3,9 @@
<key>
career_skill_id | category,catalog,catalog/id/z_related_career_skill
</key>
<key>
career_skill_id | category,catalog,catalog/id/z_related_career_skill
</key>
<key>
career_skill_title | category,catalog,catalog/title/z_related_career_skill
</key>
<key>
career_skill_title | category,catalog,catalog/title/z_related_career_skill
</key>
<key>
children_reference | catalog/reference/z_related_children
</key>
<key>
children_reference | catalog/reference/z_related_children
</key>
<key>
deliveryLineType |
movement
,catalog/portal_type/z_related_uid_or_parent_uid
</key>
<key>
deliveryLineType |
stock
,catalog/portal_type/z_related_uid_or_parent_uid
</key>
<key>
explanation_portal_type |
movement
,catalog/portal_type/z_related_explanation
</key>
<key>
explanation_portal_type |
stock
,catalog/portal_type/z_related_explanation
</key>
<key>
explanation_simulation_state |
movement
,catalog/simulation_state/z_related_explanation
</key>
<key>
explanation_simulation_state |
stock
,catalog/simulation_state/z_related_explanation
</key>
<key>
grand_grand_grand_grand_grand_parent_simulation_state | catalog,catalog,catalog,catalog,catalog,catalog/simulation_state/z_related_grand_grand_grand_grand_grand_parent
</key>
<key>
grand_grand_grand_grand_grand_parent_simulation_state | catalog,catalog,catalog,catalog,catalog,catalog/simulation_state/z_related_grand_grand_grand_grand_grand_parent
</key>
<key>
grand_grand_grand_grand_parent_specialise_portal_type | category,catalog,catalog,catalog,catalog,catalog/portal_type/z_related_grand_grand_grand_grand_parent_specialise
</key>
<key>
grand_grand_grand_grand_parent_specialise_portal_type | category,catalog,catalog,catalog,catalog,catalog/portal_type/z_related_grand_grand_grand_grand_parent_specialise
</key>
<key>
grand_grand_grand_grand_parent_specialise_reference | category,catalog,catalog,catalog,catalog,catalog/reference/z_related_grand_grand_grand_grand_parent_specialise
</key>
<key>
grand_grand_grand_grand_parent_specialise_reference | category,catalog,catalog,catalog,catalog,catalog/reference/z_related_grand_grand_grand_grand_parent_specialise
</key>
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
<key>
predicate_category_category_uid | predicate_category/category_uid/z_related_predicate_category
</key>
<key>
predicate_category_category_uid | predicate_category/category_uid/z_related_predicate_category
</key>
<key>
predicate_uid | predicate/uid/z_related_predicate
</key>
<key>
predicate_uid | predicate/uid/z_related_predicate
</key>
<key>
related_resource_from_use_category_uid | category,category/category_uid/z_related_resource_from_use
</key>
<key>
related_resource_from_use_category_uid | category,category/category_uid/z_related_resource_from_use
</key>
<key>
resourceType |
movement,catalog/portal_type/z_related_resource_from_movement
</key>
<key>
resourceType |
stock,catalog/portal_type/z_related_resource_from_stock
</key>
<key>
stock_function_category_strict_membership_uid | category/category_uid/z_related_strict_membership_function_uid_from_stock
</key>
<key>
stock_function_category_strict_membership_uid | category/category_uid/z_related_strict_membership_function_uid_from_stock
</key>
<key>
stock_function_category_uid | category/category_uid/z_related_function_uid_from_stock
</key>
<key>
stock_function_category_uid | category/category_uid/z_related_function_uid_from_stock
</key>
<key>
stock_funding_category_strict_membership_uid | category/category_uid/z_related_strict_membership_funding_uid_from_stock
</key>
<key>
stock_funding_category_strict_membership_uid | category/category_uid/z_related_strict_membership_funding_uid_from_stock
</key>
...
...
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
View file @
b24039c3
244
251
\ No newline at end of file
\ No newline at end of file
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list
View file @
b24039c3
...
@@ -109,7 +109,7 @@ erp5_mysql_innodb/z_related_payment_uid_from_stock
...
@@ -109,7 +109,7 @@ erp5_mysql_innodb/z_related_payment_uid_from_stock
erp5_mysql_innodb/z_related_predicate
erp5_mysql_innodb/z_related_predicate
erp5_mysql_innodb/z_related_predicate_category
erp5_mysql_innodb/z_related_predicate_category
erp5_mysql_innodb/z_related_project_uid_from_stock
erp5_mysql_innodb/z_related_project_uid_from_stock
erp5_mysql_innodb/z_related_resource_from_
movement
erp5_mysql_innodb/z_related_resource_from_
stock
erp5_mysql_innodb/z_related_resource_from_use
erp5_mysql_innodb/z_related_resource_from_use
erp5_mysql_innodb/z_related_resource_uid_from_item
erp5_mysql_innodb/z_related_resource_uid_from_item
erp5_mysql_innodb/z_related_resource_uid_from_stock
erp5_mysql_innodb/z_related_resource_uid_from_stock
...
...
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_related_key_list
View file @
b24039c3
...
@@ -6,8 +6,8 @@ translated_opportunity_state | translation/translated_message/z_related_translat
...
@@ -6,8 +6,8 @@ translated_opportunity_state | translation/translated_message/z_related_translat
translated_opportunity_state_title | translation/translated_message/z_related_translated_opportunity_state_title
translated_opportunity_state_title | translation/translated_message/z_related_translated_opportunity_state_title
career_skill_title | category,catalog,catalog/title/z_related_career_skill
career_skill_title | category,catalog,catalog/title/z_related_career_skill
stock_payment_category_uid | category/category_uid/z_related_payment_uid_from_stock
stock_payment_category_uid | category/category_uid/z_related_payment_uid_from_stock
explanation_portal_type |
movement
,catalog/portal_type/z_related_explanation
explanation_portal_type |
stock
,catalog/portal_type/z_related_explanation
explanation_simulation_state |
movement
,catalog/simulation_state/z_related_explanation
explanation_simulation_state |
stock
,catalog/simulation_state/z_related_explanation
stock_payment_category_strict_membership_uid | category/category_uid/z_related_strict_membership_payment_uid_from_stock
stock_payment_category_strict_membership_uid | category/category_uid/z_related_strict_membership_payment_uid_from_stock
stock_resource_category_strict_membership_uid | category/category_uid/z_related_strict_membership_resource_uid_from_stock
stock_resource_category_strict_membership_uid | category/category_uid/z_related_strict_membership_resource_uid_from_stock
translated_portal_type | translation/translated_message/z_related_translated_portal_type
translated_portal_type | translation/translated_message/z_related_translated_portal_type
...
@@ -30,11 +30,11 @@ stock_function_category_strict_membership_uid | category/category_uid/z_related_
...
@@ -30,11 +30,11 @@ stock_function_category_strict_membership_uid | category/category_uid/z_related_
stock_function_category_uid | category/category_uid/z_related_function_uid_from_stock
stock_function_category_uid | category/category_uid/z_related_function_uid_from_stock
stock_project_category_strict_membership_uid | category/category_uid/z_related_strict_membership_project_uid_from_stock
stock_project_category_strict_membership_uid | category/category_uid/z_related_strict_membership_project_uid_from_stock
stock_project_category_uid | category/category_uid/z_related_project_uid_from_stock
stock_project_category_uid | category/category_uid/z_related_project_uid_from_stock
deliveryLineType |
movement
,catalog/portal_type/z_related_uid_or_parent_uid
deliveryLineType |
stock
,catalog/portal_type/z_related_uid_or_parent_uid
item_section_category_uid | category/category_uid/z_related_section_uid_from_item
item_section_category_uid | category/category_uid/z_related_section_uid_from_item
parent_specialise_portal_type | category,catalog/portal_type/z_related_parent_specialise
parent_specialise_portal_type | category,catalog/portal_type/z_related_parent_specialise
parent_relative_url | catalog/relative_url/z_related_parent
parent_relative_url | catalog/relative_url/z_related_parent
resourceType |
movement,catalog/portal_type/z_related_resource_from_movement
resourceType |
stock,catalog/portal_type/z_related_resource_from_stock
grand_parent_portal_type | catalog,catalog/portal_type/z_related_grand_parent
grand_parent_portal_type | catalog,catalog/portal_type/z_related_grand_parent
variationCategory | category/category_uid/z_related_uid
variationCategory | category/category_uid/z_related_uid
translated_validation_state | translation/translated_message/z_related_translated_validation_state
translated_validation_state | translation/translated_message/z_related_translated_validation_state
...
...
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