lp:~mikel-martin/openobject-addons/extra-5.0_esale_osc_enhancement

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openobject-addons/extra-5.0

OpenERP Core Team: Pending requested 2010-03-12

Diff: 4794 lines (+1651/-1634) (has conflicts)

13 files modified

.bzrignore (+4/-0)
esale_osc/__terp__.py (+8/-2)
esale_osc/connector/ZhenIT_zencart_compatibility_functions.php (+244/-0)
esale_osc/connector/openerp-synchro.php (+371/-521)
esale_osc/connector/openerp_login.php (+41/-0)
esale_osc/connector/openerp_runonce.php (+10/-0)
esale_osc/esale_oscom.py (+348/-326)
esale_osc/esale_oscom_product.py (+13/-7)
esale_osc/esale_oscom_view.xml (+375/-372)
esale_osc/esale_oscom_workflow.xml (+0/-230)
esale_osc/i18n/es_ES.po (+36/-6)
esale_osc/i18n/esale_osc.pot (+200/-170)
esale_osc/wizard/wizard_esale_oscom_update_select_stocks.py (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

8. By mikel <mikel@pcl2> on 2010-07-21

Fix oscom_prod_url qhen not oscommerce o not in root folder
Fix import multiple variants qhen options value name is different in different languages
Add option to avoid syncronization of shop products whit openerp's maodifies data

7. By mikel <mikel@pcl2> on 2010-07-08

Merge totnto

6. By mikel <mikel@pcl2> on 2010-06-14

ok

5. By mikel <mikel@pcl2> on 2010-04-26

Ability to define a default category for imported partners

added:
  .bzrignore
modified:
  esale_osc/connector/openerp-synchro.php
  esale_osc/esale_oscom.py
  esale_osc/esale_oscom_view.xml
  esale_osc/i18n/es_ES.po
  esale_osc/i18n/esale_osc.pot

4. By mikel <mikel@pcl2> on 2010-04-22

Comentarios idiomas y bug en sincronización de descripciones de productos
removed:
  esale_osc/i18n/es.po
modified:
  esale_osc/__terp__.py
  esale_osc/connector/openerp-synchro.php
  esale_osc/i18n/es_ES.po*
  esale_osc/i18n/esale_osc.pot*

3. By mikel <mikel@pcl2> on 2010-03-15

changes in credits

2. By mikel <mikel@pcl2> on 2010-03-12

missing files

1. By mikel <mikel@pcl2> on 2010-03-12

Added to esale_osc:
- ZenCart compatibility
- osCommerce admin authentication