diff --git a/__tryton__.py b/__tryton__.py index 043d7a2948..8295f663f4 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -12,11 +12,11 @@ 'description': '''Stock Management and Inventory Control with: - Location definition - Stock move - - Packing Supplier / Customer / Internal + - Shipment: Supplier, Customer or Internal - Stock Inventory And with reports: - - Customer Packing + - Customer Shipment - Products by Locations ''', 'description_de_DE': '''Lagerverwaltung und Bestandskontrolle mit: diff --git a/move.py b/move.py index 2271d9146a..2f4a60fcae 100644 --- a/move.py +++ b/move.py @@ -37,16 +37,16 @@ class Move(ModelSQL, ModelView): required=True, states=STATES, domain="[('type', 'not in', " \ "('warehouse', 'view'))]") - packing_in = fields.Many2One('stock.packing.in', 'Supplier Packing', + packing_in = fields.Many2One('stock.packing.in', 'Supplier Shipment', readonly=True, select=1) - packing_out = fields.Many2One('stock.packing.out', 'Customer Packing', + packing_out = fields.Many2One('stock.packing.out', 'Customer Shipment', readonly=True, select=1) packing_out_return = fields.Many2One('stock.packing.out.return', - 'Customer Return Packing', readonly=True, select=1) + 'Customer Return Shipment', readonly=True, select=1) packing_in_return = fields.Many2One('stock.packing.in.return', - 'Supplier Return Packing', readonly=True, select=1) + 'Supplier Return Shipment', readonly=True, select=1) packing_internal = fields.Many2One('stock.packing.internal', - 'Internal Packing', readonly=True, select=1) + 'Internal Shipment', readonly=True, select=1) planned_date = fields.Date("Planned Date", states=STATES, select=2) effective_date = fields.Date("Effective Date", readonly=True, select=2) state = fields.Selection([ @@ -87,7 +87,7 @@ class Move(ModelSQL, ModelView): ('check_packing_in_out', 'CHECK(NOT(packing_in IS NOT NULL ' \ 'AND packing_out IS NOT NULL))', - 'Move can not be in both Supplier and Customer Packing'), + 'Move can not be in both Supplier and Customer Shipment'), ] self._constraints += [ ('check_product_type', 'service_product'), diff --git a/packing.py b/packing.py index b950528066..577af77100 100644 --- a/packing.py +++ b/packing.py @@ -1,6 +1,6 @@ #This file is part of Tryton. The COPYRIGHT file at the top level of #this repository contains the full copyright notices and license terms. -"Packing" +"Shipment" from trytond.model import ModelWorkflow, ModelView, ModelSQL, fields from trytond.report import CompanyReport from trytond.wizard import Wizard @@ -13,7 +13,7 @@ STATES = { class PackingIn(ModelWorkflow, ModelSQL, ModelView): - "Supplier Packing" + "Supplier Shipment" _name = 'stock.packing.in' _description = __doc__ _rec_name = 'code' @@ -292,7 +292,7 @@ PackingIn() class PackingInReturn(ModelWorkflow, ModelSQL, ModelView): - "Supplier Return Packing" + "Supplier Return Shipment" _name = 'stock.packing.in.return' _description = __doc__ _rec_name = 'code' @@ -444,7 +444,7 @@ PackingInReturn() class PackingOut(ModelWorkflow, ModelSQL, ModelView): - "Customer Packing" + "Customer Shipment" _name = 'stock.packing.out' _description = __doc__ _rec_name = 'code' @@ -832,7 +832,7 @@ PackingOut() class PackingOutReturn(ModelWorkflow, ModelSQL, ModelView): - "Customer Return Packing" + "Customer Return Shipment" _name = 'stock.packing.out.return' _description = __doc__ _rec_name = 'code' @@ -1109,7 +1109,7 @@ PackingOutReturn() class AssignPackingOutAskForce(ModelView): - 'Assign Packing Out Ask Force' + 'Assign Shipment Out Ask Force' _name = 'stock.packing.out.assign.ask_force' _description = __doc__ @@ -1120,7 +1120,7 @@ AssignPackingOutAskForce() class AssignPackingOut(Wizard): - 'Assign Packing Out' + 'Assign Shipment Out' _name = 'stock.packing.out.assign' states = { 'init': { @@ -1179,7 +1179,7 @@ AssignPackingOut() class PackingInternal(ModelWorkflow, ModelSQL, ModelView): - "Internal Packing" + "Internal Shipment" _name = 'stock.packing.internal' _description = __doc__ _rec_name = 'code' @@ -1308,7 +1308,7 @@ Address() class AssignPackingInternalAskForce(ModelView): - 'Assign Packing Internal Ask Force' + 'Assign Shipment Internal Ask Force' _name = 'stock.packing.internal.assign.ask_force' _description = __doc__ @@ -1319,7 +1319,7 @@ AssignPackingInternalAskForce() class AssignPackingInternal(Wizard): - 'Assign Packing Internal' + 'Assign Shipment Internal' _name = 'stock.packing.internal.assign' states = { 'init': { @@ -1377,7 +1377,7 @@ AssignPackingInternal() class AssignPackingInReturnAskForce(ModelView): - 'Assign Supplier Return Packing Ask Force' + 'Assign Supplier Return Shipment Ask Force' _name = 'stock.packing.in.return.assign.ask_force' _description = __doc__ @@ -1388,7 +1388,7 @@ AssignPackingInReturnAskForce() class AssignPackingInReturn(Wizard): - 'Assign Supplier Return Packing' + 'Assign Supplier Return Shipment' _name = 'stock.packing.in.return.assign' states = { 'init': { @@ -1446,7 +1446,7 @@ AssignPackingInReturn() class CreatePackingOutReturn(Wizard): - 'Create Customer Return Packing' + 'Create Customer Return Shipment' _name = 'stock.packing.out.return.create' states = { 'init': { diff --git a/packing.xml b/packing.xml index a02013fa15..be94de0075 100644 --- a/packing.xml +++ b/packing.xml @@ -4,13 +4,13 @@ this repository contains the full copyright notices and license terms. --> - + stock.packing.in form +