<menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="base.group_extended"/>
<menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2"/>
<menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
+ <menuitem name="Products by Category" id="menu_product_by_category_stock_form" action="product.product_category_action"
+ parent="stock.menu_stock_product" sequence="0"/>
<menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
<menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="group_stock_manager"/>
<menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1"/>
<menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
+ <menuitem
+ id="menu_product_in_config_stock" name="Product"
+ parent="stock.menu_stock_configuration" sequence="2"/>
+ <menuitem
+ action="product.product_category_action_form" id="menu_product_category_config_stock"
+ parent="stock.menu_product_in_config_stock" sequence="0"/>
+ <menuitem
+ action="product.product_ul_form_action" groups="base.group_extended"
+ id="menu_product_packaging_stock_action" parent="stock.menu_product_in_config_stock" sequence="1"/>
+ <menuitem
+ id="menu_stock_unit_measure_stock" name="Units of Measure"
+ parent="stock.menu_product_in_config_stock" sequence="2"/>
+ <menuitem
+ action="product.product_uom_categ_form_action" id="menu_stock_uom_categ_form_action"
+ parent="stock.menu_stock_unit_measure_stock" sequence="0"/>
+ <menuitem
+ action="product.product_uom_form_action" id="menu_stock_uom_form_action"
+ parent="stock.menu_stock_unit_measure_stock" sequence="1"/>
<record id="stock_inventory_line_tree" model="ir.ui.view">
<field name="name">stock.inventory.line.tree</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Stock Inventory Lines">
- <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1" domain="[('type','<>','service')]"/>
+ <field context="location=location_id,uom=product_uom,to_date=parent.date" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)" select="1" domain="[('type','<>','service')]"/>
<field name="product_qty"/>
<field name="product_uom"/>
<field name="prod_lot_id" groups="base.group_extended"/>
<field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list">
<tree string="Products" editable="bottom">
<field colspan="4" domain="[('usage','=','internal')]" name="location_id"/>
- <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','<>','service')]"/>
+ <field context="location=location_id,uom=product_uom,to_date=parent.date" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)" domain="[('type','<>','service')]"/>
<field name="product_qty"/>
<field name="product_uom"/>
<field name="prod_lot_id" groups="base.group_extended"/>
<form string="Products ">
<field domain="[('usage','=','internal')]" name="location_id"/>
<newline/>
- <field colspan="4" context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','<>','service')]"/>
+ <field context="location=location_id,uom=product_uom,to_date=parent.date" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)" domain="[('type','<>','service')]"/>
<field name="product_qty"/>
<field name="product_uom"/>
<group colspan="2" col="4">
<group col="2" colspan="2">
<field name="state"/>
</group>
- <group col="2" colspan="2">
- <button name="action_cancel_inventary" states="draft" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
+ <group col="3" colspan="2">
+ <button name="action_cancel_inventary" states="draft,confirm,done" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
<button name="action_confirm" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
<button name="action_done" states="confirm" string="Validate Inventory" type="object" icon="gtk-jump-to"/>
- <button name="action_cancel" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+ <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
</group>
</form>
</field>
<menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="3"/>
<menuitem action="action_tracking_form" id="menu_action_tracking_form"
groups="base.group_extended"
+ sequence="6"
parent="menu_traceability"/>
<record id="lot_line_tree" model="ir.ui.view">
<page string="Stock Moves">
<field colspan="2" name="move_ids" nolabel="1" widget="one2many_list">
<tree string="Stock Moves">
- <field name="picking_id" string="Reference"/>
- <field name="origin"/>
- <field name="partner_id"/>
+ <field name="picking_id" string="Reference"/>
+ <field name="origin"/>
+ <field name="partner_id"/>
<field name="product_id"/>
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
<field name="product_uom" string="UoM"/>
<field name="view_id" ref="view_production_lot_tree"/>
<field name="search_view_id" ref="search_product_lot_filter" />
<field name="context">{'full':'1',"search_default_available":1}</field>
- <field name="help">This is the list of all the production lots (serial numbers) you recorded. When you select a lot, you can get the upstream or downstream traceability of the products contained in lot.</field>
+ <field name="help">This is the list of all the production lots (serial numbers) you recorded. When you select a lot, you can get the upstream or downstream traceability of the products contained in lot. By default, the list is filtred on the serial numbers that are available in your warehouse but you can uncheck the 'Available' button to get all the lots you produced, received or delivered to customers.</field>
</record>
- <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability" groups="base.group_extended"/>
+ <menuitem action="action_production_lot_form" id="menu_action_production_lot_form"
+ parent="menu_traceability" groups="base.group_extended"
+ sequence="1"/>
#
# Lot composition (history)
</field>
</record>
+ <record id="action3" model="ir.actions.act_window">
+ <field name="name">Downstream traceability</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">stock.move</field>
+ <field name="domain">[('id','in',active_ids)]</field>
+ <field name="view_type">tree</field>
+ <field eval="stock_move_tree2" name="view_id"/>
+ </record>
+
+ <record id="ir_move_traceability_upstream" model="ir.values">
+ <field name="key2">tree_but_action</field>
+ <field name="model">stock.move</field>
+ <field name="name">Downstream traceability</field>
+ <field eval="'ir.actions.act_window,'+str(action3)" name="value"/>
+ <field eval="True" name="object"/>
+ </record>
+
+ <record id="action5" model="ir.actions.act_window">
+ <field name="name">Upstream traceability</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">stock.move</field>
+ <field name="domain">[('id','in',active_ids)]</field>
+ <field name="view_type">tree</field>
+ <field eval="stock_move_tree" name="view_id"/>
+ </record>
+
+ <record id="ir_move_traceability_downstream" model="ir.values">
+ <field name="key2">tree_but_action</field>
+ <field name="model">stock.move</field>
+ <field name="name">Upstream traceability</field>
+ <field eval="'ir.actions.act_window,'+str(action5)" name="value"/>
+ <field eval="True" name="object"/>
+ </record>
+
<record id="view_location_form" model="ir.ui.view">
<field name="name">stock.location.form</field>
<field name="model">stock.location</field>
<field name="posx"/>
<field name="posy"/>
<field name="posz"/>
+ <separator string="Accounting Information" colspan="2" groups="base.group_extended"/>
+ <field name="valuation_in_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}" groups="base.group_extended"/>
+ <field name="valuation_out_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}" groups="base.group_extended"/>
</group>
<separator string="Additional Information" colspan="4"/>
<field colspan="4" name="comment" nolabel="1"/>
groups="base.group_extended"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed"/>
- <button name="%(split_into)d" string="Put in a new pack" type="action"
- groups="base.group_extended"
- icon="terp-stock_effects-object-colorize"
- states="draft,assigned,confirmed"/>
<field name="location_id"/>
<field name="location_dest_id"/>
<field name="date_expected" string="Date Expected"/>
<button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="action_process" states="assigned" string="Process" groups="stock.group_stock_user" type="object" icon="gtk-go-forward"/>
- <button states="done" name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" />
+ <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','<>','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl" />
</group>
</page>
<page string="Additional info" groups="base.group_extended,base.group_multi_company">
<field name="model">stock.picking</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date < current_date" string="Outgoing Deliveries">
+ <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date < current_date" string="Delivery Orders">
<field name="name"/>
<field name="partner_id"/>
<field name="origin"/>
<field name="model">stock.picking</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Outgoing Deliveries">
+ <form string="Delivery Orders">
<group col="6" colspan="4">
<group colspan="4" col="4">
<field name="name" readonly="1"/>
<field name="location_id"/>
<field name="date"/>
<field name="state"/>
- <button name="%(action_partial_move)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>
- <button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward"/>
+ <button name="%(action_partial_move_server)d" string="Process" type="action" states="confirmed,assigned" icon="gtk-go-forward"/>
</tree>
<form string="Stock Moves">
<group colspan="2" col="4">
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
<button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
- <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" states="done" type="action" icon="terp-gtk-go-back-rtl"/>
+ <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','<>','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl"/>
</group>
</page>
<page string="Additional info" groups="base.group_extended,base.group_multi_company">
<field name="arch" type="xml">
<search string="Picking list">
<group col="8" colspan="4">
- <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Outgoing Deliveries"/>
- <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Deliveries"/>
- <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Outgoing Deliveries already processed"/>
+ <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
+ <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
+ <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/>
<separator orientation="vertical"/>
<filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
<separator orientation="vertical"/>
- <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Outgoing Deliveries to invoice"/>
+ <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="partner_id" />
</record>
<record id="action_picking_tree" model="ir.actions.act_window">
- <field name="name">Outgoing Deliveries</field>
+ <field name="name">Delivery Orders</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<group colspan="1" states="done">
<button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
</group>
- <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl"/>
+ <button states="done" name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','<>','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl" />
</group>
</page>
<page string="Additional Info" groups="base.group_extended,base.group_multi_company">
<group expand="0" string="Extended Filters..." colspan="4" col="8">
<filter string="To invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" />
</group>
- <newline/>
+ <newline/>
<group expand="0" string="Group By..." colspan="4" col="8">
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical" />
<field name="context">{'search_default_Available':1}</field>
<field name="help">This menu gives you the full traceability of inventory operations on a specific product. You can filter on the product to see all the past or future movements for the product.</field>
</record>
- <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="1"/>
+ <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="3"/>
====================================
Reception Picking (By Stock Move)
====================================
- <!-- from stock_partial_move_view -->
+ <!-- from stock_partial_move_view -->
<field name="date"/>
<field name="state"/>
<button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
- <button name="%(action_partial_move)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>
- <button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward"/>
+ <button name="%(action_partial_move_server)d" string="Process" type="action" states="confirmed,assigned" icon="gtk-go-forward"/>
</tree>
</field>
</record>
<button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
<button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
<button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
- <button name="%(action_partial_move)d" states="assigned" string="Partial" type="action" icon="gtk-justify-fill"/>
- <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
+ <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned" icon="gtk-go-forward"/>
</group>
</form>
</field>
</group>
<newline/>
<group expand="0" string="Extended Filters..." groups="base.group_extended">
- <field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
+ <field name="tracking_id" context="{'tracking': self}"/>
+ <field name="prodlot_id"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="8" groups="base.group_extended">
<group col="8" colspan="4">
<filter icon="terp-go-today" string="Today" domain="[('date','<=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','>=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
<separator orientation="vertical"/>
- <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
+ <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (available or not)"/>
+ <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
<filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
<separator orientation="vertical"/>
<field name="origin"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..." groups="base.group_extended">
- <field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
+ <field name="tracking_id" context="{'tracking_id': self}"/>
+ <field name="prodlot_id"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="8" groups="base.group_extended">
<field name="view_mode">tree,form</field>
</record>
+ <menuitem action="action_incoterms_tree" id="menu_action_incoterm_open" parent="menu_warehouse_config" sequence="7"/>
+
<act_window
context="{'location': active_id}"
domain="[('type','<>','service')]"
<field name="view_id" ref="view_move_tree_reception_picking"/>
<field name="context" eval="'{\'search_default_receive\':1, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_stock'),ref('stock_location_customers'))"/>
<field name="search_view_id" ref="view_move_search_reception_outcoming_picking"/>
- <field name="help">The Deliver Products menu lists all individual products you have to deliver to your customers. You can process the deliveries directly from this list, line by or line or through the Delivery Orders menu.</field>
+ <field name="help">You will find in this list all products you have to deliver to your customers. You can process the deliveries directly from this list using the buttons on the right of each line. You can filter the products to deliver by customer, products or sale order (using the Origin field).</field>
</record>
<record model="ir.actions.act_window.view" id="action_move_out_picking_tree">
projects / odoo / odoo.git / blobdiff