[Openerp-community] [Merge] lp:~ajite/openobject-addons/elico-7.0-imp-intercompany-000001 into lp:~openerp-community/openobject-addons/elico-7.0

2014-02-22 Thread noreply 
The proposal to merge 
lp:~ajite/openobject-addons/elico-7.0-imp-intercompany-01 into 
lp:~openerp-community/openobject-addons/elico-7.0 has been updated.

Status: Approved => Merged

For more details, see:
https://code.launchpad.net/~ajite/openobject-addons/elico-7.0-imp-intercompany-01/+merge/207813
-- 
https://code.launchpad.net/~ajite/openobject-addons/elico-7.0-imp-intercompany-01/+merge/207813
Your team OpenERP Community is subscribed to branch 
lp:~openerp-community/openobject-addons/elico-7.0.

___
Mailing list: https://launchpad.net/~openerp-community
Post to : openerp-community@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp

[Openerp-community] [Merge] lp:~ajite/openobject-addons/elico-7.0-imp-intercompany-000001 into lp:~openerp-community/openobject-addons/elico-7.0

2014-02-22 Thread Eric Caudal - www.elico-corp.com 
The proposal to merge 
lp:~ajite/openobject-addons/elico-7.0-imp-intercompany-01 into 
lp:~openerp-community/openobject-addons/elico-7.0 has been updated.

Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~ajite/openobject-addons/elico-7.0-imp-intercompany-01/+merge/207813
-- 
https://code.launchpad.net/~ajite/openobject-addons/elico-7.0-imp-intercompany-01/+merge/207813
Your team OpenERP Community is subscribed to branch 
lp:~openerp-community/openobject-addons/elico-7.0.

___
Mailing list: https://launchpad.net/~openerp-community
Post to : openerp-community@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp

[Openerp-community] [Merge] lp:~ajite/openobject-addons/elico-7.0-imp-intercompany-000001 into lp:~openerp-community/openobject-addons/elico-7.0

2014-02-22 Thread Augustin Cisterne-Kaas - www.elico-corp.com 
Augustin Cisterne-Kaas - www.elico-corp.com has proposed merging 
lp:~ajite/openobject-addons/elico-7.0-imp-intercompany-01 into 
lp:~openerp-community/openobject-addons/elico-7.0.

Requested reviews:
  LIN Yu (lin-yu)

For more details, see:
https://code.launchpad.net/~ajite/openobject-addons/elico-7.0-imp-intercompany-01/+merge/207813

[FIX] Fixed a bug that was preventing a user to create normal SO/PO
-- 
https://code.launchpad.net/~ajite/openobject-addons/elico-7.0-imp-intercompany-01/+merge/207813
Your team OpenERP Community is subscribed to branch 
lp:~openerp-community/openobject-addons/elico-7.0.
=== modified file 'base_intercompany/unit/export_synchronizer.py'
--- base_intercompany/unit/export_synchronizer.py	2014-02-18 12:28:09 +
+++ base_intercompany/unit/export_synchronizer.py	2014-02-23 01:07:25 +
@@ -128,19 +128,24 @@
 for icops in self._get_icops():
 backend = self._get_backend_with_permission(icops)
 self._set_icops(icops, backend)
-try:
-map_record = self._map_data(fields=fields)
-except MappingError as e:
-continue
+map_record = self._map_data(fields=fields)
 if self.icops_ids:
-record = self._update_data(map_record, fields=fields)
+record = None
+try:
+record = self._update_data(map_record, fields=fields)
+except MappingError as e:
+continue
 if not record:
 continue
 nb_records += 1
 self._validate_data(record)
 self._routing(record, fields)
 else:
-record = self._create_data(map_record, fields=fields)
+record = None
+try:
+record = self._create_data(map_record, fields=fields)
+except MappingError as e:
+continue
 if not record:
 continue
 nb_records += 1

___
Mailing list: https://launchpad.net/~openerp-community
Post to : openerp-community@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp

[Openerp-community] [Merge] lp:~ajite/openobject-addons/elico-7.0-imp-intercompany-000001 into lp:~openerp-community/openobject-addons/elico-7.0

2014-02-19 Thread noreply 
The proposal to merge 
lp:~ajite/openobject-addons/elico-7.0-imp-intercompany-01 into 
lp:~openerp-community/openobject-addons/elico-7.0 has been updated.

Status: Approved => Merged

For more details, see:
https://code.launchpad.net/~ajite/openobject-addons/elico-7.0-imp-intercompany-01/+merge/207113
-- 
https://code.launchpad.net/~ajite/openobject-addons/elico-7.0-imp-intercompany-01/+merge/207113
Your team OpenERP Community is subscribed to branch 
lp:~openerp-community/openobject-addons/elico-7.0.

