odoo-addon-account-commission 16.0.1.3.0__py3-none-any.whl → 16.0.1.4.1__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. odoo/addons/account_commission/__manifest__.py +1 -1
  2. odoo/addons/account_commission/i18n/account_commission.pot +5 -5
  3. odoo/addons/account_commission/i18n/hr.po +1 -1
  4. odoo/addons/account_commission/i18n/ja.po +2 -2
  5. odoo/addons/account_commission/models/account_move.py +7 -0
  6. odoo/addons/account_commission/models/commission_settlement.py +6 -7
  7. odoo/addons/account_commission/tests/test_account_commission.py +11 -0
  8. odoo/addons/account_commission/wizards/wizard_invoice.xml +6 -1
  9. {odoo_addon_account_commission-16.0.1.3.0.dist-info → odoo_addon_account_commission-16.0.1.4.1.dist-info}/METADATA +1 -1
  10. {odoo_addon_account_commission-16.0.1.3.0.dist-info → odoo_addon_account_commission-16.0.1.4.1.dist-info}/RECORD +12 -12
  11. {odoo_addon_account_commission-16.0.1.3.0.dist-info → odoo_addon_account_commission-16.0.1.4.1.dist-info}/WHEEL +0 -0
  12. {odoo_addon_account_commission-16.0.1.3.0.dist-info → odoo_addon_account_commission-16.0.1.4.1.dist-info}/top_level.txt +0 -0
odoo/addons/account_commission/__manifest__.py CHANGED
@@ -3,7 +3,7 @@
3
3
  # Copyright 2014-2022 Tecnativa - Pedro M. Baeza
