Merge lp:~gbaconnier-c2c/magentoerpconnect/magentoerpconnectv6-c2c into lp:magentoerpconnect/oerp6.0-stable
Status: | Merged |
---|---|
Merge reported by: | Guewen Baconnier @ Camptocamp |
Merged at revision: | not available |
Proposed branch: | lp:~gbaconnier-c2c/magentoerpconnect/magentoerpconnectv6-c2c |
Merge into: | lp:magentoerpconnect/oerp6.0-stable |
Diff against target: |
412 lines (+180/-68) 6 files modified
magerp_data.xml (+22/-2) product.py (+54/-19) product_view.xml (+3/-0) sale.py (+75/-40) settings/external.mappinglines.template.csv (+9/-3) stock.py (+17/-4) |
To merge this branch: | bzr merge lp:~gbaconnier-c2c/magentoerpconnect/magentoerpconnectv6-c2c |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raphaël Valyi - http://www.akretion.com | Pending | ||
Review via email: mp+55476@code.launchpad.net |
Description of the change
Hi,
Here is some proposal for the connector.
Revno 396: (Rationalized import of extra sales orders lines like shipping, discount, cash on delivery,... into one single method instead of a method for each one.)
On the sale order's creation, there's a method to add shipping fees. A new method appears to add gift certificates, and there is still the case of the discount coupons and the cash on delivery fees (and maybe other fees/rebates).
The behavior is the same for each of them : get the amount in the magento's data, get a product, get a tax if a tax amount is found in the magento's data and add the line to the order.
That's why instead of having 4 methods doing nearly the same things, I propose you to use the same.
I couldn't test the gift certificate and cash on delivery because I have not them on Magento, but the shipping and discount coupons are ok. I'm also not sure with my methods definitions (I first started with one method with a loop on each type and a dict to define types, but I think the version I propose here let more space for overridings) so don't put your priority on this proposal if you have not a lot of time.
Revno 398: (include_in_menu and page_layout attributes on product categories)
Configure these 2 magento's attributes from OpenERP.
Revno 399: (hooks and small refactoring to allow management of configurable products from a module)
We are going to release our module to manage configurable products very soon (as soon as you approve the hooks in magentoerpconnect in fact).
I added a hook in the method ext_export to export configurable products, the reason is clear.
A little more explanation why I modified the method create_
When you order a configurable product in Magento, and do a "sales_order.info" on the API, it gives you 2 items : the configurable and the simple product. We put the configurable as a service, so it doesn't appear in the picking. But when you want to create the (partial) shipping on Magento, it expects the configurable and the simple product.
So I added the method "add_picking_line" which basically just add the line of the picking. But in our module, I do a super on that method and then I add a second line with the configurable product if so.
There is also a proposal on base_sale_
https:/
revno 5352 : (base_sale_
Apply a payment term on sales orders based on payment types.
I'm open to change things that bother you.
Thanks !
Guewen
Seems Good Guewen! multichannels thing and we will merge the other part as soon as we can. Thank you very much, always a pleasure to get all those improvements from CampToCamp.
Sebastien already merged the base_sale_