• Julien Muchembled's avatar
    Sync with trunk@39785 · 3db5c274
    Julien Muchembled authored
    Conflicts:
        bt5/erp5_simulation/DocumentTemplateItem/DeliveryRootSimulationRule.py
        bt5/erp5_simulation/DocumentTemplateItem/DeliverySimulationRule.py
        bt5/erp5_simulation/DocumentTemplateItem/InvoiceRootSimulationRule.py
        bt5/erp5_simulation/DocumentTemplateItem/InvoiceSimulationRule.py
        bt5/erp5_simulation/DocumentTemplateItem/InvoiceTransactionSimulationRule.py
        bt5/erp5_simulation/DocumentTemplateItem/OrderRootSimulationRule.py
        bt5/erp5_simulation/DocumentTemplateItem/PaymentSimulationRule.py
        bt5/erp5_simulation/DocumentTemplateItem/TradeModelSimulationRule.py
        products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary.xml
        products/ERP5/Document/Alarm.py
        products/ERP5/Document/Budget.py
        products/ERP5/Document/BudgetLine.py
        products/ERP5/Document/BusinessPath.py
        products/ERP5/Document/CategoryMembershipEquivalenceTester.py
        products/ERP5/Document/DateTimeEquivalenceTester.py
        products/ERP5/Document/FloatEquivalenceTester.py
        products/ERP5/Document/MappedValue.py
        products/ERP5/Document/OrderBuilder.py
        products/ERP5/Document/Resource.py
        products/ERP5/Document/StringEquivalenceTester.py
        products/ERP5/Document/TradeModelLine.py
        products/ERP5/Document/Transformation.py
        products/ERP5/Document/TransformedResource.py
        products/ERP5/Document/VariationEquivalenceTester.py
        products/ERP5/mixin/composition.py
        products/ERP5/mixin/rule.py
        products/ERP5Type/Utils.py
    
    git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@39787 20353a03-c40f-0410-a6d1-a30d3c3de9de
    3db5c274
Rule.py 22.1 KB