Toimitustapa Pupenextiin#110

Open

samiluukkonen wants to merge 204 commits into

sami/delivery_method

Commits on May 28, 2015

add delivery method relation to company
Sami Luukkonen
committed
keyword methods
Sami Luukkonen
committed
delivery method model
Sami Luukkonen
committed
adr options
Sami Luukkonen
committed
more dropdown options
Sami Luukkonen
committed
unifaun validation
Sami Luukkonen
committed

Commits on Aug 19, 2015

Merge branch 'master' into sami/delivery_method
Sami Luukkonen
committed
remove translation function
Sami Luukkonen
committed
remove unnecessary validation
Sami Luukkonen
committed

Commits on Aug 20, 2015

view options helper
Sami Luukkonen
committed
change some of the option methods to enumerable
Sami Luukkonen
committed
add translations
Sami Luukkonen
committed
remove unnecessary tests
Sami Luukkonen
committed
fix typo
Sami Luukkonen
committed
move official legends to separate class
Sami Luukkonen
committed
helper tests
Sami Luukkonen
committed
Merge branch 'master' into sami/delivery_method
Sami Luukkonen
committed
use STI for waybill keywords
Sami Luukkonen
committed
add waybill keyword
Sami Luukkonen
committed
fix waybill keyword options
Sami Luukkonen
committed
test waybill keyword
Sami Luukkonen
committed
fix fixtures
Sami Luukkonen
committed
add validation
Sami Luukkonen
committed
fix waybill relation
Sami Luukkonen
committed
add mode of transport keyword
Sami Luukkonen
committed
add mode of transport keyword relation
Sami Luukkonen
committed
Merge branch 'master' into sami/delivery_method
Sami Luukkonen
committed
fix fixtures
Sami Luukkonen
committed
move options from model to helper
Sami Luukkonen
committed
move label options to helper module
Sami Luukkonen
committed
remove unnecessary method
Sami Luukkonen
committed
nature of transaction options helper
Sami Luukkonen
committed
remove unnecessary method
Sami Luukkonen
committed
customs options helper method
Sami Luukkonen
committed

Commits on Aug 25, 2015

Merge branch 'master' into sami/delivery_method
Sami Luukkonen
committed
sorting point options
Sami Luukkonen
committed
normalize delivery method translations
Sami Luukkonen
committed
adr prohibition options and validation
Sami Luukkonen
committed
ignore delivery method options
Sami Luukkonen
committed
alternative adr delivery method option
Sami Luukkonen
committed
add sorting point relation
Sami Luukkonen
committed
keyword helper and tests
Sami Luukkonen
committed
carrier options
Sami Luukkonen
committed
from hash to array
Sami Luukkonen
committed
route for delivery method
Sami Luukkonen
committed
permissions for delivery method
Sami Luukkonen
committed
delivery method controller and view
Sami Luukkonen
committed
fix test
Sami Luukkonen
committed

Commits on Aug 26, 2015

work on edit view
Sami Luukkonen
committed
update edit view
Sami Luukkonen
committed
update edit view
Sami Luukkonen
committed
update edit view
Sami Luukkonen
committed
validations
Sami Luukkonen
committed
delivery method controller & controller tests
Sami Luukkonen
committed
use attribute sanitator and define float columns
Sami Luukkonen
committed
add customer relation for delivery method
Sami Luukkonen
committed
fix tests
Sami Luukkonen
committed
add translations
Sami Luukkonen
committed
add destroy method
Sami Luukkonen
committed
add remove button
Sami Luukkonen
committed

Commits on Aug 27, 2015

Merge branch 'master' into sami/delivery_method
Sami Luukkonen
committed
load fixtures
Sami Luukkonen
committed
add validations for destroy method
Sami Luukkonen
committed
add freight & freight contract models
Sami Luukkonen
committed
add freight & freight contract validations for destroy method
Sami Luukkonen
committed
add customer keywords
Sami Luukkonen
committed
add customer keywords validation for destroy method
Sami Luukkonen
committed
mandatory new packaging info with unifaun online
Sami Luukkonen
committed

Commits on Aug 28, 2015

tests and fixtures
Sami Luukkonen
committed

Commits on Sep 17, 2015

Commits on Oct 20, 2015

Commits on Oct 21, 2015

add defaults to fixture
Sami Luukkonen
committed

Commits on Oct 22, 2015

Merge branch 'master' into sami/delivery_method
Sami Luukkonen
committed
update relations after save method
Sami Luukkonen
committed
company to default values
Sami Luukkonen
committed
sales orders relations update
Sami Luukkonen
committed

Commits on Oct 23, 2015

relation updates
Sami Luukkonen
committed

Commits on Oct 29, 2015

Merge branch 'master' into sami/delivery_method
Sami Luukkonen
committed
fix syntax error
Sami Luukkonen
committed
comment broken test
Sami Luukkonen
committed
add stock transfer & preorder validations
Sami Luukkonen
committed
add offer orders
Sami Luukkonen
committed
correct offer order update message
Sami Luukkonen
committed
add manufacture order validation
Sami Luukkonen
committed
add work orders
Sami Luukkonen
committed
add manufacture order test back
Sami Luukkonen
committed
add project orders
Sami Luukkonen
committed
add reclamation order
Sami Luukkonen
committed
add freight relation update
Sami Luukkonen
committed
add freight contracts relation update
Sami Luukkonen
committed
add waybills
Sami Luukkonen
committed
add translations
Sami Luukkonen
committed
remove nonexistent scopes
Sami Luukkonen
committed
fix update message
Sami Luukkonen
committed
fix test
Sami Luukkonen
committed
use chosen-select
Sami Luukkonen
committed
alternative adr delivery method validation
Sami Luukkonen
committed
fix test
Sami Luukkonen
committed
fix adr prohibition test
Sami Luukkonen
committed
freight & cargo insurance sku tests
Sami Luukkonen
committed

Commits on Oct 30, 2015

add translations
Sami Luukkonen
committed
Merge branch 'master' into sami/delivery_method
Sami Luukkonen
committed
normalize translations
Sami Luukkonen
committed
use carrier fixture
Sami Luukkonen
committed
add delivery method to fixtures
Sami Luukkonen
committed
use translated package description
Sami Luukkonen
committed
remove unnecessary method
Sami Luukkonen
committed

Commits on Nov 2, 2015

add delivery method translation model
Sami Luukkonen
committed
add translations to controller & add tests
Sami Luukkonen
committed
add view partials
Sami Luukkonen
committed
fix view partials
Sami Luukkonen
committed

Commits on Nov 3, 2015

add departures
Sami Luukkonen
committed
remove partials
Sami Luukkonen
committed
add TimeOfDay object
Sami Luukkonen
committed
remove get_locale method & use current user's locale
Sami Luukkonen
committed
Merge branch 'master' into sami/delivery_method
Sami Luukkonen
committed
departures partial
Sami Luukkonen
committed
terminal area & customer category keywords
Sami Luukkonen
committed
warehouse relation to departures
Sami Luukkonen
committed

Commits on Nov 4, 2015

add fields to departures & use of pupenext_date_field
Sami Luukkonen
committed
departure helper
Sami Luukkonen
committed
terminal area helper
Sami Luukkonen
committed
customer category helper
Sami Luukkonen
committed
warehouse helper
Sami Luukkonen
committed
status options
Sami Luukkonen
committed

Commits on Nov 5, 2015

fix status options test
Sami Luukkonen
committed
fix fixtures
Sami Luukkonen
committed
fix departure nested attributes
Sami Luukkonen
committed
add length validation for custom's selite field
Sami Luukkonen
committed
add tests for departure nested attribute
Sami Luukkonen
committed
fix customs options test
Sami Luukkonen
committed
remove time of day class
Sami Luukkonen
committed
use time select
Sami Luukkonen
committed
test relations
Sami Luukkonen
committed
add fixture
Sami Luukkonen
committed
set datefield to nowrap
Sami Luukkonen
committed
add header texts to partials
Sami Luukkonen
committed
add fixture
Sami Luukkonen
committed
make kerayserat-column to enum
Sami Luukkonen
committed
translate keys
jonikanerva
committed

Commits on Nov 6, 2015

Commits on Nov 9, 2015

Commits on Nov 11, 2015

Commits on Nov 19, 2015

Merge branch 'master' into sami/delivery_method
jonikanerva
committed