033c38c304
[MERGE] trunk
...
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
3ce5e01eca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
19854757a4
[IMP] product: in product form view, hide 'variants' field when is_only_child and no variant name
...
bzr revid: rco@openerp.com-20140127102928-pe90kntbc6mtv5uu
2014-01-27 11:29:28 +01:00
17616e08ef
[IMP] product: simplify further product_product.copy()
...
bzr revid: rco@openerp.com-20140127101957-1ywu40m081uo79nl
2014-01-27 11:19:57 +01:00
31d4a2cc6f
[IMP] product: in product.name_search(), do no search on variants (too costly)
...
bzr revid: rco@openerp.com-20140127100037-t1hzbw0f4v8uys6f
2014-01-27 11:00:37 +01:00
3ce7ccd57e
[IMP] product: Python fixes ('<>' -> '!=')
...
bzr revid: rco@openerp.com-20140127091856-1cvelz2tq16lfaml
2014-01-27 10:18:56 +01:00
aa727b9a43
[FIX] product use osv _check_recursion helper
...
bzr revid: al@openerp.com-20140126210921-0dh2dghkcyymvron
2014-01-26 22:09:21 +01:00
232475e83a
[FIX] product remove arbitrary size limits
...
bzr revid: al@openerp.com-20140126210506-3kjf53g9uxtvhn40
2014-01-26 22:05:06 +01:00
bd088d8868
[FIX] product rename and reorder variant menu items
...
bzr revid: al@openerp.com-20140126205954-q33s3h306soh43jc
2014-01-26 21:59:54 +01:00
beb15c52ab
[FIX] Softwares is made of datas and codes
...
bzr revid: al@openerp.com-20140126204334-4ggfsn31zp1yndix
2014-01-26 21:43:34 +01:00
2cf97c76d3
[IMP] product: correct copy() of products variants
...
bzr revid: chs@openerp.com-20140123183208-jg76zjt7tzd1fl75
2014-01-23 19:32:08 +01:00
86b9f997c8
[IMP] product: supplier_info: when renaming a field, please
...
use @oldname parameter.
Therefore added oldname on product_tmpl_id that was once known as product.id.
bzr revid: tde@openerp.com-20140123163243-ct1vde3luoypj5qx
2014-01-23 17:32:43 +01:00
46c55500ff
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140122171321-6r2q42p7ebfv3kb9
2014-01-22 18:13:21 +01:00
055932fc6a
[IMP] product: cleaned form in create mode. Moreover generally
...
changing the template is not possible anymore; create a new tempalte or a new
variant instead. When creating a new product, you will always create a new
template.
Added the link to the template from the product form view.
Cleaned some code (code move).
bzr revid: tde@openerp.com-20140122170218-6j2sixoxvvbbxvhd
2014-01-22 18:02:18 +01:00
d944a652dc
[FIX] product: when computing lst_price, that is the public price
...
computed based on the template price + margin and extra, use the
pricelist currency if a pricelist has been given. This alows for
example to have 'promo' prices on the ecommerce that are in the
same currency.
bzr revid: tde@openerp.com-20140122120042-ovh2mi70q0beeqwq
2014-01-22 13:00:42 +01:00
38d64147d5
[IMP] product: only template child / multiple template childs form view improvements
...
- added a is_only_child field on product.product, telling whether the
product is the only child of the product.template
- improved the product form view, to set readonly all fields coming fgrom
the template when the product is not the only child. This way, the user
is more aware that changing a value in the template changes the value
for all child products. He will have to do those changes on the template
form. A link to the template has been added in the product form view.
bzr revid: tde@openerp.com-20140122095826-8k0wl7af57iiyify
2014-01-22 10:58:26 +01:00
14bdf21b17
[CLEAN] product: cleaned product template copy method improvements
...
bzr revid: tde@openerp.com-20140121122139-j4jmr3jfbaoaamyj
2014-01-21 13:21:39 +01:00
b3fa81982b
[IMP] product: group_product_mono is default
...
bzr revid: tde@openerp.com-20140121122120-r2m1r927ne2r12mi
2014-01-21 13:21:20 +01:00
744810bbb4
[REV] product: unlink method back, no comment about why it has been
...
removed. It is therefore added back.
bzr revid: tde@openerp.com-20140121111421-x35gyqwo9jdpr3d7
2014-01-21 12:14:21 +01:00
b3a4778f26
[IMP] product variant: removed override of fields_view_get and use a "one group or another"
...
behavior for product variant. Users are either in group_product_mono or
group_product_variant, allowing to tune the form view according to the
group the user belongs to.
product: added group_product_mono group
sale: added set_group_product_variant method that adds or remove the
group_product_mono according to the group_product_variant being unchecked
or checked.
product: updated form view accordingly
bzr revid: tde@openerp.com-20140121105046-zkbs778upjg0lpyr
2014-01-21 11:50:46 +01:00
8cfd06f449
[IMP]product: removed product by template menu and action.
...
bzr revid: dka@tinyerp.com-20140117113910-csv71potcxaklem5
2014-01-17 17:09:10 +05:30
82cdf9e4c0
[IMP]product: removed unnecessary code from onchange_product_tmpl_id and improved indentation in template form view.
...
bzr revid: dka@tinyerp.com-20140117110544-y7lc0t2xc0bb6403
2014-01-17 16:35:44 +05:30
19bc4842c5
[REMOVE]test case of price margin.
...
bzr revid: dka@tinyerp.com-20140117101353-vbi7u3wfom0dep6j
2014-01-17 15:43:53 +05:30
132933f991
[IMP]revert margin calculation.
...
bzr revid: dka@tinyerp.com-20140117100627-s65f1jlv93h4w3p1
2014-01-17 15:36:27 +05:30
86ec8bd39a
[IMP]removed unnecessary code.
...
bzr revid: dka@tinyerp.com-20140117082647-6aoiouidtl06r3vk
2014-01-17 13:56:47 +05:30
effa6b282e
[IMP]product: removed attrs from variants in form view.
...
bzr revid: dka@tinyerp.com-20140117075805-r5k1epe8vzj36tzm
2014-01-17 13:28:05 +05:30
21c54c95a2
[MERGE]with lp:~openerp-dev/openobject-addons/trunk-imp-product-variant-another-amb and remove unnecessary changes.
...
bzr revid: dka@tinyerp.com-20140117070028-9xglu0v31hjid18f
2014-01-17 12:30:28 +05:30
5d770d4b6f
[MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al and resolve conflicts.
...
bzr revid: dka@tinyerp.com-20140116145307-u3e6gio449md3u2v
2014-01-16 20:23:07 +05:30
fcf6109d16
[MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al.
...
bzr revid: dka@tinyerp.com-20140116120607-rkfs8qysinmegp54
2014-01-16 17:36:07 +05:30
6a1eb008bf
[IMP] add context on product_tmpl_id of variant form.
...
bzr revid: amb@tinyerp.com-20140116111955-528o6gkjsb0p68t3
2014-01-16 16:49:55 +05:30
a00d24988f
[FIX] product: fixed file whose conflicts markers where still alive. Alive bzr diff
...
bzr revid: tde@openerp.com-20140116105508-qfxgox7rvo1ifjtj
2014-01-16 11:55:08 +01:00
9cf78e93cc
[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
...
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
2014-01-16 11:39:10 +01:00
79778888e7
[IMP]improved test case in compute_price_margin.
...
bzr revid: dka@tinyerp.com-20140116084128-4g5cqtuf6bqf9mh8
2014-01-16 14:11:28 +05:30
acde6d86c1
[IMP]rename has_variants field to standard_variants in product form and improved fields_view_get method.
...
bzr revid: dka@tinyerp.com-20140116074535-m40q8q7dy3kzfguf
2014-01-16 13:15:35 +05:30
a8fe8ac44f
[IMP]added onchange method on product_tmpl_id and added standard_variants function field to check the number of variants, improved view of product and removed unneccessary code.
...
bzr revid: dka@tinyerp.com-20140116072118-0xccl7mkdqbpdggb
2014-01-16 12:51:18 +05:30
6117f829b1
[IMP] product: Service (product.product_product_consultant) eval='False' and True inside demo data
...
bzr revid: chm@openerp.com-20140115153713-vd0tn5ttn7dhb3k6
2014-01-15 16:37:13 +01:00
cd12832f9e
[IMP] product: Service (product.product_product_consultant) is sale_ok=False by default and overwrite in hr_timesheet to True
...
bzr revid: chm@openerp.com-20140115152526-dptyljv7yxdkmis0
2014-01-15 16:25:26 +01:00
e1d3744589
[IMP] add context on product_tmpl_id.
...
bzr revid: amb@tinyerp.com-20140115141238-5bydnxn3a2qgfhz6
2014-01-15 19:42:38 +05:30
38b47cb029
[IMP] improve _save_product_lst_price.
...
bzr revid: amb@tinyerp.com-20140115135119-mh7phg952conv2of
2014-01-15 19:21:19 +05:30
6f277289ea
[IMP] improve code for fields_view_get and _save_product_lst_price.
...
bzr revid: amb@tinyerp.com-20140115125400-2hq2qgg81l21rwr0
2014-01-15 18:24:00 +05:30
d4460bf323
[IMP]product template: put context 'search_variants' in action to hide a blank varinats and revert the revno 10025.
...
bzr revid: dka@tinyerp.com-20140115122723-we4y9wmn6pu36rh9
2014-01-15 17:57:23 +05:30
33af9858b5
[IMP]put ondelete='restrict' on product_tmpl_id to restrict deletion of product template if template having a variants.
...
bzr revid: dka@tinyerp.com-20140115113455-26aupx34va3b0km5
2014-01-15 17:04:55 +05:30
fcd017aedc
[IMP] Remove deprecated code unlink method and improve code for _set_image
...
bzr revid: amb@tinyerp.com-20140115105223-st7166p7z10lkaa7
2014-01-15 16:22:23 +05:30
a452ff9d90
[IMP]remove domain from product_variant_ids and improve view.
...
bzr revid: dka@tinyerp.com-20140115065949-8vnj4lvmsiq5vixr
2014-01-15 12:29:49 +05:30
67f6f54e73
[MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al.
...
bzr revid: dka@tinyerp.com-20140113130212-4f17b0inc4u3s5k3
bzr revid: dka@tinyerp.com-20140115052550-15ulprts5fo6s30r
2014-01-15 10:55:50 +05:30
9a53155e7e
[IMP] product: product_variant restrict to the group_product_variant
...
bzr revid: chm@openerp.com-20140114152208-r2hasl9arc28rmm2
2014-01-14 16:22:08 +01:00
4e94761a8e
[IMP] product: category and website_sale controllers
...
bzr revid: chm@openerp.com-20140114142940-xpshp8e6trio5mxc
2014-01-14 15:29:40 +01:00
81c8320a2f
[IMP] price computation and yml testcase.
...
bzr revid: amb@tinyerp.com-20140110132921-klxgy71bas9jjef2
2014-01-10 18:59:21 +05:30
bea411bb98
[IMP] Backport one feature from website: this feature allows to specify a file
...
path on the field tag fetching the right file instead of using the base64
encoded file in the field.
<field name="image" type="base64" file="base/static/img/main_partner-image.png" />
bzr revid: stw@openerp.com-20140109154550-a04qybctzaaqtrlr
2014-01-09 16:45:50 +01:00
b100726312
[FIX] product: remove data demo of product in multi_company module; fix product images storage
...
bzr revid: chm@openerp.com-20140109152621-vduwsnm2hbm9nwop
2014-01-09 16:26:21 +01:00
Antony Lesuisse
Launchpad Translations on behalf of openerp
Raphael Collet
Christophe Simonis
Thibault Delavallée
Darshan Kalola (OpenERP)
Amit Bhavsar (Open ERP)
Christophe Matthieu
Stephane Wirtel