staging

bankayma_account/__manifest__.py

@@ -2,7 +2,7 @@
 {
     "name": "BANKayma (account)",
     "summary": "BANKayma accounting customizations",
-    "version": "16.0.1.0.12",
+    "version": "16.0.1.0.13",
     "development_status": "Alpha",
     "author": "Moshchot Coop",
     "license": "AGPL-3",
@@ -65,6 +65,7 @@
         "views/menu.xml",
         "views/account_analytic_account.xml",
         "views/account_fiscal_position.xml",
+        "views/account_invoice_report.xml",
         "views/account_journal.xml",
         "views/account_move.xml",
         "views/product_template.xml",
@@ -73,6 +74,7 @@
         "views/res_partner.xml",
         "views/snippets.xml",
         "views/templates.xml",
+        "views/tier_definition.xml",
         "wizards/account_payment_register.xml",
         "wizards/bankayma_company_create.xml",
         "wizards/bankayma_move_change_company.xml",

bankayma_account/data/chatter_views.xml

@@ -245,6 +245,56 @@
             Bill the robot
         </p>
     </template>
+    <template
+        id="qweb_template_account_move_paid_reminder"
+        name="BNK Vendor: reminder to send receipt"
+    >
+        <p style="margin:0px 0 12px 0;box-sizing:border-box;">
+            Hi
+            <t t-if="object.partner_id.parent_id">
+                <t t-out="object.partner_id.name or ''">Brandon Freeman</t>
+                <!-- prettier-ignore-start -->
+                (<t t-out="object.partner_id.parent_id.name or ''">Azure Interior</t>),
+                <!-- prettier-ignore-end -->
+            </t>
+            <t t-else="">
+                <!-- prettier-ignore-start -->
+                <t t-out="object.partner_id.name or ''">Brandon Freeman</t>,
+                <!-- prettier-ignore-end -->
+            </t>
+            <br />
+            <br />
+            According to our records, you haven't sent a reciept for
+            <span style="font-weight:bold;" t-field="object.amount_untaxed_signed" />
+            for
+            <t t-out="', '.join(object.mapped('invoice_line_ids.name')) or ''">
+                description
+            </t>
+            paid on
+            <t t-out="object.bankayma_payment_date or ''" />
+            from
+            <t t-out="object.company_id.name or ''">YourCompany</t>
+            to
+            <t t-out="object.partner_bank_id or ''">your bank</t>
+        </p>
+        <p style="margin:0px 0 12px 0;box-sizing:border-box;">
+            <strong style="box-sizing:border-box;font-weight:500;">
+                Please upload a receipt by replying to this email
+            </strong>
+            <br />
+            <br />
+            To: Bar-Kayma for Culture 580450898
+            <br />
+            Bank First Internation Bank of Israel (31),
+            <br />
+            Branch 012, Account 036218
+        </p>
+        <p style="margin:0px 0 12px 0;box-sizing:border-box;">
+            Love💜
+            <br />
+            Bill the robot
+        </p>
+    </template>
     <template id="qweb_template_account_move_rejected">
         <div>
             <h1>

bankayma_account/data/product_product.xml

@@ -5,8 +5,9 @@
     <record id="product_overhead" model="product.product">
         <field name="name">Overhead</field>
         <field name="default_code">OVER</field>
-        <field name="active" eval="False" />
+        <field name="active" eval="True" />
         <field name="company_id" eval="False" />
+        <field name="sale_ok" eval="True" />
     </record>
 
     <record id="product_portal" model="product.product">

bankayma_account/data/tier_definition.xml

@@ -74,6 +74,7 @@
         <field name="has_comment" eval="True" />
         <field name="comment_required_reject" eval="True" />
         <field name="comment_required_validate" eval="False" />
+        <field name="bankayma_enforce_fpos_restrictions" eval="True" />
         <field
             name="server_action_id"
             ref="action_post_validation_vendor_bill_confirm"

bankayma_account/i18n/he_IL.po

@@ -43,6 +43,17 @@ msgstr "מ"
 msgid "7.6%"
 msgstr ""
 
+#. module: bankayma_account
+#: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_paid_reminder
+msgid ""
+"<br/>\n"
+"            <br/>\n"
+"            According to our records, you haven't sent a reciept for"
+msgstr ""
+"<br/>\n"
+"            <br/>\n"
+"            על פי הרשומות שלנו, טרם שלחת קבלה עבור"
+
 #. module: bankayma_account
 #: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_paid
 msgid ""
@@ -129,6 +140,31 @@ msgstr ""
 "            <br/>\n"
 "            סניף 012, חשבון 036218"
 
+#. module: bankayma_account
+#: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_paid_reminder
+msgid ""
+"<strong style=\"box-sizing:border-box;font-weight:500;\">\n"
+"                Please upload a receipt by replying to this email\n"
+"            </strong>\n"
+"            <br/>\n"
+"            <br/>\n"
+"            To: Bar-Kayma for Culture 580450898\n"
+"            <br/>\n"
+"            Bank First Internation Bank of Israel (31),\n"
+"            <br/>\n"
+"            Branch 012, Account 036218"
+msgstr ""
+"<strong style=\"box-sizing:border-box;font-weight:500;\">\n"
+"                  נא לשלוח קבלה במייל חוזר \n"
+"            </strong>\n"
+"            <br/>\n"
+"            <br/>\n"
+"            עבור בר-קיימא לתרבות 580450898\n"
+"            <br/>\n"
+"            הבנק הבינלאומי הראשון לישראל  (31),\n"
+"            <br/>\n"
+"            סניף 012, חשבון 036218"
+
 #. module: bankayma_account
 #: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_edi_invoice
 msgid "<strong style=\"box-sizing:border-box;font-weight:500;\">For:</strong>"
@@ -198,6 +234,11 @@ msgstr "תגית"
 msgid "Analytic Accounts"
 msgstr "תגיות אנליטיות"
 
+#. module: bankayma_account
+#: model:ir.model.fields,field_description:bankayma_account.field_account_move_line__bankayma_analytic_plan_id
+msgid "Analytic Plan"
+msgstr ""
+
 #. module: bankayma_account
 #: model:ir.model.fields,field_description:bankayma_account.field_account_bank_statement_line__analytic_precision
 #: model:ir.model.fields,field_description:bankayma_account.field_account_move__analytic_precision
@@ -210,6 +251,11 @@ msgstr ""
 msgid "Analytic account"
 msgstr "תגית"
 
+#. module: bankayma_account
+#: model:ir.model.fields,field_description:bankayma_account.field_account_invoice_report__bankayma_analytic_plan_id
+msgid "Analytic plan"
+msgstr ""
+
 #. module: bankayma_account
 #. odoo-python
 #: code:addons/bankayma_account/models/account_move.py:0
@@ -253,6 +299,7 @@ msgstr "נבדק במערכת 1000, פטור"
 
 #. module: bankayma_account
 #: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_paid
+#: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_paid_reminder
 msgid "Azure Interior"
 msgstr ""
 
@@ -353,6 +400,7 @@ msgstr "מס' סניף"
 
 #. module: bankayma_account
 #: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_paid
+#: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_paid_reminder
 msgid "Brandon Freeman"
 msgstr ""
 
@@ -712,6 +760,11 @@ msgid ""
 "found and replaces the author_id field in the chatter."
 msgstr ""
 
+#. module: bankayma_account
+#: model:ir.model.fields,field_description:bankayma_account.field_tier_definition__bankayma_enforce_fpos_restrictions
+msgid "Enforce fiscal position restrictions"
+msgstr ""
+
 #. module: bankayma_account
 #: model:ir.model.fields.selection,name:bankayma_account.selection__account_move__bankayma_intercompany_grouping__expected
 msgid "Expected"
@@ -824,6 +877,11 @@ msgstr ""
 msgid "Here is your"
 msgstr "להלן"
 
+#. module: bankayma_account
+#: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_paid_reminder
+msgid "Hi"
+msgstr "אהלן"
+
 #. module: bankayma_account
 #: model_terms:ir.ui.view,arch_db:bankayma_account.payment_checkout
 msgid "I agree that the amount will be withdrawn periodically"
@@ -1058,6 +1116,7 @@ msgstr "הערות פנימיות"
 
 #. module: bankayma_account
 #: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_paid
+#: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_paid_reminder
 msgid ""
 "Love💜\n"
 "            <br/>\n"
@@ -1138,6 +1197,13 @@ msgid ""
 "comment for other messages such as user replies"
 msgstr ""
 
+#. module: bankayma_account
+#. odoo-python
+#: code:addons/bankayma_account/models/account_move.py:0
+#, python-format
+msgid "Missing attachment: %s"
+msgstr ""
+
 #. module: bankayma_account
 #: model:ir.model.fields,field_description:bankayma_account.field_account_bank_statement_line__need_validation
 #: model:ir.model.fields,field_description:bankayma_account.field_account_move__need_validation
@@ -1153,14 +1219,12 @@ msgstr "בבדיקה"
 
 #. module: bankayma_account
 #: model:ir.actions.act_window,name:bankayma_account.action_move_in_invoice_new
-#: model:ir.ui.menu,name:bankayma_account.menu_bankayma_expense_new
 #: model_terms:ir.ui.view,arch_db:bankayma_account.portal_my_invoices
 msgid "New Vendor Bill"
 msgstr "הזמנת רכש חדשה"
 
 #. module: bankayma_account
 #: model:ir.actions.act_window,name:bankayma_account.action_move_out_invoice_new
-#: model:ir.ui.menu,name:bankayma_account.menu_bankayma_income_new
 msgid "New invoice"
 msgstr "חשבון חדשה"
 
@@ -1794,6 +1858,11 @@ msgstr ""
 msgid "This partner already has a user!"
 msgstr ""
 
+#. module: bankayma_account
+#: model:ir.model,name:bankayma_account.model_tier_definition
+msgid "Tier Definition"
+msgstr ""
+
 #. module: bankayma_account
 #: model:ir.model.fields,field_description:bankayma_account.field_account_journal__bankayma_qweb_template_tier_validation_reject
 msgid "Tier validation rejection"
@@ -2040,6 +2109,7 @@ msgstr "בקשת התשלום שלך"
 
 #. module: bankayma_account
 #: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_paid
+#: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_paid_reminder
 msgid "YourCompany"
 msgstr ""
 
@@ -2081,17 +2151,20 @@ msgstr "הזמנת רכש ספק"
 
 #. module: bankayma_account
 #: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_paid
+#: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_paid_reminder
 msgid "description"
 msgstr "עבור"
 
 #. module: bankayma_account
 #: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_draft
 #: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_new_from_portal
+#: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_paid_reminder
 #: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_rejected
 msgid "for"
 msgstr "עבור"
 
 #. module: bankayma_account
+#: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_paid_reminder
 #: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_edi_invoice
 msgid "from"
 msgstr "מפרוייקט"
@@ -2124,8 +2197,14 @@ msgstr "בתאריך"
 msgid "or"
 msgstr "או"
 
+#. module: bankayma_account
+#: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_paid_reminder
+msgid "paid on"
+msgstr "ששולם בתאריך"
+
 #. module: bankayma_account
 #: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_paid
+#: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_paid_reminder
 msgid "to"
 msgstr ":)"
 
@@ -2155,5 +2234,6 @@ msgstr "כן"
 
 #. module: bankayma_account
 #: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_paid
+#: model_terms:ir.ui.view,arch_db:bankayma_account.qweb_template_account_move_paid_reminder
 msgid "your bank"
 msgstr "לבנק שלך"

bankayma_account/migrations/16.0.1.0.13/pre-migration.py

@@ -0,0 +1,9 @@
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version=None):
+    for company in env["res.company"].search(
+        [("parent_id", "!=", False), ("company_cascade_from_parent", "=", True)]
+    ):
+        company._company_cascade_fix_hierarchy()

bankayma_account/models/__init__.py

@@ -17,3 +17,4 @@
 from . import res_partner
 from . import res_partner_bank
 from . import res_users
+from . import tier_definition

bankayma_account/models/account_invoice_report.py

@@ -6,15 +6,22 @@
 from .account_move import VALIDATED_STATE_SELECTION
 
 
-class AccountTax(models.Model):
+class AccountInvoiceReport(models.Model):
     _inherit = "account.invoice.report"
 
     validated_state = fields.Selection(VALIDATED_STATE_SELECTION)
     bankayma_analytic_account_id = fields.Many2one(
         "account.analytic.account",
         string="Analytic account",
     )
+    bankayma_analytic_plan_id = fields.Many2one(
+        "account.analytic.plan",
+        string="Analytic plan",
+    )
 
     @api.model
     def _select(self):
-        return super()._select() + ", validated_state, bankayma_analytic_account_id"
+        return (
+            super()._select()
+            + ", validated_state, bankayma_analytic_account_id, bankayma_analytic_plan_id"
+        )