تقویم جلالی

.pre-commit-config.yaml

@@ -89,7 +89,7 @@ repos:
       - id: check-symlinks
       - id: check-xml
       - id: mixed-line-ending
-        args: ["--fix=lf"]
+        args: ["--fix=auto"]
   - repo: https://github.com/asottile/pyupgrade
     rev: v2.7.2
     hooks:

l10n_ir_base/__manifest__.py

@@ -10,7 +10,11 @@
     "category": "l10n/Technical",
     "summary": "Iran Base Calendar",
     "depends": ["base", "account"],
-    "data": ["views/user_preferences.xml", "views/partner_preferences.xml"],
+    "data": [
+        "views/res_lang_form.xml",
+        "views/res_partner_form.xml",
+        "views/res_user_form.xml",
+    ],
     "external_dependencies": {
         "python": ["jdatetime"],
     },

l10n_ir_base/i18n/fa.po

@@ -6,29 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-25 11:30+0000\n"
-"PO-Revision-Date: 2021-09-25 15:01+0330\n"
+"POT-Creation-Date: 2021-11-18 09:28+0000\n"
+"PO-Revision-Date: 2021-11-18 09:28+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
-"X-Generator: Poedit 3.0\n"
 
 #. module: l10n_ir_base
 #: model:ir.model,name:l10n_ir_base.model_base
 msgid "Base"
-msgstr ""
+msgstr "پایه"
 
-#. module: l10n_ir_base
-#: model_terms:ir.ui.view,arch_db:l10n_ir_base.persian_calendar_prefernces_form
-msgid "Caldendar"
-msgstr "تقویم"
 
 #. module: l10n_ir_base
+#: model:ir.model.fields,field_description:l10n_ir_base.field_res_lang__calendar
 #: model:ir.model.fields,field_description:l10n_ir_base.field_res_users__calendar
+#: model_terms:ir.ui.view,arch_db:l10n_ir_base.l10n_ir_res_lang_form
+#: model_terms:ir.ui.view,arch_db:l10n_ir_base.l10n_ir_res_user_form
 msgid "Calendar"
 msgstr "تقویم"
 
@@ -40,20 +38,23 @@ msgstr "شماره ثبت شرکت"
 #. module: l10n_ir_base
 #: model:ir.model,name:l10n_ir_base.model_res_partner
 msgid "Contact"
-msgstr ""
+msgstr "مخاطب"
 
 #. module: l10n_ir_base
 #: model:ir.model.fields,field_description:l10n_ir_base.field_account_journal__display_name
+#: model:ir.model.fields,field_description:l10n_ir_base.field_res_lang__display_name
 #: model:ir.model.fields,field_description:l10n_ir_base.field_res_partner__display_name
-#: model:ir.model.fields,field_description:l10n_ir_base.field_res_users__display_name
 msgid "Display Name"
-msgstr ""
+msgstr "نام نمایشی"
 
 #. module: l10n_ir_base
 #: code:addons/l10n_ir_base/models/account_journal_dashboard.py:0
 #, python-format
 msgid "Due"
-msgstr ""
+msgstr "برای انجام"
+
+#. module: l10n_ir_base
+#: model:ir.model.fields.selection,name:l10n_ir_base.selection__res_lang__calendar__gregorian
 
 #. module: l10n_ir_base
 #: model:ir.model.fields.selection,name:l10n_ir_base.selection__res_users__calendar__gregorian
@@ -62,10 +63,10 @@ msgstr "تقویم میلادی"
 
 #. module: l10n_ir_base
 #: model:ir.model.fields,field_description:l10n_ir_base.field_account_journal__id
+#: model:ir.model.fields,field_description:l10n_ir_base.field_res_lang__id
 #: model:ir.model.fields,field_description:l10n_ir_base.field_res_partner__id
-#: model:ir.model.fields,field_description:l10n_ir_base.field_res_users__id
 msgid "ID"
-msgstr ""
+msgstr "شناسه"
 
 #. module: l10n_ir_base
 #: model:ir.model.fields.selection,name:l10n_ir_base.selection__res_users__calendar__jalali
