[IMP] Minor spellchecking/cleanup/nitpicking while reviewing new v8 WMS

bzr revid: odo@openerp.com-20140508143940-itpazj4eatznerw7
This commit is contained in:
Olivier Dony 2014-05-08 16:39:40 +02:00
parent 168b8e1d5e
commit 74d2f592bf
9 changed files with 22 additions and 29 deletions

View File

@ -152,7 +152,7 @@ class mrp_repair(osv.osv):
select=True, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='Selecting \'Before Repair\' or \'After Repair\' will allow you to generate invoice before or after the repair is done respectively. \'No invoice\' means you don\'t want to generate invoice for this repair order.'), select=True, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='Selecting \'Before Repair\' or \'After Repair\' will allow you to generate invoice before or after the repair is done respectively. \'No invoice\' means you don\'t want to generate invoice for this repair order.'),
'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True, track_visibility="onchange"), 'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True, track_visibility="onchange"),
'move_id': fields.many2one('stock.move', 'Move', readonly=True, help="Move created by the repair order", track_visibility="onchange"), 'move_id': fields.many2one('stock.move', 'Move', readonly=True, help="Move created by the repair order", track_visibility="onchange"),
'fees_lines': fields.one2many('mrp.repair.fee', 'repair_id', 'Fees Lines', readonly=True, states={'draft': [('readonly', False)]}), 'fees_lines': fields.one2many('mrp.repair.fee', 'repair_id', 'Fees', readonly=True, states={'draft': [('readonly', False)]}),
'internal_notes': fields.text('Internal Notes'), 'internal_notes': fields.text('Internal Notes'),
'quotation_notes': fields.text('Quotation Notes'), 'quotation_notes': fields.text('Quotation Notes'),
'company_id': fields.many2one('res.company', 'Company'), 'company_id': fields.many2one('res.company', 'Company'),

View File

@ -129,7 +129,7 @@
attrs="{'readonly':[('invoice_method','=', 'none')]}"/> attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
</group> </group>
<!-- <field name="invoice_id"/> --> <!-- <field name="invoice_id"/> -->
<separator string="Fees Lines"/> <separator string="Fees"/>
<field name="fees_lines" attrs="{'readonly': [('invoice_method','=', 'none')]}"> <field name="fees_lines" attrs="{'readonly': [('invoice_method','=', 'none')]}">
<form string="Fees" version="7.0"> <form string="Fees" version="7.0">
<label for="name" class="oe_edit_only"/> <label for="name" class="oe_edit_only"/>

View File

@ -707,11 +707,8 @@ class pos_order(osv.osv):
return False return False
def _get_out_picking_type(self, cr, uid, context=None): def _get_out_picking_type(self, cr, uid, context=None):
try: return self.pool.get('ir.model.data').xmlid_to_res_id(
picking_type = self.pool.get('ir.model.data').get_object(cr, uid, 'point_of_sale', 'picking_type_posout', context=context).id cr, uid, 'point_of_sale.picking_type_posout', context=context)
except:
picking_type = False
return picking_type
_defaults = { _defaults = {
'user_id': lambda self, cr, uid, context: uid, 'user_id': lambda self, cr, uid, context: uid,

View File

@ -11,7 +11,6 @@
<div t-field="o.partner_id" <div t-field="o.partner_id"
t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": true}'/> t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": true}'/>
User: <span t-field="o.user_id"/><br/> User: <span t-field="o.user_id"/><br/>
<span t-if="o.picking_type_id">Warehouse: <span t-field="o.picking_type_id"/><br/></span>
Date: <span t-field="o.date_order"/><br/> Date: <span t-field="o.date_order"/><br/>
</div> </div>
</div> </div>

View File

@ -21,15 +21,12 @@
import threading import threading
from openerp.osv import fields, osv from openerp.osv import osv
class procurement_compute_all(osv.osv_memory): class procurement_compute_all(osv.osv_memory):
_name = 'procurement.order.compute.all' _name = 'procurement.order.compute.all'
_description = 'Compute all schedulers' _description = 'Compute all schedulers'
_columns = {
}
def _procure_calculation_all(self, cr, uid, ids, context=None): def _procure_calculation_all(self, cr, uid, ids, context=None):
""" """
@param self: The object pointer. @param self: The object pointer.

View File

@ -1,8 +1,7 @@
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # Copyright (C) 2004-2014 OpenERP S.A. (<http://www.openerp.com>).
# Copyright (C) 2010-2011 OpenERP S.A. (<http://www.openerp.com>).
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as # it under the terms of the GNU Affero General Public License as
@ -23,8 +22,6 @@ from openerp.osv import fields
from openerp.osv import osv from openerp.osv import osv
class product_product(osv.osv): class product_product(osv.osv):
_name = 'product.product' _name = 'product.product'
_inherit = 'product.product' _inherit = 'product.product'

View File

@ -51,9 +51,9 @@ class sale_configuration(osv.osv_memory):
help="Allows you to tag sales order lines with properties."), help="Allows you to tag sales order lines with properties."),
'module_project_timesheet': fields.boolean("Project Timesheet"), 'module_project_timesheet': fields.boolean("Project Timesheet"),
'module_project_mrp': fields.boolean("Project MRP"), 'module_project_mrp': fields.boolean("Project MRP"),
'group_route_so_lines': fields.boolean('Choose MTO, Dropship, ... on sale order lines', 'group_route_so_lines': fields.boolean('Choose MTO, drop shipping,... on sales order lines',
implied_group='sale_stock.group_route_so_lines', implied_group='sale_stock.group_route_so_lines',
help="Allows you to set route on sale order lines."), help="Allows you to choose a delivery route on sales order lines"),
} }
_defaults = { _defaults = {

View File

@ -2,7 +2,7 @@
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # Copyright (C) 2014 OpenERP S.A. (<http://www.openerp.com>).
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as # it under the terms of the GNU Affero General Public License as
@ -20,31 +20,36 @@
############################################################################## ##############################################################################
{ {
'name': 'Dropshipping Module', 'name': 'Drop Shipping',
'version': '1.0', 'version': '1.0',
'category': 'Warehouse Management', 'category': 'Warehouse Management',
'summary': 'Dropshipping', 'summary': 'Drop Shipping',
'description': """ 'description': """
Manage sales quotations and stock locations Manage drop shipping orders
========================================== ===========================
This adds the route to make dropshipping sales orders in which the product sold are directly transfered from the reseller to the customer (direct delivery) without creating any internal document for the transfer. This module adds a pre-configured Drop Shipping picking type
as well as a procurement route that allow configuring Drop
Shipping products and orders.
When drop shipping is used the goods are directly transferred
from suppliers to customers (direct delivery) without
going through the retailer's warehouse. In this case no
internal transfer document is needed.
""", """,
'author': 'OpenERP SA', 'author': 'OpenERP SA',
'website': 'http://www.openerp.com', 'website': 'http://www.openerp.com',
'images': [], 'images': [],
'depends': ['purchase', 'sale_stock'], 'depends': ['purchase', 'sale_stock'],
'init_xml': [],
'data': ['stock_dropshipping.xml'], 'data': ['stock_dropshipping.xml'],
'demo_xml': [],
'test': [ 'test': [
'test/cancellation_propagated.yml', 'test/cancellation_propagated.yml',
'test/crossdock.yml', 'test/crossdock.yml',
'test/dropship.yml', 'test/dropship.yml',
'test/procurementexception.yml', 'test/procurementexception.yml',
'test/lifo_price.yml' 'test/lifo_price.yml'
], ],
'installable': True, 'installable': True,
'auto_install': False, 'auto_install': False,
} }

View File

@ -19,8 +19,6 @@
# #
############################################################################## ##############################################################################
import time
from openerp.osv import fields, osv from openerp.osv import fields, osv
import openerp.addons.decimal_precision as dp import openerp.addons.decimal_precision as dp
from openerp.tools.translate import _ from openerp.tools.translate import _