Unify reopen usage

modules/account/doc/design/account.inc.rst

@@ -103,8 +103,8 @@ Account Deferral
 The *Account Deferral* concept stores, by `Account <model-account.account>`,
 any amounts that need to be carried forward to the next
 `Fiscal Year <model-account.fiscalyear>`.
-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:
 

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.
 

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')
 

modules/account/fiscalyear.xml

@@ -69,7 +69,7 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.model.button" id="fiscalyear_reopen_button">
             <field name="model">account.fiscalyear</field>
             <field name="name">reopen</field>
-            <field name="string">Re-Open</field>
+            <field name="string">Reopen</field>
         </record>
         <record model="ir.model.button" id="fiscalyear_close_button">
             <field name="model">account.fiscalyear</field>

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

modules/account/period.xml

@@ -51,7 +51,7 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.model.button" id="period_reopen_button">
             <field name="model">account.period</field>
             <field name="name">reopen</field>
-            <field name="string">Re-Open</field>
+            <field name="string">Reopen</field>
         </record>
 
         <record model="ir.model.button" id="period_lock_button">

modules/project/message.xml

@@ -10,7 +10,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="text">To complete work "%(work)s" you must complete also all its children.</field>
         </record>
         <record model="ir.message" id="msg_work_parent_progress">
-            <field name="text">To re-open work "%(work)s" you must re-open also its parent "%(parent)s".</field>
+            <field name="text">To reopen the work "%(work)s", you must also reopen its parent "%(parent)s".</field>
         </record>
         <record model="ir.message" id="msg_erase_party_opened_project">
             <field name="text">You cannot erase party "%(party)s" while they have opened projects with company "%(company)s".</field>

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

modules/sale_point/message.xml

@@ -16,10 +16,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="text">The sale "%(sale)s" is cancelled so cannot have amount paid.</field>
         </record>
         <record model="ir.message" id="msg_payment_delete_session_open">
-            <field name="text">To delete payment "%(payment)s" you must re-open session "%(session)s".</field>
+            <field name="text">To delete payment "%(payment)s", you must reopen session "%(session)s".</field>
         </record>
         <record model="ir.message" id="msg_payment_delete_sale_open">
-            <field name="text">To delete payment "%(payment)s" you must re-open sale "%(sale)s".</field>
+            <field name="text">To delete payment "%(payment)s", you must reopen sale "%(sale)s".</field>
         </record>
         <record model="ir.message" id="msg_payment_method_cash_unique">
             <field name="text">Each company can only have one cash payment method.</field>
@@ -34,13 +34,13 @@ this repository contains the full copyright notices and license terms. -->
             <field name="text">To close session "%(session)s" you must change end amount to have %(amount)s instead of %(end_amount)s.</field>
         </record>
         <record model="ir.message" id="msg_cash_session_delete_open">
-            <field name="text">To delete session "%(session)s" you must re-open it.</field>
+            <field name="text">To delete session "%(session)s", you must reopen it.</field>
         </record>
         <record model="ir.message" id="msg_transfer_delete_posted">
             <field name="text">You cannot delete transfer "%(transfer)s" because it is posted.</field>
         </record>
         <record model="ir.message" id="msg_transfer_delete_session_open">
-            <field name="text">To delete transfer "%(transfer)s" you must re-open session "%(session)s".</field>
+            <field name="text">To delete transfer "%(transfer)s", you must reopen session "%(session)s".</field>
         </record>
     </data>
 </tryton>

modules/sale_point/sale.xml

@@ -186,7 +186,7 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.model.button" id="sale_open_button">
             <field name="model">sale.point.sale</field>
             <field name="name">open</field>
-            <field name="string">Re-Open</field>
+            <field name="string">Reopen</field>
         </record>
 
         <record model="ir.model.button" id="sale_process_button">
@@ -299,7 +299,7 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.model.button" id="cash_session_open_button">
             <field name="model">sale.point.cash.session</field>
             <field name="name">open</field>
-            <field name="string">Re-Open</field>
+            <field name="string">Reopen</field>
         </record>
 
         <record model="ir.model.button" id="cash_session_close_button">