Dear ${object.partner_id.name}
-We are sorry to hear about the problem you have had - with your product. -
-We would like to be able to make the necessary - adjustment at no charge to you, - but unfortunately the warranty is expired of - following products: -
- + % if object.is_website: + %if object.is_replacement: +
+
+ %else:
+ Dear ${object.partner_id.name}
+We do hereby confirm the reception of your + request regarding replacement of products + ${object.rma_line.product_id.name}, Please accept our apologies + for this incident.
+As per your request, a new shipment for + ${object.rma_line.product_id.name} will be created + soon and we will replace product.
+We are sorry that this occurred and appreciate + your continued patronage, As a thanks for + being one of our best client. + Should you have any questions, + please do not hesitate to contact us. +
+Thank You
+
+
+ %endif
- Dear ${object.partner_id.name}
+We do hereby confirm the reception of your + request regarding return of products + ${object.rma_line.product_id.name}, Please accept our apologies + for this incident.
+We are sorry that this occurred and appreciate + your continued patronage, As a thanks for + being one of our best client. + Should you have any questions, + please do not hesitate to contact us. +
+Thank You
+| Product | -Lot | -Quantity | -Warranty Date | -
|---|---|---|---|
| ${line.product_id.name} | -${line.lot_id.name} | -${line.qty_expired} | -${line.warranty_date} | -
-
+ % if object.warranty_expire_line:
+ Dear ${object.partner_id.name}
-We are sorry to hear about the problem you have had - with your product.
-We would like to be able to make the necessary - adjustment at no charge to you, We are going to - replace your product. We will deliver it to - you as possible. -
-
+
+
+ Dear ${object.partner_id.name}
+We are sorry to hear about the problem you have had + with your product. +
+We would like to be able to make the necessary + adjustment at no charge to you, + but unfortunately the warranty is expired of + following products: +
+| Product | +Lot | +Quantity | +Warranty Date | +
|---|---|---|---|
| ${line.product_id.name} | +${line.lot_id.name} | +${line.qty_expired} | +${line.warranty_date} | +
+
+ % endif
% endif
]]>
Dear ${object.partner_id.name}
+We are sorry to hear about the problem you have had + with your product.
+We would like to be able to make the necessary + adjustment at no charge to you. +
+\n"
-"
\n"
+" % if object.is_website:\n"
+" %if object.is_replacement:\n"
+" Dear ${object.partner_id.name}
\n" -"We are sorry to hear about the problem you have had\n" -" with your product.\n" -" We would like to be able to make the necessary\n" -" adjustment at no charge to you,\n" -" but unfortunately the warranty is expired of\n" -" following products:\n" -"
\n" -"\n"
+"
\n"
+" %else:\n"
+" Dear ${object.partner_id.name}
\n" +"We do hereby confirm the reception of your\n" +" request regarding replacement of products\n" +" ${object.rma_line.product_id.name}, Please accept our apologies\n" +" for this incident.
\n" +"As per your request, a new shipment for\n" +" ${object.rma_line.product_id.name} will be created\n" +" soon and we will replace product.
\n" +"We are sorry that this occurred and appreciate\n" +" your continued patronage, As a thanks for\n" +" being one of our best client.\n" +" Should you have any questions,\n" +" please do not hesitate to contact us.\n" +"
\n" +"Thank You
\n" +"\n"
+"
\n"
+" %endif\n"
"\n"
-" Dear ${object.partner_id.name}
\n" +"We do hereby confirm the reception of your\n" +" request regarding return of products\n" +" ${object.rma_line.product_id.name}, Please accept our apologies\n" +" for this incident.
\n" +"We are sorry that this occurred and appreciate\n" +" your continued patronage, As a thanks for\n" +" being one of our best client.\n" +" Should you have any questions,\n" +" please do not hesitate to contact us.\n" +"
\n" +"Thank You
\n" +"| Product | \n" -"Lot | \n" -"Quantity | \n" -"Warranty Date | \n" -"
|---|---|---|---|
| ${line.product_id.name} | \n" -"${line.lot_id.name} | \n" -"${line.qty_expired} | \n" -"${line.warranty_date} | \n" -"
\n"
-"
\n"
-" % endif\n"
+" % else:\n"
+" % if object.warranty_expire_line:\n"
+" Dear ${object.partner_id.name}
\n" -"We are sorry to hear about the problem you have had\n" -" with your product.\n" -" We would like to be able to make the necessary\n" -" adjustment at no charge to you, We are going to\n" -" replace your product. We will deliver it to\n" -" you as possible.\n" -"
\n" -"\n"
+"
\n"
+"\n"
+" Dear ${object.partner_id.name}
\n" +"We are sorry to hear about the problem you have had\n" +" with your product.\n" +"
\n" +"We would like to be able to make the necessary\n" +" adjustment at no charge to you,\n" +" but unfortunately the warranty is expired of\n" +" following products:\n" +"
\n" +"| Product | \n" +"Lot | \n" +"Quantity | \n" +"Warranty Date | \n" +"
|---|---|---|---|
| ${line.product_id.name} | \n" +"${line.lot_id.name} | \n" +"${line.qty_expired} | \n" +"${line.warranty_date} | \n" +"
\n"
+"
\n"
+" % endif\n"
+" % endif\n"
"\n"
" "
msgstr ""
#. module: rma
-#: model:mail.template,subject:rma.email_template_notify_warranty_new
+#: model:mail.template,subject:rma.email_template_notify_warranty_date
msgid "${object.name or 'n/a'}"
msgstr ""
#. module: rma
-#: code:addons/rma/models/rma_request.py:147
+#: code:addons/rma/models/rma_request.py:150
#, python-format
msgid "Compose Email"
msgstr ""
@@ -89,11 +126,11 @@ msgstr ""
#. module: rma
#: model:ir.ui.view,arch_db:rma.view_rma_request_form
-msgid "Create Replacement"
+msgid "Create RMA"
msgstr ""
#. module: rma
-#: model:ir.model.fields,field_description:rma.field_replacement_reason_create_uid
+#: model:ir.model.fields,field_description:rma.field_return_reason_create_uid
#: model:ir.model.fields,field_description:rma.field_rma_line_create_uid
#: model:ir.model.fields,field_description:rma.field_rma_request_create_uid
#: model:ir.model.fields,field_description:rma.field_warranty_expire_line_create_uid
@@ -101,7 +138,7 @@ msgid "Created by"
msgstr ""
#. module: rma
-#: model:ir.model.fields,field_description:rma.field_replacement_reason_create_date
+#: model:ir.model.fields,field_description:rma.field_return_reason_create_date
#: model:ir.model.fields,field_description:rma.field_rma_line_create_date
#: model:ir.model.fields,field_description:rma.field_rma_request_create_date
#: model:ir.model.fields,field_description:rma.field_warranty_expire_line_create_date
@@ -139,6 +176,12 @@ msgstr ""
msgid "Demo Product2"
msgstr ""
+#. module: rma
+#: model:product.product,name:rma.demo_product_3
+#: model:product.template,name:rma.demo_product_3_product_template
+msgid "Demo Product3"
+msgstr ""
+
#. module: rma
#: model:product.product,description:rma.demo_product_1
#: model:product.template,description:rma.demo_product_1_product_template
@@ -154,7 +197,14 @@ msgid "Demo product2\n"
msgstr ""
#. module: rma
-#: model:ir.model.fields,field_description:rma.field_replacement_reason_display_name
+#: model:product.product,description:rma.demo_product_3
+#: model:product.template,description:rma.demo_product_3_product_template
+msgid "Demo product3\n"
+" "
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_return_reason_display_name
#: model:ir.model.fields,field_description:rma.field_rma_line_display_name
#: model:ir.model.fields,field_description:rma.field_rma_request_display_name
#: model:ir.model.fields,field_description:rma.field_warranty_expire_line_display_name
@@ -177,7 +227,7 @@ msgid "Group By"
msgstr ""
#. module: rma
-#: model:ir.model.fields,field_description:rma.field_replacement_reason_id
+#: model:ir.model.fields,field_description:rma.field_return_reason_id
#: model:ir.model.fields,field_description:rma.field_rma_line_id
#: model:ir.model.fields,field_description:rma.field_rma_request_id
#: model:ir.model.fields,field_description:rma.field_warranty_expire_line_id
@@ -185,7 +235,13 @@ msgid "ID"
msgstr ""
#. module: rma
-#: model:ir.model.fields,field_description:rma.field_replacement_reason___last_update
+#: code:addons/rma/wizard/stock_return_picking.py:16
+#, python-format
+msgid "It is not replacement request!"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_return_reason___last_update
#: model:ir.model.fields,field_description:rma.field_rma_line___last_update
#: model:ir.model.fields,field_description:rma.field_rma_request___last_update
#: model:ir.model.fields,field_description:rma.field_warranty_expire_line___last_update
@@ -193,7 +249,7 @@ msgid "Last Modified on"
msgstr ""
#. module: rma
-#: model:ir.model.fields,field_description:rma.field_replacement_reason_write_uid
+#: model:ir.model.fields,field_description:rma.field_return_reason_write_uid
#: model:ir.model.fields,field_description:rma.field_rma_line_write_uid
#: model:ir.model.fields,field_description:rma.field_rma_request_write_uid
#: model:ir.model.fields,field_description:rma.field_warranty_expire_line_write_uid
@@ -201,7 +257,7 @@ msgid "Last Updated by"
msgstr ""
#. module: rma
-#: model:ir.model.fields,field_description:rma.field_replacement_reason_write_date
+#: model:ir.model.fields,field_description:rma.field_return_reason_write_date
#: model:ir.model.fields,field_description:rma.field_rma_line_write_date
#: model:ir.model.fields,field_description:rma.field_rma_request_write_date
#: model:ir.model.fields,field_description:rma.field_warranty_expire_line_write_date
@@ -224,19 +280,19 @@ msgid "My Requests"
msgstr ""
#. module: rma
-#: code:addons/rma/wizard/stock_return_picking.py:62
+#: model:ir.actions.act_window,help:rma.return_request_action_reports
+msgid "No Return request."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/wizard/stock_return_picking.py:68
#, python-format
-msgid "No products to replace (only lines in Done state andnot fully replaced yet can be replaced)!"
+msgid "No products to return (only lines in Done state andnot fully returned yet can be returned)!"
msgstr ""
#. module: rma
-#: model:ir.actions.act_window,help:rma.replacement_request_action_reports
-msgid "No replacement request."
-msgstr ""
-
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_crm_team_replacements_count
-msgid "Number of replacements"
+#: model:ir.model.fields,field_description:rma.field_crm_team_returns_count
+msgid "Number of returns"
msgstr ""
#. module: rma
@@ -256,10 +312,26 @@ msgid "Product"
msgstr ""
#. module: rma
-#: model:mail.message.subtype,description:rma.mt_request_replaced
+#: model:mail.message.subtype,description:rma.mt_replacement_create
msgid "Products have been replaced"
msgstr ""
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_request_return
+msgid "Products have been returned"
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_request_menu
+msgid "RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.view,arch_db:rma.view_rma_request_filter
+#: selection:rma.request,state:0
+msgid "RMA Created"
+msgstr ""
+
#. module: rma
#: model:ir.model,name:rma.model_rma_line
msgid "RMA Line"
@@ -281,30 +353,46 @@ msgstr ""
#. module: rma
#: model:ir.actions.act_window,name:rma.act_open_rma_request_view
-#: model:ir.actions.act_window,name:rma.action_open_rma_request_replacementteam
+#: model:ir.actions.act_window,name:rma.action_open_rma_request_rmateam
+#: model:ir.model,name:rma.model_rma_request
+#: model:ir.ui.menu,name:rma.menu_request_rma
+#: model:ir.ui.view,arch_db:rma.crm_team_rma_teams_view_kanban
+#: model:ir.ui.view,arch_db:rma.rma_view_kanban
#: model:ir.ui.view,arch_db:rma.view_rma_request_filter
msgid "RMA Request"
msgstr ""
#. module: rma
#: model:ir.model.fields,field_description:rma.field_rma_line_rma_id
+#: model:ir.model.fields,field_description:rma.field_warranty_expire_line_rma_id
msgid "RMA Request Number"
msgstr ""
#. module: rma
-#: model:ir.model,name:rma.model_rma_request
-msgid "RMA Reuqest"
+#: model:mail.message.subtype,description:rma.mt_request_confirm
+msgid "RMA Request has been\n"
+" Confirmed"
msgstr ""
#. module: rma
-#: model:ir.model.fields,field_description:rma.field_warranty_expire_line_rma_id
-msgid "RMA Reuqest Number"
+#: model:mail.message.subtype,description:rma.mt_request_create
+msgid "RMA Request is Created"
msgstr ""
#. module: rma
-#: model:ir.model.fields,field_description:rma.field_replacement_reason_name
+#: model:ir.ui.view,arch_db:rma.view_rma_request_filter
+msgid "RMA Request type"
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.view,arch_db:rma.crm_team_rma_teams_view_kanban
+msgid "RMA Requests"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_return_reason_name
#: model:ir.model.fields,field_description:rma.field_rma_line_reason_id
-#: model:ir.ui.view,arch_db:rma.view_replacement_reason_form
+#: model:ir.ui.view,arch_db:rma.view_return_reason_form
msgid "Reason"
msgstr ""
@@ -314,73 +402,30 @@ msgid "Remark"
msgstr ""
#. module: rma
-#: model:ir.ui.menu,name:rma.menu_request_rma
-msgid "Replace Request"
-msgstr ""
-
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_crm_team_use_replacement
-#: model:ir.ui.menu,name:rma.rma_request_menu
-#: model:ir.ui.view,arch_db:rma.crm_team_replacement_teams_view_kanban
-#: model:ir.ui.view,arch_db:rma.replacement_view_kanban
-#: selection:rma.request,type:0
-msgid "Replacement"
-msgstr ""
-
-#. module: rma
-#: model:ir.ui.view,arch_db:rma.view_rma_request_filter
#: selection:rma.request,state:0
msgid "Replacement Created"
msgstr ""
#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_line_qty_replaced
-msgid "Replacement Quantity"
-msgstr ""
-
-#. module: rma
-#: model:ir.actions.act_window,name:rma.act_open_replacement_reason_view
-#: model:ir.model,name:rma.model_replacement_reason
-#: model:ir.ui.menu,name:rma.menu_replacement_reason
-msgid "Replacement Reason"
-msgstr ""
-
-#. module: rma
-#: model:ir.ui.view,arch_db:rma.view_rma_line_graph
+#: model:ir.actions.act_window,name:rma.action_open_replacement_request_rmateam
msgid "Replacement Request"
msgstr ""
#. module: rma
-#: model:mail.message.subtype,description:rma.mt_request_confirm
-msgid "Replacement Request has been\n"
-" Confirmed"
-msgstr ""
-
-#. module: rma
-#: model:mail.message.subtype,description:rma.mt_request_create
-msgid "Replacement Request is Created"
-msgstr ""
-
-#. module: rma
-#: model:ir.actions.act_window,name:rma.replacement_request_action_reports
-msgid "Replacement Requests"
-msgstr ""
-
-#. module: rma
-#: model:mail.message.subtype,name:rma.mt_request_replaced
-#: model:mail.message.subtype,name:rma.mt_salesteam_request_replaced
+#: model:mail.message.subtype,name:rma.mt_replacement_create
+#: model:mail.message.subtype,name:rma.mt_salesteam_request_replacement
msgid "Replacement created"
msgstr ""
#. module: rma
-#: model:ir.ui.view,arch_db:rma.crm_team_replacement_teams_view_kanban
-msgid "Replacements"
+#: model:ir.model.fields,field_description:rma.field_rma_request_is_replacement
+msgid "Replacement?"
msgstr ""
#. module: rma
-#: code:addons/rma/models/rma_line.py:35
-#, python-format
-msgid "Replacemet quantity of %s should not be greater than ordered quantity."
+#: model:ir.ui.view,arch_db:rma.crm_team_rma_teams_view_kanban
+#: model:ir.ui.view,arch_db:rma.view_rma_request_filter
+msgid "Replacements"
msgstr ""
#. module: rma
@@ -420,11 +465,76 @@ msgstr ""
msgid "Requests for RMA"
msgstr ""
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_crm_team_use_return
+msgid "Return"
+msgstr ""
+
#. module: rma
#: model:ir.model,name:rma.model_stock_return_picking
msgid "Return Picking"
msgstr ""
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_line_qty_return
+msgid "Return Quantity"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.act_open_return_reason_view
+#: model:ir.model,name:rma.model_return_reason
+msgid "Return Reason"
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.menu_return_reason
+msgid "Return Reasons"
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.view,arch_db:rma.view_rma_line_graph
+msgid "Return Request"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.return_request_action_reports
+msgid "Return Requests"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_request_return
+#: model:mail.message.subtype,name:rma.mt_salesteam_request_return
+msgid "Return created"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma_line.py:35
+#, python-format
+msgid "Return quantity of %s should not be greater than ordered quantity."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma_line.py:40
+#, python-format
+msgid "Return quantity should not be 0."
+msgstr ""
+
+#. module: rma
+#: selection:rma.request,type:0
+msgid "Return/Replace"
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.view,arch_db:rma.view_rma_request_filter
+msgid "Return/Replacement"
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.view,arch_db:rma.crm_team_rma_teams_view_kanban
+#: model:ir.ui.view,arch_db:rma.view_rma_request_filter
+msgid "Returns"
+msgstr ""
+
#. module: rma
#: model:ir.model.fields,field_description:rma.field_rma_request_sale_order_id
msgid "SO Number"
@@ -507,31 +617,36 @@ msgid "Warranty Expiry Date"
msgstr ""
#. module: rma
-#: code:addons/rma/models/rma_line.py:30
-#, python-format
-msgid "You can only replace %s quantity for product %s as its warranty has been expired."
+#: model:ir.model.fields,field_description:rma.field_rma_request_is_website
+msgid "Website"
msgstr ""
#. module: rma
-#: code:addons/rma/models/rma_request.py:183
+#: code:addons/rma/models/rma_line.py:30
+#, python-format
+msgid "You can only return %s quantity for product %s as its warranty has been expired."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma_request.py:187
#, python-format
msgid "You cannot delete a request which is not in draft state."
msgstr ""
#. module: rma
-#: code:addons/rma/wizard/stock_return_picking.py:16
-#, python-format
-msgid "You may only replace single picking at a time!"
-msgstr ""
-
-#. module: rma
-#: code:addons/rma/wizard/stock_return_picking.py:26
+#: code:addons/rma/wizard/stock_return_picking.py:32
#, python-format
msgid "You may only return Done pickings"
msgstr ""
#. module: rma
-#: code:addons/rma/models/rma_request.py:174
+#: code:addons/rma/wizard/stock_return_picking.py:22
+#, python-format
+msgid "You may only return single picking at a time!"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma_request.py:177
#, python-format
msgid "You must select rma lines!"
msgstr ""
diff --git a/addons/rma/models/__init__.py b/addons/rma/models/__init__.py
index b65c16e5..33e03e44 100644
--- a/addons/rma/models/__init__.py
+++ b/addons/rma/models/__init__.py
@@ -6,4 +6,4 @@ from . import rma_request
from . import stock_production_lot
from . import stock_picking
from . import sales_team
-from . import replacement_reason
+from . import return_reason
diff --git a/addons/rma/models/replacement_reason.py b/addons/rma/models/return_reason.py
similarity index 58%
rename from addons/rma/models/replacement_reason.py
rename to addons/rma/models/return_reason.py
index 5790576b..78c15ada 100644
--- a/addons/rma/models/replacement_reason.py
+++ b/addons/rma/models/return_reason.py
@@ -3,8 +3,8 @@
from flectra import fields, models
-class ReplacementReason(models.Model):
- _name = "replacement.reason"
- _description = "Replacement Reason"
+class ReturnReason(models.Model):
+ _name = "return.reason"
+ _description = "Return Reason"
name = fields.Char(string='Reason')
diff --git a/addons/rma/models/rma_line.py b/addons/rma/models/rma_line.py
index 3f775ca4..0e348bd7 100644
--- a/addons/rma/models/rma_line.py
+++ b/addons/rma/models/rma_line.py
@@ -11,30 +11,30 @@ class RMALine(models.Model):
product_id = fields.Many2one('product.product', string='Product')
uom_id = fields.Many2one('product.uom', string='UOM')
qty_delivered = fields.Float(string='Delivered Quantity')
- qty_replaced = fields.Float(string='Replacement Quantity')
+ qty_return = fields.Float(string='Return Quantity')
rma_id = fields.Many2one('rma.request', string='RMA Request Number')
move_line_id = fields.Many2one('stock.move', string='Stock Move')
- reason_id = fields.Many2one("replacement.reason", sting='Reason for RMA')
+ reason_id = fields.Many2one("return.reason", sting='Reason for RMA')
remark = fields.Text(sting='Remark')
team_id = fields.Many2one('crm.team', 'Team', related='rma_id.team_id')
- @api.onchange('qty_replaced')
- def _onchange_qty_replaced(self):
- if self.product_id.tracking != 'none':
- replaceable_qty = sum(line.qty_done for line in
- self.move_line_id.move_line_ids if
- line.lot_id.warranty_date and
- line.lot_id.warranty_date >=
- self.rma_id.date)
- if self.qty_replaced > replaceable_qty:
- raise UserError(_('You can only replace %s quantity for '
+ @api.onchange('qty_return')
+ def _onchange_qty_return(self):
+ if not self.rma_id.is_website and self.product_id.tracking != 'none':
+ can_be_return_qty = sum(line.qty_done for line in
+ self.move_line_id.move_line_ids if
+ line.lot_id.warranty_date and
+ line.lot_id.warranty_date >=
+ self.rma_id.date)
+ if self.qty_return > can_be_return_qty:
+ raise UserError(_('You can only return %s quantity for '
'product %s as its warranty has been '
- 'expired.') % (replaceable_qty,
+ 'expired.') % (can_be_return_qty,
self.product_id.name))
- elif self.qty_replaced > self.qty_delivered:
- raise UserError(_('Replacemet quantity of %s should not be '
+ elif self.qty_return > self.qty_delivered:
+ raise UserError(_('Return quantity of %s should not be '
'greater than ordered quantity.') %
(self.product_id.name))
- if self.qty_replaced == 0:
- raise UserError(_('Replacement quantity should not be 0.'))
+ if self.qty_return == 0:
+ raise UserError(_('Return quantity should not be 0.'))
diff --git a/addons/rma/models/rma_request.py b/addons/rma/models/rma_request.py
index 5a855172..ee7b5d36 100644
--- a/addons/rma/models/rma_request.py
+++ b/addons/rma/models/rma_request.py
@@ -6,7 +6,7 @@ from flectra.exceptions import UserError
class RmaRequest(models.Model):
_name = "rma.request"
- _inherit = ['mail.thread', 'mail.activity.mixin']
+ _inherit = ['mail.thread', 'mail.activity.mixin', 'portal.mixin']
_description = "RMA Request"
name = fields.Char(string='RMA Order Number')
@@ -16,7 +16,7 @@ class RmaRequest(models.Model):
default=fields.Date.context_today)
partner_id = fields.Many2one('res.partner', string='Customer')
type = fields.Selection([
- ('replacement', 'Replacement')
+ ('return_replace', 'Return/Replace')
], string='Request Type')
rma_line = fields.One2many('rma.line', 'rma_id', string='RMA Lines')
warranty_expire_line = fields.One2many('warranty.expire.line', 'rma_id',
@@ -24,6 +24,7 @@ class RmaRequest(models.Model):
state = fields.Selection([
('draft', 'Draft'),
('confirmed', 'Confirmed'),
+ ('rma_created', 'RMA Created'),
('replacement_created', 'Replacement Created'),
], string='Request Status', track_visibility='onchange', readonly=True,
copy=False, default='draft')
@@ -35,6 +36,8 @@ class RmaRequest(models.Model):
user_id = fields.Many2one('res.users', string='User',
default=lambda self: self.env.user)
team_id = fields.Many2one('crm.team', string='Team')
+ is_website = fields.Boolean(string="Website")
+ is_replacement = fields.Boolean(string="Replacement?")
@api.multi
def _compute_picking(self):
@@ -54,7 +57,7 @@ class RmaRequest(models.Model):
@api.onchange('picking_id')
def _get_rma_lines(self):
- if self.picking_id:
+ if self.picking_id and not self.is_website:
move_line_ids = self.env['stock.move'].search([(
'picking_id', '=', self.picking_id.id)])
move_lines = [(5, 0, 0)]
@@ -63,11 +66,11 @@ class RmaRequest(models.Model):
'product_id': line.product_id.id,
'uom_id': line.product_uom.id,
'qty_delivered': line.quantity_done,
- 'qty_replaced': sum(line.qty_done for line in
- line.move_line_ids if
- line.lot_id.warranty_date and
- line.lot_id.warranty_date >= self.date
- ),
+ 'qty_return': sum(line.qty_done for line in
+ line.move_line_ids if
+ line.lot_id.warranty_date and
+ line.lot_id.warranty_date >= self.date
+ ),
'rma_id': self.id,
'move_line_id': line.id
}))
@@ -127,7 +130,7 @@ class RmaRequest(models.Model):
ir_model_data = self.env['ir.model.data']
try:
template_id = ir_model_data.get_object_reference(
- 'rma', 'email_template_notify_warranty_new')[1]
+ 'rma', 'email_template_notify_warranty_date')[1]
except ValueError:
template_id = False
try:
@@ -163,8 +166,8 @@ class RmaRequest(models.Model):
elif 'state' in init_values and self.state == 'confirmed' and \
self.rma_line:
return 'rma.mt_request_confirm'
- elif 'state' in init_values and self.state == 'replacement_created':
- return 'rma.mt_request_replaced'
+ elif 'state' in init_values and self.state == 'rma_created':
+ return 'rma.mt_request_return'
return super(RmaRequest, self)._track_subtype(init_values)
@api.multi
@@ -172,8 +175,9 @@ class RmaRequest(models.Model):
self.ensure_one()
if not self.rma_line:
raise UserError(_('You must select rma lines!'))
- for line in self.rma_line:
- line._onchange_qty_replaced()
+ if not self.is_website:
+ for line in self.rma_line:
+ line._onchange_qty_return()
self.state = 'confirmed'
@api.multi
diff --git a/addons/rma/models/sales_team.py b/addons/rma/models/sales_team.py
index 42b30d23..25607cc7 100644
--- a/addons/rma/models/sales_team.py
+++ b/addons/rma/models/sales_team.py
@@ -6,14 +6,14 @@ from flectra import fields, models
class CrmTeam(models.Model):
_inherit = 'crm.team'
- use_replacement = fields.Boolean(string='Replacement')
- replacements_count = fields.Integer(
- compute='_compute_replacements',
- string='Number of replacements')
+ use_return = fields.Boolean(string='Return')
+ returns_count = fields.Integer(
+ compute='_compute_returns',
+ string='Number of returns')
- def _compute_replacements(self):
- for replace in self:
- if replace.use_replacement:
+ def _compute_returns(self):
+ for return_req in self:
+ if return_req.use_return:
rma_ids = self.env['rma.request'].search([
- ('team_id.id', '=', replace.id)])
- replace.replacements_count = len(rma_ids)
+ ('team_id.id', '=', return_req.id)])
+ return_req.returns_count = len(rma_ids)
diff --git a/addons/rma/security/ir.model.access.csv b/addons/rma/security/ir.model.access.csv
index 3df44237..51f8c8f7 100644
--- a/addons/rma/security/ir.model.access.csv
+++ b/addons/rma/security/ir.model.access.csv
@@ -1,5 +1,9 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_rma_request,access_rma_request,model_rma_request,,1,1,1,0
-access_rma_line,access_rma_line,model_rma_line,,1,1,1,0
-access_warranty_expire_line,access_warranty_expire_line,model_warranty_expire_line,,1,1,1,0
-access_replacement_reason,access_replacement_reason,model_replacement_reason,,1,1,1,0
+access_rma_request_manager,access_rma_request_manager,model_rma_request,stock.group_stock_manager,1,1,1,1
+access_rma_request_portal,access_rma_request_portal,model_rma_request,base.group_portal,1,0,0,0
+access_rma_line_manager,access_rma_line_manager,model_rma_line,stock.group_stock_manager,1,1,1,1
+access_rma_line_portal,access_rma_line_potal,model_rma_line,base.group_portal,1,0,0,0
+access_warranty_expire_line_manager,access_warranty_expire_line_manager,model_warranty_expire_line,stock.group_stock_manager,1,1,1,0
+access_warranty_expire_line_portal,access_warranty_expire_line_portal,model_warranty_expire_line,base.group_portal,1,0,0,0
+access_return_reason_manager,access_return_reason_manager,model_return_reason,stock.group_stock_manager,1,1,1,0
+access_return_reason_portal,access_return_reason_portal,model_return_reason,base.group_portal,1,1,1,0
diff --git a/addons/rma/static/description/create_rma_btn8.png b/addons/rma/static/description/create_rma_btn8.png
new file mode 100644
index 00000000..7cfc18a1
Binary files /dev/null and b/addons/rma/static/description/create_rma_btn8.png differ
diff --git a/addons/rma/static/description/delivery_order4.png b/addons/rma/static/description/delivery_order4.png
new file mode 100644
index 00000000..e732dd17
Binary files /dev/null and b/addons/rma/static/description/delivery_order4.png differ
diff --git a/addons/rma/static/description/email7.png b/addons/rma/static/description/email7.png
new file mode 100644
index 00000000..f8416123
Binary files /dev/null and b/addons/rma/static/description/email7.png differ
diff --git a/addons/rma/static/description/expiry_date2.png b/addons/rma/static/description/expiry_date2.png
new file mode 100644
index 00000000..f18c465f
Binary files /dev/null and b/addons/rma/static/description/expiry_date2.png differ
diff --git a/addons/rma/static/description/incoming_do9.png b/addons/rma/static/description/incoming_do9.png
new file mode 100644
index 00000000..3e4dae38
Binary files /dev/null and b/addons/rma/static/description/incoming_do9.png differ
diff --git a/addons/rma/static/description/index.html b/addons/rma/static/description/index.html
new file mode 100644
index 00000000..cb7ba38d
--- /dev/null
+++ b/addons/rma/static/description/index.html
@@ -0,0 +1,233 @@
+Dear ${object.partner_id.name}
\n" +"We are sorry to hear about the problem you have had\n" +" with your product.
\n" +"We would like to be able to make the necessary\n" +" adjustment at no charge to you.\n" +"
\n" +"
+
+Return Merchandise Authorizationing
+
+
+
+
+ Products by lots/serial numbers.
++ If product is managed by lots/serial number then warranty + expiry date is set. When return request is created, product + from expiry lot can not be return. +
+
+
+
+ 
+
+
+
+
+
+
+ Add warranty expiry date for + particular lot.
++ When product is managed by lots/serial numbers then warranty + expirey date must be set. +
+
+
+
+ 
+
+
+
+
+
+
+ Sale Order Created
++ Sale order is created for [E-COM08] Apple In-Ear Headphones + product. After confirming order, Delivery Order is generated. +
+
+
+
+ 
+
+
+
+
+
+
+ Delivery Order generated
++ Delivery order is created with lot numbers. Warranty expiry date + for lot number 0000004 is set before today's date. +
+
+
+
+ 
+
+
+
+
+
+
+ Return request is created for particular sale order and for a + particular picking.
++ In RMA Lines tab, Return quantity + is set to 5 because 2 quantity from lot number 0000004 has + been expired, so product from that lot can not be return. +
+
+
+
+ 
+
+
+
+
+
+
+ Warranty expire lines
++ In warranty Expire Lines tab, Details + of expired lot number, it's quantity and expired date is + visible. +
+
+
+
+ 
+
+
+
+
+
+
+ Email for product expiration
++ Email can be sent for product expiration by clicking "Send By + Email" button. +
+
+
+
+ 
+
+
+
+
+
+
+ Create a rma by clicking "Create + RMA" button
+
+
+
+ 
+
+
+
+
+
+
+ Incoming DO created
++ By clicking a button, Incoming Delivery Order is created. +
+
+
+
+ 
+
+
+
+
+
+
+ Details of return requests.
+
+
+
+ 
+
+
+
+
+
+
+ Return button for replacement
++ By clicking "Return" button, Outgoing Delivery is generated + if RMA request is for replacement. +
+
+
+
+ 
+
+
+
+
+
+
+ Outgoing DO generated
++ This RMA request is for replacement as Replacement checkbox + is checked. So system will allow to create replacement. +
+
+
+
+ 
+
+
+
+
+
+
+ Only return request
++ This RMA request is for return products as Replacement + checkbox is not checked. So system will not allow to create + outgoing DO. +
+
+
+
+ 
+
+
+
+
+
+
+ Create replacement is not allowed
++ From return DO, If you try to create replacement eventhough + it is not replacement request, Then this warning will appear. +
+
+
+
+ 
+
+
+
-
-
+
+
+
@@ -48,8 +53,8 @@
@@ -57,8 +62,8 @@
-
- replacement.kanban
+
+ rma.kanban
crm.team
-
diff --git a/addons/rma/views/warranty_expire_line_view.xml b/addons/rma/views/warranty_expire_line_view.xml
index 256109ce..ec49af0e 100644
--- a/addons/rma/views/warranty_expire_line_view.xml
+++ b/addons/rma/views/warranty_expire_line_view.xml
@@ -4,7 +4,6 @@
warranty.expire..line.tree
warranty.expire.line
tree
-
warranty.expire.line.form
warranty.expire.line
form
-
-