Merge lp:~magentoerpconnect-community/magentoerpconnect/955234 into lp:magentoerpconnect/oerp6.1-oldstable

Status: Merged
Merge reported by: Guewen Baconnier @ Camptocamp
Merged at revision: not available
Proposed branch: lp:~magentoerpconnect-community/magentoerpconnect/955234
Merge into: lp:magentoerpconnect/oerp6.1-oldstable
Diff against target: 27 lines (+4/-2)
2 files modified
magentoerpconnect/product.py (+2/-0)
magentoerpconnect/sale.py (+2/-2)
To merge this branch: bzr merge lp:~magentoerpconnect-community/magentoerpconnect/955234
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp 2012-03-14 Disapprove on 2012-03-14
Review via email: mp+97478@code.launchpad.net
To post a comment you must log in.

Hi,

thanks for your patch proposition.

In fact, this is not a problem in product.product.export_inventory.
This method is responsible to export the stock of the input ids.

The cron and the button trigger the method export_inventory on the sale.shop and this one has the responsibility to call product.product.export_inventory with the set of ids exportable products of the shop.

So if a fix has to be done, that's on sale.shop.export_inventory, but this one is abstracted in base_sale_multichannels. So which branch do you use for base_sale_multichannels?

review: Disapprove

Thanks for the explanation.

I use lp:on-change-suuport-extra-addons for the moment, but I will get back to lp:extra-addons once it's merged.

Will this module stay in this branch or moved to some other project?

Btw the rest has to be merged, thanks

558. By Maxime Chambreuil (http://www.savoirfairelinux.com) on 2012-03-14

Remove previous commit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'magentoerpconnect/product.py'
2--- magentoerpconnect/product.py 2012-03-14 14:05:05 +0000
3+++ magentoerpconnect/product.py 2012-03-14 18:46:20 +0000
4@@ -1178,6 +1178,8 @@
5 quantities.update({sku: x[1]})
6 if child_ids: #it is an assembly and it contains the products child_ids:
7 self.ext_export(cr, uid, child_ids, external_referential_ids, defaults, context) #so we export them
8+ else:
9+ return False
10 else:
11 logger.notifyChannel('ext synchro', netsvc.LOG_ERROR, "OpenERP 'grouped' products will export to Magento as 'grouped products' only if they have a BOM and if the 'mrp' BOM module is installed")
12 return quantities, child_ids
13
14=== modified file 'magentoerpconnect/sale.py'
15--- magentoerpconnect/sale.py 2012-03-12 10:02:51 +0000
16+++ magentoerpconnect/sale.py 2012-03-14 18:46:20 +0000
17@@ -279,8 +279,8 @@
18 if ids:
19 callback(cr, uid, ids, context=context)
20
21- tools.debug(callback)
22- tools.debug(ids)
23+ # tools.debug(callback)
24+ # tools.debug(ids)
25 return True
26
27 # Schedules functions ============ #