Skip to content

Commit

Permalink
Merge 66e8e2f into c81d52c
Browse files Browse the repository at this point in the history
  • Loading branch information
yvaucher committed Feb 13, 2015
2 parents c81d52c + 66e8e2f commit 6c3aa9c
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 14 deletions.
18 changes: 9 additions & 9 deletions __unported__/connector_ecommerce/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
#
##############################################################################

import stock
import account
import product
import invoice
import payment_method
import event
import unit
import sale
import wizard
from . import stock
from . import account
from . import product
from . import invoice
from . import payment_method
from . import event
from . import unit
from . import sale
from . import wizard
4 changes: 2 additions & 2 deletions __unported__/connector_ecommerce/tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#
##############################################################################

import test_onchange
import test_invoice_event
from . import test_onchange
from . import test_invoice_event

fast_suite = [
]
Expand Down
2 changes: 1 addition & 1 deletion __unported__/connector_ecommerce/unit/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# -*- coding: utf-8 -*-
import sale_order_onchange
from . import sale_order_onchange
3 changes: 2 additions & 1 deletion __unported__/connector_ecommerce/unit/sale_order_onchange.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@


class OnChangeManager(ConnectorUnit):

def merge_values(self, record, on_change_result):
vals = on_change_result.get('value', {})
for key in vals:
Expand Down Expand Up @@ -77,7 +78,7 @@ def _get_partner_address_id_onchange_param(self, order):
order['partner_shipping_id'],
order['partner_id'],
order['shop_id'],
]
]
kwargs = {'context': self.session.context}
return args, kwargs

Expand Down
2 changes: 1 addition & 1 deletion __unported__/connector_ecommerce/wizard/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-

import sale_ignore_cancel
from . import sale_ignore_cancel

0 comments on commit 6c3aa9c

Please sign in to comment.