4
4
  {
5
5
  "name": "Account commissions",
6
- "version": "16.0.1.3.0",
6
+ "version": "16.0.1.4.1",
7
7
  "author": "Tecnativa, Odoo Community Association (OCA)",
8
8
  "category": "Sales Management",
9
9
  "license": "AGPL-3",
odoo/addons/account_commission/i18n/account_commission.pot CHANGED
@@ -72,6 +72,11 @@ msgstr ""
72
72
  msgid "Balance"
73
73
  msgstr ""
74
74
 
75
+ #. module: account_commission
76
+ #: model_terms:ir.ui.view,arch_db:account_commission.commission_make_invoice_form
77
+ msgid "Cancel"
78
+ msgstr ""
79
+
75
80
  #. module: account_commission
76
81
  #. odoo-python
77
82
  #: code:addons/account_commission/models/commission_settlement.py:0
@@ -555,11 +560,6 @@ msgstr ""
555
560
  msgid "You can't modify a settled line"
556
561
  msgstr ""
557
562
 
558
- #. module: account_commission
559
- #: model_terms:ir.ui.view,arch_db:account_commission.commission_make_invoice_form
560
- msgid "_Cancel"
561
- msgstr ""
562
-
563
563
  #. module: account_commission
564
564
  #: model_terms:ir.ui.view,arch_db:account_commission.view_invoice_commission_analysis_graph
565
565
  #: model_terms:ir.ui.view,arch_db:account_commission.view_invoice_commission_analysis_pivot
odoo/addons/account_commission/i18n/hr.po CHANGED
@@ -559,7 +559,7 @@ msgstr ""
559
559
 
560
560
  #. module: account_commission
561
561
  #: model_terms:ir.ui.view,arch_db:account_commission.commission_make_invoice_form
562
- msgid "_Cancel"
562
+ msgid "Cancel"
563
563
  msgstr ""
564
564
 
565
565
  #. module: account_commission
odoo/addons/account_commission/i18n/ja.po CHANGED
@@ -564,8 +564,8 @@ msgstr "精算済明細を修正することはできません"
564
564
 
565
565
  #. module: account_commission
566
566
  #: model_terms:ir.ui.view,arch_db:account_commission.commission_make_invoice_form
567
- msgid "_Cancel"
568
- msgstr "_キャンセル"
567
+ msgid "Cancel"
568
+ msgstr "キャンセル"
569
569
 
570
570
  #. module: account_commission
571
571
  #: model_terms:ir.ui.view,arch_db:account_commission.view_invoice_commission_analysis_graph
odoo/addons/account_commission/models/account_move.py CHANGED
@@ -114,6 +114,13 @@ class AccountMove(models.Model):
114
114
  res["arch"] = etree.tostring(invoice_xml)
115
115
  return res
116
116
 
117
+ def unlink(self):
118
+ """Put 'invoiced' settlements associated to the invoices back in settled state."""
119
+ self.invoice_line_ids.settlement_id.filtered(
120
+ lambda s: s.state == "invoiced"
121
+ ).write({"state": "settled"})
122
+ return super().unlink()
123
+
117
124
 
118
125
  class AccountMoveLine(models.Model):
119
126
  _inherit = [
odoo/addons/account_commission/models/commission_settlement.py CHANGED
@@ -107,13 +107,12 @@ class CommissionSettlement(models.Model):
107
107
  "product_id": product.id,
108
108
  "quantity": -1 if settlement.total < 0 else 1,
109
109
  "price_unit": abs(settlement.total),
110
- "name": (
111
- "\n"
112
- + _(
113
- "Period: from %(date_from)s to %(date_to)s",
114
- date_from=date_from.strftime(lang.date_format),
115
- date_to=date_to.strftime(lang.date_format),
116
- ),
110
+ "name": product.with_context(lang=lang.code).display_name
111
+ + "\n"
112
+ + _(
113
+ "Period: from %(date_from)s to %(date_to)s",
114
+ date_from=date_from.strftime(lang.date_format),
115
+ date_to=date_to.strftime(lang.date_format),
117
116
  ),
118
117
  # todo or compute agent currency_id?
119
118
  "currency_id": settlement.currency_id.id,
odoo/addons/account_commission/tests/test_account_commission.py CHANGED
@@ -454,3 +454,14 @@ class TestAccountCommission(TestCommissionBase):
454
454
  settlements.make_invoices(self.journal, self.commission_product, grouped=True)
455
455
  invoices = settlements.mapped("invoice_id")
456
456
  self.assertEqual(2, invoices.settlement_count)
457
+
458
+ def test_unlink_settlement_invoice(self):
459
+ settlements = self._create_multi_settlements()
460
+ invoices = settlements.make_invoices(self.journal, self.commission_product)
461
+ self.assertTrue(
462
+ all(state == "invoiced" for state in settlements.mapped("state"))
463
+ )
464
+ invoices.unlink()
465
+ self.assertTrue(
466
+ all(state == "settled" for state in settlements.mapped("state"))
467
+ )
odoo/addons/account_commission/wizards/wizard_invoice.xml CHANGED
@@ -33,7 +33,12 @@
33
33
  type="object"
34
34
  class="oe_highlight"
35
35
  />
36
- <button special="cancel" string="_Cancel" class="oe_link" />
36
+ <button
37
+ special="cancel"
38
+ data-hotkey="z"
39
+ string="Cancel"
40
+ class="oe_link"
41
+ />
37
42
  </footer>
38
43
  </form>
39
44
  </field>
{odoo_addon_account_commission-16.0.1.3.0.dist-info → odoo_addon_account_commission-16.0.1.4.1.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: odoo-addon-account-commission
3
- Version: 16.0.1.3.0
3
+ Version: 16.0.1.4.1
4
4
  Summary: Account commissions
5
5
  Home-page: https://github.com/OCA/commission
6
6
  Author: Tecnativa, Odoo Community Association (OCA)
{odoo_addon_account_commission-16.0.1.3.0.dist-info → odoo_addon_account_commission-16.0.1.4.1.dist-info}/RECORD RENAMED
@@ -1,16 +1,16 @@
1
1
  odoo/addons/account_commission/README.rst,sha256=bvEDwjbdPsiIMA_fHquT43bB61iCIi6hFiqNbSKYP3A,5741
2
2
  odoo/addons/account_commission/__init__.py,sha256=8JG3SPnwMlgXTppOwkp3YTgDDQGo7U7veMEMpG1bL_c,64
3
- odoo/addons/account_commission/__manifest__.py,sha256=VP1Dwi47FtvZAk4vMz38v3PHr4M3TU6J02Ch_RtZ1AE,893
3
+ odoo/addons/account_commission/__manifest__.py,sha256=lHUuxsznm1ghgJsXbhI3wwgnpZ_22jVC1QXs1PdYiV0,893
4
4
  odoo/addons/account_commission/data/menuitem_data.xml,sha256=OX8KpilSn3zWf9cMNiJLDO7aV_vtaH6GTIyMZWDxYqM,361
5
- odoo/addons/account_commission/i18n/account_commission.pot,sha256=js6CA6b5n_2_uFhkhASTiM1ELCNb18RSjuzvHLug5i8,21380
5
+ odoo/addons/account_commission/i18n/account_commission.pot,sha256=zQ_InYit_ePqIp1eaMf5WmRCXodiFU8_-4NdbDN3cdA,21379
6
6
  odoo/addons/account_commission/i18n/es.po,sha256=x4SMR68K5SfbSnF3l8rodusuMFb5mbaqv1F5PA_UB2g,23922
7
- odoo/addons/account_commission/i18n/hr.po,sha256=4Y1CtBvDH_vmXqUyqUxMYmUdb9HkuHx1m8Ue-LbRh2o,21527
8
- odoo/addons/account_commission/i18n/ja.po,sha256=dlhZ-D-03BfTXNQkKYFIXB5Lz5zqY6GJWRcTADl4v7U,24039
7
+ odoo/addons/account_commission/i18n/hr.po,sha256=iHF8i2rPCXOUsuWUaP-NZasLAmQscs90wCqcLN6my1g,21526
8
+ odoo/addons/account_commission/i18n/ja.po,sha256=9_2UGgksNGzivOVf1o_CjKKqxYjYyXEirkAxp3KeLsQ,24037
9
9
  odoo/addons/account_commission/i18n/pt_BR.po,sha256=jH6kzeu1iAGkszCUGgsYpnQUU_zePjt-wH2jZytxa8g,22680
10
10
  odoo/addons/account_commission/models/__init__.py,sha256=NAnZVtdmEwISK51Ipnoin5jHE3_bVPLsNghvuFcM3NI,88
11
- odoo/addons/account_commission/models/account_move.py,sha256=SEwZEvJgU9ePTVyKSQb8jmKg6dbrQy73XN9cbcxPaos,9336
11
+ odoo/addons/account_commission/models/account_move.py,sha256=wnIrmVRI1S-N6LJA3E-bwn96uREEyMTqGbeQ_zQnIds,9618
12
12
  odoo/addons/account_commission/models/commission.py,sha256=UALNxONhyDw1BDnt9osGfkVrp4vHX5wFI5l6kZdGC-E,326
13
- odoo/addons/account_commission/models/commission_settlement.py,sha256=6BwO4V-YASN-YjoeO9aOW5EkPmojn4kk4b4jNp410hY,7115
13
+ odoo/addons/account_commission/models/commission_settlement.py,sha256=KitRuShOek8yNwwMmkFpynrFQPnlgKcgGuGWbQi-wMs,7114
14
14
  odoo/addons/account_commission/readme/CONFIGURE.rst,sha256=6pepxEYibatNUsjms0bHoR7YlpT7FvSrqFLrje565T4,287
15
15
  odoo/addons/account_commission/readme/CONTRIBUTORS.rst,sha256=YFOXD654dHyQEn8BPN7PdlG0QqvNBzkWQwOan50yEu0,629
16
16
  odoo/addons/account_commission/readme/DESCRIPTION.rst,sha256=dLMZSNYGysvHiOC7Untw2leoCloADPLcrkIoE8FDEVI,208
@@ -24,7 +24,7 @@ odoo/addons/account_commission/static/description/icon.png,sha256=ydxSIUuHSeE4Cf
24
24
  odoo/addons/account_commission/static/description/icon.svg,sha256=96b_cQ-F1XuDU6S5mDi9ioe0d22Vwn30uBDQ_3ZSi5w,17220
25
25
  odoo/addons/account_commission/static/description/index.html,sha256=5-Ep4okxXvdXR9MNhyLvpGdtU7JAfXJ9RwJWqp3JVJ4,16421
26
26
  odoo/addons/account_commission/tests/__init__.py,sha256=bxd564RH-TWEpEJWbbc558dPFEJZCsH9JM8JF3-PMUM,38
27
- odoo/addons/account_commission/tests/test_account_commission.py,sha256=S3e_6s02V0h9-6ME41Huxrt6fgcD7z_Gvfq-J0wSLXY,19028
27
+ odoo/addons/account_commission/tests/test_account_commission.py,sha256=Yi4RL-J7ZbeqhduGiys0ez6-9baJa4kZKw4MkzyjZFE,19465
28
28
  odoo/addons/account_commission/views/account_move_views.xml,sha256=tapDnj37344JkrCAcaf95SE2MCgTV4VRoBDb3psld20,6403
29
29
  odoo/addons/account_commission/views/commission_settlement_views.xml,sha256=JG5sX13R5jdB79m1Pub2rwqhM1s3Kux3btXAbgv_sFk,3496
30
30
  odoo/addons/account_commission/views/commission_views.xml,sha256=oY2-WJ-lEn3gCoFMqStKObGT3LRkBxMmANm2MRhYuRE,614
@@ -32,8 +32,8 @@ odoo/addons/account_commission/views/report_settlement_templates.xml,sha256=GVds
32
32
  odoo/addons/account_commission/wizards/__init__.py,sha256=ddwjnl0fpZTw56iNQmRcDJ0Q1RfptMC23XtvW93Ofec,66
33
33
  odoo/addons/account_commission/wizards/commission_make_settle.py,sha256=k7yztap0JSa5q-QH71GXd0WFaUG639ETaAKrqdH8UE0,1717
34
34
  odoo/addons/account_commission/wizards/wizard_invoice.py,sha256=SumDW3606uLS4d6L2rKjQbwdvfmIYovKark-EUMTve0,3162
35
- odoo/addons/account_commission/wizards/wizard_invoice.xml,sha256=QDGpFCICqhAu6uO7ksQihj0UPGxuQL7MeE3mNx4Xy_A,2161
36
- odoo_addon_account_commission-16.0.1.3.0.dist-info/METADATA,sha256=ptY_ZFPXJIpbK4MPUdnEPNnj50yX8iPjNTXEyIGaN-k,6331
37
- odoo_addon_account_commission-16.0.1.3.0.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
38
- odoo_addon_account_commission-16.0.1.3.0.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
39
- odoo_addon_account_commission-16.0.1.3.0.dist-info/RECORD,,
35
+ odoo/addons/account_commission/wizards/wizard_invoice.xml,sha256=Afx90Mccl0EjLzZ2dJa2dOikYhWxIY5tQ7objmca8gc,2292
36
+ odoo_addon_account_commission-16.0.1.4.1.dist-info/METADATA,sha256=CSj3mLs_IJaae3XWi0xBEBFFcMuFr17lCjeSbR2AC9k,6331
37
+ odoo_addon_account_commission-16.0.1.4.1.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
38
+ odoo_addon_account_commission-16.0.1.4.1.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
39
+ odoo_addon_account_commission-16.0.1.4.1.dist-info/RECORD,,