Commit 5659cbd5 authored by Romain Courteaud's avatar Romain Courteaud 🐙

slapos_accounting:

* add source_project constraint on all portal type requiring a ledger
* set the source_project on the open sale order
* propagate source_project in the simulation/builder
* remove source_project constraint from the ledger property sheet
* add SlapOSVirtualMasterSourceProjectConstraint on all accounting portal types
parent 382d48e6
...@@ -42,6 +42,8 @@ ...@@ -42,6 +42,8 @@
<string>destination</string> <string>destination</string>
<string>source_section</string> <string>source_section</string>
<string>destination_section</string> <string>destination_section</string>
<string>source_project</string>
<string>destination_project</string>
<string>price_currency</string> <string>price_currency</string>
<string>source_decision</string> <string>source_decision</string>
<string>destination_decision</string> <string>destination_decision</string>
......
...@@ -41,6 +41,8 @@ ...@@ -41,6 +41,8 @@
<string>destination</string> <string>destination</string>
<string>source_section</string> <string>source_section</string>
<string>destination_section</string> <string>destination_section</string>
<string>source_project</string>
<string>destination_project</string>
<string>price_currency</string> <string>price_currency</string>
<string>ledger</string> <string>ledger</string>
</tuple> </tuple>
......
...@@ -41,6 +41,8 @@ ...@@ -41,6 +41,8 @@
<string>destination</string> <string>destination</string>
<string>source_section</string> <string>source_section</string>
<string>destination_section</string> <string>destination_section</string>
<string>source_project</string>
<string>destination_project</string>
<string>source_decision</string> <string>source_decision</string>
<string>destination_decision</string> <string>destination_decision</string>
<string>price_currency</string> <string>price_currency</string>
......
<property_sheet_list> <property_sheet_list>
<portal_type id="Accounting Transaction"> <portal_type id="Accounting Transaction">
<item>SlapOSLedgerConstraint</item> <item>SlapOSLedgerConstraint</item>
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type> </portal_type>
<portal_type id="Amortisation Transaction"> <portal_type id="Amortisation Transaction">
<item>SlapOSLedgerConstraint</item> <item>SlapOSLedgerConstraint</item>
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type> </portal_type>
<portal_type id="Balance Transaction"> <portal_type id="Balance Transaction">
<item>SlapOSLedgerConstraint</item> <item>SlapOSLedgerConstraint</item>
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type> </portal_type>
<portal_type id="Cloud Contract"> <portal_type id="Cloud Contract">
<item>SlapOSCloudContractAccounting</item> <item>SlapOSCloudContractAccounting</item>
...@@ -23,27 +26,33 @@ ...@@ -23,27 +26,33 @@
</portal_type> </portal_type>
<portal_type id="Internal Invoice Transaction"> <portal_type id="Internal Invoice Transaction">
<item>SlapOSLedgerConstraint</item> <item>SlapOSLedgerConstraint</item>
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type> </portal_type>
<portal_type id="Open Sale Order"> <portal_type id="Open Sale Order">
<item>SlapOSAccountingOpenSaleOrderConstraint</item> <item>SlapOSAccountingOpenSaleOrderConstraint</item>
<item>SlapOSLedgerConstraint</item> <item>SlapOSLedgerConstraint</item>
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type> </portal_type>
<portal_type id="Open Sale Order Line"> <portal_type id="Open Sale Order Line">
<item>SlapOSAccountingOpenSaleOrderLineConstraint</item> <item>SlapOSAccountingOpenSaleOrderLineConstraint</item>
</portal_type> </portal_type>
<portal_type id="Payment Transaction"> <portal_type id="Payment Transaction">
<item>SlapOSLedgerConstraint</item> <item>SlapOSLedgerConstraint</item>
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type> </portal_type>
<portal_type id="Purchase Invoice Transaction"> <portal_type id="Purchase Invoice Transaction">
<item>SlapOSLedgerConstraint</item> <item>SlapOSLedgerConstraint</item>
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type> </portal_type>
<portal_type id="Sale Invoice Transaction"> <portal_type id="Sale Invoice Transaction">
<item>SlapOSAccountingSaleInvoiceTransactionConstraint</item> <item>SlapOSAccountingSaleInvoiceTransactionConstraint</item>
<item>SlapOSLedgerConstraint</item> <item>SlapOSLedgerConstraint</item>
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type> </portal_type>
<portal_type id="Sale Packing List"> <portal_type id="Sale Packing List">
<item>SlapOSAccountingSalePackingListConstraint</item> <item>SlapOSAccountingSalePackingListConstraint</item>
<item>SlapOSLedgerConstraint</item> <item>SlapOSLedgerConstraint</item>
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type> </portal_type>
<portal_type id="Sale Packing List Line"> <portal_type id="Sale Packing List Line">
<item>SlapOSAccountingSalePackingListLineConstraint</item> <item>SlapOSAccountingSalePackingListLineConstraint</item>
......
...@@ -28,6 +28,7 @@ def newOpenOrder(): ...@@ -28,6 +28,7 @@ def newOpenOrder():
destination_decision=person.getRelativeUrl(), destination_decision=person.getRelativeUrl(),
title="%s SlapOS Subscription" % person.getTitle(), title="%s SlapOS Subscription" % person.getTitle(),
ledger_value=portal.portal_categories.ledger.automated, ledger_value=portal.portal_categories.ledger.automated,
source_project_value=instance_tree.getFollowUpValue(),
) )
new_open_sale_order.order(activate_kw=activate_kw) new_open_sale_order.order(activate_kw=activate_kw)
......
...@@ -67,8 +67,10 @@ for movement in movement_list: ...@@ -67,8 +67,10 @@ for movement in movement_list:
source=movement.getSource(), source=movement.getSource(),
destination=movement.getDestination(), destination=movement.getDestination(),
source_section=movement.getSourceSection(), source_section=movement.getSourceSection(),
source_project=movement.getSourceProject(),
destination_section=movement.getDestination(), destination_section=movement.getDestination(),
destination_decision=movement.getDestination(), destination_decision=movement.getDestination(),
destination_project=movement.getDestinationProject(),
ledger=movement.getLedger(), ledger=movement.getLedger(),
specialise=specialise, specialise=specialise,
price_currency=movement.getPriceCurrency(), price_currency=movement.getPriceCurrency(),
......
...@@ -9,7 +9,9 @@ def newPackingList(movement, causality, message): ...@@ -9,7 +9,9 @@ def newPackingList(movement, causality, message):
source=movement.getSource(), source=movement.getSource(),
destination=movement.getDestination(), destination=movement.getDestination(),
source_section=movement.getSourceSection(), source_section=movement.getSourceSection(),
source_project=movement.getSourceProject(),
destination_section=movement.getDestination(), destination_section=movement.getDestination(),
destination_project=movement.getDestinationProject(),
destination_decision=movement.getDestination(), destination_decision=movement.getDestination(),
specialise=movement.getSpecialise(), specialise=movement.getSpecialise(),
price_currency=movement.getPriceCurrency(), price_currency=movement.getPriceCurrency(),
......
Accounting Transaction | SlapOSLedgerConstraint Accounting Transaction | SlapOSLedgerConstraint
Accounting Transaction | SlapOSVirtualMasterSourceProjectConstraint
Amortisation Transaction | SlapOSLedgerConstraint Amortisation Transaction | SlapOSLedgerConstraint
Amortisation Transaction | SlapOSVirtualMasterSourceProjectConstraint
Balance Transaction | SlapOSLedgerConstraint Balance Transaction | SlapOSLedgerConstraint
Balance Transaction | SlapOSVirtualMasterSourceProjectConstraint
Cloud Contract Line | SlapOSCloudContractLineAccounting Cloud Contract Line | SlapOSCloudContractLineAccounting
Cloud Contract | SlapOSCloudContractAccounting Cloud Contract | SlapOSCloudContractAccounting
Computer Consumption TioXML File | SortIndex Computer Consumption TioXML File | SortIndex
Hosting Subscription | SlapOSAccountingHostingSubscriptionConstraint Hosting Subscription | SlapOSAccountingHostingSubscriptionConstraint
Hosting Subscription | SlapOSLedgerConstraint Hosting Subscription | SlapOSLedgerConstraint
Internal Invoice Transaction | SlapOSLedgerConstraint Internal Invoice Transaction | SlapOSLedgerConstraint
Internal Invoice Transaction | SlapOSVirtualMasterSourceProjectConstraint
Open Sale Order Line | SlapOSAccountingOpenSaleOrderLineConstraint Open Sale Order Line | SlapOSAccountingOpenSaleOrderLineConstraint
Open Sale Order | SlapOSAccountingOpenSaleOrderConstraint Open Sale Order | SlapOSAccountingOpenSaleOrderConstraint
Open Sale Order | SlapOSLedgerConstraint Open Sale Order | SlapOSLedgerConstraint
Open Sale Order | SlapOSVirtualMasterSourceProjectConstraint
Payment Transaction | SlapOSLedgerConstraint Payment Transaction | SlapOSLedgerConstraint
Payment Transaction | SlapOSVirtualMasterSourceProjectConstraint
Purchase Invoice Transaction | SlapOSLedgerConstraint Purchase Invoice Transaction | SlapOSLedgerConstraint
Purchase Invoice Transaction | SlapOSVirtualMasterSourceProjectConstraint
Sale Invoice Transaction | SlapOSAccountingSaleInvoiceTransactionConstraint Sale Invoice Transaction | SlapOSAccountingSaleInvoiceTransactionConstraint
Sale Invoice Transaction | SlapOSLedgerConstraint Sale Invoice Transaction | SlapOSLedgerConstraint
Sale Invoice Transaction | SlapOSVirtualMasterSourceProjectConstraint
Sale Packing List Line | SlapOSAccountingSalePackingListLineConstraint Sale Packing List Line | SlapOSAccountingSalePackingListLineConstraint
Sale Packing List | SlapOSAccountingSalePackingListConstraint Sale Packing List | SlapOSAccountingSalePackingListConstraint
Sale Packing List | SlapOSLedgerConstraint Sale Packing List | SlapOSLedgerConstraint
Sale Packing List | SlapOSVirtualMasterSourceProjectConstraint
Slave Instance | InstanceAccountingSynchronisation Slave Instance | InstanceAccountingSynchronisation
Software Instance | InstanceAccountingSynchronisation Software Instance | InstanceAccountingSynchronisation
User Consumption HTML File | SortIndex User Consumption HTML File | SortIndex
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment