[WIP] Make sure stock_account and stock installs
bzr revid: jco@openerp.com-20130715081809-9wjk787xp3gcsi3e
This commit is contained in:
Josse Colpaert
parent
365586d11d
commit
421a349958
|
|
@ -67,13 +67,13 @@
|
|||
</record>
|
||||
|
||||
<!--Purchase related rules in routes -->
|
||||
<record id="procurement_rule_customer1_xdock" model="procurement.rule">
|
||||
<!--<record id="procurement_rule_customer1_xdock" model="procurement.rule">
|
||||
<field name="name">Supplier > Output</field>
|
||||
<field name="action">buy</field>
|
||||
<field name="location_id" ref="stock.stock_location_suppliers"/>
|
||||
<field name="location_src_id" ref="stock.stock_location_stock"/>
|
||||
<field name="procure_method">make_to_order</field>
|
||||
<field name="route_id" ref="stock.route_warehouse0_crossdock"/>
|
||||
</record>
|
||||
</record>-->
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -1590,5 +1590,23 @@
|
|||
</record>
|
||||
|
||||
|
||||
<record model="ir.ui.view" id="product_form_view_procurement_button">
|
||||
<field name="name">product.product.procurement</field>
|
||||
<field name="model">product.product</field>
|
||||
<field name="inherit_id" ref="view_normal_procurement_locations_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='incoming_qty']" position="after">
|
||||
<button string="⇒ Request Procurement" name="%(act_make_procurement)d" type="action" class="oe_link"/>
|
||||
</xpath>
|
||||
<xpath expr="//div[@name='buttons']" position="inside">
|
||||
<button string="Orderpoints" name="%(product_open_orderpoint)d" type="action" attrs="{'invisible':[('type', '=', 'service')]}"/>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='standard_price']" position="after">
|
||||
<field name="supply_method" groups="base.group_user"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@
|
|||
|
||||
import product
|
||||
import stock_account
|
||||
|
||||
import wizard
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -58,12 +58,12 @@ Dashboard / Reports for Warehouse Management will include:
|
|||
# 'wizard/stock_partial_picking_view.xml',
|
||||
# 'wizard/stock_partial_move_view.xml',
|
||||
# 'wizard/stock_fill_inventory_view.xml',
|
||||
# 'wizard/stock_invoice_onshipping_view.xml',
|
||||
'wizard/stock_invoice_onshipping_view.xml',
|
||||
# 'wizard/stock_inventory_merge_view.xml',
|
||||
# 'wizard/stock_location_product_view.xml',
|
||||
# 'wizard/stock_splitinto_view.xml',
|
||||
# 'wizard/stock_inventory_line_split_view.xml',
|
||||
# 'wizard/stock_change_standard_price_view.xml',
|
||||
'wizard/stock_change_standard_price_view.xml',
|
||||
# 'wizard/stock_return_picking_view.xml',
|
||||
# 'wizard/make_procurement_view.xml',
|
||||
# 'wizard/mrp_procurement_view.xml',
|
||||
|
|
|
|||
|
|
@ -186,8 +186,7 @@ class product_template(osv.osv):
|
|||
'cost_method': fields.property(type='selection', selection=[('standard', 'Standard Price'), ('average', 'Average Price'), ('real', 'Real Price')],
|
||||
help="""Standard Price: The cost price is manually updated at the end of a specific period (usually every year)
|
||||
Average Price: The cost price is recomputed at each incoming shipment
|
||||
FIFO Price: The cost price is recomputed at each outgoing shipment FIFO
|
||||
LIFO Price: The cost price is recomputed at each outgoing shipment LIFO""",
|
||||
Real Price: The cost price is calculated as the real price of the last outgoing shipment""",
|
||||
string="Costing Method", required=True),
|
||||
'property_stock_account_input': fields.property(
|
||||
type='many2one',
|
||||
|
|
|
|||
|
|
@ -281,7 +281,7 @@ class stock_quant(osv.osv):
|
|||
'credit': valuation_amount,
|
||||
'account_id': credit_account_id,
|
||||
}
|
||||
res += [(0, 0, debit_line_vals), (0, 0, credit_line_vals)]
|
||||
res = [(0, 0, debit_line_vals), (0, 0, credit_line_vals)]
|
||||
return res
|
||||
|
||||
|
||||
|
|
@ -591,7 +591,8 @@ class stock_picking(osv.osv):
|
|||
# ----------------------------------------------------
|
||||
|
||||
class stock_move(osv.osv):
|
||||
_name = "stock.move"
|
||||
|
||||
_inherit = "stock.move"
|
||||
|
||||
#TODO cancel a move must delete the accounting entry if not posted yet (otherwise raise an error)
|
||||
def action_cancel(self, cr, uid, ids, context=None):
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
##############################################################################
|
||||
#
|
||||
# OpenERP, Open Source Management Solution
|
||||
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
import stock_change_standard_price
|
||||
import stock_invoice_onshipping
|
||||
Loading…
Reference in New Issue