Thibault Delavallée 46c55500ff [MERGE] Sync with website-al ...

bzr revid: tde@openerp.com-20140122171321-6r2q42p7ebfv3kb9

2014-01-22 18:13:21 +01:00

..

i18n

Launchpad automatic translations update.

2013-11-30 05:14:29 +00:00

process

…

report

…

security

[IMP] product: group_product_mono is default

2014-01-21 13:21:20 +01:00

static/img

[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.

2014-01-16 11:39:10 +01:00

test

[REMOVE]test case of price margin.

2014-01-17 15:43:53 +05:30

wizard

…

__init__.py

…

__openerp__.py

[REMOVE]test case of price margin.

2014-01-17 15:43:53 +05:30

_common.py

…

partner_view.xml

…

partner.py

…

pricelist_view.xml

…

pricelist.py

[FIX] website_sale: link; product: clean code and use product.template for supplierinfo

2013-12-09 17:32:54 +01:00

product_data.xml

[MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al.

2014-01-16 17:36:07 +05:30

product_demo.xml

[MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al.

2014-01-16 17:36:07 +05:30

product_image_demo.xml

[MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al and resolve conflicts.

2014-01-16 20:23:07 +05:30

product_pricelist_demo.yml

…

product_report.xml

…

product_view.xml

[IMP] product: cleaned form in create mode. Moreover generally

2014-01-22 18:02:18 +01:00

product.py

[MERGE] Sync with website-al

2014-01-22 18:13:21 +01:00