Migration to 4.2

This commit is contained in:
Sergio Morillo 2017-07-28 18:55:55 +02:00
parent 4257b7cf86
commit ff8e1c86a2
15 changed files with 26 additions and 25 deletions

View File

@ -1,2 +1,3 @@
Version 4.2.0 - 2017-07-27
Version 4.0.3 - 2016-08-19
* Initial release

12
load.py
View File

@ -770,11 +770,13 @@ class LoadOrder(Workflow, ModelView, ModelSQL, IncotermDocumentMixin):
pool = Pool()
Shipment = pool.get('stock.shipment.internal')
shipment = Shipment(company=self.company,
planned_date=self.end_date.date(),
effective_date=self.end_date.date(),
from_location=self.warehouse.storage_location,
to_location=self.to_location)
shipment = Shipment(
company=self.company,
planned_date=self.end_date.date(),
planned_start_date=self.end_date.date(),
effective_date=self.end_date.date(),
from_location=self.warehouse.storage_location,
to_location=self.to_location)
shipment.dock = self.load.dock
return shipment

Binary file not shown.

View File

@ -5,6 +5,7 @@ Carrier load
Imports::
>>> import datetime
>>> from trytond.tests.tools import activate_modules
>>> from dateutil.relativedelta import relativedelta
>>> from decimal import Decimal
>>> from trytond.modules.company.tests.tools import create_company, \
@ -24,10 +25,7 @@ Create database::
Install agro Module::
>>> Module = Model.get('ir.module')
>>> module, = Module.find([('name', '=', 'carrier_load')])
>>> module.click('install')
>>> Wizard('ir.module.install_upgrade').execute('upgrade')
>>> config = activate_modules('carrier_load')
Create company::

View File

@ -1,5 +1,5 @@
[tryton]
version=4.0.3
version=4.2.0
depends:
carrier_vehicle
incoterm

View File

@ -35,4 +35,4 @@ this repository contains the full copyright notices and license terms. -->
<field name="road_note_instructions" colspan="3"/>
</page>
</xpath>
</data>
</data>

View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- The COPYRIGHT file at the top level of this repository contains the full
copyright notices and license terms. -->
<form string="Carrier load">
<form>
<label name="date"/>
<field name="date"/>
<label name="code"/>
@ -48,4 +48,4 @@
string="Create purchase"/>
</group>
</group>
</form>
</form>

View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- The COPYRIGHT file at the top level of this repository contains the full
copyright notices and license terms. -->
<tree string="Carrier load">
<tree>
<field name="code"/>
<field name="state"/>
<field name="carrier"/>
@ -15,4 +15,4 @@
<field name="purchase"/>
<field name="purchase_state"/>
<field name="warehouse_output" tree_invisible="1"/>
</tree>
</tree>

View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- The COPYRIGHT file at the top level of this repository contains the full
copyright notices and license terms. -->
<form string="Load order">
<form>
<label name="code"/>
<field name="code"/>
<label name="load"/>
@ -48,4 +48,4 @@
<button name="do" string="Do"/>
</group>
</group>
</form>
</form>

View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- The COPYRIGHT file at the top level of this repository contains the full
copyright notices and license terms. -->
<form string="Load order Incoterms">
<form>
<label name="version"/>
<field name="version"/>
<newline/>

View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- The COPYRIGHT file at the top level of this repository contains the full
copyright notices and license terms. -->
<tree string="Load order Incoterms" editable="bottom">
<tree editable="bottom">
<field name="rule" widget="selection"/>
<field name="place"/>
<field name="version" tree_invisible="1"/>

View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- The COPYRIGHT file at the top level of this repository contains the full
copyright notices and license terms. -->
<form string="Load order line">
<form>
<label name="order"/>
<field name="order"/>
<newline/>
@ -13,4 +13,4 @@
<field name="quantity"/>
<label name="uom"/>
<field name="uom"/>
</form>
</form>

View File

@ -1,10 +1,10 @@
<?xml version="1.0"?>
<!-- The COPYRIGHT file at the top level of this repository contains the full
copyright notices and license terms. -->
<tree string="Load order line" editable="bottom">
<tree editable="bottom">
<field name="order"/>
<field name="origin"/>
<field name="product"/>
<field name="quantity"/>
<field name="uom"/>
</tree>
</tree>

View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- The COPYRIGHT file at the top level of this repository contains the full
copyright notices and license terms. -->
<tree string="Load order">
<tree>
<field name="code"/>
<field name="load"/>
<field name="party"/>
@ -12,4 +12,4 @@
<field name="arrival_date"/>
<field name="state"/>
<field name="type" tree_invisible="1"/>
</tree>
</tree>