diff --git a/modules/account/doc/design/account.inc.rst b/modules/account/doc/design/account.inc.rst index c96dd50578..7a30d20510 100644 --- a/modules/account/doc/design/account.inc.rst +++ b/modules/account/doc/design/account.inc.rst @@ -103,8 +103,8 @@ Account Deferral The *Account Deferral* concept stores, by `Account `, any amounts that need to be carried forward to the next `Fiscal Year `. -The data that gets stored here is managed automatically when fiscal years -are closed or re-opened. +The data stored here is automatically managed when fiscal years are closed or +reopened. .. _model-account.general_ledger.account: diff --git a/modules/account/doc/usage/close.inc.rst b/modules/account/doc/usage/close.inc.rst index 21a8d094d2..481047b450 100644 --- a/modules/account/doc/usage/close.inc.rst +++ b/modules/account/doc/usage/close.inc.rst @@ -41,11 +41,11 @@ to close the period. .. tip:: - If you need to make changes to a closed period you can re-open it, unless - it has been locked. + If you need to make changes to a closed period, you can reopen it if it is + not locked. - To re-open a closed period use the - [:menuselection:`Financial --> Processing --> Close Periods`] menu item. + To reopen a closed period use the [:menuselection:`Financial --> Processing + --> Close Periods`] menu item. To find a closed period, you will need to clear the filter so that all the periods are listed, not just the open ones. diff --git a/modules/account/fiscalyear.py b/modules/account/fiscalyear.py index ddd5b6831b..a98616d5be 100644 --- a/modules/account/fiscalyear.py +++ b/modules/account/fiscalyear.py @@ -378,7 +378,7 @@ class FiscalYear(Workflow, ModelSQL, ModelView): @Workflow.transition('open') def reopen(cls, fiscalyears): ''' - Re-open a fiscal year + Reopen a fiscal year ''' Deferral = Pool().get('account.account.deferral') diff --git a/modules/account/fiscalyear.xml b/modules/account/fiscalyear.xml index 7ee6e0480f..b87eb5c622 100644 --- a/modules/account/fiscalyear.xml +++ b/modules/account/fiscalyear.xml @@ -69,7 +69,7 @@ this repository contains the full copyright notices and license terms. --> account.fiscalyear reopen - Re-Open + Reopen account.fiscalyear diff --git a/modules/account/period.py b/modules/account/period.py index 442852d6e2..6bc7d0bb9f 100644 --- a/modules/account/period.py +++ b/modules/account/period.py @@ -403,7 +403,7 @@ class Period(Workflow, ModelSQL, ModelView): @ModelView.button @Workflow.transition('open') def reopen(cls, periods): - "Re-open period" + "Reopen period" pass @classmethod diff --git a/modules/account/period.xml b/modules/account/period.xml index 72245a4efc..120cf44c85 100644 --- a/modules/account/period.xml +++ b/modules/account/period.xml @@ -51,7 +51,7 @@ this repository contains the full copyright notices and license terms. --> account.period reopen - Re-Open + Reopen diff --git a/modules/project/message.xml b/modules/project/message.xml index f3d5af46d6..da2f0a59c3 100644 --- a/modules/project/message.xml +++ b/modules/project/message.xml @@ -10,7 +10,7 @@ this repository contains the full copyright notices and license terms. --> To complete work "%(work)s" you must complete also all its children. - To re-open work "%(work)s" you must re-open also its parent "%(parent)s". + To reopen the work "%(work)s", you must also reopen its parent "%(parent)s". You cannot erase party "%(party)s" while they have opened projects with company "%(company)s". diff --git a/modules/project/tests/scenario_project_status.rst b/modules/project/tests/scenario_project_status.rst index 9767b9338a..9a2e7fe8bb 100644 --- a/modules/project/tests/scenario_project_status.rst +++ b/modules/project/tests/scenario_project_status.rst @@ -58,7 +58,7 @@ Try to complete project without task:: >>> task.progress = 1 >>> project.save() -Try to re-open task without project:: +Try to reopen task without project:: >>> task = Work(task.id) >>> task.progress = 0.5 @@ -78,7 +78,7 @@ Change progress with updating status:: >>> project.status = in_progress >>> project.save() -Re-open task:: +Reopen task:: >>> task = Work(task.id) >>> task.progress = 0.5 diff --git a/modules/sale_point/message.xml b/modules/sale_point/message.xml index fd73646076..95815a85f2 100644 --- a/modules/sale_point/message.xml +++ b/modules/sale_point/message.xml @@ -16,10 +16,10 @@ this repository contains the full copyright notices and license terms. --> The sale "%(sale)s" is cancelled so cannot have amount paid. - To delete payment "%(payment)s" you must re-open session "%(session)s". + To delete payment "%(payment)s", you must reopen session "%(session)s". - To delete payment "%(payment)s" you must re-open sale "%(sale)s". + To delete payment "%(payment)s", you must reopen sale "%(sale)s". Each company can only have one cash payment method. @@ -34,13 +34,13 @@ this repository contains the full copyright notices and license terms. --> To close session "%(session)s" you must change end amount to have %(amount)s instead of %(end_amount)s. - To delete session "%(session)s" you must re-open it. + To delete session "%(session)s", you must reopen it. You cannot delete transfer "%(transfer)s" because it is posted. - To delete transfer "%(transfer)s" you must re-open session "%(session)s". + To delete transfer "%(transfer)s", you must reopen session "%(session)s". diff --git a/modules/sale_point/sale.xml b/modules/sale_point/sale.xml index 3bd43b24a8..3cbc379f5b 100644 --- a/modules/sale_point/sale.xml +++ b/modules/sale_point/sale.xml @@ -186,7 +186,7 @@ this repository contains the full copyright notices and license terms. --> sale.point.sale open - Re-Open + Reopen @@ -299,7 +299,7 @@ this repository contains the full copyright notices and license terms. --> sale.point.cash.session open - Re-Open + Reopen