@@ -75,23 +76,33 @@ msgstr "تقویم شمسی (جلالی)"
 #. module: l10n_ir_base
 #: model:ir.model,name:l10n_ir_base.model_account_journal
 msgid "Journal"
-msgstr ""
+msgstr "دفتر"
+
+#. module: l10n_ir_base
+#: model:ir.model,name:l10n_ir_base.model_res_lang
+msgid "Languages"
+msgstr "زبان ها"
 
 #. module: l10n_ir_base
 #: model:ir.model.fields,field_description:l10n_ir_base.field_account_journal____last_update
+#: model:ir.model.fields,field_description:l10n_ir_base.field_res_lang____last_update
 #: model:ir.model.fields,field_description:l10n_ir_base.field_res_partner____last_update
-#: model:ir.model.fields,field_description:l10n_ir_base.field_res_users____last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "آخرین تغییر در"
+
 
 #. module: l10n_ir_base
 #: model:ir.model.fields,field_description:l10n_ir_base.field_res_users__l10n_ir_national_code
 msgid "Natinal Code"
 msgstr "کد ملی"
 
 #. module: l10n_ir_base
+#: model:ir.model.fields,help:l10n_ir_base.field_res_partner__l10n_ir_national_code
+#: model:ir.model.fields,help:l10n_ir_base.field_res_users__l10n_ir_national_code
+msgid "National code used for iran."
+msgstr "کدملی برای ایران"
+
 #: model:ir.model.fields,field_description:l10n_ir_base.field_res_partner__l10n_ir_national_code
-#, fuzzy
 msgid "National Code"
 msgstr "کد ملی"
 
@@ -105,37 +116,36 @@ msgstr ""
 #: code:addons/l10n_ir_base/models/account_journal_dashboard.py:0
 #, python-format
 msgid "Not Due"
-msgstr ""
+msgstr "انجام نشده"
 
 #. module: l10n_ir_base
 #: code:addons/l10n_ir_base/models/account_journal_dashboard.py:0
 #, python-format
 msgid "Sample data"
-msgstr ""
+msgstr "داده نمایشی"
 
 #. module: l10n_ir_base
 #: code:addons/l10n_ir_base/models/account_journal_dashboard.py:0
 #, python-format
 msgid "This Week"
+msgstr "هفته جاری"
+
+
+#. module: l10n_ir_base
+#: model:ir.model.fields,help:l10n_ir_base.field_res_users__calendar
+msgid "user current calendar"
+msgstr "تقویم فعلی کاربر"
+
+
+#. module: l10n_ir_base
+#: code:addons/l10n_ir_base/models/res_user.py:0
+#, python-format
+msgid "jalali"
+msgstr "تقویم شمسی"
+=======
 msgstr ""
 
 #. module: l10n_ir_base
 #: model:ir.model,name:l10n_ir_base.model_res_users
 msgid "Users"
 msgstr ""
-
-#~ msgid ""
-#~ "\n"
-#~ "Iran Localization"
-#~ msgstr "بومی سازی ایران"
-
-#~ msgid ""
-#~ "\n"
-#~ "Iran Localization\n"
-#~ msgstr "بومی سازی ایران"
-
-#~ msgid "l10n"
-#~ msgstr "بومی سازی"
-
-#~ msgid "Iran - Base"
-#~ msgstr "ایران - پایه"

l10n_ir_base/models/__init__.py

@@ -1,4 +1,6 @@
 # from . import sale_report
+from . import res_user
+from . import res_lang
 from . import base_model
+from . import res_partner
 from . import account_journal_dashboard
-from . import user_extensions

l10n_ir_base/models/account_journal_dashboard.py

@@ -13,7 +13,8 @@ class AccountJournal(models.Model):
     _inherit = "account.journal"
 
     def get_bar_graph_datas(self):
-        if self.env.user.calendar == "gregorian":
+        calendar = self.env["res.lang"]._lang_get(self.env.user.lang).calendar
+        if calendar == "gregorian":
             return super(AccountJournal, self).get_bar_graph_datas()
         data = []
         today = fields.Datetime.now(self)

