audrius/stock-rma
1
0
Fork 0
mirror of https://github.com/ForgeFlow/stock-rma.git synced 2025-01-21 12:57:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

[ENH]activate description also fro customer RMAs

Browse Source 
[ENH]add term and conditions field to be printed and send to the partner
[FIX]do not show rma groups on the rma line form view if they are not activated
This commit is contained in:
ahenriquez
2019-09-20 11:33:55 +02:00
parent b42ee3da29
commit f1aa549b8d
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rma/__manifest__.py
View File

@@ -3,7 +3,7 @@
{ {
'name': 'RMA (Return Merchandise Authorization)', 'name': 'RMA (Return Merchandise Authorization)',
'version': '12.0.2.2.0', 'version': '12.0.2.3.0',
'license': 'LGPL-3', 'license': 'LGPL-3',
'category': 'RMA', 'category': 'RMA',
'summary': 'Introduces the return merchandise authorization (RMA) process ' 'summary': 'Introduces the return merchandise authorization (RMA) process '

1
rma/models/rma_order_line.py
View File

@@ -183,6 +183,7 @@ class RmaOrderLine(models.Model):
' assigned.', copy=False ' assigned.', copy=False
) )
description = fields.Text(string='Description') description = fields.Text(string='Description')
conditions = fields.Html(string='Terms and conditions')
origin = fields.Char( origin = fields.Char(
string='Source Document', string='Source Document',
readonly=True, states={'draft': [('readonly', False)]}, readonly=True, states={'draft': [('readonly', False)]},

6
rma/report/rma_report_templates.xml
View File

@@ -80,10 +80,14 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div t-if="doc.type=='supplier' and doc.description"> <div t-if="doc.description">
<strong><p>Description</p></strong> <strong><p>Description</p></strong>
<span t-field="doc.description"></span> <span t-field="doc.description"></span>
</div> </div>
<div t-if="doc.conditions">
<strong><p>Term and conditions</p></strong>
<span t-field="doc.conditions"></span>
</div>
</div> </div>
</t> </t>
</template> </template>

15
rma/views/rma_order_line_view.xml
View File

@@ -11,7 +11,7 @@
<field name="partner_id"/> <field name="partner_id"/>
<field name="product_id"/> <field name="product_id"/>
<field name="lot_id" groups="stock.group_production_lot"/> <field name="lot_id" groups="stock.group_production_lot"/>
<field name="rma_id"/> <field name="rma_id" groups="rma.group_rma_groups"/>
<field name="origin"/> <field name="origin"/>
<field name="operation_id"/> <field name="operation_id"/>
<field name="supplier_address_id"/> <field name="supplier_address_id"/>
@@ -33,7 +33,7 @@
<field name="partner_id"/> <field name="partner_id"/>
<field name="product_id"/> <field name="product_id"/>
<field name="lot_id" groups="stock.group_production_lot"/> <field name="lot_id" groups="stock.group_production_lot"/>
<field name="rma_id"/> <field name="rma_id" groups="rma.group_rma_groups"/>
<field name="origin"/> <field name="origin"/>
<field name="operation_id" domain="[('type','=','supplier')]"/> <field name="operation_id" domain="[('type','=','supplier')]"/>
<field name="uom_id" groups="uom.group_uom"/> <field name="uom_id" groups="uom.group_uom"/>
@@ -188,7 +188,8 @@
</page> </page>
<page name="other" string="Other Info"> <page name="other" string="Other Info">
<group name="general" string="General"> <group name="general" string="General">
<field name="rma_id"/> <field name="conditions"/>
<field name="rma_id" groups="rma.group_rma_groups"/>
<field name="origin"/> <field name="origin"/>
</group> </group>
@@ -309,6 +310,9 @@
</group> </group>
</group> </group>
<notebook> <notebook>
<page name="description" string="Description">
<field name="description" nolabel="1"/>
</page>
<page name="route" string="Routes"> <page name="route" string="Routes">
<group name="inbound" string="Inbound"> <group name="inbound" string="Inbound">
<field name="in_warehouse_id"/> <field name="in_warehouse_id"/>
@@ -357,7 +361,8 @@
</page> </page>
<page name="other" string="Other Info"> <page name="other" string="Other Info">
<group name="general" string="General"> <group name="general" string="General">
<field name="rma_id"/> <field name="conditions"/>
<field name="rma_id" groups="rma.group_rma_groups"/>
<field name="origin"/> <field name="origin"/>
</group> </group>
<group name="company" string="Company" <group name="company" string="Company"
@@ -381,7 +386,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search RMA line"> <search string="Search RMA line">
<field name="name"/> <field name="name"/>
<field name="rma_id"/> <field name="rma_id" groups="rma.group_rma_groups"/>
<field name="partner_id"/> <field name="partner_id"/>
<field name="requested_by"/> <field name="requested_by"/>
<field name="assigned_to"/> <field name="assigned_to"/>