odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] Merged with addons/trunk. 

bzr revid: tde@openerp.com-20120718110843-iqd7r6f89sz9phtg
This commit is contained in:
Thibault Delavallée 2012-07-18 13:08:43 +02:00
parent b722ae5b82 0d1aa39f36
commit 63e046da63
16 changed files with 231 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/account/account_view.xml
View File

@ -921,15 +921,15 @@
<field name="arch" type="xml">
<form string="Account Tax" version="7.0">
<group>
<group>
<group>
<field name="name"/>
<field name="description"/>
<group>
</group>
</group>
<group>
<field name="type_tax_use"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="active"/>
</group>
</group>
</group>
<notebook>
<page string="Tax Definition">

12
addons/anonymous/anonymous.xml
View File

@ -1,12 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record model="res.users" id="user">
<record id="anonymous_user" model="res.users">
<field name="name">Anonymous</field>
<field name="login">anonymous</field>
<field name="password">anonymous</field>
<!-- Avoid auto-including this demo user in any default group -->
<field name="groups_id" eval="[(5,)]"/>
<field name="avatar">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</field>
</record>
<!--
A group dedicated to the anonymous user only, making groups
restrictions more convenient.
-->
<record id="group_anonymous" model="res.groups">
<field name="name">Anonymous Group</field>
<field name="users" eval="[(4,ref('anonymous_user'))]"/>
</record>
</data>
</openerp>

143
addons/delivery/delivery_view.xml
View File

@ -15,60 +15,82 @@
</tree>
</field>
</record>
<record id="view_delivery_carrier_form" model="ir.ui.view">
<field name="name">delivery.carrier.form</field>
<field name="model">delivery.carrier</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Carrier" version="7.0">
<group col="4" name="general">
<field name="name"/>
<field name="partner_id"/>
<field name="product_id"/>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name"/>
</h1>
</div>
<group>
<group name="general">
<field name="partner_id"/>
<field name="product_id"/>
</group>
<group>
<field name="active"/>
<separator string="Pricing Information" colspan="4"/>
<group colspan="4" col="4">
</group>
</group>
<group col="4">
<group string="Pricing Information">
<field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
<newline/>
<field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
<field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
<label for="free_if_more_than"/>
<div>
<field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
<field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
</div>
</group>
<newline/>
<field name="use_detailed_pricelist"/>
</group>
<field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree,form">
<tree string="Delivery grids">
<field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree">
<tree string="Delivery grids">
<field name="sequence"/>
<field name="name"/>
</tree>
</tree>
<form string="Delivery grids" version="7.0">
<group col="4">
<field name="name"/>
<field name="active"/>
<field name="sequence"/>
<group>
<group>
<field name="name"/>
</group>
<group>
<field name="active"/>
<field name="sequence"/>
</group>
</group>
<notebook>
<page string="Grid definition">
<field name="line_ids"/>
</page>
<page string="Destination">
<group string="Countries">
<field colspan="2" name="country_ids" nolabel="1"/>
</group>
<group string="States">
<field colspan="2" name="state_ids" nolabel="1"/>
</group>
<group col="4">
<field name="zip_from"/>
<field name="zip_to"/>
</group>
</page>
</notebook>
</form>
<page string="Grid definition">
<field name="line_ids"/>
</page>
<page string="Destination">
<group>
<group>
<field name="country_ids" widget="many2many_tags"/>
<field name="state_ids" widget="many2many_tags"/>
</group>
<group>
<label for="zip_from" string="Zip"/>
<div>
<field name="zip_from" class="oe_inline"/>
-
<field name="zip_to" class="oe_inline"/>
</div>
</group>
</group>
</page>
</notebook>
</form>
</field>
</form>
</field>
</record>
<record id="action_delivery_carrier_form" model="ir.actions.act_window">
<field name="name">Delivery Method</field>
<field name="type">ir.actions.act_window</field>
@ -140,18 +162,28 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Grid Lines" version="7.0">
<field colspan="4" name="name"/>
<div>
<label string="condition" for="type"/>
<field name="type" class="oe_inline"/>
<field name="operator" class="oe_inline"/>
<field name="max_value" class="oe_inline"/>
</div>
<group col="4">
<field name="list_price"/>
<field name="standard_price"/>
<field name="price_type"/>
<field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}"/>
<group>
<field name="name"/>
</group>
<group>
<group>
<label for="type" string="Condition"/>
<div>
<field name="type" class="oe_inline"/>
<field name="operator" class="oe_inline"/>
<field name="max_value" class="oe_inline"/>
</div>
<label for="price_type"/>
<div>
<field name="price_type" class="oe_inline"/>
<label string=" in Function of " class="oe_inline" attrs="{'invisible':[('price_type','=','fixed')]}"/>
<field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}" class="oe_inline"/>
</div>
</group>
<group>
<field name="list_price"/>
<field name="standard_price"/>
</group>
</group>
</form>
</field>
@ -178,7 +210,7 @@
<field name="model">stock.picking.out</field>
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
<field name="partner_id" position="after">
<field name="min_date" position="after">
<field name="carrier_id"/>
<field name="carrier_tracking_ref"/>
<field name="number_of_packages"/>
@ -230,23 +262,10 @@
<field name="model">stock.move</field>
<field name="inherit_id" ref="stock.view_move_form"/>
<field name="arch" type="xml">
<field name="picking_id" position="after">
<xpath expr="//group[@name='main_grp']" position="inside">
<field name="weight"/>
<field name="weight_net"/>
</field>
</field>
</record>
<record id="view_move_reception_picking_withweight_form" model="ir.ui.view">
<field name="name">stock.move.reception.packing.form.weight</field>
<field name="type">form</field>
<field name="model">stock.move</field>
<field name="inherit_id" ref="stock.view_move_form_reception_picking"/>
<field name="arch" type="xml">
<field name="picking_id">
<field name="weight"/>
<field name="weight_net"/>
</field>
</xpath>
</field>
</record>
@ -264,7 +283,7 @@
<button name="delivery_set" string="Add in Quote" type="object"
class="oe_edit_only"
attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/>
<br/>
<br/>
<label string="If you don't 'Add in Quote', the exact price will be computed when invoicing based on delivery order(s)."
class="oe_edit_only"
attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/>

4
addons/mail/res_users_view.xml
View File

@ -9,7 +9,7 @@
<field name="inherit_id" ref="base.view_users_form_simple_modif"/>
<field name="arch" type="xml">
<data>
<field name="context_tz" position="after">
<field name="user_email" position="before">
<field name="notification_email_pref" readonly="0"/>
</field>
</data>
@ -23,7 +23,7 @@
<field name="inherit_id" ref="base.view_users_form"/>
<field name="arch" type="xml">
<data>
<field name="context_tz" position="after">
<field name="user_email" position="before">
<field name="notification_email_pref"/>
</field>
<xpath expr="/form/sheet" position="after">

46
addons/procurement/procurement_view.xml
View File

@ -55,34 +55,46 @@
<field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" />
</header>
<sheet>
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name" class="oe_inline"/>
<label string="-" attrs="{'invisible':[('origin','=',False)]}"/>
<field name="origin" class="oe_inline"/>
</h1>
<group>
<group string="References">
<field name="name"/>
<field name="origin"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<group string="Planification">
<group>
<field name="date_planned"/>
<field name="procure_method"/>
<field name="priority"/>
</group>
<group>
<field name="message"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
</group>
<notebook>
<page string="Procurement Details">
<group string="Product &amp; Location" col="4">
<field name="product_id" on_change="onchange_product_id(product_id)"/>
<field name="location_id" domain="[('usage','=','internal')]"/>
<field name="product_qty"/>
<field name="product_uom"/>
<field name="product_uos_qty" groups="product.group_uos"/>
<field name="product_uos" groups="product.group_uos"/>
<group>
<group>
<field name="product_id" on_change="onchange_product_id(product_id)"/>
<label for="product_qty"/>
<div>
<field name="product_qty" class="oe_inline"/>
<field name="product_uom" class="oe_inline"/>
</div>
<label for="product_uos_qty" groups="product.group_uos"/>
<div groups="product.group_uos">
<field name="product_uos_qty" class="oe_inline"/>
<field name="product_uos" class="oe_inline"/>
</div>
</group>
<group>
<field name="location_id" domain="[('usage','=','internal')]"/>
</group>
</group>
<separator string="Status"/>
<field name="message"/>
</page>
<page string="Extra Information">
<group string="Details" col="4">
<group>
<field name="move_id"/>
<field name="date_close"/>
<field name="close_move"/>

2
addons/procurement/wizard/schedulers_all_view.xml
View File

@ -10,7 +10,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Scheduler Parameters" version="7.0">
<group string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing.">
<group>
<field name="automatic"/>
</group>
<footer>

1
addons/product_expiry/product_expiry_view.xml
View File

@ -8,7 +8,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<field name="date" position="after">
<separator string="Dates" colspan="4" />
<field name="life_date" />
<field name="use_date" />
<field name="removal_date" />

2
addons/purchase/purchase.py
View File

@ -167,7 +167,7 @@ class purchase_order(osv.osv):
help="Put an address if you want to deliver directly from the supplier to the customer. " \
"Otherwise, keep empty to deliver to your own company."
),
'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}),
'warehouse_id': fields.many2one('stock.warehouse', 'Destination Warehouse', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}),
'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')]),
'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
'state': fields.selection(STATE_SELECTION, 'Status', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),

2
addons/purchase/stock.py
View File

@ -40,6 +40,7 @@ class stock_picking(osv.osv):
'purchase_id': fields.many2one('purchase.order', 'Purchase Order',
ondelete='set null', select=True),
}
_defaults = {
'purchase_id': False,
}
@ -133,5 +134,6 @@ class stock_picking_in(osv.osv):
_columns = {
'purchase_id': fields.many2one('purchase.order', 'Purchase Order',
ondelete='set null', select=True),
'warehouse_id': fields.related('purchase_id', 'warehouse_id', type='many2one', relation='stock.warehouse', string='Destination Warehouse'),
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

9
addons/purchase/stock_view.xml
View File

@ -7,8 +7,8 @@
<field name="type">form</field>
<field name="inherit_id" ref="stock.view_move_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='tracking_id']" position="before">
<field name="purchase_line_id" colspan="2" />
<xpath expr="//group[@name='destination_grp']" position="inside">
<field name="purchase_line_id"/>
</xpath>
</field>
</record>
@ -30,9 +30,12 @@
<field name="type">form</field>
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
<xpath expr="/form/sheet/group/group/field[@name='date']" position="before">
<xpath expr="//field[@name='date']" position="before">
<field name="purchase_id"/>
</xpath>
<xpath expr="//field[@name='company_id']" position="after">
<field name="warehouse_id"/>
</xpath>
</field>
</record>

2
addons/sale/sale_view.xml
View File

@ -171,7 +171,7 @@
</h1>
<group>
<group>
<field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true}'/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true, "highlight_first_line": true}'/>
<field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address"/>
<field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address"/>

4
addons/sale/stock_view.xml
View File

@ -19,8 +19,8 @@
<field name="type">form</field>
<field name="inherit_id" ref="stock.view_move_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='tracking_id']" position="before">
<field name="sale_line_id" colspan="2"/>
<xpath expr="//group[@name='origin_grp']" position="inside">
<field name="sale_line_id"/>
</xpath>
</field>
</record>

170
addons/stock/stock_view.xml
View File

@ -121,20 +121,16 @@
<field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
</header>
<sheet>
<div class="oe_title">
<div class="oe_edit_only">
<label for="name" />
</div>
<div>
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name" placeholder="Annual inventory"/>
<field name="name" placeholder="e.g. Annual inventory" class="oe_inline"/> -
<field name="date" class="oe_inline"/>
</h1>
</div>
<group>
<group>
<field name="date"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
</group>
<notebook>
<page string="General Informations">
<field name="inventory_line_id">
@ -150,19 +146,27 @@
<field name="state" invisible="True"/>
</tree>
<form string="Products" version="7.0">
<group col="4">
<field domain="[('usage','=','internal')]" name="location_id"/>
<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','&lt;&gt;','service')]"/>
<field name="product_qty"/>
<field name="product_uom" groups="product.group_uom"/>
<field name="prod_lot_id" groups="stock.group_production_lot"/>
<button name="%(stock.action_view_stock_inventory_line_split)d"
<group>
<group>
<field domain="[('usage','=','internal')]" name="location_id"/>
<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','&lt;&gt;','service')]"/>
</group>
<group>
<label for="product_qty"/>
<div>
<field name="product_qty" class="oe_inline"/>
<field name="product_uom" class="oe_inline" groups="product.group_uom"/>
</div>
<field name="prod_lot_id" groups="stock.group_production_lot"/>
<button name="%(stock.action_view_stock_inventory_line_split)d"
string="Split inventory lines" groups="stock.group_inventory_valuation"
type="action" icon="terp-stock_effects-object-colorize"/>
</group>
</group>
</form>
</field>
</page><page string="Posted Inventory">
</page>
<page string="Posted Inventory">
<field name="move_ids" context="{'inventory_id':active_id}" >
<tree string="Stock Moves">
<field name="product_id"/>
@ -331,18 +335,25 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Serial Number" version="7.0">
<div class="oe_button_box oe_right">
<button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up"/>
<button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down"/>
</div>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name"/>
</h1>
</div>
<group>
<group string="Serial Number Identification">
<group>
<field name="product_id"/>
<field name="prefix"/>
<field name="name"/>
<field name="ref"/>
<field name="date"/>
</group>
<group string="Traceability">
<group>
<field name="date"/>
<field name="stock_available"/>
<button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
<button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down" colspan="2"/>
</group>
</group>
<notebook>
@ -734,7 +745,7 @@
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name" class="oe_inline"/>
<span attr="{'invisible': [('origin','=',False)]}"> - </span>
<span attrs="{'invisible': [('origin','=',False)]}"> - </span>
<field name="origin" placeholder="PO0032" class="oe_inline"/>
</h1>
<label for="partner_id" class="oe_edit_only"/>
@ -793,7 +804,7 @@
<field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" />
</header>
<group>
<group string="Move Information">
<group>
<field name="name" invisible="1"/>
<field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
<label for="product_qty"/>
@ -803,17 +814,16 @@
<button name="%(stock.move_scrap)d"
string="Scrap" type="action"
icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" colspan="1"/>
states="draft,waiting,confirmed,assigned"/>
</div>
<label for="product_uos_qty" groups="product.group_uos"/>
<div>
<field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
<field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
<div groups="product.group_uos">
<field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
<field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
</div>
<field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
</group>
<group string="Dates">
<group>
<field name="create_date" invisible="1"/>
<field name="date"/>
<field name="date_expected" on_change="onchange_date(date,date_expected)"/>
@ -1216,14 +1226,15 @@
<form string="Stock Moves" version="7.0">
<header>
<button name="action_confirm" states="draft" string="Process Later" type="object" class="oe_highlight"/>
<button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" class="oe_highlight"/>
<button name="%(action_partial_move_server)d" string="Process Partially" type="action" states="assigned" class="oe_highlight"/>
<button name="action_done" states="draft,assigned,confirmed" string="Process Entirely" type="object" class="oe_highlight"/>
<button name="force_assign" states="confirmed" string="Set Available" type="object" class="oe_highlight"/>
<button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
</header>
<sheet>
<group>
<group>
<group name="main_grp" string="Details">
<field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
<label for="product_qty"/>
<div>
@ -1236,28 +1247,28 @@
icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" colspan="1"/>
</div>
<label for="product_uso_qty" />
<div>
<label for="product_uos_qty" groups="product.group_uos"/>
<div groups="product.group_uos">
<field name="product_uos_qty"
groups="product.group_uos"
on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"
class="oe_inline"/>
<field name="product_uos" groups="product.group_uos" colspan="4" class="oe_inline"/>
<field name="product_uos" class="oe_inline"/>
</div>
<field name="name" string="Reason"/>
</group>
<group>
<field name="picking_id"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<group name="origin_grp" string="Origin">
<field name="picking_id"/>
<field name="location_id" groups="stock.group_locations"/>
<field name="create_date" groups="base.group_no_one"/>
</group>
<group name="destination_grp" string="Destination">
<field name="location_dest_id" groups="stock.group_locations"/>
<field name="partner_id" context="{'contact_display':'partner'}"/>
<field name="create_date" groups="base.group_no_one" />
<field name="date" groups="base.group_no_one" />
<field name="date_expected" on_change="onchange_date(date,date_expected)"/>
<field name="date" groups="base.group_no_one" />
</group>
<group>
<group string="Tracability">
<label for="tracking_id"/>
<div>
<field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
@ -1397,77 +1408,6 @@
</field>
</record>
<record id="view_move_form_reception_picking" model="ir.ui.view">
<field name="name">stock.move.form2</field>
<field name="model">stock.move</field>
<field name="type">form</field>
<field eval="6" name="priority"/>
<field name="arch" type="xml">
<form string="Receive Products" version="7.0">
<header>
<button name="action_confirm" states="draft" string="Process Later" type="object" class="oe_highlight"/>
<button name="force_assign" states="confirmed" string="Set Available" type="object" class="oe_highlight"/>
<button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned" class="oe_highlight"/>
<button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
</header>
<sheet>
<group>
<group>
<field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
<label for="product_qty"/>
<div>
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
<field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
<button name="%(stock.move_scrap)d"
string="Scrap" type="action"
icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" colspan="1"/>
</div>
<label for="product_uos_qty"/>
<div>
<field name="product_uos_qty" groups="product.group_uos" class="oe_inline"
on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
<field name="product_uos" groups="product.group_uos" class="oe_inline"/>
</div>
<field name="name" string="Reason"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="location_id" groups="stock.group_locations"/>
<field name="location_dest_id" groups="stock.group_locations"/>
<field name="partner_id" groups="stock.group_locations"/>
</group>
<group>
<field name="picking_id"/>
<field name="create_date" groups="base.group_no_one" />
<field name="date" groups="base.group_no_one" string="Move Date"/>
<field name="date_expected" on_change="onchange_date(date,date_expected)"/>
<label for="tracking_id"/>
<div>
<field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
<button name="%(split_into)d" string="New Pack" type="action"
groups="product.group_stock_packaging"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed,done" class="oe_inline"/>
</div>
<label for="prodlot_id"/>
<div>
<field name="prodlot_id" groups="stock.group_production_lot"
context="{'location_id':location_id, 'product_id':product_id}"
domain="[('product_id','=?',product_id)]" class="oe_inline"
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
<button name="%(track_line)d"
groups="stock.group_tracking_lot" class="oe_inline"
states="draft,waiting,confirmed,assigned,done"
string="Split" type="action" icon="terp-stock_effects-object-colorize" />
</div>
</group>
</group>
</sheet>
</form>
</field>
</record>
<record id="view_move_search_reception_incoming_picking" model="ir.ui.view">
<field name="name">stock.move.incoming.search2</field>
<field name="model">stock.move</field>
@ -1552,7 +1492,7 @@
<record model="ir.actions.act_window.view" id="action_move_reception_picking_form">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="view_move_form_reception_picking"/>
<field name="view_id" ref="view_move_form"/>
<field name="act_window_id" ref="action_reception_picking_move"/>
</record>

52
addons/stock_planning/stock_planning_view.xml
View File

@ -242,10 +242,9 @@
<field name="type">form</field>
<field name="priority">50</field>
<field name="arch" type="xml">
<form string="Stock Planning">
<group colspan="4" col="7">
<group colspan ="3" col="2">
<separator colspan ="2" string = "General Info"/>
<form string="Stock Planning" version="7.0">
<group>
<group string="General Info">
<field name="company_id" widget="selection"
on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
<field name="warehouse_id" domain = "[('company_id','=',company_id)] " />
@ -256,45 +255,48 @@
<field name="product_uom"
domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
on_change = "onchange_uom(product_uom, product_id, active_uom, planned_outgoing, to_procure)"/>
<field name="active_uom" invisible = "True" />
<separator colspan ="2" string = "Forecasts"/>
<field name="active_uom" invisible = "True"/>
<separator string="Current Period Situation" colspan="2"/>
<field name="stock_start"/>
<field name="already_out"/>
<field name="already_in"/>
<separator string="Minimum Stock Rule Indicators" colspan="2"/>
<field name="minimum_op"/>
<field name="maximum_op"/>
<separator string="Forecasts" colspan="2"/>
<field name="warehouse_forecast"/>
<field name="company_forecast"/>
<field name="confirmed_forecasts_only"/>
</group>
<group colspan ="2" col="2">
<separator colspan ="2" string = "Current Period Situation"/>
<field name="stock_start"/>
<field name="already_out"/>
<field name="already_in"/>
<separator colspan ="2" string = "Planning and Situation for Calculated Period"/>
<group>
<button name="calculate_planning" string="Compute Planning" type="object" icon="gtk-execute"/>
<separator string="Planning and Situation for Calculated Period" colspan="2"/>
<field name="planned_outgoing"/>
<field name="outgoing"/>
<field name="outgoing_left"/>
<field name="to_procure"/>
<field name="incoming"/>
<field name="incoming_left"/>
<button name="calculate_planning" string="Calculate Planning" type="object" icon="gtk-execute" colspan="2"/>
<label for="incoming_left"/>
<div>
<field name="incoming_left" class="oe_inline"/>
<button name="procure_incomming_left" icon="gtk-convert" string="Make Procurement" type="object" class="oe_inline"/>
<button name="internal_supply" string="Make Picking" help="Supply from Another Warehouse" icon="gtk-convert" type="object" class="oe_inline"/>
</div>
<field name="stock_only"/>
</group>
<group colspan ="2" col="2">
<separator colspan ="2" string = "Minimum Stock Rule Indicators"/>
<field name="minimum_op"/>
<field name="maximum_op"/>
<separator colspan ="2" string = "Calculated Period Simulation"/>
<separator string="Calculated Period Simulation" colspan="2"/>
<field name="outgoing_before"/>
<field name="incoming_before"/>
<field name="stock_simulation"/>
<button name="procure_incomming_left" icon="gtk-convert" string="Procure Incoming Left" type="object" colspan="2"/>
<field name="procure_to_stock"/>
<separator colspan ="2" string = "Internal Supply"/>
<button name="internal_supply" string="Supply from Another Warehouse" icon="gtk-convert" type="object" colspan="2"/>
<separator string="Internal Supply" colspan="2"/>
<field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/>
<field name="stock_supply_location"/>
</group>
</group>
<separator colspan ="4" string = "Procurement History"/>
<field name = "history" colspan = "2" nolabel = "1"/>
<group string="Procurement History" colspan="4">
<field name="history" nolabel="1" colspan="4"/>
</group>
</form>
</field>
</record>

8
addons/stock_planning/wizard/stock_planning_create_periods_view.xml
View File

@ -10,8 +10,12 @@
<field name="arch" type="xml">
<form string="Stock Periods" version="7.0">
<group col="4">
<field name="date_start"/>
<field name="date_stop"/>
<label for="date_start" string="Duration"/>
<div>
<field name="date_start"/>
<label string="-"/>
<field name="date_stop"/>
</div>
</group>
<footer>
<button name="create_stock_periods" string="Create Daily Periods" type="object" class="oe_highlight"/>

6
addons/stock_planning/wizard/stock_planning_createlines_view.xml
View File

@ -9,16 +9,16 @@
<field name="arch" type="xml">
<form string="Create Stock Planning Lines" version="7.0">
<group col="4">
<field name="period_id" widget="selection"/>
<field name="period_id"/>
<field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
<field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
<field name="forecasted_products"/>
<field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}" widget="selection"/>
<field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}"/>
</group>
<footer>
<button name="create_planning" string="Create" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>