Merge lp:~unifield-team/unifield-server/us-2156 into lp:unifield-server

[Quentin THEURET @Amaris]

Unmerged revisions

4231. By Quentin THEURET @Amaris on 2017-02-21

Merge https://code.launchpad.net/~jfb-tempo-consulting/unifield-server/utp-830

=== added file 'bin/objects_categories.py'
--- bin/objects_categories.py	1970-01-01 00:00:00 +0000
+++ bin/objects_categories.py	2017-02-22 08:05:00 +0000
@@ -0,0 +1,332 @@
+# -*- coding: utf-8 -*-
+
+SUPPLY_OBJECTS = [
+ 'add.event',
+ 'allocation.stock.setup',
+ 'assign.to.kit',
+ 'assign.to.kit.line',
+ 'auto.supply.rules.report',
+ 'change.dest.location',
+ 'change.product.memory.move',
+ 'change.product.move.processor',
+ 'claim.event',
+ 'claim.product.line',
+ 'composition.item',
+ 'composition.kit',
+ 'cost.center.distribution.line',
+ 'country.export.mapping',
+ 'create.picking',
+ 'create.picking.move.processor',
+ 'create.picking.processor',
+ 'delivery.process.setup',
+ 'documents.done.problem',
+ 'documents.done.problem.line',
+ 'documents.done.wizard',
+ 'enter.reason',
+ 'expected.sale.order.line',
+ 'expiry.quantity.report',
+ 'expiry.quantity.report.line',
+ 'export.report.stock.inventory',
+ 'export.report.stock.move',
+ 'field.orders.setup',
+ 'fixed.asset.setup',
+ 'from.supplier.choose.catalogue',
+ 'import_category',
+ 'import_nomenclature',
+ 'import_product',
+ 'incoming.import.xml.line',
+ 'initial.stock.inventory',
+ 'initial.stock.inventory.line',
+ 'internal.move.processor',
+ 'internal.picking.processor',
+ 'international.transport.cost.report',
+ 'kit.creation',
+ 'kit.creation.to.consume',
+ 'kit.mass.import',
+ 'kit.selection',
+ 'kit.selection.line',
+ 'kit.selection.sale',
+ 'kit.selection.sale.line',
+ 'local.transport.cost.report',
+ 'make.procurement',
+ 'memory.additionalitems',
+ 'min.max.rules.report',
+ 'mission.stock.wizard',
+ 'modify.expiry.date',
+ 'monthly.review.consumption',
+ 'monthly.review.consumption.line',
+ 'mrp.property',
+ 'mrp.property.group',
+ 'multiple.sourcing.wizard',
+ 'old.product.list.line',
+ 'order.cycle.rules.report',
+ 'outgoing.delivery.move.processor',
+ 'outgoing.delivery.processor',
+ 'pack.family.memory',
+ 'pack.type',
+ 'picking.tools',
+ 'po.follow.up',
+ 'ppl.customize.label',
+ 'ppl.family.processor',
+ 'ppl.move.processor',
+ 'ppl.processor',
+ 'pricelist.partnerinfo',
+ 'process.to.consume',
+ 'process.to.consume.line',
+ 'procurement.batch.cron',
+ 'procurement.cycle.compute.all',
+ 'procurement.min.max.compute.all',
+ 'procurement.order',
+ 'procurement.order.compute',
+ 'procurement.order.compute.all',
+ 'procurement.orderpoint.compute',
+ 'procurement.purchase.compute.all',
+ 'procurement.request.import',
+ 'procurement.request.sourcing.document',
+ 'procurement.rules.report',
+ 'procurement.supply.compute.all',
+ 'product.asset',
+ 'product.asset.event',
+ 'product.asset.type',
+ 'product.category',
+ 'product.cold_chain',
+ 'product.deactivation.error',
+ 'product.deactivation.error.line',
+ 'product.heat_sensitive',
+ 'product.history.consumption',
+ 'product.history.consumption.month',
+ 'product.history.consumption.product',
+ 'product.international.status',
+ 'product.justification.code',
+ 'product.likely.expire.report',
+ 'product.likely.expire.report.item',
+ 'product.likely.expire.report.item.line',
+ 'product.likely.expire.report.line',
+ 'product.list',
+ 'product.list.add.products',
+ 'product.list.line',
+ 'product.manufacturer.attribute',
+ 'product.nomenclature',
+ 'product.packaging',
+ 'product.price.type',
+ 'product.price_list',
+ 'product.pricelist',
+ 'product.pricelist.item',
+ 'product.pricelist.type',
+ 'product.pricelist.version',
+ 'product.product',
+ 'product.product.import.line.qty',
+ 'product.section.code',
+ 'product.status',
+ 'product.supplierinfo',
+ 'product.supply.source',
+ 'product.template',
+ 'product.to.list',
+ 'product.ul',
+ 'product.uom',
+ 'product.uom.categ',
+ 'product.where.used',
+ 'project.leadtime.setup',
+ 'purchase.double.validation.installer',
+ 'purchase.import.xml.line',
+ 'purchase.installer',
+ 'purchase.line.import.xml.line',
+ 'purchase.order',
+ 'purchase.order.cancel.wizard',
+ 'purchase.order.change.currency',
+ 'purchase.order.confirm.wizard',
+ 'purchase.order.followup',
+ 'purchase.order.followup.from.menu',
+ 'purchase.order.followup.line',
+ 'purchase.order.group',
+ 'purchase.order.line',
+ 'purchase.order.line.allocation.report',
+ 'purchase.order.line.to.split',
+ 'purchase.order.line.unlink.wizard',
+ 'purchase.order.line_invoice',
+ 'purchase.order.merged.line',
+ 'purchase.order.simu.import.file',
+ 'purchase.report',
+ 'real.average.consumption',
+ 'real.average.consumption.line',
+ 'real.consumption.change.location',
+ 'report.batch.recall',
+ 'report.stock.inventory',
+ 'report.stock.lines.date',
+ 'report.stock.move',
+ 'return.claim',
+ 'return.pack.shipment.family.processor',
+ 'return.pack.shipment.processor',
+ 'return.ppl.move.processor',
+ 'return.ppl.processor',
+ 'return.shipment.family.processor',
+ 'return.shipment.processor',
+ 'sale.advance.payment.inv',
+ 'sale.config.picking_policy',
+ 'sale.followup.multi.wizard',
+ 'sale.installer',
+ 'sale.make.invoice',
+ 'sale.open.invoice',
+ 'sale.order',
+ 'sale.order.cancelation.wizard',
+ 'sale.order.change.currency',
+ 'sale.order.followup',
+ 'sale.order.followup.from.menu',
+ 'sale.order.followup.test',
+ 'sale.order.leave.close',
+ 'sale.order.line',
+ 'sale.order.line.cancel',
+ 'sale.order.line.followup',
+ 'sale.order.line.make.invoice',
+ 'sale.order.sourcing.progress',
+ 'sale.order.sourcing.progress.mem',
+ 'sale.order.unlink.wizard',
+ 'sale.price.setup',
+ 'sale.receipt.report',
+ 'sale.report',
+ 'sale.shop',
+ 'shipment',
+ 'shipment.additional.line.processor',
+ 'shipment.additionalitems',
+ 'shipment.family.processor',
+ 'shipment.processor',
+ 'shipment.wizard',
+ 'split.memory.move',
+ 'split.move',
+ 'split.move.processor',
+ 'split.purchase.order.line.wizard',
+ 'split.sale.order.line.wizard',
+ 'standard.price.track.changes',
+ 'stock.analyze.view',
+ 'stock.batch.recall',
+ 'stock.card.wizard',
+ 'stock.card.wizard.line',
+ 'stock.certificate.picking',
+ 'stock.certificate.valuation',
+ 'stock.change.product.qty',
+ 'stock.change.standard.price',
+ 'stock.cost.reevaluation',
+ 'stock.cost.reevaluation.line',
+ 'stock.fill.inventory',
+ 'stock.forecast',
+ 'stock.forecast.export',
+ 'stock.forecast.line',
+ 'stock.frequence',
+ 'stock.incoming.processor',
+ 'stock.incoterms',
+ 'stock.inventory',
+ 'stock.inventory.line',
+ 'stock.inventory.line.split',
+ 'stock.inventory.merge',
+ 'stock.invoice.onshipping',
+ 'stock.journal',
+ 'stock.location',
+ 'stock.location.chained.options',
+ 'stock.location.configuration.wizard',
+ 'stock.location.product',
+ 'stock.mission.report',
+ 'stock.mission.report.line',
+ 'stock.move',
+ 'stock.move.cancel.wizard',
+ 'stock.move.consume',
+ 'stock.move.in.processor',
+ 'stock.move.memory.families',
+ 'stock.move.memory.in',
+ 'stock.move.memory.out',
+ 'stock.move.memory.picking',
+ 'stock.move.memory.ppl',
+ 'stock.move.memory.returnproducts',
+ 'stock.move.memory.shipment.additionalitems',
+ 'stock.move.memory.shipment.create',
+ 'stock.move.memory.shipment.returnpacks',
+ 'stock.move.memory.shipment.returnpacksfromshipment',
+ 'stock.move.processor',
+ 'stock.move.scrap',
+ 'stock.move.split',
+ 'stock.move.split.lines',
+ 'stock.move.split.lines.exist',
+ 'stock.move.track',
+ 'stock.move.tracking',
+ 'stock.partial.move',
+ 'stock.partial.picking',
+ 'stock.picking',
+ 'stock.picking.cancel.wizard',
+ 'stock.picking.not.available',
+ 'stock.picking.processing.info',
+ 'stock.picking.processor',
+ 'stock.print.certificate',
+ 'stock.production.lot',
+ 'stock.production.lot.revision',
+ 'stock.reason.type',
+ 'stock.remove.location.wizard',
+ 'stock.replacement',
+ 'stock.replacement.result',
+ 'stock.report.prodlots',
+ 'stock.report.prodlots.virtual',
+ 'stock.report.tracklots',
+ 'stock.return.picking',
+ 'stock.split.into',
+ 'stock.tracking',
+ 'stock.ups',
+ 'stock.ups.final',
+ 'stock.ups.upload',
+ 'stock.warehouse',
+ 'stock.warehouse.automatic.supply',
+ 'stock.warehouse.automatic.supply.line',
+ 'stock.warehouse.order.cycle',
+ 'stock.warehouse.order.cycle.line',
+ 'stock.warehouse.orderpoint',
+ 'stock.warehouse.orderpoint.line',
+ 'substitute',
+ 'substitute.item',
+ 'substitute.item.mirror',
+ 'supplier.catalogue',
+ 'supplier.catalogue.line',
+ 'supplier.historical.catalogue',
+ 'tender',
+ 'tender.cancel.wizard',
+ 'tender.line',
+ 'tender.line.cancel.wizard',
+ 'threshold.value',
+ 'threshold.value.compute.all',
+ 'threshold.value.line',
+ 'threshold.value.rules.report',
+ 'unconsistent.stock.report',
+ 'unconsistent.stock.report.line',
+ 'uom.tools',
+ 'update.lines',
+ 'update_product',
+ 'validate.move.processor',
+ 'validate.picking.processor',
+ 'weekly.forecast.report',
+ 'wizard.choose.supplier',
+ 'wizard.choose.supplier.line',
+ 'wizard.common.import.line',
+ 'wizard.compare.rfq',
+ 'wizard.compare.rfq.line',
+ 'wizard.delete.lines',
+ 'wizard.export.fmc',
+ 'wizard.export.po',
+ 'wizard.export.po.validated',
+ 'wizard.export.rac',
+ 'wizard.import.auto.supply.line',
+ 'wizard.import.fmc',
+ 'wizard.import.fo.line',
+ 'wizard.import.in.line.simulation.screen',
+ 'wizard.import.in.simulation.screen',
+ 'wizard.import.ir.line',
+ 'wizard.import.order.cycle.line',
+ 'wizard.import.pick.line',
+ 'wizard.import.po',
+ 'wizard.import.po.line',
+ 'wizard.import.po.simulation.screen',
+ 'wizard.import.po.simulation.screen.line',
+ 'wizard.import.product.list',
+ 'wizard.import.rac',
+ 'wizard.import.stock.warehouse.orderpoint.line',
+ 'wizard.import.tender.line',
+ 'wizard.import.threshold.value.line',
+ 'wizard.incoming.xml.export',
+ 'wizard.simu.import.po.line',
+ 'wizard.valid.line',
+]
 
=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2017-02-20 10:12:46 +0000
+++ bin/osv/orm.py	2017-02-22 08:05:00 +0000
@@ -1284,6 +1284,8 @@
                     if getattr(field_col, arg, None):
                         res[f][arg] = getattr(field_col, arg)
 
+                if field_col._type == 'float' and self.is_supply:
+                    res[f]['truncate'] = True
                 context_lang = context and context.get('lang', False) or 'en_US'
                 if field_col.string and context_lang != 'en_US':
                     res_trans = translation_obj._get_source(cr, user,
 
=== modified file 'bin/osv/osv.py'
--- bin/osv/osv.py	2016-11-04 13:19:03 +0000
+++ bin/osv/osv.py	2017-02-22 08:05:00 +0000
@@ -33,6 +33,7 @@
 from tools.translate import translate
 import time
 import random
+import objects_categories
 
 module_list = []
 module_class_list = {}
@@ -298,6 +299,9 @@
     def __init__(self, pool, cr):
         pool.add(self._name, self)
         self.pool = pool
+        self.is_supply = False
+        if self._name in objects_categories.SUPPLY_OBJECTS:
+            self.is_supply = True
         super(osv_base, self).__init__(cr)
 
     def __new__(cls):