Merge pull request #946 from expsa/bakry_base

fix

odex25_base/dynamic_reject_workflow/i18n/ar_001.po

@@ -36,7 +36,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:dynamic_reject_workflow.reject_wizard_view
 #: model_terms:ir.ui.view,arch_db:dynamic_reject_workflow.view_form_reject_button_wizard
 msgid "Cancel"
-msgstr ""
+msgstr "إلغـــاء"
 
 #. module: dynamic_reject_workflow
 #: model_terms:ir.ui.view,arch_db:dynamic_reject_workflow.reject_workflow_form
@@ -46,8 +46,8 @@ msgstr ""
 #. module: dynamic_reject_workflow
 #: model_terms:ir.ui.view,arch_db:dynamic_reject_workflow.reject_wizard_view
 #: model_terms:ir.ui.view,arch_db:dynamic_reject_workflow.view_form_reject_button_wizard
-msgid "Confirm"
-msgstr ""
+msgid "Send"
+msgstr "إرســال"
 
 #. module: dynamic_reject_workflow
 #: model:ir.model.fields,field_description:dynamic_reject_workflow.field_reject_button__create_uid
@@ -134,7 +134,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:dynamic_reject_workflow.field_outgoing_transaction__reason
 #: model:ir.model.fields,field_description:dynamic_reject_workflow.field_salary_advance__reason
 msgid "Reason"
-msgstr ""
+msgstr "السبب"
 
 #. module: dynamic_reject_workflow
 #: model:ir.model.fields,field_description:dynamic_reject_workflow.field_account_analytic_account__reason
@@ -260,8 +260,9 @@ msgstr ""
 #: model:ir.model.fields,field_description:dynamic_reject_workflow.field_stock_scrap__reason
 #: model:ir.model.fields,field_description:dynamic_reject_workflow.field_survey_survey__reason
 #: model:ir.model.fields,field_description:dynamic_reject_workflow.field_ticket_class__reason
+#: model:ir.model.fields,field_description:dynamic_reject_workflow.field_all_reject_wizard__reason
 msgid "Reason/Justification"
-msgstr ""
+msgstr "السبب/التوضيح"
 
 #. module: dynamic_reject_workflow
 #: code:addons/dynamic_reject_workflow/models/reject_workflow.py:0
@@ -292,8 +293,13 @@ msgstr ""
 #. module: dynamic_reject_workflow
 #: model:ir.model,name:dynamic_reject_workflow.model_reject_wizard
 #: model_terms:ir.ui.view,arch_db:dynamic_reject_workflow.reject_wizard_view
-msgid "Reject Wizard"
-msgstr ""
+msgid "Reason Wizard"
+msgstr "السبب"
+
+#. module: dynamic_reject_workflow
+#: model:ir.model,name:dynamic_reject_workflow.model_all_reject_wizard
+msgid "All Reject Wizard"
+msgstr "الأسبــاب"
 
 #. module: dynamic_reject_workflow
 #: model:ir.actions.act_window,name:dynamic_reject_workflow.reject_workflow_action
@@ -323,4 +329,4 @@ msgstr ""
 #. module: dynamic_reject_workflow
 #: model_terms:ir.ui.view,arch_db:dynamic_reject_workflow.view_form_reject_button_wizard
 msgid "or"
-msgstr ""
+msgstr ""

odex25_base/dynamic_reject_workflow/models/reject_workflow.py

@@ -80,9 +80,7 @@ class RejectButton(models.Model):
 class MailThread(models.AbstractModel):
     _inherit = 'mail.thread'
 
-    reason = fields.Text(string='Reason/Justification',
-    tracking=True
-    )
+    reason = fields.Text(string='Reason/Justification', tracking=True )
 
     def action_reject_workflow(self):
         return {

odex25_base/dynamic_reject_workflow/wizard/reject_wizard.xml

@@ -2,18 +2,16 @@
 <odoo>
     <data>
         <record id="reject_wizard_view" model="ir.ui.view">
-            <field name="name">all.reject.wizard.view</field>
+            <field name="name">Reason Wizard</field>
             <field name="model">all.reject.wizard</field>
             <field name="arch" type="xml">
-                <form string="Reject Wizard">
+                <form string="Reason Wizard">
                     <group>
                         <field name="reason" required="1"/>
                     </group>
                     <footer>
-                        <button name="button_confirm"
-                                string="Confirm"
-                                type="object" class="btn-primary"/>
-                        <button string="Cancel" class="btn-default" special="cancel" />
+                        <button name="button_confirm"  string="Send"  type="object" class="btn-primary"/>
+                        <button special="cancel" string="Cancel" class="btn-default" />
                     </footer>
                 </form>
             </field>