Merge pull request #718 from expsa/dev_odex25_accounting

Dev odex25 accounting

odex25_accounting/budget_extra/i18n/ar_001.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-12 15:29+0000\n"
-"PO-Revision-Date: 2024-08-12 15:29+0000\n"
+"POT-Creation-Date: 2024-08-14 12:37+0000\n"
+"PO-Revision-Date: 2024-08-14 12:37+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -25,6 +25,11 @@ msgstr ""
 msgid "Account Program"
 msgstr "التصنيف حسب البرنامج"
 
+#. module: budget_extra
+#: model_terms:ir.ui.view,arch_db:budget_extra.view_crossovered_budget_line_search
+msgid "Analytic Account"
+msgstr "الحساب التحليلي"
+
 #. module: budget_extra
 #: model:ir.model,name:budget_extra.model_crossovered_budget
 msgid "Budget"

odex25_accounting/budget_extra/views/view.xml

@@ -314,7 +314,7 @@
                     <filter name="group_program_id" string="Program" domain="[]" context="{'group_by':'program_id'}"/>
                     <filter name="group_account_program_id" string="Account Program" domain="[]" context="{'group_by':'account_program_id'}"/>
                     <filter name="group_door_id" string="Door" domain="[]" context="{'group_by':'door_id'}"/>
-
+                    <filter name="analytic_account_filter" string="Analytic Account" domain="[]" context="{'group_by':'analytic_account_id'}"/>
               </xpath>
         </field>
     </record>

odex25_accounting/odex25_account_payment_fix/security/security.xml

@@ -21,4 +21,9 @@
         <field name="name">Post Payment</field>
         <field name="category_id" ref="odex25_account_payment_fix.module_category_payment_access"/>
     </record>
+
+    <record id="group_cancel" model="res.groups">
+        <field name="name">Cancel Payment</field>
+        <field name="category_id" ref="odex25_account_payment_fix.module_category_payment_access"/>
+    </record>
 </odoo>

odex25_accounting/odex25_account_payment_fix/views/account_payment_views.xml

@@ -32,6 +32,7 @@
                     <button name="action_post" type="object" string="Posted" states="general_manager"
                             groups="odex25_account_payment_fix.group_posted" class="oe_highlight"/>
                     <button name="action_cancel" type="object" string="Cancel"
+                            groups="odex25_account_payment_fix.group_cancel"
                             states="draft,depart_manager,accounting_manager,general_manager,posted"
                             class="oe_highlight"/>
                     <field name="state" widget="statusbar"