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

[IMP] Various improvements

Browse Source
This commit is contained in:
Bhavesh Odedra
2018-02-14 19:22:41 +05:30
committed by Mateu Griful
parent e8ddd7b31f
commit c47f6f7521
4 changed files with 36 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rma/models/rma_order_line.py
View File

@@ -46,16 +46,18 @@ class RmaOrderLine(models.Model):
@api.multi @api.multi
def _compute_in_shipment_count(self): def _compute_in_shipment_count(self):
for line in self: for line in self:
line.in_shipment_count = len(self.env['stock.picking'].search( moves = self.env['stock.move'].search([
[('origin', '=', line.name), ('rma_line_id', '=', line.id)])
('picking_type_code', '=', 'incoming')]).ids) line.in_shipment_count = len(moves.mapped('picking_id').filtered(
lambda p: p.picking_type_code == 'incoming').ids)
@api.multi @api.multi
def _compute_out_shipment_count(self): def _compute_out_shipment_count(self):
for line in self: for line in self:
line.out_shipment_count = len(self.env['stock.picking'].search( moves = self.env['stock.move'].search([
[('origin', '=', line.name), ('rma_line_id', '=', line.id)])
('picking_type_code', '=', 'outgoing')]).ids) line.out_shipment_count = len(moves.mapped('picking_id').filtered(
lambda p: p.picking_type_code == 'outgoing').ids)
@api.multi @api.multi
def _get_rma_move_qty(self, states, direction='in'): def _get_rma_move_qty(self, states, direction='in'):

19
rma/views/product_view.xml
View File

@@ -3,13 +3,16 @@
<record id="product_category_form_view" model="ir.ui.view"> <record id="product_category_form_view" model="ir.ui.view">
<field name="name">product.category.form</field> <field name="name">product.category.form</field>
<field name="model">product.category</field> <field name="model">product.category</field>
<field name="inherit_id" ref="product.product_category_form_view" /> <field name="inherit_id" ref="stock.product_category_form_view_inherit"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="parent_id" position="after"> <field name="removal_strategy_id" position="after">
<group name="rma"> <group name="rma">
<field name="rma_approval_policy" groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/> <field name="rma_approval_policy"
<field name="rma_customer_operation_id" groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/> groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
<field name="rma_supplier_operation_id" groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/> <field name="rma_customer_operation_id"
groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
<field name="rma_supplier_operation_id"
groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
</group> </group>
</field> </field>
</field> </field>
@@ -23,8 +26,10 @@
<group name="inventory" position="inside"> <group name="inventory" position="inside">
<group name="rma" groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"> <group name="rma" groups="rma.group_rma_customer_user,rma.group_rma_supplier_user">
<field name="rma_approval_policy"/> <field name="rma_approval_policy"/>
<field name="rma_customer_operation_id" groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/> <field name="rma_customer_operation_id"
<field name="rma_supplier_operation_id" groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/> groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
<field name="rma_supplier_operation_id"
groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
</group> </group>
</group> </group>
</field> </field>

4
rma/wizards/rma_make_picking_view.xml
View File

@@ -61,26 +61,26 @@
<field name="name">Create Incoming Shipment</field> <field name="name">Create Incoming Shipment</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">rma_make_picking.wizard</field> <field name="res_model">rma_make_picking.wizard</field>
<field name="src_model">rma.order.line</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="target">new</field> <field name="target">new</field>
<field name="view_id" ref="view_rma_picking"/> <field name="view_id" ref="view_rma_picking"/>
<field name="groups_id" eval="[(4, ref('stock.group_stock_user'))]"/> <field name="groups_id" eval="[(4, ref('stock.group_stock_user'))]"/>
<field name="context">{'picking_type': 'incoming'}</field> <field name="context">{'picking_type': 'incoming'}</field>
<field name="binding_model_id" ref="rma.model_rma_order_line"/>
</record> </record>
<record id="action_rma_picking_out" model="ir.actions.act_window"> <record id="action_rma_picking_out" model="ir.actions.act_window">
<field name="name">Create Delivery</field> <field name="name">Create Delivery</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">rma_make_picking.wizard</field> <field name="res_model">rma_make_picking.wizard</field>
<field name="src_model">rma.order.line</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="target">new</field> <field name="target">new</field>
<field name="view_id" ref="view_rma_picking_out"/> <field name="view_id" ref="view_rma_picking_out"/>
<field name="groups_id" eval="[(4, ref('stock.group_stock_user'))]"/> <field name="groups_id" eval="[(4, ref('stock.group_stock_user'))]"/>
<field name="context">{'picking_type': 'outgoing'}</field> <field name="context">{'picking_type': 'outgoing'}</field>
<field name="binding_model_id" ref="rma.model_rma_order_line"/>
</record> </record>
<record id="view_rma_line_button_form" model="ir.ui.view"> <record id="view_rma_line_button_form" model="ir.ui.view">

11
rma/wizards/rma_order_line_make_supplier_rma_view.xml
View File

@@ -56,18 +56,9 @@
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="view_id" ref="view_rma_order_line_make_supplier_rma"/> <field name="view_id" ref="view_rma_order_line_make_supplier_rma"/>
<field name="target">new</field> <field name="target">new</field>
<field name="binding_model_id" ref="rma.model_rma_order_line"/>
</record> </record>
<!--record model="ir.values" id="rma_order_line_make_supplier_rma">
<field name="model_id" ref="model_rma_order_line" />
<field name="name">Create Supplier RMA Group</field>
<field name="key2">client_action_multi</field>
<field name="value"
eval="'ir.actions.act_window,' + str(ref('action_rma_order_line_make_supplier_rma'))" />
<field name="key">action</field>
<field name="model">rma.order.line</field>
</record-->
<record id="view_rma_line_supplier_rma_button_form" model="ir.ui.view"> <record id="view_rma_line_supplier_rma_button_form" model="ir.ui.view">
<field name="name">rma.order.line.supplier.rma.form</field> <field name="name">rma.order.line.supplier.rma.form</field>
<field name="model">rma.order.line</field> <field name="model">rma.order.line</field>