wip - restructure menu items, move wizard_settle to commistion, updat…

…e tests

account_commission/__init__.py

@@ -1,3 +1,3 @@
 from . import models
-from . import wizard
+from . import wizards
 from . import report

account_commission/__manifest__.py

@@ -8,7 +8,6 @@
     "license": "AGPL-3",
     "depends": [
         "account",
-        "product",
         "commission",
     ],
     "website": "https://github.com/OCA/commission",
@@ -18,9 +17,9 @@
         "security/account_commission_security.xml",
         "views/account_move_views.xml",
         "views/account_commission_settlement_view.xml",
+        "views/commission_views.xml",
         "views/report_settlement_templates.xml",
         "views/res_partner.xml",
-        "wizard/wizard_settle.xml",
         "report/commission_analysis_view.xml",
     ],
     "installable": True,

account_commission/models/__init__.py

@@ -1,3 +1,4 @@
 from . import account_move
+from . import commission
 from . import settlement
 from . import res_partner

account_commission/models/commission.py

@@ -0,0 +1,14 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class Commission(models.Model):
+    _inherit = "commission"
+
+    invoice_state = fields.Selection(
+        [("open", "Invoice Based"), ("paid", "Payment Based")],
+        string="Invoice Status",
+        required=True,
+        default="open",
+    )

account_commission/readme/CONFIGURE.rst

@@ -24,7 +24,7 @@ For adding commissions:
 
 For adding new agents:
 
-#. Go to *Invoicing > Vendors > Agents*. You can also access from
+#. Go to *Invoicing > Vendors > Commissios Agents*. You can also access from
    *Contacts > Contacts* or *Invoicing > Customers > Customers*.
 #. Edit or create a new record.
 #. On "Sales & Purchases" page, mark "Agent" check. It should be checked if
@@ -37,7 +37,7 @@ For adding new agents:
      for setting an "Employee" agent type.
    * The associated commission type.
    * The settlement period, where you can select:
-   *
+
      * Monthly: the settlement will be done for the whole past month.
      * Bi-weekly: there will be 2 settlement per month, one covering the first
        15 days, and the other for the rest of the month.

account_commission/readme/CONTRIBUTORS.rst

@@ -7,6 +7,7 @@
 * Oihane Crucelaegui <[email protected]>
 * Nicola Malcontenti <[email protected]>
 * Aitor Bouzas <[email protected]>
+* Aung Ko Ko Lin <[email protected]>
 
 * `Tecnativa <https://www.tecnativa.com>`__:
 

account_commission/readme/USAGE.rst

@@ -24,7 +24,7 @@ For adding commissions on invoices:
 
 For settling the commissions to agents:
 
-#. Go to *Invoicing > Configuration > Commissions Management > Settle commissions*.
+#. Go to *Invoicing > Vendors > Commissions > Settle commissions*.
 #. On the window that appears, you should select the date up to which you
    want to create commissions. It should be at least one day after the last
    period date. For example, if you settlements are monthly, you have to put

account_commission/security/ir.model.access.csv

@@ -1,5 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_account_invoice_line_agent,access_account_invoice_line_agent,model_account_invoice_line_agent,account.group_account_invoice,1,1,1,1
 access_account_invoice_line_agent_user,access_account_invoice_line_agent_user,model_account_invoice_line_agent,base.group_user,1,0,0,0
-access_invoice_commission_make_settle,access_invoice_commission_make_settle,model_invoice_commission_make_settle,account.group_account_manager,1,1,1,0
 access_invoice_commission_analysis_report,access_invoice_commission_analysis_report,model_invoice_commission_analysis_report,base.group_user,1,0,0,0

account_commission/tests/__init__.py

@@ -1 +1 @@
-from . import test_invoice_commission
+from . import test_account_commission