Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP][17.0] agreement rebate #34

Closed
wants to merge 26 commits into from
Closed

[WIP][17.0] agreement rebate #34

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f943bd9
[ADD] agreement_rebate: New module to manage agreement rebate sales
sergio-teruel May 13, 2020
bcc878c
[IMP] agreement_rebate: Add active fields in settlements
carlosdauden Mar 7, 2022
fb05337
[IMP] Add partner_id as deafult _settlement_line_break_fields
sergio-teruel Mar 9, 2022
38c2d7f
[IMP] Add partner_id to settlement lines tree view
sergio-teruel Mar 9, 2022
6e66d07
[IMP] agreement_rebate: Set partner_id to settlement lines
sergio-teruel Mar 9, 2022
a7ad3fb
[IMP] agreement_rebate: Improvements
carlosdauden Apr 21, 2022
c3b292f
[UPD] Update agreement_rebate.pot
Jun 18, 2022
3c19cca
agreement_rebate 13.0.1.0.1
OCA-git-bot Jun 18, 2022
ed20217
[IMP] agreement_rebate: black, isort
sergio-teruel Nov 1, 2022
b7204d6
[MIG] agreement_rebate: Migration to v15.0
sergio-teruel Nov 1, 2022
0a1a479
[UPD] Update agreement_rebate.pot
Dec 16, 2022
7803caf
[UPD] README.rst
OCA-git-bot Dec 16, 2022
592ede6
Update translation files
weblate Dec 16, 2022
af96db4
[IMP] agreement: Change menus structure to make it easy to adapt
Jan 26, 2023
b002612
[UPD] Update agreement_rebate.pot
Jan 26, 2023
a225bb3
agreement_rebate 15.0.1.1.0
OCA-git-bot Jan 26, 2023
ac8f227
Update translation files
weblate Jan 26, 2023
49f5f91
[MIG] agreement_rebate: Migration to 16.0
ao-landoo Jul 18, 2023
5bd29b3
[UPD] Update agreement_rebate.pot
Sep 17, 2023
9f94cf6
oca-github-bot post-merge updates
OCA-git-bot Sep 17, 2023
8c9b340
Update translation files
weblate Sep 20, 2023
abad766
Translated using Weblate (Spanish)
Ivorra78 Sep 21, 2023
dbf2fb3
[FIX] aggrement_rebate: The type of movement is defined in the field …
pilarvargas-tecnativa Jan 31, 2024
cf736af
[BOT] post-merge updates
OCA-git-bot Jan 31, 2024
7fbd61b
[IMP] : pre-commit auto fixes
chandni-serpentcs Feb 20, 2024
b0a311b
[MIG]agreement_rebate: Migrated module to V17
chandni-serpentcs Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
[MIG]agreement_rebate: Migrated module to V17
  • Loading branch information
@chandni-serpentcs
chandni-serpentcs committed Mar 19, 2024
commit b0a311ba90855512a8907a75c59095b4dc76281f
21 changes: 12 additions & 9 deletions agreement_rebate/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"name": "Agreement Rebate",
"summary": "Rebate in agreements",
"version": "16.0.1.0.1",
"version": "17.0.1.0.0",
"development_status": "Beta",
"category": "Agreement",
"website": "https://github.com/OCA/agreement",
Expand All @@ -14,15 +14,18 @@
"installable": True,
"depends": ["account_invoice_refund_link", "agreement"],
"data": [
"data/agreement_rebate_data.xml",
"data/agreement_rebate_settlement_data.xml",
"security/agreement_rebate_security.xml",
"security/ir.model.access.csv",
"views/agreement_condition_view.xml",
"views/agreement_view.xml",
"views/agreement_rebate_settlement_view.xml",
"views/agreement_type.xml",
"wizards/invoice_create_views.xml",
"wizards/settlement_create_views.xml",
"views/agreement_menu_view.xml",
"views/agreement_rebate_condition_views.xml",
"views/agreement_rebate_line_views.xml",
"views/agreement_rebate_section_views.xml",
"views/agreement_views.xml",
"views/agreement_rebate_settlement_views.xml",
"views/agreement_rebate_settlement_line_views.xml",
"views/agreement_type_views.xml",
"wizards/agreement_invoice_create_wiz_views.xml",
"wizards/agreement_settlement_create_wiz_views.xml",
"views/agreement_menu_views.xml",
],
}
19 changes: 19 additions & 0 deletions agreement_rebate/data/agreement_rebate_settlement_data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo noupdate="1">
<record id="agreement_rebate_settlement_sequence" model="ir.sequence">
<field name="name">Agreement rebate settlement</field>
<field name="code">agreement.rebate.settlement</field>
<field name="padding" eval="4" />
<field name="prefix">ARS</field>
</record>
<record id="agreement_type_rebate_sale" model="agreement.type">
<field name="name">Rebate agreements for sales</field>
<field name="is_rebate">True</field>
<field name="domain">sale</field>
</record>
<record id="agreement_type_rebate_purchase" model="agreement.type">
<field name="name">Rebate agreements for purchases</field>
<field name="is_rebate">True</field>
<field name="domain">purchase</field>
</record>
</odoo>
102 changes: 51 additions & 51 deletions agreement_rebate/i18n/agreement_rebate.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,25 @@ msgid "%(name)s - Period: %(date_from)s - %(date_to)s"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_view_form
msgid ""
"<i class=\"fa fa-filter\"/>\n"
" You can create a filter to apply the rebate.\n"
" Categories, products, variants, generic conditions to reuse or a custom filter"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_view_form
msgid "<span>Agreement</span>"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_view_form
msgid "<span>Details</span>"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_view_form
msgid "<span>Lines</span>"
msgstr ""

