[IMP] removing complex and unuseful concepts
This commit is contained in:
Fabien Pinckaers
@@ -59,7 +59,6 @@ access_mrp_bom_line_salesman,mrp.bom.line,model_mrp_bom_line,base.group_sale_sal
|
||||
access_mrp_bom_line_stockuser,mrp.bom.line,model_mrp_bom_line,stock.group_stock_user,1,0,0,0
|
||||
access_product_uom_categ_mrp_manager,product.uom.categ mrp_manager,product.model_product_uom_categ,mrp.group_mrp_manager,1,1,1,1
|
||||
access_product_uom_mrp_manager,product.uom mrp_manager,product.model_product_uom,mrp.group_mrp_manager,1,1,1,1
|
||||
access_product_ul_mrp_manager,product.ul mrp_manager,product.model_product_ul,mrp.group_mrp_manager,1,1,1,1
|
||||
access_product_category_mrp_manager,product.category mrp_manager,product.model_product_category,mrp.group_mrp_manager,1,1,1,1
|
||||
access_product_template_mrp_manager,product.template mrp_manager,product.model_product_template,mrp.group_mrp_manager,1,1,1,1
|
||||
access_product_product_mrp_manager,product.product mrp_manager,product.model_product_product,mrp.group_mrp_manager,1,1,1,1
|
||||
|
||||
|
@@ -177,30 +177,6 @@ class product_uom(osv.osv):
|
||||
return {'value': {'factor': 1, 'factor_inv': 1}}
|
||||
return {}
|
||||
|
||||
def write(self, cr, uid, ids, vals, context=None):
|
||||
if isinstance(ids, (int, long)):
|
||||
ids = [ids]
|
||||
if 'category_id' in vals:
|
||||
for uom in self.browse(cr, uid, ids, context=context):
|
||||
if uom.category_id.id != vals['category_id']:
|
||||
raise UserError(_("Cannot change the category of existing Unit of Measure '%s'.") % (uom.name,))
|
||||
return super(product_uom, self).write(cr, uid, ids, vals, context=context)
|
||||
|
||||
|
||||
|
||||
class product_ul(osv.osv):
|
||||
_name = "product.ul"
|
||||
_description = "Logistic Unit"
|
||||
_columns = {
|
||||
'name' : fields.char('Name', select=True, required=True, translate=True),
|
||||
'type' : fields.selection([('unit','Unit'),('pack','Pack'),('box', 'Box'), ('pallet', 'Pallet')], 'Type', required=True),
|
||||
'height': fields.float('Height', help='The height of the package'),
|
||||
'width': fields.float('Width', help='The width of the package'),
|
||||
'length': fields.float('Length', help='The length of the package'),
|
||||
'weight': fields.float('Empty Package Weight'),
|
||||
}
|
||||
|
||||
|
||||
#----------------------------------------------------------
|
||||
# Categories
|
||||
#----------------------------------------------------------
|
||||
@@ -1189,55 +1165,19 @@ class product_product(osv.osv):
|
||||
class product_packaging(osv.osv):
|
||||
_name = "product.packaging"
|
||||
_description = "Packaging"
|
||||
_rec_name = 'barcode'
|
||||
_order = 'sequence'
|
||||
_columns = {
|
||||
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of packaging."),
|
||||
'name' : fields.text('Description'),
|
||||
'name' : fields.char('Packaging Type', required=True),
|
||||
'sequence': fields.integer('Sequence', help="The first in the sequence is the default one."),
|
||||
'product_tmpl_id': fields.many2one('product.template', string='Product'),
|
||||
'qty' : fields.float('Quantity by Package',
|
||||
help="The total number of products you can put by pallet or box."),
|
||||
'ul' : fields.many2one('product.ul', 'Package Logistic Unit', required=True),
|
||||
'ul_qty' : fields.integer('Package by layer', help='The number of packages by layer'),
|
||||
'ul_container': fields.many2one('product.ul', 'Pallet Logistic Unit'),
|
||||
'rows' : fields.integer('Number of Layers', required=True,
|
||||
help='The number of layers on a pallet or box'),
|
||||
'product_tmpl_id' : fields.many2one('product.template', 'Product', select=1, ondelete='cascade', required=True),
|
||||
'barcode' : fields.char('Barcode', help="The Barcode of the package unit.", oldname="ean"),
|
||||
'code' : fields.char('Code', help="The code of the transport unit."),
|
||||
'weight': fields.float('Total Package Weight',
|
||||
help='The weight of a full package, pallet or box.'),
|
||||
'barcode' : fields.char('Barcode', help="The Barcode of the package unit."),
|
||||
}
|
||||
|
||||
def name_get(self, cr, uid, ids, context=None):
|
||||
if not len(ids):
|
||||
return []
|
||||
res = []
|
||||
for pckg in self.browse(cr, uid, ids, context=context):
|
||||
p_name = pckg.barcode and '[' + pckg.barcode + '] ' or ''
|
||||
p_name += pckg.ul.name
|
||||
res.append((pckg.id,p_name))
|
||||
return res
|
||||
|
||||
def _get_1st_ul(self, cr, uid, context=None):
|
||||
cr.execute('select id from product_ul order by id asc limit 1')
|
||||
res = cr.fetchone()
|
||||
return (res and res[0]) or False
|
||||
|
||||
_defaults = {
|
||||
'rows' : 3,
|
||||
'sequence' : 1,
|
||||
'ul' : _get_1st_ul,
|
||||
}
|
||||
|
||||
def checksum(ean):
|
||||
salt = '31' * 6 + '3'
|
||||
sum = 0
|
||||
for ean_part, salt_part in zip(ean, salt):
|
||||
sum += int(ean_part) * int(salt_part)
|
||||
return (10 - (sum % 10)) % 10
|
||||
checksum = staticmethod(checksum)
|
||||
|
||||
|
||||
|
||||
class product_supplierinfo(osv.osv):
|
||||
_name = "product.supplierinfo"
|
||||
|
||||
@@ -27,15 +27,6 @@
|
||||
<field name="name">Physical</field>
|
||||
</record>
|
||||
|
||||
<record id="product_ul_box" model="product.ul">
|
||||
<field name="name">Box 20x20x40</field>
|
||||
<field name="type">box</field>
|
||||
</record>
|
||||
<record id="product_ul_big_box" model="product.ul">
|
||||
<field name="name">Box 30x40x60</field>
|
||||
<field name="type">box</field>
|
||||
</record>
|
||||
|
||||
<!-- Apple Products -->
|
||||
<!--
|
||||
Resource: product.product
|
||||
|
||||
+13
-106
@@ -114,7 +114,7 @@
|
||||
</group>
|
||||
</group>
|
||||
<group name="packaging" string="Packaging" attrs="{'invisible':[('type','=','service')]}" groups="product.group_stock_packaging" colspan="4">
|
||||
<field name="packaging_ids" string="Configurations" context="{'tree_view_ref':'product.product_packaging_tree_view_product', 'form_view_ref': 'product.product_packaging_form_view_without_product'}"/>
|
||||
<field name="packaging_ids" nolabel="1"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Sales" attrs="{'invisible':[('sale_ok','=',False)]}" name="sales">
|
||||
@@ -684,55 +684,6 @@
|
||||
</record>
|
||||
<menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="product.prod_config_main" sequence="7" groups="base.group_no_one"/>
|
||||
|
||||
<record id="product_ul_form_view" model="ir.ui.view">
|
||||
<field name="name">product.ul.form.view</field>
|
||||
<field name="model">product.ul</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Logistic Units">
|
||||
<sheet>
|
||||
<group>
|
||||
<field name="name"/>
|
||||
<field name="type"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="height"/>
|
||||
<field name="width"/>
|
||||
<field name="length"/>
|
||||
<field name="weight"/>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
<record id="product_ul_tree" model="ir.ui.view">
|
||||
<field name="name">product.ul.tree</field>
|
||||
<field name="model">product.ul</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Logistic Units">
|
||||
<field name="name"/>
|
||||
<field name="type"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
<record id="product_ul_form_action" model="ir.actions.act_window">
|
||||
<field name="name">Logistic Units</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">product.ul</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="help" type="html">
|
||||
<p class="oe_view_nocontent_create">
|
||||
Click to add a new Logistic Unit
|
||||
</p><p>
|
||||
The logistic unit defines the container used for the package.
|
||||
It has a type (e.g. pallet, box, ...) and you can specify its
|
||||
size.
|
||||
</p>
|
||||
</field>
|
||||
</record>
|
||||
<menuitem
|
||||
action="product_ul_form_action" groups="product.group_stock_packaging" id="menu_product_ul_form_action" parent="prod_config_main" sequence="3"/>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_packaging_view">
|
||||
<field name="name">Packagings</field>
|
||||
<field name="res_model">product.packaging</field>
|
||||
@@ -745,25 +696,8 @@
|
||||
<tree string="Packaging">
|
||||
<field name="sequence" widget="handle"/>
|
||||
<field name="name"/>
|
||||
<field name="product_tmpl_id"/>
|
||||
<field name="qty"/>
|
||||
<field name="barcode"/>
|
||||
<field name="qty"/>
|
||||
<field name="ul"/>
|
||||
<field name="ul_container"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="product_packaging_tree_view_product" model="ir.ui.view">
|
||||
<field name="name">product.packaging.tree.view.product</field>
|
||||
<field name="model">product.packaging</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Packaging">
|
||||
<field name="qty"/>
|
||||
<field name="ul"/>
|
||||
<field name="ul_qty"/>
|
||||
<field name="rows"/>
|
||||
<field name="ul_container"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
@@ -774,50 +708,23 @@
|
||||
<field name="arch" type="xml">
|
||||
<form string="Packaging">
|
||||
<sheet>
|
||||
<group col="4">
|
||||
<field name="product_tmpl_id"/>
|
||||
<newline/>
|
||||
<field name="barcode"/>
|
||||
<field name="sequence" invisible="1"/>
|
||||
<newline/>
|
||||
<field name="qty"/>
|
||||
<field name="ul"/>
|
||||
<separator colspan="4" string="Palletization"/>
|
||||
<field name="ul_qty"/>
|
||||
<field name="rows"/>
|
||||
<field name="ul_container"/>
|
||||
<field name="weight"/>
|
||||
<separator colspan="4" string="Other Info"/>
|
||||
<field colspan="4" name="name"/>
|
||||
<label for="name"/>
|
||||
<h1>
|
||||
<field name="name"/>
|
||||
</h1>
|
||||
<group>
|
||||
<group>
|
||||
<field name="qty"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="barcode"/>
|
||||
</group>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="product_packaging_form_view_without_product" model="ir.ui.view">
|
||||
<field name="name">product.packaging.form.view.without.product</field>
|
||||
<field name="model">product.packaging</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Packaging">
|
||||
<group col="4">
|
||||
<field name="barcode"/>
|
||||
<field name="sequence" invisible="1"/>
|
||||
<newline/>
|
||||
<field name="qty"/>
|
||||
<field name="ul"/>
|
||||
<separator colspan="4" string="Palletization"/>
|
||||
<field name="ul_qty"/>
|
||||
<field name="rows"/>
|
||||
<field name="ul_container"/>
|
||||
<field name="weight"/>
|
||||
<separator colspan="4" string="Other Info"/>
|
||||
<field colspan="4" name="name"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="product_supplierinfo_form_view" model="ir.ui.view">
|
||||
<field name="name">product.supplierinfo.form.view</field>
|
||||
<field name="model">product.supplierinfo</field>
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
|
||||
access_product_uom_categ_user,product.uom.categ.user,model_product_uom_categ,base.group_user,1,0,0,0
|
||||
access_product_uom_user,product.uom.user,model_product_uom,base.group_user,1,0,0,0
|
||||
access_product_ul_user,product.ul.user,model_product_ul,base.group_user,1,0,0,0
|
||||
access_product_category_user,product.category.user,model_product_category,base.group_user,1,0,0,0
|
||||
access_product_template_user,product.template.user,model_product_template,base.group_user,1,0,0,0
|
||||
access_product_packaging_user,product.packaging.user,model_product_packaging,base.group_user,1,0,0,0
|
||||
|
||||
|
@@ -23,12 +23,7 @@
|
||||
<record id="product_package_jambon" model="product.packaging">
|
||||
<field name="name">box of 10</field>
|
||||
<field name="qty">12</field>
|
||||
<field name="ul" ref="product.product_ul_box" />
|
||||
<field name="ul_qty">6</field>
|
||||
<field name="rows">4</field>
|
||||
<field name="product_tmpl_id" ref="product_product_jambon_product_template" />
|
||||
<field name="barcode"></field>
|
||||
<field name="weight">10</field>
|
||||
</record>
|
||||
|
||||
<record id="product_product_from" model="product.product">
|
||||
@@ -51,12 +46,7 @@
|
||||
<record id="product_package_from" model="product.packaging">
|
||||
<field name="name">Box of 5</field>
|
||||
<field name="qty">12</field>
|
||||
<field name="ul" ref="product.product_ul_box" />
|
||||
<field name="ul_qty">6</field>
|
||||
<field name="rows">4</field>
|
||||
<field name="product_tmpl_id" ref="product_product_from_product_template" />
|
||||
<field name="barcode"></field>
|
||||
<field name="weight">10</field>
|
||||
</record>
|
||||
|
||||
<record id="product_product_pain" model="product.product">
|
||||
@@ -79,12 +69,7 @@
|
||||
<record id="product_package_pain" model="product.packaging">
|
||||
<field name="name">Bag of 2</field>
|
||||
<field name="qty">6</field>
|
||||
<field name="ul" ref="product.product_ul_box" />
|
||||
<field name="ul_qty">6</field>
|
||||
<field name="rows">4</field>
|
||||
<field name="product_tmpl_id" ref="product_product_pain_product_template" />
|
||||
<field name="barcode"></field>
|
||||
<field name="weight">10</field>
|
||||
</record>
|
||||
|
||||
<record id="product_product_lait" model="product.product">
|
||||
@@ -107,12 +92,7 @@
|
||||
<record id="product_package_lait" model="product.packaging">
|
||||
<field name="name">Boxes of 1 liter</field>
|
||||
<field name="qty">4</field>
|
||||
<field name="ul" ref="product.product_ul_box" />
|
||||
<field name="ul_qty">6</field>
|
||||
<field name="rows">4</field>
|
||||
<field name="product_tmpl_id" ref="product_product_lait_product_template" />
|
||||
<field name="barcode"></field>
|
||||
<field name="weight">10</field>
|
||||
</record>
|
||||
</data>
|
||||
</openerp>
|
||||
|
||||
@@ -37,7 +37,6 @@ access_account_analytic_line,account.analytic.line,account.model_account_analyti
|
||||
access_res_partner_purchase_manager,res.partner.purchase.manager,base.model_res_partner,group_purchase_manager,1,1,1,0
|
||||
access_product_uom_categ_purchase_manager,product.uom.categ purchase_manager,product.model_product_uom_categ,purchase.group_purchase_manager,1,1,1,1
|
||||
access_product_uom_purchase_manager,product.uom purchase_manager,product.model_product_uom,purchase.group_purchase_manager,1,1,1,1
|
||||
access_product_ul_purchase_manager,product.ul purchase_manager,product.model_product_ul,purchase.group_purchase_manager,1,1,1,1
|
||||
access_product_category_purchase_manager,product.category purchase_manager,product.model_product_category,purchase.group_purchase_manager,1,1,1,1
|
||||
access_product_template_purchase_manager,product.template purchase_manager,product.model_product_template,purchase.group_purchase_manager,1,1,1,1
|
||||
access_product_packaging_purchase_manager,product.packaging purchase_manager,product.model_product_packaging,purchase.group_purchase_manager,1,1,1,1
|
||||
|
||||
|
@@ -809,7 +809,6 @@ class sale_order_line(osv.osv):
|
||||
'price_subtotal': fields.function(_amount_line, string='Subtotal', digits=0),
|
||||
'price_reduce': fields.function(_get_price_reduce, type='float', string='Price Reduce', digits_compute=dp.get_precision('Product Price')),
|
||||
'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft': [('readonly', False)]}),
|
||||
'address_allotment_id': fields.many2one('res.partner', 'Allotment Partner',help="A partner to whom the particular product needs to be allotted."),
|
||||
'product_uom_qty': fields.float('Quantity', digits_compute= dp.get_precision('Product UoS'), required=True, readonly=True, states={'draft': [('readonly', False)]}),
|
||||
'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, readonly=True, states={'draft': [('readonly', False)]}),
|
||||
'product_uos_qty': fields.float('Quantity (UoS)' ,digits_compute= dp.get_precision('Product UoS'), readonly=True, states={'draft': [('readonly', False)]}),
|
||||
|
||||
@@ -213,8 +213,6 @@
|
||||
<group>
|
||||
<field name="tax_id" widget="many2many_tags" domain="[('type_tax_use','=','sale')]"/>
|
||||
<field name="th_weight"/>
|
||||
<!-- we should put a config wizard for these two fields -->
|
||||
<field name="address_allotment_id"/>
|
||||
</group>
|
||||
</group>
|
||||
<label for="name"/>
|
||||
|
||||
@@ -28,7 +28,6 @@ access_product_pricelist_sale_user,product.pricelist.sale.user,product.model_pro
|
||||
access_account_account_salesman,account_account salesman,account.model_account_account,base.group_sale_salesman,1,0,0,0
|
||||
access_product_uom_categ_sale_manager,product.uom.categ salemanager,product.model_product_uom_categ,base.group_sale_manager,1,1,1,1
|
||||
access_product_uom_sale_manager,product.uom salemanager,product.model_product_uom,base.group_sale_manager,1,1,1,1
|
||||
access_product_ul_sale_manager,product.ul salemanager,product.model_product_ul,base.group_sale_manager,1,1,1,1
|
||||
access_product_category_sale_manager,product.category salemanager,product.model_product_category,base.group_sale_manager,1,1,1,1
|
||||
access_product_supplierinfo_user,product.supplierinfo.user,product.model_product_supplierinfo,base.group_sale_salesman,1,0,0,0
|
||||
access_product_supplierinfo_sale_manager,product.supplierinfo salemanager,product.model_product_supplierinfo,base.group_sale_manager,1,1,1,1
|
||||
|
||||
|
@@ -21,7 +21,7 @@
|
||||
<field name="model">sale.order</field>
|
||||
<field name="inherit_id" ref="sale.view_order_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='address_allotment_id']" position="after">
|
||||
<xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='th_weight']" position="after">
|
||||
<field name="property_ids" widget="many2many_tags"
|
||||
groups="sale.group_mrp_properties"/>
|
||||
</xpath>
|
||||
|
||||
@@ -27,7 +27,6 @@ access_product_product_stock_user,product_product_stock_user,product.model_produ
|
||||
access_product_template_stock_user,product.template stock user,product.model_product_template,stock.group_stock_user,1,1,0,0
|
||||
access_product_uom_categ_stock_manager,product.uom.categ stock_manager,product.model_product_uom_categ,stock.group_stock_manager,1,1,1,1
|
||||
access_product_uom_stock_manager,product.uom stock_manager,product.model_product_uom,stock.group_stock_manager,1,1,1,1
|
||||
access_product_ul_stock_manager,product.ul stock_manager,product.model_product_ul,stock.group_stock_manager,1,1,1,1
|
||||
access_product_category_stock_manager,product.category stock_manager,product.model_product_category,stock.group_stock_manager,1,1,1,1
|
||||
access_product_template_stock_manager,product.template stock_manager,product.model_product_template,stock.group_stock_manager,1,1,1,1
|
||||
access_product_product_stock_manager,product.product stock_manager,product.model_product_product,stock.group_stock_manager,1,1,1,1
|
||||
|
||||
|
@@ -3838,7 +3838,6 @@ class stock_package(osv.osv):
|
||||
'parent_left': fields.integer('Left Parent', select=1),
|
||||
'parent_right': fields.integer('Right Parent', select=1),
|
||||
'packaging_id': fields.many2one('product.packaging', 'Packaging', help="This field should be completed only if everything inside the package share the same product, otherwise it doesn't really makes sense.", select=True),
|
||||
'ul_id': fields.many2one('product.ul', 'Logistic Unit'),
|
||||
'location_id': fields.function(_get_package_info, type='many2one', relation='stock.location', string='Location', multi="package",
|
||||
store={
|
||||
'stock.quant': (_get_packages, ['location_id'], 10),
|
||||
|
||||
@@ -34,9 +34,6 @@
|
||||
<menuitem
|
||||
action="product.product_template_action" id="menu_product_template_config_stock"
|
||||
parent="stock.menu_product_in_config_stock" sequence="1"/>
|
||||
<menuitem
|
||||
action="product.product_ul_form_action" groups="product.group_stock_packaging"
|
||||
id="menu_product_packaging_stock_action" parent="stock.menu_packs_config" sequence="99"/>
|
||||
<menuitem
|
||||
id="menu_stock_unit_measure_stock" name="Units of Measure"
|
||||
parent="stock.menu_product_in_config_stock" sequence="35" groups="product.group_uom"/>
|
||||
@@ -1873,7 +1870,6 @@
|
||||
</div>
|
||||
<group>
|
||||
<group>
|
||||
<field name="ul_id"/>
|
||||
<field name="packaging_id"/>
|
||||
<field name='company_id' groups="base.group_multi_company"/>
|
||||
<field name='owner_id' groups="stock.group_tracking_owner"/>
|
||||
@@ -1899,7 +1895,6 @@
|
||||
<field name="children_ids">
|
||||
<tree string="Contained Packages">
|
||||
<field name="complete_name"/>
|
||||
<field name="ul_id"/>
|
||||
<field name="packaging_id"/>
|
||||
<field name="location_id"/>
|
||||
</tree>
|
||||
@@ -1919,7 +1914,6 @@
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Package">
|
||||
<field name="complete_name"/>
|
||||
<field name="ul_id"/>
|
||||
<field name="packaging_id"/>
|
||||
<field name="location_id"/>
|
||||
<field name="company_id"/>
|
||||
@@ -1934,7 +1928,6 @@
|
||||
<search string="Package">
|
||||
<field name="name" string="Package Name"/>
|
||||
<field name="location_id"/>
|
||||
<field name="ul_id"/>
|
||||
<field name="packaging_id"/>
|
||||
<group expand='0' string='Group by...'>
|
||||
<filter string='Location' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'location_id'}"/>
|
||||
|
||||
Reference in New Issue
Block a user