___
Mailing list: https://launchpad.net/~openerp-community
Post to : openerp-community@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp

[Openerp-community] [Merge] lp:~ajite/openobject-addons/elico-7.0-imp-intercompany-000001 into lp:~openerp-community/openobject-addons/elico-7.0

2014-02-19 Thread Eric Caudal - www.elico-corp.com 
The proposal to merge 
lp:~ajite/openobject-addons/elico-7.0-imp-intercompany-01 into 
lp:~openerp-community/openobject-addons/elico-7.0 has been updated.

Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~ajite/openobject-addons/elico-7.0-imp-intercompany-01/+merge/207113
-- 
https://code.launchpad.net/~ajite/openobject-addons/elico-7.0-imp-intercompany-01/+merge/207113
Your team OpenERP Community is subscribed to branch 
lp:~openerp-community/openobject-addons/elico-7.0.

___
Mailing list: https://launchpad.net/~openerp-community
Post to : openerp-community@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp

[Openerp-community] [Merge] lp:~ajite/openobject-addons/elico-7.0-imp-intercompany-000001 into lp:~openerp-community/openobject-addons/elico-7.0

2014-02-19 Thread Augustin Cisterne-Kaas - www.elico-corp.com 
Augustin Cisterne-Kaas - www.elico-corp.com has proposed merging 
lp:~ajite/openobject-addons/elico-7.0-imp-intercompany-01 into 
lp:~openerp-community/openobject-addons/elico-7.0.

Requested reviews:
  LIN Yu (lin-yu)

For more details, see:
https://code.launchpad.net/~ajite/openobject-addons/elico-7.0-imp-intercompany-01/+merge/207113

Made this module compatible with the latest version of the connector (Version > 
2.0.1)
-- 
https://code.launchpad.net/~ajite/openobject-addons/elico-7.0-imp-intercompany-01/+merge/207113
Your team OpenERP Community is subscribed to branch 
lp:~openerp-community/openobject-addons/elico-7.0.
=== modified file 'base_intercompany/__openerp__.py'
--- base_intercompany/__openerp__.py	2014-01-17 22:42:32 +
+++ base_intercompany/__openerp__.py	2014-02-19 08:51:05 +
@@ -22,7 +22,7 @@
 ##
 
 {'name': 'Base Intercompany',
- 'version': '0.3',
+ 'version': '0.4',
  'category': 'Generic Modules',
  'depends': ['connector'],
  'author': 'Elico Corp',

=== modified file 'base_intercompany/unit/export_synchronizer.py'
--- base_intercompany/unit/export_synchronizer.py	2014-01-18 20:51:09 +
+++ base_intercompany/unit/export_synchronizer.py	2014-02-19 08:51:05 +
@@ -124,26 +124,26 @@
 
 nb_records = 0
 icops_ids = {}
+
 for icops in self._get_icops():
 backend = self._get_backend_with_permission(icops)
 self._set_icops(icops, backend)
 try:
-self._map_data(fields=fields)
+map_record = self._map_data(fields=fields)
 except MappingError as e:
 continue
 if self.icops_ids:
-record = self.mapper.data
+record = self._update_data(map_record, fields=fields)
 if not record:
 continue
 nb_records += 1
 self._validate_data(record)
 self._routing(record, fields)
 else:
-record = self.mapper.data_for_create
+record = self._create_data(map_record, fields=fields)
 if not record:
 continue
 nb_records += 1
-self._validate_data(record)
 key = '%s_%s' % (icops.backend_to.id, icops.concept)
 icops_ids[key] = {
 'id': self._create(record),
@@ -183,13 +183,14 @@
 
 def _set_icops(self, icops, backend):
 self.mapper._icops = icops
+self.mapper._backend_to = backend
 self.backend_adapter._icops = icops
-self.mapper._backend_to = backend
 self.backend_adapter._backend_to = backend
 
 def _create(self, data):
 if not self.backend_adapter._icops.on_create:
 raise osv.except_osv('ICOPS Error', 'Can\'t create')
+self._validate_data(data)
 return self.backend_adapter.create(data)
 
 def _write(self, id, data):
@@ -215,7 +216,15 @@
 
 def _map_data(self, fields=None):
 """ Convert the external record to OpenERP """
-self.mapper.convert(self.binding_record, fields=fields)
+return self.mapper.map_record(self.binding_record)
+
+def _create_data(self, map_record, fields=None, **kwargs):
+""" Get the data to pass to :py:meth:`_create` """
+return map_record.values(for_create=True, fields=fields, **kwargs)
+
+def _update_data(self, map_record, fields=None, **kwargs):
+""" Get the data to pass to :py:meth:`_update` """
+return map_record.values(fields=fields, **kwargs)
 
 def _validate_data(self, data):
 """ Check if the values to export are correct

=== modified file 'base_intercompany/unit/mapper.py'
--- base_intercompany/unit/mapper.py	2014-01-17 22:42:32 +
+++ base_intercompany/unit/mapper.py	2014-02-19 08:51:05 +
@@ -20,10 +20,27 @@
 #along with this program.  If not, see .
 #
 ##
-from openerp.addons.connector.unit.mapper import ExportMapper
+from openerp.addons.connector.unit.mapper import (ExportMapper, ExportMapChild)
+
+
+class ICOPSExportMapChild(ExportMapChild):
+""" :py:class:`MapChild` for the Exports """
+
+def _child_mapper(self):
+mapper = self.get_connector_unit_for_model(
+ExportMapper, self.model._name)
+mapper._icops = self._icops
+mapper._backend_to = self._backend_to
+return mapper
+
+def format_items(self, items_values):
+items = super(ICOPSExportMapChild, self).format_items(items_values)
+return [(5, 0)] + [(0, 0, data) for data in items]
 
 
 class ICOPSExportMapper(ExportMapper):
+_map_child_class = ICOPSExportMapChild
+
 def __init__(self, environment):
 """
 
@@ -34,11 +51,8 @@
 self._icops = None
 self._backe

[Openerp-community] [Merge] lp:~ajite/openobject-addons/elico-7.0-imp-intercompany-000001 into lp:~openerp-community/openobject-addons/elico-7.0

2014-01-22 Thread noreply 
The proposal to merge 
lp:~ajite/openobject-addons/elico-7.0-imp-intercompany-01 into 
lp:~openerp-community/openobject-addons/elico-7.0 has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~ajite/openobject-addons/elico-7.0-imp-intercompany-01/+merge/202453
-- 
https://code.launchpad.net/~ajite/openobject-addons/elico-7.0-imp-intercompany-01/+merge/202453
Your team OpenERP Community is subscribed to branch 
lp:~openerp-community/openobject-addons/elico-7.0.

___
Mailing list: https://launchpad.net/~openerp-community
Post to : openerp-community@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-community] [Merge] lp:~ajite/openobject-addons/elico-7.0-imp-intercompany-000001 into lp:~openerp-community/openobject-addons/elico-7.0

2014-01-22 Thread Eric Caudal - www.elico-corp.com 
Review: Approve


-- 
https://code.launchpad.net/~ajite/openobject-addons/elico-7.0-imp-intercompany-01/+merge/202453
Your team OpenERP Community is subscribed to branch 
lp:~openerp-community/openobject-addons/elico-7.0.

___
Mailing list: https://launchpad.net/~openerp-community
Post to : openerp-community@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp

[Openerp-community] [Merge] lp:~ajite/openobject-addons/elico-7.0-imp-intercompany-000001 into lp:~openerp-community/openobject-addons/elico-7.0

2014-01-21 Thread Augustin Cisterne-Kaas - www.elico-corp.com 
Augustin Cisterne-Kaas - www.elico-corp.com has proposed merging 
lp:~ajite/openobject-addons/elico-7.0-imp-intercompany-01 into 
lp:~openerp-community/openobject-addons/elico-7.0.

Requested reviews:
  Eric Caudal - www.elico-corp.com (elicoidal)

For more details, see:
https://code.launchpad.net/~ajite/openobject-addons/elico-7.0-imp-intercompany-01/+merge/202453

Added lock and unlock function for object created during the ICOPS process.
Corrected a bug that was preventing an user from creating an object when the 
update event was disabled in the backend.
-- 
https://code.launchpad.net/~ajite/openobject-addons/elico-7.0-imp-intercompany-01/+merge/202453
Your team OpenERP Community is subscribed to branch 
lp:~openerp-community/openobject-addons/elico-7.0.
=== modified file 'base_intercompany/__init__.py'
--- base_intercompany/__init__.py	2014-01-17 13:12:23 +
+++ base_intercompany/__init__.py	2014-01-21 13:18:01 +
@@ -2,7 +2,7 @@
 ##
 #
 #OpenERP, Open Source Management Solution
-#Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#Copyright (c) 2010-2014 Elico Corp. All Rights Reserved.
 #Augustin Cisterne-Kaas 
 #Eric Caudal 
 

=== modified file 'base_intercompany/__openerp__.py'
--- base_intercompany/__openerp__.py	2014-01-17 16:27:10 +
+++ base_intercompany/__openerp__.py	2014-01-21 13:18:01 +
@@ -2,7 +2,7 @@
 ##
 #
 #OpenERP, Open Source Management Solution
-#Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#Copyright (c) 2010-2014 Elico Corp. All Rights Reserved.
 #Augustin Cisterne-Kaas 
 #Eric Caudal 
 

=== modified file 'base_intercompany/backend.py'
--- base_intercompany/backend.py	2014-01-17 13:12:23 +
+++ base_intercompany/backend.py	2014-01-21 13:18:01 +
@@ -2,7 +2,7 @@
 ##
 #
 #OpenERP, Open Source Management Solution
-#Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#Copyright (c) 2010-2014 Elico Corp. All Rights Reserved.
 #Augustin Cisterne-Kaas 
 #Eric Caudal 
 

=== modified file 'base_intercompany/company.py'
--- base_intercompany/company.py	2014-01-17 13:12:23 +
+++ base_intercompany/company.py	2014-01-21 13:18:01 +
@@ -2,7 +2,7 @@
 ##
 #
 #OpenERP, Open Source Management Solution
-#Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#Copyright (c) 2010-2014 Elico Corp. All Rights Reserved.
 #Augustin Cisterne-Kaas 
 #Eric Caudal 
 
@@ -35,25 +35,25 @@
 """
 return []
 
-def _select_object_names(self, cr, uid, context=None):
+def _select_models(self, cr, uid, context=None):
 """ Available Object names
 
 Can be inherited to add custom versions.
 """
 return {}
 
-def _get_object_name(self, cr, uid, ids, name, arg, context=None):
+def _get_model(self, cr, uid, ids, name, arg, context=None):
 """ Available versions
 
 Can be inherited to add custom versions.
 """
 res = {}
 for intercompany in self.browse(cr, uid, ids, context):
-object_name = None
+model = None
 if intercompany.concept:
-object_name = self._select_object_names(
+model = self._select_models(
 cr, uid)[intercompany.concept]
-res[intercompany.id] = object_name
+res[intercompany.id] = model
 return res
 
 def get_intercompany(self, cr, uid, obj_id,
@@ -93,8 +93,8 @@
   required=True, ondelete='cascade'),
 'concept': fields.selection(_select_concepts, string="Concept",
 required=True),
-'object_name': fields.function(_get_object_name, type='char',
-   string='Object', store=False),
+'model': fields.function(_get_model, type='char',
+ string='Object', store=False),
 'icops_uid': fields.related(
 'backend_to', 'icops_uid', type='many2one',
 relation='res.users', readonly=True, string='IC User'),

=== modified file 'base_intercompany/connector.py'
--- base_intercompany/connector.py	2014-01-17 13:12:23 +
+++ base_intercompany/connector.py	2014-01-21 13:18:01 +
@@ -2,7 +2,7 @@
 ##
 #
 #OpenERP, Open Source Management Solution
-#Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#Copyright (c) 2010-2014 Elico Corp. All Rights Reserved.
 #Augustin Cisterne-Kaas 
 #Eric Caudal 
 
@@ -21,7 +21,7 @@
 #
 ###

[Openerp-community] [Merge] lp:~ajite/openobject-addons/elico-7.0-imp-intercompany-000001 into lp:~openerp-community/openobject-addons/elico-7.0

2014-01-21 Thread noreply 
The proposal to merge 
lp:~ajite/openobject-addons/elico-7.0-imp-intercompany-01 into 
lp:~openerp-community/openobject-addons/elico-7.0 has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~ajite/openobject-addons/elico-7.0-imp-intercompany-01/+merge/202396
-- 
https://code.launchpad.net/~ajite/openobject-addons/elico-7.0-imp-intercompany-01/+merge/202396
Your team OpenERP Community is subscribed to branch 
lp:~openerp-community/openobject-addons/elico-7.0.

___
Mailing list: https://launchpad.net/~openerp-community
Post to : openerp-community@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-community] [Merge] lp:~ajite/openobject-addons/elico-7.0-imp-intercompany-000001 into lp:~openerp-community/openobject-addons/elico-7.0

2014-01-20 Thread Eric Caudal - www.elico-corp.com 
Review: Approve

copyright should be 2014
-- 
https://code.launchpad.net/~ajite/openobject-addons/elico-7.0-imp-intercompany-01/+merge/202396
Your team OpenERP Community is subscribed to branch 
lp:~openerp-community/openobject-addons/elico-7.0.

___
Mailing list: https://launchpad.net/~openerp-community
Post to : openerp-community@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp