- 06 Mar, 2024 40 commits
-
-
Romain Courteaud authored
(it is nto correctly working)
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
* close erp5js as new panel * add WIP access page on panel * add an action to create a Compute Node from a Project * add custom CSS, to reduce site confusion * drop unused code * add Project Module view * add project view * add Compute Node view * proxify the gadget fields * add compute node revoke certificate * add compute node request certificate action * add compute node module view * add Ticket module view * add new Support Request from Instance Tree and Compute Node * add support request view * add event module view * fix add compute node action title * add Mail/Web Message view * add add_slapos_event action * add instance tree module view * add software product module view * add Software Product view * add add_slapos_software_product on project * add Software Release Module view * SoftwareProductModule_viewSoftwareProductListOnSlaposPanel view * add Software Release view * reference is needed on the created software product * add Software Release action * show software release state * setup software release language * create Software Installation * fixup portal_status_message propagation * move SoftwareInstallation_getSoftwareReleaseInformation * add Software Installation Module view * configure website view and CSP * add Software Installation view * add request_slapos_destroy * move instance action from slapos_cloud * move instance tree action from slapos_cloud * add Project request_slapos_instance_tree action * add Instance Tree view * add Instance Tree update parameter action * add Software Instance view * add Slave Instance view * add Software Instance Module view * try to install slapos_panel in test * only show action if the project is validated * set configuration_default_project_relative_url on panel web site * revert: no need to set default project on web site * export the panel web sections * view Subscription Request Module * do not crash if document is not linked to a project * fork header/panel gadgets * fork header/panel * only export last workflow history * do not display action view list in the panel * only show "slapos" actions in the panel * do not display "Modules" and workflow actions * do not display "Editable" checkbox * do not display "Logout" link * fixup: only export last workflow history * use "vifib.cloud" icon on the panel * do not display search form in the panel * requires Release/Type variations when creating Software Product * jump to Software Release * add Release view * jump from Project to Software Product * Release are now Software Product variation * review View section in panel Needed to cancel jump view * jump_to_slapos_software_type * add Software Type view * add Software Type action * jump to Compute Node from project * initialise Software Release title (to not see the ID by default) * Release are now Software Product sub objects * create draft allocation supply from project * translate string * add Allocation Supply view * view Allocation Supply Line * create Software Installation from Allocation Supply * show Allocation Supply list * only show allocable Software Product when requesting * jump to project instance trees * hide header link to prevent confusion Good links must be defined in next version * show all project support request * close ticket action * prefill all Software Product info from JS * create Instance Node from Instance Tree * create Allocation Supply from Instance Node * software.json contains multiple entries with the same software-type * do not create multiple Instance Node from an Instance Tree * show project Instance Nodes * show Compute/Instance Node's allocation supplies * handle software product with only one software type * try not to duplicate software product * improve software release creation extend software type list * no need to manually create software type * only check Software Product from the same project * person view * use Allocation Supply to return the list of Software Product * use Project_getSoftwareProductPredicateList to find Software Product * show Allocation Supply destination * invalidate Allocation Supply * add Allocation Supply Module view * Instance Node view * do not add Instance Tree for project with accounting * add an exemple of payable product list * drop unused script * add Sale Supply for Project * validate/invalidate Sale Supply * show price unit * add missing view action on Instance Node * add field to allow slave on same instance tree * add actions for Remote Node * jump from Project to Remote Node * export favicon it was dropped from slapos_web * restrict the list of software type based on allocation supply * drop upgrade_scope * add Upgrade Decision view/actions * change action title from View to Panel View To make coding style test happier * display translated state title * add Computer Network * add Computer Network jump * show Computer Network related Compute Nodes * invalidate Computer Network * install payzen/wechat dependencies they were provided by subscription bt5 * fetch currency from project default trade condition * use Project_getAccountingCurrency * use Project_getAccountingCurrency in action conditions * action to create a virtual master for a user * Person_addVirtualMaster: try to find trade condition with Trade Model Line and currency * require currency information when creating a virtual master * merge request payable/non payable instance actions * update slapos_master_panel modification date * update add Sale SUpply action * do not install slapos_subscription_request * add dependencies * alphabetical order * restore Compute Node token creation and usage Token is now created from a Project * dependency to slapos_jio keep status gadget and the parameter gadget in their original bt5, to simplify rebase * add missing js dependencies for the json schema validator gadget * drop hardcoded url * restore status gadget first rendering onLoop must be fixed probably * project does not have status gadget anymore * use getPreferredHateoasUrl to generate the compute token improve consistency with slaptool (configure this value in 1 place only) * readd translation bt5 dependencies * configure trade_condition_type on the Sale Trade Condition * adding a virtual master also adds assignment for the user * drop unused script * show the issue when it is not possible to add a virtual master * more assertion when creating a virtual master * Subscription Request categories were inverted * prototype Subscription Request's events view * display the discussion in read only mode * use discussion gadget on Support Request * do not build url by joing strings * create Virtual Master only for validated Person * simplify configuration by not requiring to fill the hateoas url in the preferences * allow to enter the API url on the web site panel * project's codification is used to generate the local roles * drop useless field tales which hide the content * ensure the url is relative to the web site, but without containing a // * those files exist in slapos_cloud * desactivat the Supply action Force user to supply from the Allocation Supply configuration. otherwise, alarms will clean up the manually added Software Installation. * user has no group if it can not even access the Project * use souce_project to find the trade condition no need to trick source/destination project anymore, as trade_condition_type is used * add a Sale Supply Line for the Compute Node price * SoftwareInstallation_getNewsDict has been dropped * add missing arguments * ComputeNode_getSoftwareReleaseState was replaced by SoftwareInstallation_getInstallationState * add activate_kw parameter * virtual master can be free, and instance payble * control trade condition reference length * drop ComputeNode_getNewsDict * jsoneditor needs unsafe-inline style * fixup support request creation * fix Support Request listbox * fix support request view * use source_project as sender if none is defined * ticket use source_project * stop using dropped requestEvent workflow transition * customer can not close tickets * allow customer to see the list of tickets * validate the ticket when possible * stop using gadget_slapos_event_discussion_entry * display and sort by start date * show software types and releases * show instance allocation information * show Instance/Remote Node * set the expected Sale Supply by default * drop computer network status field * XXX drop slapos_jio dependency * activate the service worker * move login page templates * moved to slapos_panel * move to slapos_panel * add Preference view * add Subscription Request view action * drop global search * use slapos view on the access page * add Regularisation Request view * change panel access page to only show user services/projects/computers/tickets * add a global request action * do not show invalidated tickets * move to slapos_panel * display radiofield vertically * make request dialog a bit more understandable * do not propose to close the ticket if it is already closed
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
it is impossible to understand
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
Invoice must be correctly grouped.
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
* test: always create open order before trying to allocate * define subscription prices on Sale Trade Condition Prices are defined on Supply Line inside Sale Trade Condition. Drop prices from Subscription Condition. Instead, link the Subscription Condition to a Sale Trade Condition. Apply the Sale Trade Condition on the created Open Sale Order. Stop duplicating properties from the Subscription Condition to the created Subscription Request. Payment is managed by the 'payment' category, and not the language. This allows to remove all '==zh' conditions. Instead, use custom Sale Trade Condition. * use explicit id to improve understanding of all paths Clarify trade condition title * use the trade condition reference instead of the id sale trade condition are versionned. * no need to rely on the catalog to validate the trade condition * factorise code * add new trade condition versions * The new versions do not include any price informations. It is needed to create new Trade Condition which inherite from those versions. Update preference to use those latest trade conditions. * rename couscous trade condition * remove zh templates * change subscription price. Do not defined it as ttc Try to understand why price is not always copied * restore original price * restore previous price setting * set round price * disable invoice generation for consumption to see test impacted * XXX consumption price must be set to 0 XXX migrate existing packing list * no need to create open order slowly * trade condition has more than one supply line * WIP create open order for compute node * alarm to create compute node open order * categrory * define comp node subscription price * add SlapOSLedgerConstraint * add SlapOSLedgerConstraint on all * Transaction XXX FOrces tests to fail as much as possible if ledger is not configured. Add test to ensure constraint is configured * hardcode automated ledger category for the newly created sale packing list * propagate ledger in the simulation tree * build ledger category from delivery builders * aggregate ledger from order builder * ensure ledger category is allowed on the portal type when using the constraint * requires ledger on Hosting Subscription, Open Sale Order and Sale Packing List * hardcode ledger value on Open Sale Order and Hosting Subscription * open order must propagate the ledger value * automated ledger path * add ledger to the accounting template * source_administration is not used anymore on Compute Node * source_administration is not used anymore on Compute Node * 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 * use Software Product instead of the service slapos_instance_subscription * build movement using Software Product * consider Software Product as a Service * use Software Product * search the trade condition with searchPredicateList * ensure trade condition is found * disable open order alarm * disable open order creation * add slapos_virtual_master_subscription service * allow using open order for different kind of item * add constraint to check if open order has a sale trade condition * reactivate open order alarm * check if Sale Trade Condition has a business process * ensure open order line has a resource, price, quantity * new constraints for open order / sale trade condition * only automate invoice with automated ledger * only automate packing list with automated ledger * only automate packing list with automated ledger * only automate packing list with automated ledger * add new business process to go from order to invoice This may be temporary. Name is bad on purpose for now. * not sure if it is a good idea to hardcode the business process list... * do not crash if open order line is not linked to an instance * force total_quantity to be > 0 instead of checking quantity property * XXX support Open Order Cell * XXX constraint must also support Cell * create Open Order Cell * first version to fetch trade conditions and prices * select the correct software release/type on open order * get price from sale supply * do not create the open order if the software product can not be found * set price on the open order it requires to create a temp sale order, where sale supply is automatically applied * SlapOSVirtualMasterSourceProjectConstraint on Sale Supply * InstanceTree_getSoftwareProduct also return release and type variations * wip sale supply test * configure Sale Supply predicate * test Supply Line matching and getPrice * allow Supply Line to define price even if resource has variations Force quantity unit to match (no convertion for now) * order Supply Predicate matching * Supply Cell before Line * stop hardcoding default quantity unit * add comment if price not found * quantity is defined on cell * do not create Hosting Subscript before the price is found * slapos_accounting: link Hosting Subscription to project * Cloud Contract is not global for ERP5 Site, but per Virtual MAster * project needed on assignment/compute node * export module business application * revert zero_emission_ratio service deletion I do not remember why I dropped it * set source/destination_project and ledger on created payment * drop slapos orga and accounting template * propagate ledger from order builder * add ledger to the accounting template * aggregate source_project on payment * drop template_sale_invoice_transaction it is only used in one place. Let's create it manually * drop the aggregated packing list logic Some parts are still there, but linked to subscription, which I will check later * testSlapOSAccountingBuilder Recreate the expected organisation. Drop the aggregated builder test * revert aggregated builder test removal * drop consumption/reservation/subscription business process * drop all trade conditions * force using ledger=automated Disable all simulation logic if the automated ledger is not used * builder test: set ledger and destination_project Use a test trade condition * drop Base_testSlapOSValidTradeCondition * update testSlapOSAccountingRule * drop compatibility with expliciate trade condition usage * add Project_getAccountingCurrency * ensore project has a currency before generating an open order * do not explode the workflow history with the same comment * testSlapOSAccountingRule stop using hardcoded trade condition * do not expand packing list if no invoice is supposed to be generated (aka, no need for slapos_consumption_trade_condition) * testSlapOSAccountingBuilder stop using deleted business processes * testSlapOSAccountingAlarm: only ledger/automated movement are built * testSlapOSAccountingBuilder: stop using deleted business processes * testSlapOSAccountingAlarm: update test * drop usage of createZODBPythonScript * testSlapOSAccountingInteractionWorkflow: a project is required on the Instance Tree * stop hardcoding expected trade condition * testSlapOSAccountingSkins update to latest changes * testSlapOSEntityCreatePayment: stop using invoice template * drop Base_useSaleTradeConditionReference * drop usage of createZODBScript * call OpenSaleOrder_reindexIfIndexedBeforeLine on an Open Order, instead of the Alarm * testSlapOSAccountingRule: factorise Sale Supply creation * test InstanceTree_requestUpdateOpenSaleOrder * do not invalidate open order, as it breaks the simulation * keep slapos_legacy_aggregated_subscription_trade_condition_2022 when uninstalling it * do not duplicate arguments * set Ban Account from the trade condition source payment * constraint to check if invoice has a source payment defined * stop checking specialise == getPreferredAggregatedSaleTradeCondition. Check ledger instead * build source/destination decision/payment * no causality on invoice * do not invalidate open order * test: define source payment on the open order * builders: do not merge movement with different prices * builder: set aggregate on cell, not line * builder: group movement by specialise Previously, we has 1 invoice per simulation tree. But we want to reduce the number of invoice, without using the "aggregate" builder trick * SimulationMovement_buildSlapOS search by specialise * test that dedicated trade condition / supply are applied * invoice builder: group movement's date on the delivery level * invoice builder: dates are now set on delivery. Do not modify causality if it exists * testSlapOSAccountingBuilder: update quantity unit of software product * testSlapOSAccountingBuilder: typo * do not hardcode payzen payment mode * get payment mode from the trade condition's payment condition * invoice payment mode is fetched from trade condition * payzen payment mode is not set anymore on invoice * source project is not required on Payment Transaction Customer can buy Virtual MAster * do not filter by destination_project__uid=None It leads to always return nothing, as it does a join to the category table * the virtual master subscription Service has a time/month quantity unit * Open Order, Packing List, Hosting Subscription may not be linked to a Project * do not aply trade condition if source/destination projects are different from order * do not require Project on Sale Invoice Transaction * do not require a Project on Sale Supply * disable open order creation * stop creation Open Sale Order from Instance Tree * deprecate Alarm_requestUpdateInstanceTreeOpenSaleOrder * trigger alarm as soon as Item are marked as subscribed * export service_module/slapos_compute_node_subscription * contraint: source_section is not required on Open Sale Order Needed for accounting less Open Order. * constraint: source_section is not required on Sale Packing List * constraint: no Organisation as destination / destination_section * export month quantity unit convertion To drop warning in logs * drop InstanceTree_requestUpdateOpenSaleOrder * rules: stop diverging on source/destination payment Those info are not supposed to be set on order/delivery (ie, there is no field for this) * drop duplicated config * set the source payment before finalising the sale invoice * ensure the same currency is used on Order and Trade Condition * force all Sale documents to use a consistent price currency * add script to generate the deposit * add deposit account XXX configuration must be reviewed * add Deposit service to use on the invoice * deposit service is not taxable XXX to check with accountants * business process: no need to have 2 credit path * creation causality link between the deposit payment and invoice * put destination account in the transaction line XXX no way currently to support having no destination if the destination_section does not handle accounting * add alarm slapos_update_delivery_simulation Generate invoice from packing list * generate accounting for resource_use/use/trade/deposit * add slapos_simulation_interaction_workflow Speed up execution of the simulation process by triggering alarms as soon as it is needed * generate Open Order simulation as soon as it is simulated * do not stop invoice until the stop date is passed * stop setting the source_payment on the Invoice It is too early, and prevent other Simulation Movement to be aggregated * set source_payment just before closing the invoice * checkConsistency after the source_payment is set * serialise on business link to try grouping all user invoices movements * destination project is not required on invoice Do not search with a None value * Extend the invoice causality with the parent simulation movement explanation * drop not needed movement group Previous movement group already force the same invoice * use the discount_service on the discount service No idea if it is a good idea or not for now * generate accounting movement for discount service * also compare invoice price with discount sale packing list * no need to update open order period anymore * drop unused script * drop unused slapos_request_update_instance_tree_open_sale_order * drop unused SubscriptionRequest_*etAggregatedConsumptionDelivery * drop not needed slapos_start_confirmed_aggregated_subscription_sale_packing_list * drop slapos_api_invoicing_workflow * add an alarm to close the open order * no need to reindex open sale order * expand the open order one last time, to no miss any period * use Base_reindexAndSenseAlarm * drop jump_related_grouped_sale_packing_list * drop slapos_contract_request_validation_payment alarm * drop unused script * drop Project_getAccountingCurrency * test: slapos_request_update_instance_tree_open_sale_order was dropped * test: drop outdated tests * test: update titles * test: InstanceTree_requestUpdateOpenSaleOrder was dropped * test: drop tests related to dropped scripts * test: use valid trade condition to generate the simulation * only run alarm once per day Interaction workflow are now supposed to trigger the alarm when needed * run alarm once per day * require trade_condition_type on Sale Trade Condition * search Sale Trade Condition by trade_condition_type * set trade_condition_type on temporary Sale Order * ensure trade_condition_type matches * disable packing list generation from tioxml Everything is broken currently... * drop testSlapOSContractAlarm * drop create_new_cloud_contract action * drop jump_to_cloud_contract action * test: SoftwareInstance_requestValidationPayment was dropped * drop CloudContractLine_getRemainingInvoiceCredit * drop Person_isAllowedToAllocate * drop Entity_statSlapOSOutstandingAmount * test: change class inheritance do not inherit from a class with existing test, as it forces subclass to keep exactly the same test function name * lint: do not redefine id variable * fix: do not use unrelated causality value Builder passes all movement used to generate all the invoice * allow closing the invoice has soon as the stop date value is reached * test: wip accounting checks * do not access the object if not needed * drop Entity_statOutstandingAmount * wip Entity_hasOutstandingAmount * wip: create from multiple invoices using Entity_getOutstandingAmountList * group also outstanding amount by ledger * drop PaymentTransaction_start * use the same ledger than the payment transaction * create Payment Transaction to pay all user's invoices * improve Payment line title * allow to pay invoices at a date * test paying invoices * test: fix create payment tests * drop preferred_default_pre_payment_subscription_invoice_template_property * test: templates were dropped * drop preferred_default_pre_payment_template * drop getPreferredAggregatedSubscriptionSaleTradeCondition * drop preferred_aggregated_sale_trade_condition * test: unused variable * test: fixup testSlapOSAccountingConstraint * test: fix trade condition retrieval * drop preferred_instance_delivery_template_property * drop slapos_accounting_instance_delivery_template * drop slapos_accounting_instance_delivery_line_template * drop preferred_aggregated_consumption_sale_trade_condition * drop SlapOSAccountingSystemPreference * keep organisation_module/slapos/bank_account * disable packing list generation from tio xml this is not critical for now, and will be upgraded later * fixConsistency is not called anymore on Hosting Subscription * drop template_compute_node * drop template_member * test: there is no causality_state anymore on instance tree * test: fix consistency on Hosting Subscription does not set the periodicity date * drop unused script * reduce number of sale trade condition to check * stop using fixConsistency to set hosting subscription periodicity Set it directly from the script which create it * reduce alarm frequency * constraint: be consistent if invoice has no source payment * check more usable invoices * do not forget to retry building the simulation movement * test invoice generation and aggregation * test: fixup trade condition retrieval * try to reduce conflicts when building the deliveries No need to trigger multiple build for the same group of movements * drop not needed serialize * fix open order simu tests * test fix TestDefaultTradeModelRule * test: fix one test * test: fix builder tests * test: fixup
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
-
Romain Courteaud authored
* validate slapos_manual_accounting_trade_condition * propagate ledger from order builder * add ledger to the accounting template * aggregate source_project on payment * stop building payment transaction automatically * drop template_sale_invoice_transaction it is only used in one place. Let's create it manually
-
Romain Courteaud authored
* restore status gadget first rendering onLoop must be fixed probably * drop organisation/site pages * drop project creation/deletion pages * drop gadget_erp5_page_slap_cloud_contract_view_js * drop template_software_installation * drop template_instance_tree * drop template_software_instance * move login page templates * moved to slapos_panel
-