Expand All @@ -64,7 +64,7 @@ msgstr ""
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_line__agreement_id
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_section__agreement_id
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_settlement_line__agreement_id
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_view_search
msgid "Agreement"
msgstr ""

Expand Down Expand Up @@ -136,16 +136,16 @@ msgstr ""
#. module: agreement_rebate
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_invoice_create_wiz__agreement_type_ids
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_settlement_create_wiz__agreement_type_ids
#: model_terms:ir.ui.view,arch_db:agreement_rebate.view_invoice_create_wiz
#: model_terms:ir.ui.view,arch_db:agreement_rebate.view_settlement_create_wiz
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_invoice_create_wiz_view_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_settlement_create_wiz_view_form
msgid "Agreement types"
msgstr ""

#. module: agreement_rebate
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_invoice_create_wiz__agreement_ids
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_settlement_create_wiz__agreement_ids
#: model_terms:ir.ui.view,arch_db:agreement_rebate.view_invoice_create_wiz
#: model_terms:ir.ui.view,arch_db:agreement_rebate.view_settlement_create_wiz
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_invoice_create_wiz_view_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_settlement_create_wiz_view_form
msgid "Agreements"
msgstr ""

Expand All @@ -167,9 +167,9 @@ msgid "Amount Rebate"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_view_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_view_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_view_search
msgid "Archived"
msgstr ""

Expand All @@ -179,8 +179,8 @@ msgid "Calculate the discount in each amount section"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.view_invoice_create_wiz
#: model_terms:ir.ui.view,arch_db:agreement_rebate.view_settlement_create_wiz
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_invoice_create_wiz_view_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_settlement_create_wiz_view_form
msgid "Cancel"
msgstr ""

Expand All @@ -202,13 +202,13 @@ msgstr ""

#. module: agreement_rebate
#: model:ir.ui.menu,name:agreement_rebate.agreement_invoice_create_menu
#: model_terms:ir.ui.view,arch_db:agreement_rebate.view_invoice_create_wiz
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_invoice_create_wiz_view_form
msgid "Create invoices"
msgstr ""

#. module: agreement_rebate
#: model:ir.ui.menu,name:agreement_rebate.agreement_settlement_create_menu
#: model_terms:ir.ui.view,arch_db:agreement_rebate.view_settlement_create_wiz
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_settlement_create_wiz_view_form
msgid "Create settlements"
msgstr ""

Expand Down Expand Up @@ -248,8 +248,8 @@ msgstr ""
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_settlement__date
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_settlement_line__date
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_settlement_create_wiz__date
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_view_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_view_search
msgid "Date"
msgstr ""

Expand All @@ -264,8 +264,8 @@ msgid "Date To"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.view_invoice_create_wiz
#: model_terms:ir.ui.view,arch_db:agreement_rebate.view_settlement_create_wiz
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_invoice_create_wiz_view_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_settlement_create_wiz_view_form
msgid "Dates filter"
msgstr ""

