From 4683fde7ac9c349345b61afdd6e2769c9342b5d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 1 Jan 2023 10:36:03 +0100 Subject: [PATCH] Make scenario independent of the current day The fiscal years are created centered on the passed date such that if the current day change during the execution, the fiscal year is still usable. Also fiscal year can be created for a range of dates such that it is guarantee that the dates are in the fiscal year. And finally remove datetime and dateutil import when they are not used. Closes #9977 --- .../tests/scenario_account_reconciliation.rst | 3 --- .../tests/scenario_close_fiscalyear.rst | 4 ++-- .../account/tests/scenario_move_cancel.rst | 3 --- .../tests/scenario_move_line_reschedule.rst | 2 +- .../tests/scenario_renew_fiscalyear.rst | 12 ++++------- modules/account/tests/scenario_reports.rst | 8 ++++---- modules/account/tests/tools.py | 14 ++++++++++--- .../tests/scenario_account_asset.rst | 4 +--- .../scenario_account_asset_depreciated.rst | 4 +--- .../tests/scenario_purchase_asset.rst | 3 --- ...count_cash_rounding_alternate_currency.rst | 3 --- .../tests/scenario_deposit.rst | 3 --- .../tests/scenario_account_dunning.rst | 2 +- .../tests/scenario_account_dunning_final.rst | 10 ++++------ .../tests/scenario_account_dunning_fee.rst | 13 ++++++------ .../tests/scenario_account_dunning_letter.rst | 8 +++----- .../account_es/tests/scenario_reporting.rst | 6 +++--- .../scenario_reporting_alternate_currency.rst | 6 +++--- .../tests/scenario_reporting_compensate.rst | 6 +++--- .../scenario_reporting_surcharge_tax.rst | 6 +++--- modules/account_es_sii/tests/test_module.py | 2 +- modules/account_fr/setup.py | 2 +- modules/account_fr/tests/scenario_fec.rst | 13 ++++++------ .../tests/scenario_invoice.rst | 11 +++++----- .../scenario_invoice_alternate_currency.rst | 13 +++++------- ..._invoice_alternate_currency_lower_rate.rst | 7 ++++--- .../scenario_invoice_customer_sequential.rst | 14 ++++++------- .../tests/scenario_invoice_in_future.rst | 8 ++++---- .../tests/scenario_invoice_manual_tax.rst | 2 +- .../tests/scenario_invoice_supplier.rst | 8 ++++---- .../scenario_invoice_supplier_post_paid.rst | 7 ++++--- .../tests/scenario_invoice_tax_deductible.rst | 2 +- .../tests/scenario_invoice_with_credit.rst | 5 ++--- .../tests/scenario_renew_fiscalyear.rst | 15 +++++++------- .../tests/scenario_account_invoice_defer.rst | 6 ++++-- ...nario_account_invoice_stock_correction.rst | 2 +- .../tests/scenario_account_payment.rst | 9 ++++++--- .../scenario_account_payment_direct_debit.rst | 7 ++++--- .../scenario_account_payment_dunning.rst | 2 +- .../scenario_account_payment_planning.rst | 11 +++++----- modules/account_payment_clearing/setup.py | 2 +- ...ario_account_negative_payment_clearing.rst | 6 +++--- .../scenario_account_payment_clearing.rst | 16 +++++++-------- ...payment_clearing_invoice_amount_to_pay.rst | 6 +----- .../tests/scenario_account_payment_stripe.rst | 16 ++++++++------- ...cenario_account_payment_stripe_dispute.rst | 12 ++++++----- ...nario_account_payment_stripe_identical.rst | 6 ++++-- ...scenario_account_payment_stripe_intent.rst | 8 +++++--- .../tests/scenario_account_statement.rst | 7 ++++--- .../tests/scenario_statement_origin.rst | 7 ++++--- .../scenario_statement_origin_invoices.rst | 7 ++++--- .../tests/scenario_account_statement_rule.rst | 8 ++++---- ...nt_statement_rule_keyword_bank_account.rst | 6 +++--- ...enario_account_statement_rule_keywords.rst | 7 ++++--- .../scenario_account_stock_anglo_saxon.rst | 12 +++++------ ...t_stock_anglo_saxon_with_drop_shipment.rst | 12 +++++------ .../scenario_account_stock_continental.rst | 13 ++++++------ .../scenario_account_stock_landed_cost.rst | 8 ++++---- ...nario_account_stock_landed_cost_weight.rst | 8 ++++---- .../scenario_account_stock_shipment_cost.rst | 2 +- ...rio_account_stock_shipment_cost_weight.rst | 2 +- .../scenario_account_tax_non_deductible.rst | 2 +- .../tests/scenario_analytic_account.rst | 3 --- .../tests/scenario_analytic_budget.rst | 2 -- .../tests/scenario_analytic_invoice.rst | 4 +--- .../tests/scenario_analytic_invoice_asset.rst | 16 ++++++++------- .../tests/scenario_analytic_purchase.rst | 3 --- .../tests/scenario_analytic_sale.rst | 3 --- ...percentage_with_purchase_shipment_cost.rst | 3 --- .../tests/scenario_carrier_weight.rst | 3 --- .../tests/scenario_agent_selection.rst | 12 +++++------ .../commission/tests/scenario_commission.rst | 10 +++++----- .../tests/scenario_commission_stock.rst | 2 +- .../tests/scenario_commission_waiting.rst | 8 ++++---- .../tests/scenario_product_cost_fifo.rst | 5 ++--- .../scenario_product_cost_fifo_no_in.rst | 4 ++-- ...product_cost_fifo_recompute_cost_price.rst | 1 - .../tests/scenario_product_cost_fifo_uom.rst | 4 ++-- .../tests/scenario_product_cost_history.rst | 1 - .../tests/scenario_product_kit_purchase.rst | 2 +- .../production/tests/scenario_production.rst | 12 +++++------ .../tests/scenario_production_work.rst | 8 ++++---- .../tests/scenario_project_invoice_effort.rst | 10 ++++------ ...cenario_project_invoice_multiple_party.rst | 8 +++----- .../scenario_project_invoice_progress.rst | 8 +++----- .../scenario_project_invoice_timesheet.rst | 13 ++++++------ modules/purchase/tests/scenario_purchase.rst | 8 ++++---- .../tests/scenario_purchase_return_wizard.rst | 4 ---- .../scenario_purchase_blanket_agreement.rst | 7 +++---- ...nario_purchase_invoice_line_standalone.rst | 3 --- .../scenario_purchase_product_quantity.rst | 3 --- .../tests/scenario_purchase_request.rst | 6 +++--- .../scenario_purchase_request_quotation.rst | 5 +++-- .../tests/scenario_purchase_requisition.rst | 6 +++--- ...chase_blanket_agreement_secondary_unit.rst | 7 +++---- .../tests/scenario_purchase_shipment_cost.rst | 3 --- ...o_purchase_shipment_cost_invoice_stock.rst | 2 +- ...chase_shipment_cost_with_account_stock.rst | 3 --- ...nt_cost_with_account_stock_anglo_saxon.rst | 8 ++++---- modules/sale/tests/scenario_sale.rst | 3 --- .../tests/scenario_advance_payment.rst | 13 +++++------- .../tests/scenario_sale_blanket_agreement.rst | 8 +++----- .../sale_extra/tests/scenario_sale_extra.rst | 8 +++----- .../tests/scenario_sale_invoice_date.rst | 5 +++-- .../tests/scenario_sale_invoice_grouping.rst | 3 --- ..._sale_blanket_agreement_secondary_unit.rst | 8 +++----- .../tests/scenario_sale_shipment_cost.rst | 8 +++----- .../scenario_sale_shipment_cost_promotion.rst | 3 --- .../tests/scenario_sale_shipment_grouping.rst | 3 --- .../tests/scenario_sale_stock_quantity.rst | 12 ++++++----- .../tests/scenario_sale_supply.rst | 3 --- .../scenario_sale_supply_drop_shipment.rst | 8 ++++---- ...ale_supply_drop_shipment_remaining_qty.rst | 6 ++---- .../scenario_stock_average_cost_price.rst | 11 +++++----- .../stock/tests/scenario_stock_inventory.rst | 6 +++--- .../tests/scenario_stock_inventory_count.rst | 3 --- ...cenario_stock_inventory_empty_quantity.rst | 6 +++--- .../tests/scenario_stock_move_in_future.rst | 8 ++++---- ..._stock_product_quantities_by_warehouse.rst | 10 +++++----- ...rio_stock_recompute_average_cost_price.rst | 2 +- .../stock/tests/scenario_stock_reporting.rst | 8 ++++---- .../tests/scenario_stock_reporting_margin.rst | 1 + .../scenario_stock_shipment_in_return.rst | 8 ++++---- .../scenario_stock_shipment_internal.rst | 10 +++++----- .../tests/scenario_stock_shipment_out.rst | 8 ++++---- .../tests/scenario_stock_assign_manual.rst | 2 -- .../tests/scenario_stock_location_move.rst | 8 ++++---- .../scenario_stock_location_move_empty.rst | 9 +++++---- .../scenario_stock_location_move_supply.rst | 5 +++-- modules/stock_lot/setup.py | 2 +- .../tests/scenario_stock_lot_assign_try.rst | 6 +++--- .../tests/scenario_stock_lot_shipment_out.rst | 6 +++--- modules/stock_lot/tests/test_module.py | 20 +++++++++---------- .../tests/scenario_stock_lot_unit.rst | 3 --- .../tests/scenario_stock_package.rst | 6 +++--- .../tests/scenario_shipping_dpd.rst | 3 --- .../tests/scenario_shipping_ups.rst | 3 --- .../tests/scenario_stock_product_location.rst | 5 +++-- ...ario_stock_product_location_production.rst | 6 ++++-- ...enario_stock_product_location_template.rst | 5 +++-- .../stock_quantity_early_planning/setup.py | 1 - ...scenario_stock_quantity_early_planning.rst | 9 ++++----- ...stock_quantity_early_planning_incoming.rst | 7 +++---- modules/stock_quantity_issue/setup.py | 1 - .../tests/scenario_stock_quantity_issue.rst | 7 +++---- .../tests/scenario_stock_shipment_cost.rst | 1 + .../tests/scenario_stock_internal_supply.rst | 3 --- ...enario_stock_internal_supply_lead_time.rst | 10 +++++----- ...cenario_stock_internal_supply_overflow.rst | 3 --- ...scenario_stock_supply_purchase_request.rst | 11 +++++----- .../tests/scenario_stock_supply_forecast.rst | 9 ++++----- .../scenario_stock_supply_production.rst | 1 + 152 files changed, 440 insertions(+), 533 deletions(-) diff --git a/modules/account/tests/scenario_account_reconciliation.rst b/modules/account/tests/scenario_account_reconciliation.rst index 32b89e98e5..602b67bb55 100644 --- a/modules/account/tests/scenario_account_reconciliation.rst +++ b/modules/account/tests/scenario_account_reconciliation.rst @@ -4,8 +4,6 @@ Account Reconciliation Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -13,7 +11,6 @@ Imports:: ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ ... create_chart, get_accounts - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/account/tests/scenario_close_fiscalyear.rst b/modules/account/tests/scenario_close_fiscalyear.rst index 6f566c21c3..f121fa6169 100644 --- a/modules/account/tests/scenario_close_fiscalyear.rst +++ b/modules/account/tests/scenario_close_fiscalyear.rst @@ -4,7 +4,7 @@ Account Close Fiscalyear Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from dateutil.relativedelta import relativedelta @@ -17,7 +17,7 @@ Imports:: ... create_fiscalyear, create_chart, get_accounts) >>> from trytond.modules.currency.tests.tools import get_currency - >>> today = datetime.date.today() + >>> today = dt.date.today() >>> last_year = today - relativedelta(years=1) Activate modules:: diff --git a/modules/account/tests/scenario_move_cancel.rst b/modules/account/tests/scenario_move_cancel.rst index ecf0d7009f..4903a8f189 100644 --- a/modules/account/tests/scenario_move_cancel.rst +++ b/modules/account/tests/scenario_move_cancel.rst @@ -4,8 +4,6 @@ Move Cancel Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -14,7 +12,6 @@ Imports:: >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ ... create_chart, get_accounts >>> from trytond.modules.currency.tests.tools import get_currency - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/account/tests/scenario_move_line_reschedule.rst b/modules/account/tests/scenario_move_line_reschedule.rst index d65589b553..bac2d96152 100644 --- a/modules/account/tests/scenario_move_line_reschedule.rst +++ b/modules/account/tests/scenario_move_line_reschedule.rst @@ -122,7 +122,7 @@ Split line by number:: (Decimal('33.33'), Decimal('33.33'), Decimal('33.34')) >>> term1.amount = Decimal('40.00') >>> term2.amount = term3.amount = Decimal('30.00') - >>> term3.date += relativedelta(months=1) + >>> term3.date = period.end_date + relativedelta(months=3) >>> reschedule.execute('reschedule') >>> reschedule_move, = reschedule.actions[0] diff --git a/modules/account/tests/scenario_renew_fiscalyear.rst b/modules/account/tests/scenario_renew_fiscalyear.rst index 3bb73c2194..c1f0725ddf 100644 --- a/modules/account/tests/scenario_renew_fiscalyear.rst +++ b/modules/account/tests/scenario_renew_fiscalyear.rst @@ -4,16 +4,12 @@ Account Renew Fiscalyear Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear - >>> today = datetime.date.today() - >>> end_year = today + relativedelta(month=12, day=31) Activate modules:: @@ -30,8 +26,8 @@ Create fiscal year:: >>> fiscalyear.click('create_period') >>> period = fiscalyear.periods.new() >>> period.name = 'Adjustment' - >>> period.start_date = end_year - >>> period.end_date = end_year + >>> period.start_date = fiscalyear.end_date + >>> period.end_date = fiscalyear.end_date >>> period.type = 'adjustment' >>> fiscalyear.save() @@ -64,7 +60,7 @@ Renew fiscalyear resetting sequences:: Set the sequence name:: >>> sequence = new_fiscalyear.post_move_sequence - >>> sequence.name = 'Sequence %s' % new_fiscalyear.start_date.strftime('%Y') + >>> sequence.name = 'Sequence %s' % new_fiscalyear.name >>> sequence.save() Renew fiscalyear and test sequence name is updated:: @@ -74,5 +70,5 @@ Renew fiscalyear and test sequence name is updated:: >>> renew_fiscalyear.execute('create_') >>> new_fiscalyear, = renew_fiscalyear.actions[0] >>> new_fiscalyear.post_move_sequence.name == ( - ... 'Sequence %s' % new_fiscalyear.start_date.strftime('%Y')) + ... 'Sequence %s' % new_fiscalyear.name) True diff --git a/modules/account/tests/scenario_reports.rst b/modules/account/tests/scenario_reports.rst index 217d421049..48eda72d84 100644 --- a/modules/account/tests/scenario_reports.rst +++ b/modules/account/tests/scenario_reports.rst @@ -4,8 +4,7 @@ Account Reports Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report >>> from trytond.tests.tools import activate_modules @@ -13,7 +12,8 @@ Imports:: ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ ... create_chart, get_accounts - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: @@ -26,7 +26,7 @@ Create company:: Create fiscal year:: - >>> fiscalyear = create_fiscalyear(company) + >>> fiscalyear = create_fiscalyear(company, today) >>> fiscalyear.click('create_period') >>> periods = fiscalyear.periods >>> period_1, period_3, period_5 = periods[0], periods[2], periods[4] diff --git a/modules/account/tests/tools.py b/modules/account/tests/tools.py index ecc7c900a3..a050a9d2c2 100644 --- a/modules/account/tests/tools.py +++ b/modules/account/tests/tools.py @@ -12,7 +12,7 @@ __all__ = ['create_fiscalyear', 'create_chart', 'get_accounts', def create_fiscalyear(company=None, today=None, config=None): - "Create a fiscal year for the company on today" + "Create a fiscal year for the company on today or range" FiscalYear = Model.get('account.fiscalyear', config=config) Sequence = Model.get('ir.sequence', config=config) SequenceType = Model.get('ir.sequence.type', config=config) @@ -22,10 +22,18 @@ def create_fiscalyear(company=None, today=None, config=None): if not today: today = datetime.date.today() + if isinstance(today, datetime.date): + start_date = end_date = today + else: + start_date, end_date = today + today = start_date + (end_date - start_date) / 2 + start_date = min(start_date, today - relativedelta(months=6, day=1)) + end_date = max(end_date, today + relativedelta(months=5, day=31)) + assert start_date <= end_date fiscalyear = FiscalYear(name=str(today.year)) - fiscalyear.start_date = today + relativedelta(month=1, day=1) - fiscalyear.end_date = today + relativedelta(month=12, day=31) + fiscalyear.start_date = start_date + fiscalyear.end_date = end_date fiscalyear.company = company sequence_type, = SequenceType.find( diff --git a/modules/account_asset/tests/scenario_account_asset.rst b/modules/account_asset/tests/scenario_account_asset.rst index 780b751945..f4cf43c0c5 100644 --- a/modules/account_asset/tests/scenario_account_asset.rst +++ b/modules/account_asset/tests/scenario_account_asset.rst @@ -4,7 +4,6 @@ Account Asset Scenario Imports:: - >>> import datetime >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard @@ -17,7 +16,6 @@ Imports:: ... set_fiscalyear_invoice_sequences, create_payment_term >>> from trytond.modules.account_asset.tests.tools \ ... import add_asset_accounts - >>> today = datetime.date.today() Activate modules:: @@ -98,7 +96,7 @@ Buy an asset:: >>> invoice_line.unit_price = Decimal('1000') >>> invoice_line.account == asset_account True - >>> supplier_invoice.invoice_date = today + relativedelta(day=1, month=1) + >>> supplier_invoice.invoice_date = fiscalyear.start_date >>> supplier_invoice.click('post') >>> supplier_invoice.state 'posted' diff --git a/modules/account_asset/tests/scenario_account_asset_depreciated.rst b/modules/account_asset/tests/scenario_account_asset_depreciated.rst index bf59888b56..45e8c425e9 100644 --- a/modules/account_asset/tests/scenario_account_asset_depreciated.rst +++ b/modules/account_asset/tests/scenario_account_asset_depreciated.rst @@ -4,7 +4,6 @@ Account Asset Depreciated Scenario Imports:: - >>> import datetime >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard @@ -17,7 +16,6 @@ Imports:: ... set_fiscalyear_invoice_sequences, create_payment_term >>> from trytond.modules.account_asset.tests.tools \ ... import add_asset_accounts - >>> today = datetime.date.today() Activate modules:: @@ -77,7 +75,7 @@ Depreciate the asset:: >>> asset.product = asset_product >>> asset.value = Decimal('1500.00') >>> asset.depreciated_amount = Decimal('500.00') - >>> asset.start_date = today + relativedelta(day=1, month=1) + >>> asset.start_date = fiscalyear.start_date >>> asset.purchase_date = asset.start_date >>> asset.end_date = (asset.start_date + ... relativedelta(years=2, days=-1)) diff --git a/modules/account_asset/tests/scenario_purchase_asset.rst b/modules/account_asset/tests/scenario_purchase_asset.rst index bd59afe75e..e4a1dad256 100644 --- a/modules/account_asset/tests/scenario_purchase_asset.rst +++ b/modules/account_asset/tests/scenario_purchase_asset.rst @@ -4,8 +4,6 @@ Purchase Asset Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -17,7 +15,6 @@ Imports:: ... set_fiscalyear_invoice_sequences >>> from trytond.modules.account_asset.tests.tools \ ... import add_asset_accounts - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/account_cash_rounding/tests/scenario_account_cash_rounding_alternate_currency.rst b/modules/account_cash_rounding/tests/scenario_account_cash_rounding_alternate_currency.rst index 69bf4a59d9..e771e27331 100644 --- a/modules/account_cash_rounding/tests/scenario_account_cash_rounding_alternate_currency.rst +++ b/modules/account_cash_rounding/tests/scenario_account_cash_rounding_alternate_currency.rst @@ -4,7 +4,6 @@ Account Cash Rounding Alternate Currency Scenario Imports:: - >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -15,8 +14,6 @@ Imports:: ... create_fiscalyear, create_chart, get_accounts) >>> from trytond.modules.account_invoice.tests.tools import ( ... set_fiscalyear_invoice_sequences) - >>> today = dt.date.today() - >>> tomorrow = today + dt.timedelta(days=1) Activate modules:: diff --git a/modules/account_deposit/tests/scenario_deposit.rst b/modules/account_deposit/tests/scenario_deposit.rst index 303e3ab2ae..199dbc40f2 100644 --- a/modules/account_deposit/tests/scenario_deposit.rst +++ b/modules/account_deposit/tests/scenario_deposit.rst @@ -4,8 +4,6 @@ Deposit Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -17,7 +15,6 @@ Imports:: ... set_fiscalyear_invoice_sequences, create_payment_term >>> from trytond.modules.account_deposit.tests.tools import \ ... add_deposit_accounts - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/account_dunning/tests/scenario_account_dunning.rst b/modules/account_dunning/tests/scenario_account_dunning.rst index ec14bfb901..2f33941f0f 100644 --- a/modules/account_dunning/tests/scenario_account_dunning.rst +++ b/modules/account_dunning/tests/scenario_account_dunning.rst @@ -198,7 +198,7 @@ Process dunning:: >>> dunning.reload() >>> dunning.state 'waiting' - >>> dunning.date == today + >>> bool(dunning.date) True Create dunnings on 30 days with blocked dunning:: diff --git a/modules/account_dunning/tests/scenario_account_dunning_final.rst b/modules/account_dunning/tests/scenario_account_dunning_final.rst index f05e0cd7c3..f1bc65bfc0 100644 --- a/modules/account_dunning/tests/scenario_account_dunning_final.rst +++ b/modules/account_dunning/tests/scenario_account_dunning_final.rst @@ -4,8 +4,7 @@ Account Dunning Final Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules, set_user @@ -13,7 +12,6 @@ Imports:: ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ ... create_chart, get_accounts - >>> today = datetime.date.today() Activate modules:: @@ -44,7 +42,7 @@ Create dunning procedure:: >>> procedure = Procedure(name='Procedure') >>> level = procedure.levels.new() >>> level.sequence = 1 - >>> level.overdue = datetime.timedelta(0) + >>> level.overdue = dt.timedelta(0) >>> procedure.save() Create parties:: @@ -82,7 +80,7 @@ Create dunning:: >>> Dunning = Model.get('account.dunning') >>> create_dunning = Wizard('account.dunning.create') - >>> create_dunning.form.date = period.start_date + relativedelta(days=1) + >>> create_dunning.form.date = period.start_date + dt.timedelta(days=1) >>> create_dunning.execute('create_') >>> dunning, = Dunning.find([]) >>> dunning.state @@ -100,7 +98,7 @@ Process dunning:: Refresh dunning:: >>> create_dunning = Wizard('account.dunning.create') - >>> create_dunning.form.date = period.start_date + relativedelta(days=2) + >>> create_dunning.form.date = period.start_date + dt.timedelta(days=2) >>> create_dunning.execute('create_') >>> dunning, = Dunning.find([]) >>> dunning.state diff --git a/modules/account_dunning_fee/tests/scenario_account_dunning_fee.rst b/modules/account_dunning_fee/tests/scenario_account_dunning_fee.rst index 9a54e45f78..041a5b408c 100644 --- a/modules/account_dunning_fee/tests/scenario_account_dunning_fee.rst +++ b/modules/account_dunning_fee/tests/scenario_account_dunning_fee.rst @@ -4,7 +4,7 @@ Account Dunning Fee Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import config, Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -12,7 +12,6 @@ Imports:: ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ ... create_chart, get_accounts - >>> today = datetime.date.today() Activate modules:: @@ -87,10 +86,10 @@ Create dunning procedure:: >>> Procedure = Model.get('account.dunning.procedure') >>> procedure = Procedure(name='Procedure Fee') >>> level = procedure.levels.new() - >>> level.overdue = datetime.timedelta(5) + >>> level.overdue = dt.timedelta(5) >>> level.fee = fee >>> level = procedure.levels.new() - >>> level.overdue = datetime.timedelta(10) + >>> level.overdue = dt.timedelta(10) >>> level.fee = fee_pc >>> procedure.save() @@ -131,8 +130,8 @@ Create dunning on 5 days:: >>> Dunning = Model.get('account.dunning') >>> create_dunning = Wizard('account.dunning.create') - >>> create_dunning.form.date = (period.start_date - ... + datetime.timedelta(days=5)) + >>> create_dunning.form.date = ( + ... period.start_date + dt.timedelta(days=5)) >>> create_dunning.execute('create_') >>> dunning, = Dunning.find([]) @@ -156,7 +155,7 @@ Create dunning on 10 days:: >>> Dunning = Model.get('account.dunning') >>> create_dunning = Wizard('account.dunning.create') >>> create_dunning.form.date = (period.start_date - ... + datetime.timedelta(days=10)) + ... + dt.timedelta(days=10)) >>> create_dunning.execute('create_') >>> dunning, = Dunning.find([]) diff --git a/modules/account_dunning_letter/tests/scenario_account_dunning_letter.rst b/modules/account_dunning_letter/tests/scenario_account_dunning_letter.rst index bb3aa02856..11fe9d489e 100644 --- a/modules/account_dunning_letter/tests/scenario_account_dunning_letter.rst +++ b/modules/account_dunning_letter/tests/scenario_account_dunning_letter.rst @@ -4,8 +4,7 @@ Account Dunning Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import config, Model, Wizard >>> from trytond.tests.tools import activate_modules, set_user @@ -13,7 +12,6 @@ Imports:: ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ ... create_chart, get_accounts - >>> today = datetime.date.today() Activate modules:: @@ -82,7 +80,7 @@ Create dunning procedure:: >>> procedure = Procedure(name='Procedure') >>> level = procedure.levels.new() >>> level.sequence = 1 - >>> level.overdue = datetime.timedelta(5) + >>> level.overdue = dt.timedelta(5) >>> level.print_on_letter = True >>> procedure.save() @@ -174,7 +172,7 @@ Create dunnings:: >>> set_user(dunning_user) >>> Dunning = Model.get('account.dunning') >>> create_dunning = Wizard('account.dunning.create') - >>> create_dunning.form.date = period.start_date + relativedelta(days=5) + >>> create_dunning.form.date = period.start_date + dt.timedelta(days=5) >>> create_dunning.execute('create_') >>> dunning, = Dunning.find([]) diff --git a/modules/account_es/tests/scenario_reporting.rst b/modules/account_es/tests/scenario_reporting.rst index c3f1656a84..95eff07ef3 100644 --- a/modules/account_es/tests/scenario_reporting.rst +++ b/modules/account_es/tests/scenario_reporting.rst @@ -4,7 +4,7 @@ Account ES Reporting Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report >>> from trytond.tests.tools import activate_modules @@ -15,7 +15,6 @@ Imports:: ... create_chart, get_accounts, create_fiscalyear) >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences - >>> today = datetime.date.today() Activate modules:: @@ -33,7 +32,8 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company, datetime.date(2018, 1, 1))) + ... create_fiscalyear( + ... company, (dt.date(2018, 1, 1), dt.date(2018, 12, 31)))) >>> fiscalyear.click('create_period') >>> period = fiscalyear.periods[0] diff --git a/modules/account_es/tests/scenario_reporting_alternate_currency.rst b/modules/account_es/tests/scenario_reporting_alternate_currency.rst index 3c8f29b177..f1876c6a6a 100644 --- a/modules/account_es/tests/scenario_reporting_alternate_currency.rst +++ b/modules/account_es/tests/scenario_reporting_alternate_currency.rst @@ -4,7 +4,7 @@ Account ES Reporting Alternate Currency Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model >>> from trytond.tests.tools import activate_modules @@ -15,7 +15,7 @@ Imports:: ... create_chart, get_accounts, create_fiscalyear) >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences - >>> today = datetime.date.today() + >>> today = dt.date.today() Activate modules:: @@ -31,7 +31,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/account_es/tests/scenario_reporting_compensate.rst b/modules/account_es/tests/scenario_reporting_compensate.rst index a40b05990e..cac570b6bc 100644 --- a/modules/account_es/tests/scenario_reporting_compensate.rst +++ b/modules/account_es/tests/scenario_reporting_compensate.rst @@ -4,7 +4,7 @@ Account ES Compensated Reporting Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -15,7 +15,6 @@ Imports:: ... create_chart, get_accounts, create_fiscalyear) >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences - >>> today = datetime.date.today() Activate modules:: @@ -33,7 +32,8 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company, datetime.date(2018, 1, 1))) + ... create_fiscalyear( + ... company, (dt.date(2018, 1, 1), dt.date(2018, 12, 31)))) >>> fiscalyear.click('create_period') >>> previous_period = fiscalyear.periods[0] >>> period = fiscalyear.periods[1] diff --git a/modules/account_es/tests/scenario_reporting_surcharge_tax.rst b/modules/account_es/tests/scenario_reporting_surcharge_tax.rst index 6073c6e81d..855d950e42 100644 --- a/modules/account_es/tests/scenario_reporting_surcharge_tax.rst +++ b/modules/account_es/tests/scenario_reporting_surcharge_tax.rst @@ -4,7 +4,7 @@ Account ES Reporting Surcharge Tax Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report >>> from trytond.tests.tools import activate_modules @@ -15,7 +15,6 @@ Imports:: ... create_chart, get_accounts, create_fiscalyear) >>> from trytond.modules.account_invoice.tests.tools import ( ... set_fiscalyear_invoice_sequences) - >>> today = datetime.date.today() Activate modules:: @@ -33,7 +32,8 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company, datetime.date(2020, 1, 1))) + ... create_fiscalyear( + ... company, (dt.date(2020, 1, 1), dt.date(2020, 12, 31)))) >>> fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/account_es_sii/tests/test_module.py b/modules/account_es_sii/tests/test_module.py index 7b208dbdfc..a3be80593b 100644 --- a/modules/account_es_sii/tests/test_module.py +++ b/modules/account_es_sii/tests/test_module.py @@ -331,7 +331,7 @@ class AccountEsSiiTestCase(ModuleTestCase): fiscalyear.save() currency = create_currency('gbp') - add_currency_rate(currency, 2) + add_currency_rate(currency, 2, fiscalyear.start_date) party = create_party('Customer', 'eu_vat', 'ES00000000T') tax, = Tax.search([ diff --git a/modules/account_fr/setup.py b/modules/account_fr/setup.py index 82a994c69c..29511e9fdb 100755 --- a/modules/account_fr/setup.py +++ b/modules/account_fr/setup.py @@ -47,7 +47,7 @@ for dep in info.get('depends', []): requires.append(get_require_version('trytond_%s' % dep)) requires.append(get_require_version('trytond')) -tests_require = [get_require_version('proteus'), 'python-dateutil'] +tests_require = [get_require_version('proteus')] setup(name=name, version=version, diff --git a/modules/account_fr/tests/scenario_fec.rst b/modules/account_fr/tests/scenario_fec.rst index 99dd6e11e1..1a61fd3582 100644 --- a/modules/account_fr/tests/scenario_fec.rst +++ b/modules/account_fr/tests/scenario_fec.rst @@ -4,11 +4,10 @@ FEC Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> import os >>> import io >>> from decimal import Decimal - >>> from dateutil.relativedelta import relativedelta >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ @@ -17,8 +16,6 @@ Imports:: >>> from trytond.modules.account_fr.tests.tools import create_chart, \ ... get_accounts - >>> today = datetime.date(2018, 1, 1) - Activate modules:: >>> config = activate_modules('account_fr') @@ -34,13 +31,14 @@ Create company:: Create last year fiscal year:: >>> fiscalyear_previous = create_fiscalyear( - ... company, today=today - relativedelta(years=1)) + ... company, (dt.date(2017, 1, 1), dt.date(2017, 12, 31))) >>> fiscalyear_previous.click('create_period') >>> period_previous = fiscalyear_previous.periods[0] Create fiscal year:: - >>> fiscalyear = create_fiscalyear(company, today=today) + >>> fiscalyear = create_fiscalyear( + ... company, (dt.date(2018, 1, 1), dt.date(2018, 12, 31))) >>> fiscalyear.click('create_period') >>> period = fiscalyear.periods[0] @@ -153,6 +151,7 @@ With reconciliation:: ... [reconcile1, reconcile2]) >>> reconcile_lines.state == 'end' True + >>> reconcile_date = reconcile1.reconciliation.create_date Balance non-deferral:: @@ -197,7 +196,7 @@ Generate FEC:: >>> file = os.path.join(os.path.dirname(__file__), 'FEC.csv') >>> with io.open(file, mode='rb') as fp: ... template = fp.read().decode('utf-8') - >>> current_date = datetime.date.today().strftime('%Y%m%d') + >>> current_date = reconcile_date.strftime('%Y%m%d') >>> template = template.format( ... current_date=current_date, ... ) diff --git a/modules/account_invoice/tests/scenario_invoice.rst b/modules/account_invoice/tests/scenario_invoice.rst index 893bac469a..164523640d 100644 --- a/modules/account_invoice/tests/scenario_invoice.rst +++ b/modules/account_invoice/tests/scenario_invoice.rst @@ -3,8 +3,8 @@ Invoice Scenario ================ Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + + >>> import datetime as dt >>> from decimal import Decimal >>> from operator import attrgetter >>> from proteus import Model, Wizard @@ -15,7 +15,7 @@ Imports:: ... create_chart, get_accounts, create_tax, create_tax_code >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences - >>> today = datetime.date.today() + >>> today = dt.date.today() Activate modules:: @@ -33,7 +33,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') >>> period = fiscalyear.periods[0] >>> period_ids = [p.id for p in fiscalyear.periods] @@ -167,6 +167,7 @@ Test change tax:: Post invoice:: + >>> invoice.invoice_date = today >>> invoice.click('post') >>> invoice.state 'posted' @@ -219,7 +220,7 @@ Credit invoice with refund:: >>> invoice.reload() >>> invoice.state 'cancelled' - >>> invoice.reconciled == today + >>> bool(invoice.reconciled) True >>> credit_note, = Invoice.find([ ... ('type', '=', 'out'), ('id', '!=', invoice.id)]) diff --git a/modules/account_invoice/tests/scenario_invoice_alternate_currency.rst b/modules/account_invoice/tests/scenario_invoice_alternate_currency.rst index a2d72ac421..5f27a7372d 100644 --- a/modules/account_invoice/tests/scenario_invoice_alternate_currency.rst +++ b/modules/account_invoice/tests/scenario_invoice_alternate_currency.rst @@ -4,8 +4,7 @@ Invoice Scenario Alternate Currency Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from operator import attrgetter >>> from proteus import Model, Wizard @@ -17,8 +16,8 @@ Imports:: ... create_chart, get_accounts, create_tax >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences - >>> today = datetime.date.today() - >>> tomorrow = today + relativedelta(days=1) + >>> today = dt.date.today() + >>> tomorrow = today + dt.timedelta(days=1) Activate modules:: @@ -44,11 +43,8 @@ Set alternate currency rates:: Create fiscal years:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company, today=today)) + ... create_fiscalyear(company, (today, tomorrow))) >>> fiscalyear.click('create_period') - >>> next_fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company, today=today + relativedelta(years=1))) - >>> next_fiscalyear.click('create_period') Create chart of accounts:: @@ -147,6 +143,7 @@ Create invoice with alternate currency:: Decimal('40.00') >>> invoice.total_amount Decimal('460.00') + >>> invoice.invoice_date = today >>> invoice.click('post') >>> invoice.state 'posted' diff --git a/modules/account_invoice/tests/scenario_invoice_alternate_currency_lower_rate.rst b/modules/account_invoice/tests/scenario_invoice_alternate_currency_lower_rate.rst index d3c909aa4f..2dd907bcfb 100644 --- a/modules/account_invoice/tests/scenario_invoice_alternate_currency_lower_rate.rst +++ b/modules/account_invoice/tests/scenario_invoice_alternate_currency_lower_rate.rst @@ -4,7 +4,7 @@ Invoice Scenario Alternate Currency Lower Rate Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -15,7 +15,7 @@ Imports:: ... create_chart, get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences - >>> today = datetime.date.today() + >>> today = dt.date.today() Activate modules:: @@ -38,7 +38,7 @@ Set alternate currency rates:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') Create chart of accounts:: @@ -76,6 +76,7 @@ Create invoice with alternate currency:: >>> line.account = accounts['revenue'] >>> line.quantity = 5 >>> line.unit_price = Decimal('80') + >>> invoice.invoice_date = today >>> invoice.click('post') >>> invoice.state 'posted' diff --git a/modules/account_invoice/tests/scenario_invoice_customer_sequential.rst b/modules/account_invoice/tests/scenario_invoice_customer_sequential.rst index e54579a259..cc360ff300 100644 --- a/modules/account_invoice/tests/scenario_invoice_customer_sequential.rst +++ b/modules/account_invoice/tests/scenario_invoice_customer_sequential.rst @@ -6,8 +6,7 @@ Imports:: >>> from decimal import Decimal >>> import datetime as dt - >>> from dateutil.relativedelta import relativedelta - >>> from proteus import Model + >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -16,7 +15,7 @@ Imports:: >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences >>> today = dt.date.today() - >>> past_year = today - relativedelta(years=1) + >>> past_year = today - dt.timedelta(days=365) Activate modules:: @@ -30,11 +29,12 @@ Create company:: Create fiscal years:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company, today=past_year)) + ... create_fiscalyear(company, past_year)) >>> fiscalyear.click('create_period') - >>> next_fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company, today=today)) - >>> next_fiscalyear.click('create_period') + + >>> renew_fiscalyear = Wizard('account.fiscalyear.renew') + >>> renew_fiscalyear.execute('create_') + >>> next_fiscalyear, = renew_fiscalyear.actions[0] Create chart of accounts:: diff --git a/modules/account_invoice/tests/scenario_invoice_in_future.rst b/modules/account_invoice/tests/scenario_invoice_in_future.rst index c1807bab35..5a4367af05 100644 --- a/modules/account_invoice/tests/scenario_invoice_in_future.rst +++ b/modules/account_invoice/tests/scenario_invoice_in_future.rst @@ -4,7 +4,7 @@ Invoice in Future Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model >>> from trytond.tests.tools import activate_modules @@ -14,8 +14,8 @@ Imports:: ... create_chart, get_accounts) >>> from trytond.modules.account_invoice.tests.tools import ( ... set_fiscalyear_invoice_sequences) - >>> today = datetime.date.today() - >>> tomorrow = today + datetime.timedelta(days=1) + >>> today = dt.date.today() + >>> tomorrow = today + dt.timedelta(days=1) Activate modules:: @@ -29,7 +29,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, (today, tomorrow))) >>> fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/account_invoice/tests/scenario_invoice_manual_tax.rst b/modules/account_invoice/tests/scenario_invoice_manual_tax.rst index 79fe6ce244..ccf1a0032a 100644 --- a/modules/account_invoice/tests/scenario_invoice_manual_tax.rst +++ b/modules/account_invoice/tests/scenario_invoice_manual_tax.rst @@ -33,7 +33,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') >>> period_ids = [p.id for p in fiscalyear.periods] diff --git a/modules/account_invoice/tests/scenario_invoice_supplier.rst b/modules/account_invoice/tests/scenario_invoice_supplier.rst index a4c9c0bd72..e7bcac9d97 100644 --- a/modules/account_invoice/tests/scenario_invoice_supplier.rst +++ b/modules/account_invoice/tests/scenario_invoice_supplier.rst @@ -4,7 +4,7 @@ Invoice Supplier Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from operator import attrgetter @@ -16,7 +16,7 @@ Imports:: ... create_chart, get_accounts, create_tax, create_tax_code >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences - >>> today = datetime.date.today() + >>> today = dt.date.today() Activate modules:: @@ -30,7 +30,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') >>> period_ids = [p.id for p in fiscalyear.periods] @@ -243,5 +243,5 @@ Cancel posted invoice:: 'cancelled' >>> invoice.cancel_move is not None True - >>> invoice.reconciled == today + >>> bool(invoice.reconciled) True diff --git a/modules/account_invoice/tests/scenario_invoice_supplier_post_paid.rst b/modules/account_invoice/tests/scenario_invoice_supplier_post_paid.rst index 2bd95b6791..20c30fc583 100644 --- a/modules/account_invoice/tests/scenario_invoice_supplier_post_paid.rst +++ b/modules/account_invoice/tests/scenario_invoice_supplier_post_paid.rst @@ -3,7 +3,8 @@ Invoice Supplier Post Paid ========================== Imports:: - >>> import datetime + + >>> import datetime as dt >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from operator import attrgetter @@ -15,7 +16,7 @@ Imports:: ... create_chart, get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences - >>> today = datetime.date.today() + >>> today = dt.date.today() Activate modules:: @@ -29,7 +30,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') >>> period = fiscalyear.periods[0] diff --git a/modules/account_invoice/tests/scenario_invoice_tax_deductible.rst b/modules/account_invoice/tests/scenario_invoice_tax_deductible.rst index 0cbeb6e335..06ebe6a746 100644 --- a/modules/account_invoice/tests/scenario_invoice_tax_deductible.rst +++ b/modules/account_invoice/tests/scenario_invoice_tax_deductible.rst @@ -34,7 +34,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/account_invoice/tests/scenario_invoice_with_credit.rst b/modules/account_invoice/tests/scenario_invoice_with_credit.rst index 171f2e71e1..02a2eef5f8 100644 --- a/modules/account_invoice/tests/scenario_invoice_with_credit.rst +++ b/modules/account_invoice/tests/scenario_invoice_with_credit.rst @@ -3,8 +3,7 @@ Invoice with credit Scenario ============================ Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> from decimal import Decimal >>> from operator import attrgetter >>> from proteus import Model, Wizard @@ -15,7 +14,6 @@ Imports:: ... create_chart, get_accounts, create_tax, create_tax_code >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences - >>> today = datetime.date.today() Activate modules:: @@ -74,6 +72,7 @@ Create invoice:: >>> line.quantity = -2 >>> line.unit_price = Decimal('5.0000') >>> line.taxes.append(Tax(tax.id)) + >>> invoice.invoice_date = fiscalyear.start_date >>> invoice.click('post') >>> invoice.untaxed_amount diff --git a/modules/account_invoice/tests/scenario_renew_fiscalyear.rst b/modules/account_invoice/tests/scenario_renew_fiscalyear.rst index 3da0b37c83..deee4ee912 100644 --- a/modules/account_invoice/tests/scenario_renew_fiscalyear.rst +++ b/modules/account_invoice/tests/scenario_renew_fiscalyear.rst @@ -4,7 +4,7 @@ Renew Fiscalyear Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report @@ -14,8 +14,7 @@ Imports:: >>> from trytond.modules.account.tests.tools import create_fiscalyear >>> from trytond.modules.account_invoice.tests.tools \ ... import set_fiscalyear_invoice_sequences - >>> today = datetime.date.today() - >>> end_year = today + relativedelta(month=12, day=31) + >>> today = dt.date.today() Activate modules:: @@ -29,7 +28,7 @@ Create company:: Create fiscal year:: >>> InvoiceSequence = Model.get('account.fiscalyear.invoice_sequence') - >>> fiscalyear = create_fiscalyear(company) + >>> fiscalyear = create_fiscalyear(company, today) >>> fiscalyear = set_fiscalyear_invoice_sequences(fiscalyear) >>> fiscalyear.click('create_period') >>> inv_seq, = fiscalyear.invoice_sequences @@ -45,8 +44,8 @@ Create fiscal year:: ... }) >>> period = fiscalyear.periods.new() >>> period.name = 'Adjustment' - >>> period.start_date = end_year - >>> period.end_date = end_year + >>> period.start_date = fiscalyear.end_date + >>> period.end_date = fiscalyear.end_date >>> period.type = 'adjustment' >>> fiscalyear.save() @@ -91,7 +90,7 @@ Set the sequence name:: >>> for seq in new_fiscalyear.invoice_sequences: ... seq.out_invoice_sequence.name = ('Sequence %s' % - ... new_fiscalyear.start_date.strftime('%Y')) + ... new_fiscalyear.name) ... seq.out_invoice_sequence.save() Renew fiscalyear and test sequence name is updated:: @@ -101,6 +100,6 @@ Renew fiscalyear and test sequence name is updated:: >>> renew_fiscalyear.execute('create_') >>> new_fiscalyear, = renew_fiscalyear.actions[0] >>> all(seq.out_invoice_sequence.name == - ... 'Sequence %s' % new_fiscalyear.start_date.strftime('%Y') + ... 'Sequence %s' % new_fiscalyear.name ... for seq in new_fiscalyear.invoice_sequences) True diff --git a/modules/account_invoice_defer/tests/scenario_account_invoice_defer.rst b/modules/account_invoice_defer/tests/scenario_account_invoice_defer.rst index 28f87b3c6d..806647cf93 100644 --- a/modules/account_invoice_defer/tests/scenario_account_invoice_defer.rst +++ b/modules/account_invoice_defer/tests/scenario_account_invoice_defer.rst @@ -18,6 +18,8 @@ Imports:: >>> from trytond.modules.account_invoice_defer.tests.tools import ( ... add_deferred_accounts) + >>> today = dt.date.today() + Activate modules:: >>> config = activate_modules('account_invoice_defer') @@ -36,7 +38,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') >>> period = fiscalyear.periods[0] @@ -81,7 +83,7 @@ Create invoice:: >>> line.unit_price = Decimal('1000') >>> line.defer_from = period.start_date >>> line.defer_to = line.defer_from + dt.timedelta(days=499) - >>> invoice.invoice_date = dt.date.today() + >>> invoice.invoice_date = today >>> invoice.click('post') >>> invoice_line, = invoice.lines diff --git a/modules/account_invoice_stock/tests/scenario_account_invoice_stock_correction.rst b/modules/account_invoice_stock/tests/scenario_account_invoice_stock_correction.rst index 7cb3b3cfb0..95bd2f8504 100644 --- a/modules/account_invoice_stock/tests/scenario_account_invoice_stock_correction.rst +++ b/modules/account_invoice_stock/tests/scenario_account_invoice_stock_correction.rst @@ -38,7 +38,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/account_payment/tests/scenario_account_payment.rst b/modules/account_payment/tests/scenario_account_payment.rst index 606f2829a4..ce8a21b3c9 100644 --- a/modules/account_payment/tests/scenario_account_payment.rst +++ b/modules/account_payment/tests/scenario_account_payment.rst @@ -3,7 +3,8 @@ Payment Scenario ================ Imports:: - >>> import datetime + + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -11,7 +12,9 @@ Imports:: ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ ... create_chart, get_accounts - >>> tomorrow = datetime.date.today() + datetime.timedelta(days=1) + + >>> today = dt.date.today() + >>> tomorrow = today + dt.timedelta(days=1) Activate modules:: @@ -38,7 +41,7 @@ Set employee:: Create fiscal year:: - >>> fiscalyear = create_fiscalyear(company) + >>> fiscalyear = create_fiscalyear(company, (today, tomorrow)) >>> fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/account_payment/tests/scenario_account_payment_direct_debit.rst b/modules/account_payment/tests/scenario_account_payment_direct_debit.rst index 173e248218..521e1f43f1 100644 --- a/modules/account_payment/tests/scenario_account_payment_direct_debit.rst +++ b/modules/account_payment/tests/scenario_account_payment_direct_debit.rst @@ -16,6 +16,7 @@ Imports:: >>> today = dt.date.today() >>> tomorrow = today + dt.timedelta(days=1) + >>> after_tomorrow = tomorrow + dt.timedelta(days=1) Activate modules:: @@ -34,7 +35,7 @@ Create company:: Create fiscal year:: - >>> fiscalyear = create_fiscalyear(company) + >>> fiscalyear = create_fiscalyear(company, (today, after_tomorrow)) >>> fiscalyear.click('create_period') Create chart of accounts:: @@ -83,7 +84,7 @@ Create receivable moves:: Create direct debit:: >>> create_direct_debit = Wizard('account.move.line.create_direct_debit') - >>> create_direct_debit.form.date = tomorrow + dt.timedelta(days=1) + >>> create_direct_debit.form.date = after_tomorrow >>> create_direct_debit.execute('create_') >>> payment, = Payment.find([]) @@ -99,7 +100,7 @@ Create direct debit:: Re-run create direct debit does nothing:: >>> create_direct_debit = Wizard('account.move.line.create_direct_debit') - >>> create_direct_debit.form.date = tomorrow + dt.timedelta(days=1) + >>> create_direct_debit.form.date = after_tomorrow >>> create_direct_debit.execute('create_') >>> Payment.find([]) == [payment] diff --git a/modules/account_payment/tests/scenario_account_payment_dunning.rst b/modules/account_payment/tests/scenario_account_payment_dunning.rst index ece4533339..94eb55e292 100644 --- a/modules/account_payment/tests/scenario_account_payment_dunning.rst +++ b/modules/account_payment/tests/scenario_account_payment_dunning.rst @@ -41,7 +41,7 @@ Create chart of accounts:: Create fiscal year:: - >>> fiscalyear = create_fiscalyear(company) + >>> fiscalyear = create_fiscalyear(company, today) >>> fiscalyear.click('create_period') Create dunning procedure:: diff --git a/modules/account_payment/tests/scenario_account_payment_planning.rst b/modules/account_payment/tests/scenario_account_payment_planning.rst index bd78753002..bb199c89c9 100644 --- a/modules/account_payment/tests/scenario_account_payment_planning.rst +++ b/modules/account_payment/tests/scenario_account_payment_planning.rst @@ -4,7 +4,7 @@ Payment Planning Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -12,9 +12,10 @@ Imports:: ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ ... create_chart, get_accounts - >>> today = datetime.date.today() - >>> tomorrow = today + datetime.timedelta(days=1) - >>> next_week = today + datetime.timedelta(weeks=1) + + >>> today = dt.date.today() + >>> tomorrow = today + dt.timedelta(days=1) + >>> next_week = today + dt.timedelta(weeks=1) Activate modules:: @@ -27,7 +28,7 @@ Create company:: Create fiscal year:: - >>> fiscalyear = create_fiscalyear(company) + >>> fiscalyear = create_fiscalyear(company, (today, next_week)) >>> fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/account_payment_clearing/setup.py b/modules/account_payment_clearing/setup.py index f2863592b5..9d9a357b75 100755 --- a/modules/account_payment_clearing/setup.py +++ b/modules/account_payment_clearing/setup.py @@ -51,7 +51,7 @@ tests_require = [get_require_version('proteus'), get_require_version('trytond_account_statement'), get_require_version('trytond_account_statement_rule'), get_require_version('trytond_account_invoice'), - 'python-dateutil'] + ] setup(name=name, version=version, diff --git a/modules/account_payment_clearing/tests/scenario_account_negative_payment_clearing.rst b/modules/account_payment_clearing/tests/scenario_account_negative_payment_clearing.rst index 5761344188..864659b53b 100644 --- a/modules/account_payment_clearing/tests/scenario_account_negative_payment_clearing.rst +++ b/modules/account_payment_clearing/tests/scenario_account_negative_payment_clearing.rst @@ -3,8 +3,8 @@ Negative Payment Clearing Scenario ================================== Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -12,7 +12,7 @@ Imports:: ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ ... create_chart, get_accounts - >>> today = datetime.date.today() + >>> today = dt.date.today() Activate modules:: diff --git a/modules/account_payment_clearing/tests/scenario_account_payment_clearing.rst b/modules/account_payment_clearing/tests/scenario_account_payment_clearing.rst index 22c5919a4e..7cfdb1cd1c 100644 --- a/modules/account_payment_clearing/tests/scenario_account_payment_clearing.rst +++ b/modules/account_payment_clearing/tests/scenario_account_payment_clearing.rst @@ -3,8 +3,8 @@ Payment Clearing Scenario ========================= Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -15,9 +15,9 @@ Imports:: ... create_chart, get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences - >>> today = datetime.date.today() - >>> yesterday = today - relativedelta(days=1) - >>> first = today + relativedelta(day=1) + >>> today = dt.date.today() + >>> yesterday = today - dt.timedelta(days=1) + >>> first = today + dt.timedelta(days=1) Activate modules:: @@ -31,7 +31,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, (yesterday, first))) >>> fiscalyear.click('create_period') Create chart of accounts:: @@ -62,7 +62,7 @@ Create payment journal:: >>> payment_journal = PaymentJournal(name='Manual', ... process_method='manual', clearing_journal=expense, ... clearing_account=bank_clearing, - ... clearing_posting_delay=datetime.timedelta(1)) + ... clearing_posting_delay=dt.timedelta(1)) >>> payment_journal.save() Create parties:: @@ -110,8 +110,6 @@ Partially pay the line:: Succeed payment:: >>> succeed = Wizard('account.payment.succeed', [payment]) - >>> succeed.form.date == today - True >>> succeed.form.date = first >>> succeed.execute('succeed') >>> payment.state diff --git a/modules/account_payment_clearing/tests/scenario_account_payment_clearing_invoice_amount_to_pay.rst b/modules/account_payment_clearing/tests/scenario_account_payment_clearing_invoice_amount_to_pay.rst index e5374acf5b..7a81bb39b9 100644 --- a/modules/account_payment_clearing/tests/scenario_account_payment_clearing_invoice_amount_to_pay.rst +++ b/modules/account_payment_clearing/tests/scenario_account_payment_clearing_invoice_amount_to_pay.rst @@ -3,8 +3,7 @@ Payment Clearing Invoice Amount to Pay ====================================== Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -15,9 +14,6 @@ Imports:: ... create_fiscalyear, create_chart, get_accounts) >>> from trytond.modules.account_invoice.tests.tools import ( ... set_fiscalyear_invoice_sequences) - >>> today = datetime.date.today() - >>> yesterday = today - relativedelta(days=1) - >>> first = today + relativedelta(day=1) Activate modules:: diff --git a/modules/account_payment_stripe/tests/scenario_account_payment_stripe.rst b/modules/account_payment_stripe/tests/scenario_account_payment_stripe.rst index 49096155ee..53e264491c 100644 --- a/modules/account_payment_stripe/tests/scenario_account_payment_stripe.rst +++ b/modules/account_payment_stripe/tests/scenario_account_payment_stripe.rst @@ -5,7 +5,7 @@ Account Payment Stripe Scenario Imports:: >>> import os - >>> import datetime + >>> import datetime as dt >>> import time >>> from decimal import Decimal >>> import stripe @@ -16,6 +16,8 @@ Imports:: >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ ... create_chart, get_accounts + >>> today = dt.date.today() + Activate modules:: >>> config = activate_modules('account_payment_stripe') @@ -28,7 +30,7 @@ Create company:: Create fiscal year:: - >>> fiscalyear = create_fiscalyear(company) + >>> fiscalyear = create_fiscalyear(company, today) >>> fiscalyear.click('create_period') Create chart of accounts:: @@ -102,7 +104,7 @@ Checkout the payment:: ... card={ ... 'number': '4242424242424242', ... 'exp_month': 12, - ... 'exp_year': datetime.date.today().year + 1, + ... 'exp_year': today.year + 1, ... 'cvc': '123', ... }, ... ) @@ -144,7 +146,7 @@ Create failing payment:: ... card={ ... 'number': '4000000000000002', ... 'exp_month': 12, - ... 'exp_year': datetime.date.today().year + 1, + ... 'exp_year': today.year + 1, ... 'cvc': '123', ... }, ... ) @@ -178,7 +180,7 @@ Checkout the customer:: ... card={ ... 'number': '4012888888881881', ... 'exp_month': 12, - ... 'exp_year': datetime.date.today().year + 1, + ... 'exp_year': today.year + 1, ... 'cvc': '123', ... }, ... ) @@ -217,7 +219,7 @@ Make payment with customer:: >>> payment.save() >>> _, source = Payment.get_stripe_customer_sources(payment.id, config.context) >>> source_id, source_name = source - >>> source_name == 'Visa ****1881 12/%s' % (datetime.date.today().year + 1) + >>> source_name == 'Visa ****1881 12/%s' % (today.year + 1) True >>> payment.stripe_customer_source = source_id >>> payment.click('submit') @@ -280,7 +282,7 @@ Checkout the capture payment:: ... card={ ... 'number': '4242424242424242', ... 'exp_month': 12, - ... 'exp_year': datetime.date.today().year + 1, + ... 'exp_year': today.year + 1, ... 'cvc': '123', ... }, ... ) diff --git a/modules/account_payment_stripe/tests/scenario_account_payment_stripe_dispute.rst b/modules/account_payment_stripe/tests/scenario_account_payment_stripe_dispute.rst index b6c72323c9..3a8d8077ed 100644 --- a/modules/account_payment_stripe/tests/scenario_account_payment_stripe_dispute.rst +++ b/modules/account_payment_stripe/tests/scenario_account_payment_stripe_dispute.rst @@ -5,7 +5,7 @@ Account Payment Stripe Dispute Scenario Imports:: >>> import os - >>> import datetime + >>> import datetime as dt >>> import time >>> from decimal import Decimal >>> import stripe @@ -16,6 +16,8 @@ Imports:: >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ ... create_chart, get_accounts + >>> today = dt.date.today() + Activate modules:: >>> config = activate_modules('account_payment_stripe') @@ -28,7 +30,7 @@ Create company:: Create fiscal year:: - >>> fiscalyear = create_fiscalyear(company) + >>> fiscalyear = create_fiscalyear(company, today) >>> fiscalyear.click('create_period') Create chart of accounts:: @@ -87,7 +89,7 @@ Create fully disputed payment:: ... card={ ... 'number': '4000000000000259', ... 'exp_month': 12, - ... 'exp_year': datetime.date.today().year + 1, + ... 'exp_year': today.year + 1, ... 'cvc': '123', ... }, ... ) @@ -180,7 +182,7 @@ Create partial disputed payment:: ... card={ ... 'number': '4000000000000259', ... 'exp_month': 12, - ... 'exp_year': datetime.date.today().year + 1, + ... 'exp_year': today.year + 1, ... 'cvc': '123', ... }, ... ) @@ -251,7 +253,7 @@ Create won disputed payment:: ... card={ ... 'number': '4000000000000259', ... 'exp_month': 12, - ... 'exp_year': datetime.date.today().year + 1, + ... 'exp_year': today.year + 1, ... 'cvc': '123', ... }, ... ) diff --git a/modules/account_payment_stripe/tests/scenario_account_payment_stripe_identical.rst b/modules/account_payment_stripe/tests/scenario_account_payment_stripe_identical.rst index 894c308f4a..06e5e64636 100644 --- a/modules/account_payment_stripe/tests/scenario_account_payment_stripe_identical.rst +++ b/modules/account_payment_stripe/tests/scenario_account_payment_stripe_identical.rst @@ -16,6 +16,8 @@ Imports:: >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) + >>> today = dt.date.today() + Activate modules:: >>> config = activate_modules('account_payment_stripe') @@ -65,7 +67,7 @@ Create a customer:: ... card={ ... 'number': '4012888888881881', ... 'exp_month': 12, - ... 'exp_year': dt.date.today().year + 1, + ... 'exp_year': today.year + 1, ... 'cvc': '123', ... }, ... ) @@ -90,7 +92,7 @@ Create a second customer with same card:: ... card={ ... 'number': '4012888888881881', ... 'exp_month': 12, - ... 'exp_year': dt.date.today().year + 1, + ... 'exp_year': today.year + 1, ... 'cvc': '123', ... }, ... ) diff --git a/modules/account_payment_stripe/tests/scenario_account_payment_stripe_intent.rst b/modules/account_payment_stripe/tests/scenario_account_payment_stripe_intent.rst index 63299bad7b..4c4973a0cc 100644 --- a/modules/account_payment_stripe/tests/scenario_account_payment_stripe_intent.rst +++ b/modules/account_payment_stripe/tests/scenario_account_payment_stripe_intent.rst @@ -5,7 +5,7 @@ Account Payment Stripe Intent Scenario Imports:: >>> import os - >>> import datetime + >>> import datetime as dt >>> import time >>> from decimal import Decimal >>> import stripe @@ -16,6 +16,8 @@ Imports:: >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ ... create_chart, get_accounts + >>> today = dt.date.today() + Activate modules:: >>> config = activate_modules('account_payment_stripe') @@ -28,7 +30,7 @@ Create company:: Create fiscal year:: - >>> fiscalyear = create_fiscalyear(company) + >>> fiscalyear = create_fiscalyear(company, today) >>> fiscalyear.click('create_period') Create chart of accounts:: @@ -80,7 +82,7 @@ Register card:: ... card={ ... 'number': '4000000000003055', ... 'exp_month': 12, - ... 'exp_year': datetime.date.today().year + 1, + ... 'exp_year': today.year + 1, ... 'cvc': '123', ... }) >>> setup_intent = stripe.SetupIntent.confirm( diff --git a/modules/account_statement/tests/scenario_account_statement.rst b/modules/account_statement/tests/scenario_account_statement.rst index 952cd74680..a84a6d40ba 100644 --- a/modules/account_statement/tests/scenario_account_statement.rst +++ b/modules/account_statement/tests/scenario_account_statement.rst @@ -4,7 +4,7 @@ Account Statement Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report @@ -15,7 +15,8 @@ Imports:: ... create_chart, get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: @@ -29,7 +30,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/account_statement/tests/scenario_statement_origin.rst b/modules/account_statement/tests/scenario_statement_origin.rst index 259f180cf2..b5f54335eb 100644 --- a/modules/account_statement/tests/scenario_statement_origin.rst +++ b/modules/account_statement/tests/scenario_statement_origin.rst @@ -4,7 +4,7 @@ Account Statement Origin Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report >>> from trytond.tests.tools import activate_modules @@ -14,7 +14,8 @@ Imports:: ... create_chart, get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: @@ -28,7 +29,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/account_statement/tests/scenario_statement_origin_invoices.rst b/modules/account_statement/tests/scenario_statement_origin_invoices.rst index 7b8b00812a..452de72f0b 100644 --- a/modules/account_statement/tests/scenario_statement_origin_invoices.rst +++ b/modules/account_statement/tests/scenario_statement_origin_invoices.rst @@ -4,7 +4,7 @@ Account Statement Origin Invoices Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report >>> from trytond.tests.tools import activate_modules @@ -14,7 +14,8 @@ Imports:: ... create_chart, get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: @@ -28,7 +29,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/account_statement_rule/tests/scenario_account_statement_rule.rst b/modules/account_statement_rule/tests/scenario_account_statement_rule.rst index ec7cc32fe0..ac2b3905b1 100644 --- a/modules/account_statement_rule/tests/scenario_account_statement_rule.rst +++ b/modules/account_statement_rule/tests/scenario_account_statement_rule.rst @@ -4,15 +4,15 @@ Account Statement Rule Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ - ... create_chart, get_accounts - >>> today = datetime.date.today() + >>> from trytond.modules.account.tests.tools import ( + ... create_chart, get_accounts) + >>> today = dt.date.today() Activate modules:: diff --git a/modules/account_statement_rule/tests/scenario_account_statement_rule_keyword_bank_account.rst b/modules/account_statement_rule/tests/scenario_account_statement_rule_keyword_bank_account.rst index 3da2af18c4..7996ba3e7a 100644 --- a/modules/account_statement_rule/tests/scenario_account_statement_rule_keyword_bank_account.rst +++ b/modules/account_statement_rule/tests/scenario_account_statement_rule_keyword_bank_account.rst @@ -4,7 +4,7 @@ Account Statement Rule Keyword Bank Account Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model >>> from trytond.tests.tools import activate_modules @@ -14,7 +14,7 @@ Imports:: ... create_fiscalyear, create_chart, get_accounts) >>> from trytond.modules.account_invoice.tests.tools import ( ... set_fiscalyear_invoice_sequences) - >>> today = datetime.date.today() + >>> today = dt.date.today() Activate modules:: @@ -36,7 +36,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/account_statement_rule/tests/scenario_account_statement_rule_keywords.rst b/modules/account_statement_rule/tests/scenario_account_statement_rule_keywords.rst index 092d9ef5ff..588230772d 100644 --- a/modules/account_statement_rule/tests/scenario_account_statement_rule_keywords.rst +++ b/modules/account_statement_rule/tests/scenario_account_statement_rule_keywords.rst @@ -4,7 +4,7 @@ Account Statement Rule Keyword Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -14,7 +14,8 @@ Imports:: ... create_fiscalyear, create_chart, get_accounts) >>> from trytond.modules.account_invoice.tests.tools import ( ... set_fiscalyear_invoice_sequences) - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: @@ -28,7 +29,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon.rst b/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon.rst index c321a66a71..d37825382a 100644 --- a/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon.rst +++ b/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon.rst @@ -4,8 +4,7 @@ Account Stock Anglo-Saxon Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules, set_user @@ -19,7 +18,8 @@ Imports:: ... add_stock_accounts >>> from trytond.modules.account_stock_anglo_saxon.tests.tools import \ ... add_cogs_accounts - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: @@ -69,7 +69,7 @@ Create the required users:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.account_stock_method = 'anglo_saxon' >>> fiscalyear.click('create_period') @@ -121,7 +121,7 @@ Create product:: >>> template.salable = True >>> template.list_price = Decimal('10') >>> template.cost_price_method = 'fixed' - >>> template.lead_time = datetime.timedelta(0) + >>> template.lead_time = dt.timedelta(0) >>> template.account_category = account_category >>> product, = template.products >>> product.cost_price = Decimal('5') @@ -355,7 +355,7 @@ Now we will use a product with different unit of measure:: >>> template_by5.sale_uom = unit_5 >>> template_by5.list_price = Decimal('10') >>> template_by5.cost_price_method = 'fixed' - >>> template_by5.lead_time = datetime.timedelta(0) + >>> template_by5.lead_time = dt.timedelta(0) >>> template_by5.account_category = account_category >>> product_by5, = template_by5.products >>> product_by5.cost_price = Decimal('5') diff --git a/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst b/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst index 2be0b60b29..cfb32ade03 100644 --- a/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst +++ b/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst @@ -4,8 +4,7 @@ Account Stock Anglo-Saxon with Drop Shipment Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules, set_user @@ -19,7 +18,8 @@ Imports:: ... add_stock_accounts >>> from trytond.modules.account_stock_anglo_saxon.tests.tools import \ ... add_cogs_accounts - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: @@ -79,7 +79,7 @@ Create account user:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.account_stock_method = 'anglo_saxon' >>> fiscalyear.click('create_period') @@ -132,7 +132,7 @@ Create product:: >>> template.salable = True >>> template.list_price = Decimal('10') >>> template.cost_price_method = 'fixed' - >>> template.lead_time = datetime.timedelta(0) + >>> template.lead_time = dt.timedelta(0) >>> template.supply_on_sale = True >>> template.account_category = account_category >>> product, = template.products @@ -143,7 +143,7 @@ Create product:: >>> product_supplier.template = template >>> product_supplier.party = supplier >>> product_supplier.drop_shipment = True - >>> product_supplier.lead_time = datetime.timedelta(0) + >>> product_supplier.lead_time = dt.timedelta(0) >>> product_supplier.save() Create payment term:: diff --git a/modules/account_stock_continental/tests/scenario_account_stock_continental.rst b/modules/account_stock_continental/tests/scenario_account_stock_continental.rst index 2089ce25d3..6b9e51eeea 100644 --- a/modules/account_stock_continental/tests/scenario_account_stock_continental.rst +++ b/modules/account_stock_continental/tests/scenario_account_stock_continental.rst @@ -4,7 +4,7 @@ Account Stock Continental Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard @@ -17,7 +17,8 @@ Imports:: ... set_fiscalyear_invoice_sequences, create_payment_term >>> from trytond.modules.account_stock_continental.tests.tools import \ ... add_stock_accounts - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: @@ -36,7 +37,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.account_stock_method = 'continental' >>> fiscalyear.click('create_period') @@ -86,7 +87,7 @@ Create product:: >>> template.salable = True >>> template.list_price = Decimal('10') >>> template.cost_price_method = 'fixed' - >>> template.lead_time = datetime.timedelta(0) + >>> template.lead_time = dt.timedelta(0) >>> template.account_category = account_category >>> product, = template.products >>> product.cost_price = Decimal('5') @@ -282,7 +283,7 @@ Create Drop Shipment Move:: >>> product_supplier.template = product.template >>> product_supplier.party = supplier >>> product_supplier.drop_shipment = True - >>> product_supplier.lead_time = datetime.timedelta(0) + >>> product_supplier.lead_time = dt.timedelta(0) >>> product_supplier.save() >>> product.template.supply_on_sale = True >>> product.template.save() @@ -335,7 +336,7 @@ Create Drop Shipment Move:: >>> product_supplier.template = product_average.template >>> product_supplier.party = supplier >>> product_supplier.drop_shipment = True - >>> product_supplier.lead_time = datetime.timedelta(0) + >>> product_supplier.lead_time = dt.timedelta(0) >>> product_supplier.save() >>> product_average.template.supply_on_sale = True >>> product_average.template.save() diff --git a/modules/account_stock_landed_cost/tests/scenario_account_stock_landed_cost.rst b/modules/account_stock_landed_cost/tests/scenario_account_stock_landed_cost.rst index 3244991125..5875d66036 100644 --- a/modules/account_stock_landed_cost/tests/scenario_account_stock_landed_cost.rst +++ b/modules/account_stock_landed_cost/tests/scenario_account_stock_landed_cost.rst @@ -4,8 +4,7 @@ Account Stock Landed Cost Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -15,7 +14,8 @@ Imports:: ... create_chart, get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: @@ -29,7 +29,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/account_stock_landed_cost_weight/tests/scenario_account_stock_landed_cost_weight.rst b/modules/account_stock_landed_cost_weight/tests/scenario_account_stock_landed_cost_weight.rst index 695051928c..62f1006767 100644 --- a/modules/account_stock_landed_cost_weight/tests/scenario_account_stock_landed_cost_weight.rst +++ b/modules/account_stock_landed_cost_weight/tests/scenario_account_stock_landed_cost_weight.rst @@ -4,8 +4,7 @@ Account Stock Landed Cost Weight Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -15,7 +14,8 @@ Imports:: ... create_chart, get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: @@ -29,7 +29,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/account_stock_shipment_cost/tests/scenario_account_stock_shipment_cost.rst b/modules/account_stock_shipment_cost/tests/scenario_account_stock_shipment_cost.rst index e197010a42..aba3625eba 100644 --- a/modules/account_stock_shipment_cost/tests/scenario_account_stock_shipment_cost.rst +++ b/modules/account_stock_shipment_cost/tests/scenario_account_stock_shipment_cost.rst @@ -43,7 +43,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/account_stock_shipment_cost_weight/tests/scenario_account_stock_shipment_cost_weight.rst b/modules/account_stock_shipment_cost_weight/tests/scenario_account_stock_shipment_cost_weight.rst index 671ee3a827..ff7574cd61 100644 --- a/modules/account_stock_shipment_cost_weight/tests/scenario_account_stock_shipment_cost_weight.rst +++ b/modules/account_stock_shipment_cost_weight/tests/scenario_account_stock_shipment_cost_weight.rst @@ -39,7 +39,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/account_tax_non_deductible/tests/scenario_account_tax_non_deductible.rst b/modules/account_tax_non_deductible/tests/scenario_account_tax_non_deductible.rst index 718fc19ad1..0979002945 100644 --- a/modules/account_tax_non_deductible/tests/scenario_account_tax_non_deductible.rst +++ b/modules/account_tax_non_deductible/tests/scenario_account_tax_non_deductible.rst @@ -35,7 +35,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') >>> period_ids = [p.id for p in fiscalyear.periods] diff --git a/modules/analytic_account/tests/scenario_analytic_account.rst b/modules/analytic_account/tests/scenario_analytic_account.rst index d9c5f8f7ad..0d44c5aa78 100644 --- a/modules/analytic_account/tests/scenario_analytic_account.rst +++ b/modules/analytic_account/tests/scenario_analytic_account.rst @@ -4,8 +4,6 @@ Analytic Account Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -13,7 +11,6 @@ Imports:: ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ ... create_chart, get_accounts - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/analytic_budget/tests/scenario_analytic_budget.rst b/modules/analytic_budget/tests/scenario_analytic_budget.rst index 36dffd1095..ca99ed6c29 100644 --- a/modules/analytic_budget/tests/scenario_analytic_budget.rst +++ b/modules/analytic_budget/tests/scenario_analytic_budget.rst @@ -4,7 +4,6 @@ Analytic Budget Scenario Imports:: - >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -12,7 +11,6 @@ Imports:: ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( ... create_fiscalyear, create_chart, get_accounts) - >>> today = dt.date.today() Activate the analytic_budget module:: diff --git a/modules/analytic_invoice/tests/scenario_analytic_invoice.rst b/modules/analytic_invoice/tests/scenario_analytic_invoice.rst index 870255c7a4..3b5d075ec8 100644 --- a/modules/analytic_invoice/tests/scenario_analytic_invoice.rst +++ b/modules/analytic_invoice/tests/scenario_analytic_invoice.rst @@ -3,8 +3,7 @@ Analytic Invoice Scenario ========================= Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> from decimal import Decimal >>> from operator import attrgetter >>> from proteus import Model, Wizard @@ -15,7 +14,6 @@ Imports:: ... create_chart, get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/analytic_invoice/tests/scenario_analytic_invoice_asset.rst b/modules/analytic_invoice/tests/scenario_analytic_invoice_asset.rst index 80312b8b28..591050e011 100644 --- a/modules/analytic_invoice/tests/scenario_analytic_invoice_asset.rst +++ b/modules/analytic_invoice/tests/scenario_analytic_invoice_asset.rst @@ -4,7 +4,7 @@ Analytic Invoice with Assets Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from operator import attrgetter @@ -18,7 +18,10 @@ Imports:: ... set_fiscalyear_invoice_sequences, create_payment_term >>> from trytond.modules.account_asset.tests.tools \ ... import add_asset_accounts - >>> today = datetime.date.today() + + >>> today = dt.date.today() + >>> next_month = today + relativedelta(day=1, month=1) + >>> next_next_month = next_month + relativedelta(months=1) Activate modules:: @@ -32,7 +35,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, (today, next_next_month))) >>> fiscalyear.click('create_period') Create chart of accounts:: @@ -98,7 +101,7 @@ Buy an asset:: >>> invoice_line.unit_price = Decimal('1000') >>> entry, = invoice_line.analytic_accounts >>> entry.account = analytic_account - >>> supplier_invoice.invoice_date = today + relativedelta(day=1, month=1) + >>> supplier_invoice.invoice_date = next_month >>> supplier_invoice.click('post') >>> supplier_invoice.state 'posted' @@ -121,8 +124,7 @@ Depreciate the asset:: Create Moves for 1 month:: >>> create_moves = Wizard('account.asset.create_moves') - >>> create_moves.form.date = (supplier_invoice.invoice_date - ... + relativedelta(months=1)) + >>> create_moves.form.date = next_next_month >>> create_moves.execute('create_moves') >>> analytic_account.reload() >>> analytic_account.debit @@ -137,4 +139,4 @@ Close the asset:: >>> analytic_account.debit Decimal('1000.00') >>> analytic_account.credit - Decimal('0.00') \ No newline at end of file + Decimal('0.00') diff --git a/modules/analytic_purchase/tests/scenario_analytic_purchase.rst b/modules/analytic_purchase/tests/scenario_analytic_purchase.rst index 5fc9445c03..c28ceca6f8 100644 --- a/modules/analytic_purchase/tests/scenario_analytic_purchase.rst +++ b/modules/analytic_purchase/tests/scenario_analytic_purchase.rst @@ -4,8 +4,6 @@ Analytic Purchase Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from operator import attrgetter >>> from proteus import Model, Wizard, Report @@ -16,7 +14,6 @@ Imports:: ... create_chart, get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/analytic_sale/tests/scenario_analytic_sale.rst b/modules/analytic_sale/tests/scenario_analytic_sale.rst index ea85809547..5d6a7146fb 100644 --- a/modules/analytic_sale/tests/scenario_analytic_sale.rst +++ b/modules/analytic_sale/tests/scenario_analytic_sale.rst @@ -4,8 +4,6 @@ Analytic Sale Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from operator import attrgetter >>> from proteus import Model, Wizard, Report @@ -16,7 +14,6 @@ Imports:: ... create_chart, get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/carrier_percentage/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst b/modules/carrier_percentage/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst index c3599fe1a2..3af38a1184 100644 --- a/modules/carrier_percentage/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst +++ b/modules/carrier_percentage/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst @@ -4,8 +4,6 @@ Carrier Percentage with Purchase Shipment Cost Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -15,7 +13,6 @@ Imports:: ... create_chart, get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/carrier_weight/tests/scenario_carrier_weight.rst b/modules/carrier_weight/tests/scenario_carrier_weight.rst index 4abf0c3bba..5c68e75e86 100644 --- a/modules/carrier_weight/tests/scenario_carrier_weight.rst +++ b/modules/carrier_weight/tests/scenario_carrier_weight.rst @@ -4,8 +4,6 @@ Carrier Weight Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -15,7 +13,6 @@ Imports:: ... create_chart, get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/commission/tests/scenario_agent_selection.rst b/modules/commission/tests/scenario_agent_selection.rst index 18ffbb14d4..8f09da2b05 100644 --- a/modules/commission/tests/scenario_agent_selection.rst +++ b/modules/commission/tests/scenario_agent_selection.rst @@ -4,17 +4,17 @@ Agent Selection Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules, set_user >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ - ... create_chart, get_accounts - >>> today = datetime.date.today() - >>> yesterday = today - relativedelta(days=1) + >>> from trytond.modules.account.tests.tools import ( + ... create_chart, get_accounts) + + >>> today = dt.date.today() + >>> yesterday = today - dt.timedelta(days=1) Activate modules:: diff --git a/modules/commission/tests/scenario_commission.rst b/modules/commission/tests/scenario_commission.rst index 8cf78e477c..7e02191c08 100644 --- a/modules/commission/tests/scenario_commission.rst +++ b/modules/commission/tests/scenario_commission.rst @@ -4,8 +4,7 @@ Commission Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -15,8 +14,9 @@ Imports:: ... create_chart, get_accounts, create_tax >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term - >>> today = datetime.date.today() - >>> tomorrow = today + relativedelta(days=1) + + >>> today = dt.date.today() + >>> tomorrow = today + dt.timedelta(days=1) Activate modules:: @@ -33,7 +33,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, (today, tomorrow))) >>> fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/commission/tests/scenario_commission_stock.rst b/modules/commission/tests/scenario_commission_stock.rst index 8314b1ed7c..60ec1272dd 100644 --- a/modules/commission/tests/scenario_commission_stock.rst +++ b/modules/commission/tests/scenario_commission_stock.rst @@ -42,7 +42,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, (yesterday, today))) >>> fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/commission_waiting/tests/scenario_commission_waiting.rst b/modules/commission_waiting/tests/scenario_commission_waiting.rst index b737dbc488..1ce8b34e2d 100644 --- a/modules/commission_waiting/tests/scenario_commission_waiting.rst +++ b/modules/commission_waiting/tests/scenario_commission_waiting.rst @@ -4,8 +4,7 @@ Commission Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -15,7 +14,8 @@ Imports:: ... create_chart, get_accounts, create_tax >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: @@ -29,7 +29,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/product_cost_fifo/tests/scenario_product_cost_fifo.rst b/modules/product_cost_fifo/tests/scenario_product_cost_fifo.rst index ff3f341960..13ad6786d5 100644 --- a/modules/product_cost_fifo/tests/scenario_product_cost_fifo.rst +++ b/modules/product_cost_fifo/tests/scenario_product_cost_fifo.rst @@ -4,14 +4,13 @@ Stock FIFO Cost Price Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() + >>> today = dt.date.today() Activate modules:: diff --git a/modules/product_cost_fifo/tests/scenario_product_cost_fifo_no_in.rst b/modules/product_cost_fifo/tests/scenario_product_cost_fifo_no_in.rst index 48ba721941..19fcc16809 100644 --- a/modules/product_cost_fifo/tests/scenario_product_cost_fifo_no_in.rst +++ b/modules/product_cost_fifo/tests/scenario_product_cost_fifo_no_in.rst @@ -4,13 +4,13 @@ Stock FIFO Cost Price with no Input Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() + >>> today = dt.date.today() Activate modules:: diff --git a/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price.rst b/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price.rst index 3d4cf35f8f..c0b307406c 100644 --- a/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price.rst +++ b/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price.rst @@ -5,7 +5,6 @@ Product Cost FIFO Recompute Cost Price Imports:: >>> import datetime as dt - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules diff --git a/modules/product_cost_fifo/tests/scenario_product_cost_fifo_uom.rst b/modules/product_cost_fifo/tests/scenario_product_cost_fifo_uom.rst index 04d5be7106..78a6de7006 100644 --- a/modules/product_cost_fifo/tests/scenario_product_cost_fifo_uom.rst +++ b/modules/product_cost_fifo/tests/scenario_product_cost_fifo_uom.rst @@ -4,14 +4,14 @@ Stock FIFO Cost Price UoM Imports:: - >>> import datetime + >>> import datetime as dt >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() + >>> today = dt.date.today() Activate modules:: diff --git a/modules/product_cost_history/tests/scenario_product_cost_history.rst b/modules/product_cost_history/tests/scenario_product_cost_history.rst index 7d6f9aa049..e88ebf1117 100644 --- a/modules/product_cost_history/tests/scenario_product_cost_history.rst +++ b/modules/product_cost_history/tests/scenario_product_cost_history.rst @@ -6,7 +6,6 @@ Imports:: >>> import datetime as dt >>> import time - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules diff --git a/modules/product_kit/tests/scenario_product_kit_purchase.rst b/modules/product_kit/tests/scenario_product_kit_purchase.rst index 9b38643891..e10954b697 100644 --- a/modules/product_kit/tests/scenario_product_kit_purchase.rst +++ b/modules/product_kit/tests/scenario_product_kit_purchase.rst @@ -30,7 +30,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/production/tests/scenario_production.rst b/modules/production/tests/scenario_production.rst index 740a62a898..cb252e5e1c 100644 --- a/modules/production/tests/scenario_production.rst +++ b/modules/production/tests/scenario_production.rst @@ -4,17 +4,17 @@ Production Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.production.production import BOM_CHANGES - >>> today = datetime.date.today() - >>> yesterday = today - relativedelta(days=1) - >>> before_yesterday = yesterday - relativedelta(days=1) + + >>> today = dt.date.today() + >>> yesterday = today - dt.timedelta(days=1) + >>> before_yesterday = yesterday - dt.timedelta(days=1) Activate modules:: @@ -97,7 +97,7 @@ Create Bill of Material:: >>> production_lead_time = ProductionLeadTime() >>> production_lead_time.product = product >>> production_lead_time.bom = bom - >>> production_lead_time.lead_time = datetime.timedelta(1) + >>> production_lead_time.lead_time = dt.timedelta(1) >>> production_lead_time.save() Create an Inventory:: diff --git a/modules/production_work/tests/scenario_production_work.rst b/modules/production_work/tests/scenario_production_work.rst index 6d188aa376..1021e084d5 100644 --- a/modules/production_work/tests/scenario_production_work.rst +++ b/modules/production_work/tests/scenario_production_work.rst @@ -4,14 +4,14 @@ Production Work Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: @@ -216,7 +216,7 @@ Run works:: 'draft' >>> work2.click('start') >>> cycle2, = [c for c in work2.active_cycles] - >>> cycle2.duration = datetime.timedelta(hours=1) + >>> cycle2.duration = dt.timedelta(hours=1) >>> cycle2.save() >>> work2.click('stop') >>> work2.state diff --git a/modules/project_invoice/tests/scenario_project_invoice_effort.rst b/modules/project_invoice/tests/scenario_project_invoice_effort.rst index 78a5e267cd..c0fd8c8860 100644 --- a/modules/project_invoice/tests/scenario_project_invoice_effort.rst +++ b/modules/project_invoice/tests/scenario_project_invoice_effort.rst @@ -4,8 +4,7 @@ Project Invoice Effort Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules, set_user @@ -15,7 +14,6 @@ Imports:: ... get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... create_payment_term - >>> today = datetime.date.today() Activate modules:: @@ -120,12 +118,12 @@ Create a Project:: >>> project.party = customer >>> project.project_invoice_method = 'effort' >>> project.product = product - >>> project.effort_duration = datetime.timedelta(hours=1) + >>> project.effort_duration = dt.timedelta(hours=1) >>> task = project.children.new() >>> task.name = 'Task 1' >>> task.type = 'task' >>> task.product = product - >>> task.effort_duration = datetime.timedelta(hours=5) + >>> task.effort_duration = dt.timedelta(hours=5) >>> task_no_effort = project.children.new() >>> task_no_effort.name = "Task 2" >>> task_no_effort.type = 'task' @@ -133,7 +131,7 @@ Create a Project:: >>> task_fixed = project.children.new() >>> task_fixed.name = "Task 2" >>> task_fixed.type = 'task' - >>> task_fixed.effort_duration = datetime.timedelta(hours=2) + >>> task_fixed.effort_duration = dt.timedelta(hours=2) >>> task_fixed.product = product_fixed >>> project.save() >>> task, task_no_effort, task_fixed = project.children diff --git a/modules/project_invoice/tests/scenario_project_invoice_multiple_party.rst b/modules/project_invoice/tests/scenario_project_invoice_multiple_party.rst index 8c8a389841..2e8d5ddb4a 100644 --- a/modules/project_invoice/tests/scenario_project_invoice_multiple_party.rst +++ b/modules/project_invoice/tests/scenario_project_invoice_multiple_party.rst @@ -4,8 +4,7 @@ Project Invoice Multiple Parties Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -13,7 +12,6 @@ Imports:: ... get_company >>> from trytond.modules.account.tests.tools import create_chart, \ ... get_accounts - >>> today = datetime.date.today() Activate modules:: @@ -70,7 +68,7 @@ Create a Project with multiple customers:: >>> project.party = customer1 >>> project.project_invoice_method = 'effort' >>> project.product = product - >>> project.effort_duration = datetime.timedelta(hours=1) + >>> project.effort_duration = dt.timedelta(hours=1) >>> subproject = project.children.new() >>> subproject.name = 'Subproject' @@ -78,7 +76,7 @@ Create a Project with multiple customers:: >>> subproject.party = customer2 >>> subproject.project_invoice_method = 'effort' >>> subproject.product = product - >>> subproject.effort_duration = datetime.timedelta(hours=5) + >>> subproject.effort_duration = dt.timedelta(hours=5) >>> project.save() >>> subproject, = project.children diff --git a/modules/project_invoice/tests/scenario_project_invoice_progress.rst b/modules/project_invoice/tests/scenario_project_invoice_progress.rst index 1b043b9f02..f4182b9a56 100644 --- a/modules/project_invoice/tests/scenario_project_invoice_progress.rst +++ b/modules/project_invoice/tests/scenario_project_invoice_progress.rst @@ -4,8 +4,7 @@ Project Invoice Progress Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules, set_user @@ -15,7 +14,6 @@ Imports:: ... get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... create_payment_term - >>> today = datetime.date.today() Activate modules:: @@ -124,12 +122,12 @@ Create a Project:: >>> project.party = customer >>> project.project_invoice_method = 'progress' >>> project.product = product - >>> project.effort_duration = datetime.timedelta(hours=1) + >>> project.effort_duration = dt.timedelta(hours=1) >>> task = project.children.new() >>> task.name = 'Task 1' >>> task.type = 'task' >>> task.product = product - >>> task.effort_duration = datetime.timedelta(hours=5) + >>> task.effort_duration = dt.timedelta(hours=5) >>> task_fixed = project.children.new() >>> task_fixed.name = 'Task 2' >>> task_fixed.type = 'task' diff --git a/modules/project_invoice/tests/scenario_project_invoice_timesheet.rst b/modules/project_invoice/tests/scenario_project_invoice_timesheet.rst index 6b4be53e5c..4dab1b1101 100644 --- a/modules/project_invoice/tests/scenario_project_invoice_timesheet.rst +++ b/modules/project_invoice/tests/scenario_project_invoice_timesheet.rst @@ -4,7 +4,7 @@ Project Invoice Timesheet Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard @@ -15,8 +15,9 @@ Imports:: ... get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... create_payment_term - >>> today = datetime.date.today() - >>> yesterday = today - datetime.timedelta(days=1) + + >>> today = dt.date.today() + >>> yesterday = today - dt.timedelta(days=1) Activate modules:: @@ -135,13 +136,13 @@ Create timesheets:: >>> line = TimesheetLine() >>> line.date = yesterday >>> line.employee = employee - >>> line.duration = datetime.timedelta(hours=3) + >>> line.duration = dt.timedelta(hours=3) >>> line.work, = task.timesheet_works >>> line.save() >>> line = TimesheetLine() >>> line.date = today >>> line.employee = employee - >>> line.duration = datetime.timedelta(hours=2) + >>> line.duration = dt.timedelta(hours=2) >>> line.work, = project.timesheet_works >>> line.save() @@ -199,7 +200,7 @@ Create more timesheets:: >>> TimesheetLine = Model.get('timesheet.line') >>> line = TimesheetLine() >>> line.employee = employee - >>> line.duration = datetime.timedelta(hours=4) + >>> line.duration = dt.timedelta(hours=4) >>> line.work, = task.timesheet_works >>> line.save() diff --git a/modules/purchase/tests/scenario_purchase.rst b/modules/purchase/tests/scenario_purchase.rst index 77146cb431..0d991cc542 100644 --- a/modules/purchase/tests/scenario_purchase.rst +++ b/modules/purchase/tests/scenario_purchase.rst @@ -4,8 +4,7 @@ Purchase Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from operator import attrgetter >>> from proteus import Model, Wizard, Report @@ -16,7 +15,8 @@ Imports:: ... create_chart, get_accounts, create_tax >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: @@ -45,7 +45,7 @@ Set employee:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/purchase/tests/scenario_purchase_return_wizard.rst b/modules/purchase/tests/scenario_purchase_return_wizard.rst index e10774408a..949f2ff32d 100644 --- a/modules/purchase/tests/scenario_purchase_return_wizard.rst +++ b/modules/purchase/tests/scenario_purchase_return_wizard.rst @@ -4,8 +4,6 @@ Purchase Return Wizard Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -15,8 +13,6 @@ Imports:: ... create_chart, get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences - >>> today = datetime.date.today() - Activate modules:: diff --git a/modules/purchase_blanket_agreement/tests/scenario_purchase_blanket_agreement.rst b/modules/purchase_blanket_agreement/tests/scenario_purchase_blanket_agreement.rst index bdc5638993..d8314357c5 100644 --- a/modules/purchase_blanket_agreement/tests/scenario_purchase_blanket_agreement.rst +++ b/modules/purchase_blanket_agreement/tests/scenario_purchase_blanket_agreement.rst @@ -4,8 +4,7 @@ Purchase Blanket Agreement Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard @@ -15,8 +14,8 @@ Imports:: >>> from trytond.modules.account.tests.tools import ( ... create_chart, get_accounts) - >>> today = datetime.date.today() - >>> later = today + relativedelta(days=30) + >>> today = dt.date.today() + >>> later = today + dt.timedelta(days=30) Activate modules:: diff --git a/modules/purchase_invoice_line_standalone/tests/scenario_purchase_invoice_line_standalone.rst b/modules/purchase_invoice_line_standalone/tests/scenario_purchase_invoice_line_standalone.rst index 86fd5b35bf..49cfa8625e 100644 --- a/modules/purchase_invoice_line_standalone/tests/scenario_purchase_invoice_line_standalone.rst +++ b/modules/purchase_invoice_line_standalone/tests/scenario_purchase_invoice_line_standalone.rst @@ -4,8 +4,6 @@ Purchase Invoice Line Standalone Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from operator import attrgetter >>> from proteus import Model, Wizard @@ -16,7 +14,6 @@ Imports:: ... create_chart, get_accounts, create_tax >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/purchase_product_quantity/tests/scenario_purchase_product_quantity.rst b/modules/purchase_product_quantity/tests/scenario_purchase_product_quantity.rst index e4487f50af..f1d3dc440d 100644 --- a/modules/purchase_product_quantity/tests/scenario_purchase_product_quantity.rst +++ b/modules/purchase_product_quantity/tests/scenario_purchase_product_quantity.rst @@ -4,7 +4,6 @@ Purchase Product Quantity Scenario Imports:: - >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard @@ -14,8 +13,6 @@ Imports:: >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) - >>> today = dt.date.today() - Activate modules:: >>> config = activate_modules( diff --git a/modules/purchase_request/tests/scenario_purchase_request.rst b/modules/purchase_request/tests/scenario_purchase_request.rst index d0f222c64a..dd57a70fab 100644 --- a/modules/purchase_request/tests/scenario_purchase_request.rst +++ b/modules/purchase_request/tests/scenario_purchase_request.rst @@ -4,8 +4,7 @@ Purchase Request Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules, set_user @@ -13,7 +12,8 @@ Imports:: ... get_company >>> from trytond.modules.account.tests.tools import (create_chart, ... get_accounts) - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: diff --git a/modules/purchase_request_quotation/tests/scenario_purchase_request_quotation.rst b/modules/purchase_request_quotation/tests/scenario_purchase_request_quotation.rst index e991797898..aa80fb79ce 100644 --- a/modules/purchase_request_quotation/tests/scenario_purchase_request_quotation.rst +++ b/modules/purchase_request_quotation/tests/scenario_purchase_request_quotation.rst @@ -4,7 +4,7 @@ Purchase Request For Quotation Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report >>> from trytond.tests.tools import activate_modules, set_user @@ -12,7 +12,8 @@ Imports:: ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( ... create_chart, get_accounts) - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate purchase_request_quotation Module:: diff --git a/modules/purchase_requisition/tests/scenario_purchase_requisition.rst b/modules/purchase_requisition/tests/scenario_purchase_requisition.rst index a8372bc94d..1b5b4fa2e5 100644 --- a/modules/purchase_requisition/tests/scenario_purchase_requisition.rst +++ b/modules/purchase_requisition/tests/scenario_purchase_requisition.rst @@ -4,8 +4,7 @@ Purchase Requisition Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules, set_user @@ -13,7 +12,8 @@ Imports:: ... get_company) >>> from trytond.modules.account.tests.tools import (create_chart, ... get_accounts) - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate purchase_requisition Module:: diff --git a/modules/purchase_secondary_unit/tests/scenario_purchase_blanket_agreement_secondary_unit.rst b/modules/purchase_secondary_unit/tests/scenario_purchase_blanket_agreement_secondary_unit.rst index 6cb9cd1944..a6b4b9b9d4 100644 --- a/modules/purchase_secondary_unit/tests/scenario_purchase_blanket_agreement_secondary_unit.rst +++ b/modules/purchase_secondary_unit/tests/scenario_purchase_blanket_agreement_secondary_unit.rst @@ -4,8 +4,7 @@ Purchase Blanket Agreement Secondary Unit Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard @@ -15,8 +14,8 @@ Imports:: >>> from trytond.modules.account.tests.tools import ( ... create_chart, get_accounts) - >>> today = datetime.date.today() - >>> later = today + relativedelta(days=30) + >>> today = dt.date.today() + >>> later = today + dt.timedelta(days=30) Activate modules:: diff --git a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost.rst b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost.rst index 5e56730bb8..29b0b31ec1 100644 --- a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost.rst +++ b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost.rst @@ -4,14 +4,11 @@ Purchase Shipment Cost Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_invoice_stock.rst b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_invoice_stock.rst index 222dca49e3..1525bd1d1c 100644 --- a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_invoice_stock.rst +++ b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_invoice_stock.rst @@ -48,7 +48,7 @@ Create chart of accounts:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') Create account categories:: diff --git a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock.rst b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock.rst index 3e820ddb19..c3ad263c07 100644 --- a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock.rst +++ b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock.rst @@ -4,8 +4,6 @@ Purchase Shipment Cost with Account Stock Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -17,7 +15,6 @@ Imports:: ... set_fiscalyear_invoice_sequences >>> from trytond.modules.account_stock_continental.tests.tools import \ ... add_stock_accounts - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst index 82c8b85c62..d071421967 100644 --- a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst +++ b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst @@ -4,8 +4,7 @@ Purchase Shipment Cost with Account Stock Anglo-Saxon Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -19,7 +18,8 @@ Imports:: ... add_stock_accounts >>> from trytond.modules.account_stock_anglo_saxon.tests.tools import \ ... add_cogs_accounts - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: @@ -37,7 +37,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.account_stock_method = 'anglo_saxon' >>> fiscalyear.click('create_period') diff --git a/modules/sale/tests/scenario_sale.rst b/modules/sale/tests/scenario_sale.rst index 290add38de..c13e9d2889 100644 --- a/modules/sale/tests/scenario_sale.rst +++ b/modules/sale/tests/scenario_sale.rst @@ -4,8 +4,6 @@ Sale Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from operator import attrgetter >>> from proteus import Model, Wizard, Report @@ -16,7 +14,6 @@ Imports:: ... create_chart, get_accounts, create_tax >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/sale_advance_payment/tests/scenario_advance_payment.rst b/modules/sale_advance_payment/tests/scenario_advance_payment.rst index 7e40248f69..1b304255f0 100644 --- a/modules/sale_advance_payment/tests/scenario_advance_payment.rst +++ b/modules/sale_advance_payment/tests/scenario_advance_payment.rst @@ -4,9 +4,8 @@ Sale Advance Payment Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal - >>> from dateutil.relativedelta import relativedelta >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ @@ -17,8 +16,9 @@ Imports:: ... set_fiscalyear_invoice_sequences, create_payment_term >>> from trytond.modules.sale_advance_payment.tests.tools import \ ... create_advance_payment_term, add_advance_payment_accounts - >>> today = datetime.date.today() - >>> next_week = today + relativedelta(days=7) + + >>> today = dt.date.today() + >>> next_week = today + dt.timedelta(days=7) Activate sale_advance_payment:: @@ -32,11 +32,8 @@ Create company:: Create fiscal years:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company, today=today)) + ... create_fiscalyear(company, (today, next_week))) >>> fiscalyear.click('create_period') - >>> next_fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company, today=today + relativedelta(years=1))) - >>> next_fiscalyear.click('create_period') Create chart of accounts:: diff --git a/modules/sale_blanket_agreement/tests/scenario_sale_blanket_agreement.rst b/modules/sale_blanket_agreement/tests/scenario_sale_blanket_agreement.rst index 954349d3f8..1ffff27c16 100644 --- a/modules/sale_blanket_agreement/tests/scenario_sale_blanket_agreement.rst +++ b/modules/sale_blanket_agreement/tests/scenario_sale_blanket_agreement.rst @@ -4,8 +4,7 @@ Sale Blanket Agreement Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard @@ -15,9 +14,8 @@ Imports:: >>> from trytond.modules.account.tests.tools import ( ... create_chart, get_accounts) - >>> today = datetime.date.today() - >>> later = today + relativedelta(days=30) - + >>> today = dt.date.today() + >>> later = today + dt.timedelta(days=30) Activate modules:: diff --git a/modules/sale_extra/tests/scenario_sale_extra.rst b/modules/sale_extra/tests/scenario_sale_extra.rst index b4b8385f1b..c4eda40c26 100644 --- a/modules/sale_extra/tests/scenario_sale_extra.rst +++ b/modules/sale_extra/tests/scenario_sale_extra.rst @@ -4,8 +4,7 @@ Sale Extra Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -15,7 +14,6 @@ Imports:: ... get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... create_payment_term - >>> today = datetime.date.today() Activate modules:: @@ -58,7 +56,7 @@ Create product:: >>> template.default_uom = unit >>> template.type = 'goods' >>> template.salable = True - >>> template.lead_time = datetime.timedelta(0) + >>> template.lead_time = dt.timedelta(0) >>> template.list_price = Decimal('20') >>> template.account_category = account_category >>> template.save() @@ -69,7 +67,7 @@ Create product:: >>> extra_template.default_uom = unit >>> extra_template.type = 'service' >>> extra_template.salable = True - >>> extra_template.lead_time = datetime.timedelta(0) + >>> extra_template.lead_time = dt.timedelta(0) >>> extra_template.list_price = Decimal('3') >>> extra_template.account_category = account_category >>> extra_template.save() diff --git a/modules/sale_invoice_date/tests/scenario_sale_invoice_date.rst b/modules/sale_invoice_date/tests/scenario_sale_invoice_date.rst index eb733c5952..a3ca6fbcaf 100644 --- a/modules/sale_invoice_date/tests/scenario_sale_invoice_date.rst +++ b/modules/sale_invoice_date/tests/scenario_sale_invoice_date.rst @@ -19,6 +19,7 @@ Imports:: ... set_fiscalyear_invoice_sequences) >>> today = dt.date.today() + >>> end_month = today + relativedelta(day=31) Activate modules:: @@ -39,7 +40,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, (today, end_month))) >>> fiscalyear.click('create_period') Create chart of accounts:: @@ -98,5 +99,5 @@ Make a sale:: Check invoice date:: >>> invoice, = sale.invoices - >>> invoice.invoice_date == today + relativedelta(day=31) + >>> invoice.invoice_date == end_month True diff --git a/modules/sale_invoice_grouping/tests/scenario_sale_invoice_grouping.rst b/modules/sale_invoice_grouping/tests/scenario_sale_invoice_grouping.rst index 546c8219f4..45b5b86440 100644 --- a/modules/sale_invoice_grouping/tests/scenario_sale_invoice_grouping.rst +++ b/modules/sale_invoice_grouping/tests/scenario_sale_invoice_grouping.rst @@ -4,8 +4,6 @@ Sale Invoice Grouping Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from operator import attrgetter >>> from proteus import Model, Wizard @@ -16,7 +14,6 @@ Imports:: ... create_chart, get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/sale_secondary_unit/tests/scenario_sale_blanket_agreement_secondary_unit.rst b/modules/sale_secondary_unit/tests/scenario_sale_blanket_agreement_secondary_unit.rst index 873db1ca08..11c0bf68c3 100644 --- a/modules/sale_secondary_unit/tests/scenario_sale_blanket_agreement_secondary_unit.rst +++ b/modules/sale_secondary_unit/tests/scenario_sale_blanket_agreement_secondary_unit.rst @@ -4,8 +4,7 @@ Sale Blanket Agreement Secondary Unit Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard @@ -15,9 +14,8 @@ Imports:: >>> from trytond.modules.account.tests.tools import ( ... create_chart, get_accounts) - >>> today = datetime.date.today() - >>> later = today + relativedelta(days=30) - + >>> today = dt.date.today() + >>> later = today + dt.timedelta(days=30) Activate modules:: diff --git a/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost.rst b/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost.rst index 9e5343bec2..b3971f3a40 100644 --- a/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost.rst +++ b/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost.rst @@ -4,8 +4,7 @@ Sale Shipment Cost Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -15,7 +14,6 @@ Imports:: ... create_chart, get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term - >>> today = datetime.date.today() Activate modules:: @@ -69,7 +67,7 @@ Create product:: >>> template.default_uom = unit >>> template.type = 'goods' >>> template.salable = True - >>> template.lead_time = datetime.timedelta(0) + >>> template.lead_time = dt.timedelta(0) >>> template.list_price = Decimal('20') >>> template.account_category = account_category >>> template.save() @@ -80,7 +78,7 @@ Create product:: >>> carrier_template.default_uom = unit >>> carrier_template.type = 'service' >>> carrier_template.salable = True - >>> carrier_template.lead_time = datetime.timedelta(0) + >>> carrier_template.lead_time = dt.timedelta(0) >>> carrier_template.list_price = Decimal('3') >>> carrier_template.account_category = account_category >>> carrier_template.save() diff --git a/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_promotion.rst b/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_promotion.rst index fc7aa7f30a..61fab08453 100644 --- a/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_promotion.rst +++ b/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_promotion.rst @@ -4,8 +4,6 @@ Sale Shipment Cost Promotion Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -15,7 +13,6 @@ Imports:: ... create_chart, get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/sale_shipment_grouping/tests/scenario_sale_shipment_grouping.rst b/modules/sale_shipment_grouping/tests/scenario_sale_shipment_grouping.rst index 9aa1888a94..f9c5a156aa 100644 --- a/modules/sale_shipment_grouping/tests/scenario_sale_shipment_grouping.rst +++ b/modules/sale_shipment_grouping/tests/scenario_sale_shipment_grouping.rst @@ -4,8 +4,6 @@ Sale Invoice Grouping Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from operator import attrgetter >>> from proteus import Model, Wizard @@ -16,7 +14,6 @@ Imports:: ... create_chart, get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/sale_stock_quantity/tests/scenario_sale_stock_quantity.rst b/modules/sale_stock_quantity/tests/scenario_sale_stock_quantity.rst index 5a84fd4d1f..b70434de37 100644 --- a/modules/sale_stock_quantity/tests/scenario_sale_stock_quantity.rst +++ b/modules/sale_stock_quantity/tests/scenario_sale_stock_quantity.rst @@ -4,7 +4,7 @@ Sale Stock Quantity Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report >>> from trytond.tests.tools import activate_modules @@ -15,7 +15,9 @@ Imports:: >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term >>> from trytond.modules.stock.exceptions import InventoryFutureWarning - >>> today = datetime.date.today() + + >>> today = dt.date.today() + >>> later = today + dt.timedelta(days=2) Activate modules:: @@ -29,7 +31,7 @@ Create company:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, (today, later))) >>> fiscalyear.click('create_period') Create chart of accounts:: @@ -77,7 +79,7 @@ Create product:: >>> product_supplier = ProductSupplier() >>> product_supplier.template = template >>> product_supplier.party = supplier - >>> product_supplier.lead_time = datetime.timedelta(3) + >>> product_supplier.lead_time = dt.timedelta(3) >>> product_supplier.save() Create payment term:: @@ -165,7 +167,7 @@ Make an inventory of 3 products in 2 days:: >>> inventory = Inventory() >>> inventory.location = storage - >>> inventory.date = today + datetime.timedelta(2) + >>> inventory.date = later >>> inventory_line = inventory.lines.new(product=product) >>> inventory_line.quantity = 3.0 >>> inventory_line.expected_quantity = 5.0 diff --git a/modules/sale_supply/tests/scenario_sale_supply.rst b/modules/sale_supply/tests/scenario_sale_supply.rst index f1b90c979a..cfdc63b9a4 100644 --- a/modules/sale_supply/tests/scenario_sale_supply.rst +++ b/modules/sale_supply/tests/scenario_sale_supply.rst @@ -4,8 +4,6 @@ Sale Supply Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules, set_user @@ -15,7 +13,6 @@ Imports:: ... create_chart, get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment.rst b/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment.rst index 369544bdca..cf69b66563 100644 --- a/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment.rst +++ b/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment.rst @@ -4,7 +4,7 @@ Sale Supply Drop Shipment Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard @@ -15,7 +15,7 @@ Imports:: ... create_chart, get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term - >>> today = datetime.date.today() + >>> today = dt.date.today() Activate modules:: @@ -82,7 +82,7 @@ Create account user:: Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( - ... create_fiscalyear(company)) + ... create_fiscalyear(company, today)) >>> fiscalyear.click('create_period') Create chart of accounts:: @@ -133,7 +133,7 @@ Create product:: >>> product_supplier.template = template >>> product_supplier.party = supplier >>> product_supplier.drop_shipment = True - >>> product_supplier.lead_time = datetime.timedelta(0) + >>> product_supplier.lead_time = dt.timedelta(0) >>> product_supplier.save() Create payment term:: diff --git a/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment_remaining_qty.rst b/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment_remaining_qty.rst index 3f1a0ce257..041162a4b0 100644 --- a/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment_remaining_qty.rst +++ b/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment_remaining_qty.rst @@ -4,8 +4,7 @@ Sale Supply Drop Shipment Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -15,7 +14,6 @@ Imports:: ... create_chart, get_accounts >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term - >>> today = datetime.date.today() Activate modules:: @@ -82,7 +80,7 @@ Create product:: >>> product_supplier.template = template >>> product_supplier.party = supplier >>> product_supplier.drop_shipment = True - >>> product_supplier.lead_time = datetime.timedelta(0) + >>> product_supplier.lead_time = dt.timedelta(0) >>> product_supplier.save() Create payment term:: diff --git a/modules/stock/tests/scenario_stock_average_cost_price.rst b/modules/stock/tests/scenario_stock_average_cost_price.rst index 47ee3959f4..c01f8e269f 100644 --- a/modules/stock/tests/scenario_stock_average_cost_price.rst +++ b/modules/stock/tests/scenario_stock_average_cost_price.rst @@ -4,14 +4,15 @@ Stock Average Cost Price Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() + + >>> today = dt.date.today() + >>> next_day = today + dt.timedelta(days=1) Activate modules:: @@ -147,7 +148,7 @@ Reduce Cost Price by 80%, to force to write recomputed price later:: >>> modify_cost_price = Wizard('product.modify_cost_price', [product]) >>> modify_cost_price.form.cost_price = 'cost_price * 0.8' - >>> modify_cost_price.form.date = today + datetime.timedelta(days=1) + >>> modify_cost_price.form.date = next_day >>> modify_cost_price.execute('modify') >>> product.cost_price Decimal('140.0000') @@ -157,7 +158,7 @@ Increase Cost Price by 10% using Template wizard:: >>> modify_cost_price = Wizard( ... 'product.modify_cost_price', [product.template]) >>> modify_cost_price.form.cost_price = 'cost_price * 1.1' - >>> modify_cost_price.form.date = today + datetime.timedelta(days=1) + >>> modify_cost_price.form.date = next_day >>> modify_cost_price.execute('modify') >>> product.reload() >>> product.cost_price diff --git a/modules/stock/tests/scenario_stock_inventory.rst b/modules/stock/tests/scenario_stock_inventory.rst index 403394ebe1..43621cb5e4 100644 --- a/modules/stock/tests/scenario_stock_inventory.rst +++ b/modules/stock/tests/scenario_stock_inventory.rst @@ -4,14 +4,14 @@ Stock Inventory Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: diff --git a/modules/stock/tests/scenario_stock_inventory_count.rst b/modules/stock/tests/scenario_stock_inventory_count.rst index ef0dcf6fda..373441a6d9 100644 --- a/modules/stock/tests/scenario_stock_inventory_count.rst +++ b/modules/stock/tests/scenario_stock_inventory_count.rst @@ -4,14 +4,11 @@ Stock Inventory Count Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/stock/tests/scenario_stock_inventory_empty_quantity.rst b/modules/stock/tests/scenario_stock_inventory_empty_quantity.rst index d06f986778..2f6b39b270 100644 --- a/modules/stock/tests/scenario_stock_inventory_empty_quantity.rst +++ b/modules/stock/tests/scenario_stock_inventory_empty_quantity.rst @@ -4,14 +4,14 @@ Stock Inventory Scenario Empty Quantity Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: diff --git a/modules/stock/tests/scenario_stock_move_in_future.rst b/modules/stock/tests/scenario_stock_move_in_future.rst index a1ebb70265..3bdfbe5aad 100644 --- a/modules/stock/tests/scenario_stock_move_in_future.rst +++ b/modules/stock/tests/scenario_stock_move_in_future.rst @@ -4,15 +4,15 @@ Stock Move In Future Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) - >>> today = datetime.date.today() - >>> tomorrow = today + relativedelta(days=1) + + >>> today = dt.date.today() + >>> tomorrow = today + dt.timedelta(days=1) Activate modules:: diff --git a/modules/stock/tests/scenario_stock_product_quantities_by_warehouse.rst b/modules/stock/tests/scenario_stock_product_quantities_by_warehouse.rst index 33326b9a9f..fc7761003d 100644 --- a/modules/stock/tests/scenario_stock_product_quantities_by_warehouse.rst +++ b/modules/stock/tests/scenario_stock_product_quantities_by_warehouse.rst @@ -4,17 +4,17 @@ Stock Product Quantities by Warehouse Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report >>> from trytond import backend >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() - >>> yesterday = today - relativedelta(days=1) - >>> tomorrow = today + relativedelta(days=1) + + >>> today = dt.date.today() + >>> yesterday = today - dt.timedelta(days=1) + >>> tomorrow = today + dt.timedelta(days=1) Activate modules:: diff --git a/modules/stock/tests/scenario_stock_recompute_average_cost_price.rst b/modules/stock/tests/scenario_stock_recompute_average_cost_price.rst index 3decaf6337..652cfc9801 100644 --- a/modules/stock/tests/scenario_stock_recompute_average_cost_price.rst +++ b/modules/stock/tests/scenario_stock_recompute_average_cost_price.rst @@ -5,12 +5,12 @@ Stock Recompute Average Cost Price Imports:: >>> import datetime as dt - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company + >>> today = dt.date.today() Activate modules:: diff --git a/modules/stock/tests/scenario_stock_reporting.rst b/modules/stock/tests/scenario_stock_reporting.rst index e0470cd5cb..8863d2f8fe 100644 --- a/modules/stock/tests/scenario_stock_reporting.rst +++ b/modules/stock/tests/scenario_stock_reporting.rst @@ -4,15 +4,15 @@ Stock Shipment Reporting Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() - >>> yesterday = today - relativedelta(days=1) + + >>> today = dt.date.today() + >>> yesterday = today - dt.timedelta(days=1) Activate modules:: diff --git a/modules/stock/tests/scenario_stock_reporting_margin.rst b/modules/stock/tests/scenario_stock_reporting_margin.rst index 41ccfa47a2..e088b0f2cf 100644 --- a/modules/stock/tests/scenario_stock_reporting_margin.rst +++ b/modules/stock/tests/scenario_stock_reporting_margin.rst @@ -10,6 +10,7 @@ Imports:: >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) + >>> today = dt.date.today() >>> yesterday = today - dt.timedelta(days=1) diff --git a/modules/stock/tests/scenario_stock_shipment_in_return.rst b/modules/stock/tests/scenario_stock_shipment_in_return.rst index 46a078544c..258bf83864 100644 --- a/modules/stock/tests/scenario_stock_shipment_in_return.rst +++ b/modules/stock/tests/scenario_stock_shipment_in_return.rst @@ -4,15 +4,15 @@ Stock Shipment In Return Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() - >>> yesterday = today - relativedelta(days=1) + + >>> today = dt.date.today() + >>> yesterday = today - dt.timedelta(days=1) Activate modules:: diff --git a/modules/stock/tests/scenario_stock_shipment_internal.rst b/modules/stock/tests/scenario_stock_shipment_internal.rst index fe8e262924..b0a0ff38ae 100644 --- a/modules/stock/tests/scenario_stock_shipment_internal.rst +++ b/modules/stock/tests/scenario_stock_shipment_internal.rst @@ -4,16 +4,16 @@ Stock Shipment Internal Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules, set_user >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() - >>> yesterday = today - relativedelta(days=1) - >>> tomorrow = today + relativedelta(days=1) + + >>> today = dt.date.today() + >>> yesterday = today - dt.timedelta(days=1) + >>> tomorrow = today + dt.timedelta(days=1) Activate modules:: diff --git a/modules/stock/tests/scenario_stock_shipment_out.rst b/modules/stock/tests/scenario_stock_shipment_out.rst index b5d8e8eaff..963b3d2b99 100644 --- a/modules/stock/tests/scenario_stock_shipment_out.rst +++ b/modules/stock/tests/scenario_stock_shipment_out.rst @@ -4,15 +4,15 @@ Stock Shipment Out Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules, set_user >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() - >>> yesterday = today - relativedelta(days=1) + + >>> today = dt.date.today() + >>> yesterday = today - dt.timedelta(days=1) Activate modules:: diff --git a/modules/stock_assign_manual/tests/scenario_stock_assign_manual.rst b/modules/stock_assign_manual/tests/scenario_stock_assign_manual.rst index facedfee6f..7d1fd53455 100644 --- a/modules/stock_assign_manual/tests/scenario_stock_assign_manual.rst +++ b/modules/stock_assign_manual/tests/scenario_stock_assign_manual.rst @@ -4,14 +4,12 @@ Stock Assign Manual Scenario Imports:: - >>> import datetime as dt >>> import json >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) - >>> today = dt.date.today() Activate stock_assign_manual:: diff --git a/modules/stock_location_move/tests/scenario_stock_location_move.rst b/modules/stock_location_move/tests/scenario_stock_location_move.rst index 7e3adbd6bb..328b1c1933 100644 --- a/modules/stock_location_move/tests/scenario_stock_location_move.rst +++ b/modules/stock_location_move/tests/scenario_stock_location_move.rst @@ -4,14 +4,14 @@ Stock Location Move Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() - >>> tomorrow = today + datetime.timedelta(1) + >>> today = dt.date.today() + >>> tomorrow = today + dt.timedelta(1) Activate modules:: @@ -104,7 +104,7 @@ Add lead time between warehouses:: >>> lead_time = LeadTime() >>> lead_time.warehouse_from = warehouse1 >>> lead_time.warehouse_to = warehouse2 - >>> lead_time.lead_time = datetime.timedelta(1) + >>> lead_time.lead_time = dt.timedelta(1) >>> lead_time.save() Move pallet from storage1 to storage2 with lead_time:: diff --git a/modules/stock_location_move/tests/scenario_stock_location_move_empty.rst b/modules/stock_location_move/tests/scenario_stock_location_move_empty.rst index 128cd4c3d7..43255f00aa 100644 --- a/modules/stock_location_move/tests/scenario_stock_location_move_empty.rst +++ b/modules/stock_location_move/tests/scenario_stock_location_move_empty.rst @@ -4,16 +4,17 @@ Stock Location Move Empty Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() - >>> yesterday = today - datetime.timedelta(1) - >>> tomorrow = today + datetime.timedelta(1) + + >>> today = dt.date.today() + >>> yesterday = today - dt.timedelta(1) + >>> tomorrow = today + dt.timedelta(1) Activate modules:: diff --git a/modules/stock_location_move/tests/scenario_stock_location_move_supply.rst b/modules/stock_location_move/tests/scenario_stock_location_move_supply.rst index a5ec42803c..901ec1f036 100644 --- a/modules/stock_location_move/tests/scenario_stock_location_move_supply.rst +++ b/modules/stock_location_move/tests/scenario_stock_location_move_supply.rst @@ -4,14 +4,15 @@ Stock Location Move Supply Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: diff --git a/modules/stock_lot/setup.py b/modules/stock_lot/setup.py index c501ad13c4..1a7d586aca 100755 --- a/modules/stock_lot/setup.py +++ b/modules/stock_lot/setup.py @@ -47,7 +47,7 @@ for dep in info.get('depends', []): requires.append(get_require_version('trytond_%s' % dep)) requires.append(get_require_version('trytond')) -tests_require = [get_require_version('proteus'), 'python-dateutil'] +tests_require = [get_require_version('proteus')] setup(name=name, version=version, diff --git a/modules/stock_lot/tests/scenario_stock_lot_assign_try.rst b/modules/stock_lot/tests/scenario_stock_lot_assign_try.rst index 5e2f534caf..f080c9b405 100644 --- a/modules/stock_lot/tests/scenario_stock_lot_assign_try.rst +++ b/modules/stock_lot/tests/scenario_stock_lot_assign_try.rst @@ -4,15 +4,15 @@ Stock Lot Assign Request Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import config, Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: diff --git a/modules/stock_lot/tests/scenario_stock_lot_shipment_out.rst b/modules/stock_lot/tests/scenario_stock_lot_shipment_out.rst index c4ffcd1ae1..1f3302563a 100644 --- a/modules/stock_lot/tests/scenario_stock_lot_shipment_out.rst +++ b/modules/stock_lot/tests/scenario_stock_lot_shipment_out.rst @@ -4,14 +4,14 @@ Stock Lot Shipment Out Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import config, Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: diff --git a/modules/stock_lot/tests/test_module.py b/modules/stock_lot/tests/test_module.py index f6a7f73576..0c8c73e309 100644 --- a/modules/stock_lot/tests/test_module.py +++ b/modules/stock_lot/tests/test_module.py @@ -1,11 +1,9 @@ # This file is part of Tryton. The COPYRIGHT file at the top level of # this repository contains the full copyright notices and license terms. -import datetime +import datetime as dt from decimal import Decimal -from dateutil.relativedelta import relativedelta - from trytond.modules.company.tests import ( CompanyTestMixin, create_company, set_company) from trytond.pool import Pool @@ -145,7 +143,7 @@ class StockLotTestCase(CompanyTestMixin, ModuleTestCase): 'product': product.id, }]) - today = datetime.date.today() + today = dt.date.today() moves = Move.create([{ 'product': product.id, @@ -154,8 +152,8 @@ class StockLotTestCase(CompanyTestMixin, ModuleTestCase): 'quantity': 5, 'from_location': supplier.id, 'to_location': storage.id, - 'planned_date': today - relativedelta(days=1), - 'effective_date': today - relativedelta(days=1), + 'planned_date': today - dt.timedelta(days=1), + 'effective_date': today - dt.timedelta(days=1), 'company': company.id, 'unit_price': Decimal('1'), 'currency': currency.id, @@ -166,8 +164,8 @@ class StockLotTestCase(CompanyTestMixin, ModuleTestCase): 'quantity': 10, 'from_location': supplier.id, 'to_location': storage.id, - 'planned_date': today - relativedelta(days=1), - 'effective_date': today - relativedelta(days=1), + 'planned_date': today - dt.timedelta(days=1), + 'effective_date': today - dt.timedelta(days=1), 'company': company.id, 'unit_price': Decimal('1'), 'currency': currency.id, @@ -178,8 +176,8 @@ class StockLotTestCase(CompanyTestMixin, ModuleTestCase): 'quantity': 3, 'from_location': supplier.id, 'to_location': storage.id, - 'planned_date': today - relativedelta(days=1), - 'effective_date': today - relativedelta(days=1), + 'planned_date': today - dt.timedelta(days=1), + 'effective_date': today - dt.timedelta(days=1), 'company': company.id, 'unit_price': Decimal('1'), 'currency': currency.id, @@ -187,7 +185,7 @@ class StockLotTestCase(CompanyTestMixin, ModuleTestCase): Move.do(moves) period, = Period.create([{ - 'date': today - relativedelta(days=1), + 'date': today - dt.timedelta(days=1), 'company': company.id, }]) Period.close([period]) diff --git a/modules/stock_lot_unit/tests/scenario_stock_lot_unit.rst b/modules/stock_lot_unit/tests/scenario_stock_lot_unit.rst index dce1906b4c..5cc30c64d0 100644 --- a/modules/stock_lot_unit/tests/scenario_stock_lot_unit.rst +++ b/modules/stock_lot_unit/tests/scenario_stock_lot_unit.rst @@ -4,14 +4,11 @@ Stock Lot Unit Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import config, Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/stock_package/tests/scenario_stock_package.rst b/modules/stock_package/tests/scenario_stock_package.rst index 1e88c98b48..d74425e44d 100644 --- a/modules/stock_package/tests/scenario_stock_package.rst +++ b/modules/stock_package/tests/scenario_stock_package.rst @@ -4,15 +4,15 @@ Stock Package Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.exceptions import UserError >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: diff --git a/modules/stock_package_shipping_dpd/tests/scenario_shipping_dpd.rst b/modules/stock_package_shipping_dpd/tests/scenario_shipping_dpd.rst index f1179751cd..5199beffc9 100644 --- a/modules/stock_package_shipping_dpd/tests/scenario_shipping_dpd.rst +++ b/modules/stock_package_shipping_dpd/tests/scenario_shipping_dpd.rst @@ -4,9 +4,7 @@ Stock Package Shipping with DPD scenario Imports:: - >>> import datetime >>> import os - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from operator import attrgetter >>> from proteus import Model, Wizard, Report @@ -17,7 +15,6 @@ Imports:: ... create_chart, get_accounts, create_tax >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/stock_package_shipping_ups/tests/scenario_shipping_ups.rst b/modules/stock_package_shipping_ups/tests/scenario_shipping_ups.rst index 55bbd16472..a5f39992ed 100644 --- a/modules/stock_package_shipping_ups/tests/scenario_shipping_ups.rst +++ b/modules/stock_package_shipping_ups/tests/scenario_shipping_ups.rst @@ -4,9 +4,7 @@ Stock Package Shipping with UPS scenario Imports:: - >>> import datetime >>> import os - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from operator import attrgetter >>> from proteus import Model, Wizard, Report @@ -17,7 +15,6 @@ Imports:: ... create_chart, get_accounts, create_tax >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/stock_product_location/tests/scenario_stock_product_location.rst b/modules/stock_product_location/tests/scenario_stock_product_location.rst index b757d3f141..78355ef5e5 100644 --- a/modules/stock_product_location/tests/scenario_stock_product_location.rst +++ b/modules/stock_product_location/tests/scenario_stock_product_location.rst @@ -4,13 +4,14 @@ Stock Product Locations Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: diff --git a/modules/stock_product_location/tests/scenario_stock_product_location_production.rst b/modules/stock_product_location/tests/scenario_stock_product_location_production.rst index e3bae98fcb..f4761cac55 100644 --- a/modules/stock_product_location/tests/scenario_stock_product_location_production.rst +++ b/modules/stock_product_location/tests/scenario_stock_product_location_production.rst @@ -4,12 +4,14 @@ Stock Product Locations Production Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company + >>> today = dt.date.today() + Activate modules:: >>> _ = activate_modules(['stock_product_location', 'production']) @@ -120,7 +122,7 @@ Make a production:: >>> Production = Model.get('production') >>> production = Production() - >>> production.planned_date = datetime.date.today() + >>> production.planned_date = today >>> production.product = product >>> production.bom = bom >>> production.quantity = 2 diff --git a/modules/stock_product_location/tests/scenario_stock_product_location_template.rst b/modules/stock_product_location/tests/scenario_stock_product_location_template.rst index 01feb08cd9..d8dd4a5ea5 100644 --- a/modules/stock_product_location/tests/scenario_stock_product_location_template.rst +++ b/modules/stock_product_location/tests/scenario_stock_product_location_template.rst @@ -4,13 +4,14 @@ Stock Product Locations Template Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: diff --git a/modules/stock_quantity_early_planning/setup.py b/modules/stock_quantity_early_planning/setup.py index b2ba6e36f8..a45950cd58 100755 --- a/modules/stock_quantity_early_planning/setup.py +++ b/modules/stock_quantity_early_planning/setup.py @@ -51,7 +51,6 @@ for dep in info.get('depends', []): requires.append(get_require_version('trytond')) tests_require = [ - 'python-dateutil', get_require_version('proteus'), get_require_version('trytond_production'), ] diff --git a/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning.rst b/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning.rst index 1b933a9ddb..16e73d03d1 100644 --- a/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning.rst +++ b/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning.rst @@ -7,7 +7,6 @@ Imports:: >>> from decimal import Decimal >>> import datetime as dt - >>> from dateutil.relativedelta import relativedelta >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -15,10 +14,10 @@ Imports:: ... create_company, get_company) >>> today = dt.date.today() - >>> week1 = today + relativedelta(weeks=1) - >>> week2 = today + relativedelta(weeks=2) - >>> week3 = today + relativedelta(weeks=3) - >>> week4 = today + relativedelta(weeks=4) + >>> week1 = today + dt.timedelta(weeks=1) + >>> week2 = today + dt.timedelta(weeks=2) + >>> week3 = today + dt.timedelta(weeks=3) + >>> week4 = today + dt.timedelta(weeks=4) Activate modules:: diff --git a/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning_incoming.rst b/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning_incoming.rst index a6ee6286b9..fcfed40730 100644 --- a/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning_incoming.rst +++ b/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning_incoming.rst @@ -7,7 +7,6 @@ Imports:: >>> from decimal import Decimal >>> import datetime as dt - >>> from dateutil.relativedelta import relativedelta >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -15,9 +14,9 @@ Imports:: ... create_company, get_company) >>> today = dt.date.today() - >>> week1 = today + relativedelta(weeks=1) - >>> week2 = today + relativedelta(weeks=2) - >>> week3 = today + relativedelta(weeks=3) + >>> week1 = today + dt.timedelta(weeks=1) + >>> week2 = today + dt.timedelta(weeks=2) + >>> week3 = today + dt.timedelta(weeks=3) Activate modules:: diff --git a/modules/stock_quantity_issue/setup.py b/modules/stock_quantity_issue/setup.py index 4a56f475df..6948e6eb16 100755 --- a/modules/stock_quantity_issue/setup.py +++ b/modules/stock_quantity_issue/setup.py @@ -51,7 +51,6 @@ for dep in info.get('depends', []): requires.append(get_require_version('trytond')) tests_require = [ - 'python-dateutil', get_require_version('proteus'), get_require_version('trytond_production'), ] diff --git a/modules/stock_quantity_issue/tests/scenario_stock_quantity_issue.rst b/modules/stock_quantity_issue/tests/scenario_stock_quantity_issue.rst index 1952e4edf7..647f15fa49 100644 --- a/modules/stock_quantity_issue/tests/scenario_stock_quantity_issue.rst +++ b/modules/stock_quantity_issue/tests/scenario_stock_quantity_issue.rst @@ -7,7 +7,6 @@ Imports:: >>> from decimal import Decimal >>> import datetime as dt - >>> from dateutil.relativedelta import relativedelta >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -15,9 +14,9 @@ Imports:: ... create_company, get_company) >>> today = dt.date.today() - >>> week1 = today + relativedelta(weeks=1) - >>> week2 = today + relativedelta(weeks=2) - >>> week3 = today + relativedelta(weeks=3) + >>> week1 = today + dt.timedelta(weeks=1) + >>> week2 = today + dt.timedelta(weeks=2) + >>> week3 = today + dt.timedelta(weeks=3) Activate modules:: diff --git a/modules/stock_shipment_cost/tests/scenario_stock_shipment_cost.rst b/modules/stock_shipment_cost/tests/scenario_stock_shipment_cost.rst index 8b6c93e63f..818971f62e 100644 --- a/modules/stock_shipment_cost/tests/scenario_stock_shipment_cost.rst +++ b/modules/stock_shipment_cost/tests/scenario_stock_shipment_cost.rst @@ -10,6 +10,7 @@ Imports:: >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) + >>> today = dt.date.today() >>> yesterday = today - dt.timedelta(days=1) diff --git a/modules/stock_supply/tests/scenario_stock_internal_supply.rst b/modules/stock_supply/tests/scenario_stock_internal_supply.rst index acd193eea4..d3f0a50170 100644 --- a/modules/stock_supply/tests/scenario_stock_internal_supply.rst +++ b/modules/stock_supply/tests/scenario_stock_internal_supply.rst @@ -4,14 +4,11 @@ Stock Shipment Out Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules, set_user >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/stock_supply/tests/scenario_stock_internal_supply_lead_time.rst b/modules/stock_supply/tests/scenario_stock_internal_supply_lead_time.rst index fbd77c0e5f..e5f06ddb11 100644 --- a/modules/stock_supply/tests/scenario_stock_internal_supply_lead_time.rst +++ b/modules/stock_supply/tests/scenario_stock_internal_supply_lead_time.rst @@ -4,15 +4,15 @@ Stock Internal Supply Lead Time Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() - >>> tomorrow = today + relativedelta(days=1) + + >>> today = dt.date.today() + >>> tomorrow = today + dt.timedelta(days=1) Activate modules:: @@ -61,7 +61,7 @@ Add lead time between warehouses:: >>> lead_time = LeadTime() >>> lead_time.warehouse_from = warehouse_loc >>> lead_time.warehouse_to = sec_warehouse_loc - >>> lead_time.lead_time = datetime.timedelta(1) + >>> lead_time.lead_time = dt.timedelta(1) >>> lead_time.save() Create internal order point:: diff --git a/modules/stock_supply/tests/scenario_stock_internal_supply_overflow.rst b/modules/stock_supply/tests/scenario_stock_internal_supply_overflow.rst index a8e427b5d5..8f63628408 100644 --- a/modules/stock_supply/tests/scenario_stock_internal_supply_overflow.rst +++ b/modules/stock_supply/tests/scenario_stock_internal_supply_overflow.rst @@ -4,14 +4,11 @@ Stock supply scenario: Internal supply with overflow Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company - >>> today = datetime.date.today() Activate modules:: diff --git a/modules/stock_supply/tests/scenario_stock_supply_purchase_request.rst b/modules/stock_supply/tests/scenario_stock_supply_purchase_request.rst index 0244427d38..43cfd5822f 100644 --- a/modules/stock_supply/tests/scenario_stock_supply_purchase_request.rst +++ b/modules/stock_supply/tests/scenario_stock_supply_purchase_request.rst @@ -4,7 +4,7 @@ Purchase Request Scenario Imports:: - >>> import datetime + >>> import datetime as dt >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard @@ -13,7 +13,8 @@ Imports:: ... get_company >>> from trytond.modules.account.tests.tools import (create_chart, ... get_accounts) - >>> today = datetime.date.today() + + >>> today = dt.date.today() Activate modules:: @@ -42,7 +43,7 @@ Configure supply period:: >>> PurchaseConfig = Model.get('purchase.configuration') >>> purchase_config = PurchaseConfig(1) - >>> purchase_config.supply_period = datetime.timedelta(days=30) + >>> purchase_config.supply_period = dt.timedelta(days=30) >>> purchase_config.save() Create stock admin user:: @@ -120,7 +121,7 @@ Define a product supplier:: >>> ProductSupplier = Model.get('purchase.product_supplier') >>> product_supplier = ProductSupplier(template=template) >>> product_supplier.party = supplier - >>> product_supplier.lead_time = datetime.timedelta(days=1) + >>> product_supplier.lead_time = dt.timedelta(days=1) >>> product_supplier.save() Get stock locations:: @@ -155,7 +156,7 @@ Create needs for missing product:: >>> shipment_out.click('wait') >>> shipment_out, = shipment_out.duplicate( - ... default={'planned_date': today + datetime.timedelta(days=10)}) + ... default={'planned_date': today + dt.timedelta(days=10)}) >>> shipment_out.click('wait') There is no purchase request:: diff --git a/modules/stock_supply_forecast/tests/scenario_stock_supply_forecast.rst b/modules/stock_supply_forecast/tests/scenario_stock_supply_forecast.rst index 70022e5778..456443cb0c 100644 --- a/modules/stock_supply_forecast/tests/scenario_stock_supply_forecast.rst +++ b/modules/stock_supply_forecast/tests/scenario_stock_supply_forecast.rst @@ -4,8 +4,7 @@ Stock Supply Forecast Scenario Imports:: - >>> import datetime - >>> from dateutil.relativedelta import relativedelta + >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard >>> from trytond.tests.tools import activate_modules @@ -13,9 +12,9 @@ Imports:: ... get_company >>> from trytond.modules.account.tests.tools import (create_chart, ... get_accounts) - >>> today = datetime.date.today() - >>> yesterday = today - relativedelta(days=1) - >>> tomorrow = today + relativedelta(days=1) + >>> today = dt.date.today() + >>> yesterday = today - dt.timedelta(days=1) + >>> tomorrow = today + dt.timedelta(days=1) Activate modules:: diff --git a/modules/stock_supply_production/tests/scenario_stock_supply_production.rst b/modules/stock_supply_production/tests/scenario_stock_supply_production.rst index 7beffa6641..7f931d918c 100644 --- a/modules/stock_supply_production/tests/scenario_stock_supply_production.rst +++ b/modules/stock_supply_production/tests/scenario_stock_supply_production.rst @@ -11,6 +11,7 @@ Imports:: >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.stock.exceptions import MoveFutureWarning + >>> today = dt.date.today() Activate modules::