9863dbe5c8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
4b72678bc7
[MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
...
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
652c574866
[FIX] product.pricelist: leftover undefined variable from pricelist refactoring at revid:fp@tinyerp.com-20131206221809-x1muf0wonl4ated0
...
bzr revid: odo@openerp.com-20140212175224-wd9etr8xyrg6l0oz
2014-02-12 18:52:24 +01:00
bbd813e76e
[MERGE] Forward-port of latest saas-2 (incl. 7.0) bugfixes, up to rev. 9127 odo@openerp.com-20140212122042-3m2tysmr31mtecnc
...
bzr revid: odo@openerp.com-20140212175141-i9yz8zlseglrk8sb
2014-02-12 18:51:41 +01:00
65257c48b5
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9835 revid:launchpad_translations_on_behalf_of_openerp-20140213064742-xiotlx8wzfhexnhc
...
bzr revid: dle@openerp.com-20140210160759-oybxhdwgv2q4ma5a
bzr revid: odo@openerp.com-20140212122042-3m2tysmr31mtecnc
bzr revid: dle@openerp.com-20140212143044-0c94q4evxl4ltwr0
bzr revid: dle@openerp.com-20140213115951-h7c2o65lgg26aosv
2014-02-13 12:59:51 +01:00
ebdb230699
[FIX] pricelist: correctly take into account uom when computing pricelists based on supplier price on product form (opw 595881)
...
The previous behaviour used the uom of product while it could be a different one selected (by default the purchase unit of measure for purchase orders).
This was an issue especially when having different uom with supplier info lines setting degressive prices. The price should be computed based on selected uom and not the product uom.
bzr revid: mat@openerp.com-20140211145703-9uut4hw9aqh7326o
2014-02-11 15:57:03 +01:00
8d85c23e4a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140209065003-9soyulgvssk8n5ci
bzr revid: launchpad_translations_on_behalf_of_openerp-20140208071621-b018rnkhyxmmm5jk
bzr revid: launchpad_translations_on_behalf_of_openerp-20140209065224-kih7tx56elds0zok
bzr revid: launchpad_translations_on_behalf_of_openerp-20140210055324-raxopm5ej680oc73
2014-02-10 05:53:24 +00:00
6c478b8125
[MERGE] [IMP] product: added data for american units of measure + 1 yml test
...
bzr revid: tde@openerp.com-20140207151320-gw84zrmq5ifl9rdy
2014-02-07 16:13:20 +01:00
ffabcd257c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062321-j6cpns6xz3f81net
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062510-x502ahdwzezvea54
2014-02-06 06:25:10 +00:00
ff8f5104b1
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140131062421-oq9ywafamdrwjbtj
2014-01-31 06:24:21 +00:00
4d3a623af7
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128070310-721zmkmw0ocyz6im
bzr revid: launchpad_translations_on_behalf_of_openerp-20140129060326-647er2mw0mfn2j5s
2014-01-29 06:03:26 +00:00
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
d9cdc8564c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061252-9jm03vlbr13ofqo9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055652-0p71divui34v1c1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140124062440-hx0z2e4sd6nz7exc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051449-rlunde7qysqsh1b1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140125064003-v340hiykcngjg9ue
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051541-9fnyw12nex5poeth
bzr revid: launchpad_translations_on_behalf_of_openerp-20140127054606-1jb6usf6pj7gy1xl
2014-01-27 05:46:06 +00: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
805d3757e9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055732-ggft6ftma1kfpaq6
2014-01-23 05:57:32 +00: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
d5bc07f898
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061335-z6h1dn3yd94l8850
2014-01-22 06:13:35 +00: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
28d79433c3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070457-rn2tgdxis2fi3nqo
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055822-ajy043mntc4jr407
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055854-z7wtyb24c5t8kcmj
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070538-2xm86ece1aate8u9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055932-sa6vrp2g8ua3u88e
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055948-lwcyqcfutgamwac1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070546-d89xqw56zou7e9p9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055955-6wrdxqy1018mo7jq
2014-01-20 05:59:55 +00: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
216824eae4
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140117070359-ulb46tg4k5pv2xl7
2014-01-17 07:03:59 +00:00
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
Launchpad Translations on behalf of openerp
Christophe Simonis
Olivier Dony
Denis Ledoux
Martin Trigaux
Thibault Delavallée
Antony Lesuisse
Raphael Collet
Darshan Kalola (OpenERP)
Amit Bhavsar (Open ERP)