Expand Down Expand Up @@ -324,7 +324,7 @@ msgid "Global (A discount global for all lines)"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_view_search
msgid "Group By"
msgstr ""

Expand Down Expand Up @@ -367,12 +367,12 @@ msgid "Invoice Type"
msgstr ""

#. module: agreement_rebate
#: model:ir.actions.act_window,name:agreement_rebate.agreement_invoice_create_action
#: model:ir.actions.act_window,name:agreement_rebate.agreement_invoice_create_wiz_action
msgid "Invoice create"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.view_invoice_create_wiz
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_invoice_create_wiz_view_form
msgid "Invoice data"
msgstr ""

Expand All @@ -382,8 +382,8 @@ msgid "Invoice lines"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_view_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_view_search
msgid "Invoiced"
msgstr ""

Expand All @@ -405,7 +405,7 @@ msgstr ""

#. module: agreement_rebate
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_settlement_create_wiz__journal_ids
#: model_terms:ir.ui.view,arch_db:agreement_rebate.view_settlement_create_wiz
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_settlement_create_wiz_view_form
msgid "Journals"
msgstr ""

Expand Down Expand Up @@ -448,8 +448,8 @@ msgid "Line (A discount for every line)"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_view_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_view_form
msgid "Lines"
msgstr ""

Expand All @@ -459,13 +459,13 @@ msgid "Name"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_view_search
msgid "Name or agreement code"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_view_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_view_search
msgid "Not invoiced"
msgstr ""

Expand All @@ -478,8 +478,8 @@ msgstr ""
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_settlement__partner_id
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_settlement_line__partner_id
#: model:ir.model.fields.selection,name:agreement_rebate.selection__agreement_invoice_create_wiz__invoice_group__partner
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_view_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_view_search
msgid "Partner"
msgstr ""

Expand All @@ -489,8 +489,8 @@ msgid "Percent"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_view_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_view_search
msgid "Period"
msgstr ""

Expand Down Expand Up @@ -529,9 +529,9 @@ msgid "Products"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_type_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_view_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_view_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_type_view_search
msgid "Rebate"
msgstr ""

Expand All @@ -552,12 +552,12 @@ msgid "Rebate Line"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_line_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_line_view_form
msgid "Rebate Lines"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_view_form
msgid "Rebate Settlements"
msgstr ""

Expand All @@ -570,7 +570,7 @@ msgstr ""
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_condition__name
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_line__rebate_condition_id
#: model:ir.model.fields.selection,name:agreement_rebate.selection__agreement_rebate_line__rebate_target__condition
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_condition_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_condition_view_form
msgid "Rebate condition"
msgstr ""

Expand Down Expand Up @@ -605,28 +605,28 @@ msgid "Rebate type"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_view_search
msgid "Search agreement settlements"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_view_search
msgid "Search settlement lines"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_view_form
msgid "Sections"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_line_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_line_view_form
msgid "Select items"
msgstr ""

#. module: agreement_rebate
#: model:ir.model.fields.selection,name:agreement_rebate.selection__agreement_invoice_create_wiz__invoice_group__settlement
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_view_search
msgid "Settlement"
msgstr ""

Expand All @@ -637,7 +637,7 @@ msgid "Settlement Lines"
msgstr ""

#. module: agreement_rebate
#: model:ir.actions.act_window,name:agreement_rebate.agreement_settlement_create_action
#: model:ir.actions.act_window,name:agreement_rebate.agreement_settlement_create_wiz_action
msgid "Settlement create"
msgstr ""

Expand All @@ -649,13 +649,13 @@ msgstr ""
#. module: agreement_rebate
#: model:ir.ui.menu,name:agreement_rebate.agreement_rebate_settlement_menu
#: model:ir.ui.menu,name:agreement_rebate.agreement_rebate_settlement_menu_root
#: model_terms:ir.ui.view,arch_db:agreement_rebate.view_invoice_create_wiz
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_invoice_create_wiz_view_form
msgid "Settlements"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_tree
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_view_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_view_tree
msgid "Show details"
msgstr ""

Expand All @@ -678,7 +678,7 @@ msgid "To Invoice"
msgstr ""

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_tree
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_view_tree
msgid "Total"
msgstr ""

Expand Down
Loading
Loading