l10n_ir_base/models/base_model.py

@@ -31,7 +31,8 @@ class BaseModelExtend(models.AbstractModel):
 
     @api.model
     def _read_group_format_result(self, data, annotated_groupbys, groupby, domain):
-        if self.env.user.calendar == "gregorian":
+        calendar = self.env["res.lang"]._lang_get(self.env.user.lang).calendar
+        if calendar == "gregorian":
             return super(BaseModelExtend, self)._read_group_format_result(
                 data, annotated_groupbys, groupby, domain
             )

l10n_ir_base/models/res_lang.py

@@ -0,0 +1,10 @@
+from odoo import fields, models
+
+
+class UsersExtensions(models.Model):
+    _inherit = "res.lang"
+
+    calendar = fields.Selection(
+        [("gregorian", "Gregorian Calendar"), ("jalali", "Jalali (Persian) Calendar")],
+        default="jalali",
+    )

l10n_ir_base/models/res_partner.py

@@ -0,0 +1,9 @@
+from odoo import fields, models
+
+
+class ResPartner(models.Model):
+    _inherit = "res.partner"
+
+    l10n_ir_national_code = fields.Char(
+        string="Natinal Code", size=11, help="National code used for iran."
+    )

l10n_ir_base/models/res_user.py

@@ -0,0 +1,18 @@
+from odoo import _, api, fields, models
+
+
+class ResUser(models.Model):
+    _inherit = "res.users"
+
+    calendar = fields.Char(
+        string="Calendar",
+        size=10,
+        help="user current calendar",
+        readonly=True,
+        translate=True,
+        compute="_compute_calendar",
+    )
+
+    @api.depends("user_id")
+    def _compute_calendar(self):
+        self.calendar = _(self.env["res.lang"]._lang_get(self.env.user.lang).calendar)

l10n_ir_base/views/res_lang_form.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- pylint:disable=file-not-used -->
+<odoo>
+        <record model="ir.ui.view" id="l10n_ir_res_lang_form">
+          <field name="name">Lang Calendar</field>
+          <field name="model">res.lang</field>
+          <field name="inherit_id" ref="base.res_lang_form" />
+          <field name="arch" type="xml">
+            <field name="date_format" position="before">
+              <field name='calendar' string='Calendar' />
+            </field>
+          </field>
+        </record>
+</odoo>

l10n_ir_base/views/partner_preferences.xml → l10n_ir_base/views/res_partner_form.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!-- pylint:disable=file-not-used -->
 <odoo>
         <record id="res_partner_form_inherit_ir" model="ir.ui.view">
             <field name="name">res.partner.form.inherit.l10n.ir</field>

l10n_ir_base/views/user_preferences.xml → l10n_ir_base/views/res_user_form.xml

@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!-- pylint:disable=file-not-used -->
 <odoo>
-  <data>
-    <record model="ir.ui.view" id="persian_calendar_prefernces_form">
+    <record model="ir.ui.view" id="l10n_ir_res_user_form">
       <field name="name">User Prefernces</field>
       <field name="model">res.users</field>
       <field name="inherit_id" ref="base.view_users_form_simple_modif" />
       <field name="arch" type="xml">
-        <field name="tz_offset" position="after">
-          <field name='calendar' string='Caldendar' />
+        <field name="tz" position="before">
+          <field name='calendar' string='Calendar' class="text-primary" readonly="1" />
         </field>
       </field>
     </record>
-  </data>
 </odoo>

l10n_ir_hr_contract/views/hr_contract_view.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!-- pylint:disable=file-not-used -->
 <odoo>
     <record id="hr_contract_form_additional_allowance" model="ir.ui.view">
         <field name="name">hr.contract.view.additional.allowance</field>

l10n_ir_states/data/res_country_data.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!-- pylint:disable=file-not-used -->
 <odoo>
     <record id="base.ir" model="res.country">
         <field name="enforce_cities" eval="1" />