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

[9.0] rma_account:

Browse Source 
* fix view
 * small issue in wizard
 * modify data file
 * smaller issues
This commit is contained in:
Lois Rilo
2018-05-17 12:40:52 +02:00
committed by ahenriquez
parent 5620e95df1
commit da1979af48
4 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rma_account/demo/rma_operation.xml
View File

@@ -17,6 +17,7 @@
<field name="delivery_policy">no</field> <field name="delivery_policy">no</field>
<field name="type">customer</field> <field name="type">customer</field>
<field name="in_route_id" ref="rma.route_rma_customer"/> <field name="in_route_id" ref="rma.route_rma_customer"/>
<field name="out_route_id" ref="rma.route_rma_customer"/>
</record> </record>
<record id="rma_operation_supplier_refund" model="rma.operation"> <record id="rma_operation_supplier_refund" model="rma.operation">
@@ -26,6 +27,7 @@
<field name="receipt_policy">no</field> <field name="receipt_policy">no</field>
<field name="delivery_policy">no</field> <field name="delivery_policy">no</field>
<field name="type">supplier</field> <field name="type">supplier</field>
<field name="in_route_id" ref="rma.route_rma_supplier"/>
<field name="out_route_id" ref="rma.route_rma_supplier"/> <field name="out_route_id" ref="rma.route_rma_supplier"/>
</record> </record>

5
rma_account/models/rma_order_line.py
View File

@@ -177,9 +177,8 @@ class RmaOrderLine(models.Model):
@api.onchange('operation_id') @api.onchange('operation_id')
def _onchange_operation_id(self): def _onchange_operation_id(self):
result = super(RmaOrderLine, self)._onchange_operation_id() result = super(RmaOrderLine, self)._onchange_operation_id()
if not self.operation_id: if self.operation_id:
return result self.refund_policy = self.operation_id.refund_policy or 'no'
self.refund_policy = self.operation_id.refund_policy
return result return result
@api.multi @api.multi

19
rma_account/views/rma_order_line_view.xml
View File

@@ -49,13 +49,18 @@
<field name="inherit_id" ref="rma.view_rma_line_form"/> <field name="inherit_id" ref="rma.view_rma_line_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<button name="action_view_out_shipments" position="after"> <button name="action_view_out_shipments" position="after">
<button type="object" name="action_view_refunds" <button type="object" name="action_view_invoice"
class="oe_stat_button" class="oe_stat_button"
icon="fa-pencil-square-o" icon="fa-pencil-square-o"
groups="account.group_account_user"> string="Origin Inv">
<field name="refund_count" widget="statinfo" </button>
string="Refunds"/> <button type="object" name="action_view_refunds"
</button> class="oe_stat_button"
icon="fa-pencil-square-o"
groups="account.group_account_user">
<field name="refund_count" widget="statinfo"
string="Refunds"/>
</button>
</button> </button>
<group name="main_info" position="inside"> <group name="main_info" position="inside">
<field name="invoice_line_id" <field name="invoice_line_id"

21
rma_account/wizards/rma_refund.py
View File

@@ -19,16 +19,17 @@ class RmaRefund(models.TransientModel):
@api.returns('rma.order.line') @api.returns('rma.order.line')
def _prepare_item(self, line): def _prepare_item(self, line):
values = {'product_id': line.product_id.id, values = {
'name': line.name, 'product_id': line.product_id.id,
'product_qty': line.product_qty, 'name': line.name,
'uom_id': line.uom_id.id, 'product_qty': line.product_qty,
'qty_to_refund': line.qty_to_refund, 'uom_id': line.uom_id.id,
'refund_policy': line.refund_policy, 'qty_to_refund': line.qty_to_refund,
'invoice_address_id': line.invoice_address_id.id, 'refund_policy': line.refund_policy,
'line_id': line.id, 'invoice_address_id': line.invoice_address_id.id,
'rma_id': line.rma_id.id, 'line_id': line.id,
'wiz_id': self.env.context['active_id']} 'rma_id': line.rma_id.id,
}
return values return values
@api.model @api.model