Commit Graph

2651 Commits

Author SHA1 Message Date
Josse Colpaert 9ac4fd4bcc [IMP] Add ul for palletization on packaging and put dimensions on ul
bzr revid: jco@openerp.com-20140320121335-cnjfecg115t8fa7t
2014-03-20 13:13:35 +01:00
Quentin (OpenERP) bde6b6d6e5 [REF] refactoring made during code review. Some optimization patches have been rewritten more clearly, others abandonned or kept. WIP
bzr revid: qdp-launchpad@openerp.com-20140319163359-2ea7tjn5ba1ggein
2014-03-19 17:33:59 +01:00
Christophe Simonis 99a3c45976 [MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
bzr revid: chs@openerp.com-20140318132741-aur3q1k7t9iympri
2014-03-18 14:27:41 +01:00
Denis Ledoux d8d312768c [FIX] product: overwritten name_search of product.pricelist ignored lang translations. It worked prior to saas-3 because the pricelist filter in the searchview used a selection widget, which did not care about translations
bzr revid: dle@openerp.com-20140317120126-qx4wrkqfdu3nr3sp
2014-03-17 13:01:26 +01:00
Josse Colpaert dcb12c7db8 [MERGE] Merge from trunk-wms-loconopmerge2 + only keep good optims
bzr revid: jco@openerp.com-20140313170620-fq25a32fdlo3xrxy
2014-03-13 18:06:20 +01:00
Josse Colpaert 8c49378527 [MERGE] Merge from trunk-wms
bzr revid: jco@openerp.com-20140312123434-c6je2o30w3tmtez9
2014-03-12 13:34:34 +01:00
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
Quentin (OpenERP) da210e4b5e [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20140311132813-0gmbof2u8nmgv9p3
2014-03-11 14:28:13 +01:00
Denis Ledoux 74af3ac0fe [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9144 revid:dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140310143600-kz7qjfe4p63s0a34
2014-03-10 15:36:00 +01:00
Denis Ledoux c2ba11e72e [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9885 revid:dle@openerp.com-20140310114026-r0ijm0m36su19wn7
bzr revid: dle@openerp.com-20140310122101-gicombyc5ii0yz6a
2014-03-10 13:21:01 +01:00
Launchpad Translations on behalf of openerp fd98bf36aa Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140307072427-zkvqj45icrzupx0m
bzr revid: launchpad_translations_on_behalf_of_openerp-20140307072433-0lqpjt07j1s8k8cs
2014-03-07 07:24:33 +00:00
Olivier Dony c43c308c33 [FIX] product: typo in previous commit
"The only man who makes no mistakes is the man who never does anything. ~T.R." ;-)

bzr revid: odo@openerp.com-20140306190906-k8wjr9urekpoy7ch
2014-03-06 20:09:06 +01:00
Martin Trigaux dc46ffd589 [FIX] use float rounding for pricelist instead of ceiling
bzr revid: mat@openerp.com-20140306162953-iu7k53i5zsllokdp
2014-03-06 17:29:53 +01:00
Martin Trigaux 1e048736df [IMP] remove useless imports
bzr revid: mat@openerp.com-20140306153125-czwswqw1k3w5ungh
2014-03-06 16:31:25 +01:00
Martin Trigaux 378dbbfaae [IMP] product: add python tests
bzr revid: mat@openerp.com-20140306133456-cnqjcwmo73ioqxxf
2014-03-06 14:34:56 +01:00
Martin Trigaux 5db649549c [IMP] mrp: use also the ceiling method from product
bzr revid: mat@openerp.com-20140306094504-37r691hxcemp0ual
2014-03-06 10:45:04 +01:00
Martin Trigaux 1967b6ce19 [FIX] product: when converting unit of mesures, round above instead of mathematical rounding
bzr revid: mat@openerp.com-20140305171456-goo7on3ncfihu0wu
2014-03-05 18:14:56 +01:00
Launchpad Translations on behalf of openerp e231045095 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140306061409-nvr56r44q6smklxz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140305055718-w3c9kzsncncpu12w
bzr revid: launchpad_translations_on_behalf_of_openerp-20140306061519-n2qbjt3fe7l104aw
2014-03-06 06:15:19 +00:00
Denis Ledoux b38245d6cb [FIX] product: price_get_multi raise if there is no active pricelist version (same behavior than before the pricelist computation factoring)
bzr revid: dle@openerp.com-20140305110314-pgiotwksjmdt63zm
2014-03-05 12:03:14 +01:00
Olivier Dony a6e9d3edcc [FIX] product: avoid reading image_small field which is bandwidth intensive and un-necessary
bzr revid: odo@openerp.com-20140304182724-kplzfik56ebp2boe
2014-03-04 19:27:24 +01:00
Launchpad Translations on behalf of openerp b201dc79b7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140218054104-8egkh4jj7hiiwuih
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219054048-688twg0fubtm2x2q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140220054214-237ri67t9rw3l4fu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063855-wniw42r27gyg3h6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073328-xpn7nwqz407yzumq
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074516-0r09cpmma58ylqji
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060319-535oheaq2w9u2ye3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062420-zl7curej0e0warhz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073146-3vzhw4hddr81olbs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140227062959-24e2rn98rqb9afpr
bzr revid: launchpad_translations_on_behalf_of_openerp-20140228072152-f9gm4ud1wu19ge27
bzr revid: launchpad_translations_on_behalf_of_openerp-20140301055205-r0df0fqz9yf5z66i
bzr revid: launchpad_translations_on_behalf_of_openerp-20140302052638-bjf11oumy7w15oco
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304082704-k1z2te1tfud43zy3
2014-03-04 08:27:04 +00:00
Launchpad Translations on behalf of openerp 9863dbe5c8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
Josse Colpaert 6694c3a094 [MERGE] Merge from trunk-wms
bzr revid: jco@openerp.com-20140303083411-wg6ilg9mft9qx3td
2014-03-03 09:34:11 +01:00
Josse Colpaert d39056faec [IMP] Change _compute_qty to0 _compute_qty_obj in order to pass browse records immediately instead
bzr revid: jco@openerp.com-20140228173241-qfenlx2hb8h1k40j
2014-02-28 18:32:41 +01:00
Quentin (OpenERP) e36b32a661 [MERGE] merged with main trunk (revision 9186)
bzr revid: qdp-launchpad@openerp.com-20140228131516-ihigousbe5p1nt68
2014-02-28 14:15:16 +01:00
Josse Colpaert bd0fcb70b7 [IMP] name_get of product should not ask for seller_ids if not necessary
bzr revid: jco@openerp.com-20140227160808-m53f0kkgbqno1ea8
2014-02-27 17:08:08 +01:00
Denis Ledoux 70d3f251a3 [REVERT] rev 8788.1.1769: The exchange rate of the currency of the pricelist should not be applied as this price computation method does not depends of any pricelist
bzr revid: dle@openerp.com-20140226172300-z2okr3vpjuwxs4mz
2014-02-26 18:23:00 +01:00
Christophe Simonis 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
Denis Ledoux 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
Olivier Dony 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
Olivier Dony 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
Cedric Snauwaert ca6a1adb3c [MERGE]merge with latest trunk-wms
bzr revid: csn@openerp.com-20140212153016-50qjg6lpn8o4440r
2014-02-12 16:30:16 +01:00
Cedric Snauwaert b8826aaa30 [FIX]various usability thing
bzr revid: csn@openerp.com-20140212124646-301rfsr1712cdy18
2014-02-12 13:46:46 +01:00
Martin Trigaux 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
Cedric Snauwaert 9b249181e3 [MERGE]merge with latest trunk
bzr revid: csn@openerp.com-20140210161556-qq52vvhdegyda7k6
2014-02-10 17:15:56 +01:00
Cedric Snauwaert 9502276166 [FIX]work on view for better usability
bzr revid: csn@openerp.com-20140210100727-1q2q61t3c3nxfd10
2014-02-10 11:07:27 +01:00
Darshan Kalola (OpenERP) b3c6e20e36 [MERGE]sync with trunk and resolve conflicts.
bzr revid: dka@tinyerp.com-20140210084803-rjkt9e4rhni8nhlt
2014-02-10 14:18:03 +05:30
Launchpad Translations on behalf of openerp 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
Thibault Delavallée 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
Launchpad Translations on behalf of openerp 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
Quentin (OpenERP) bbe5811e56 [FIX] fix needed after the previous merge with trunk: produce_delay field doesn't belong to product module anymore
bzr revid: qdp-launchpad@openerp.com-20140203184520-5p1j2y3sk1asu8hj
2014-02-03 19:45:20 +01:00
Quentin (OpenERP) 4416f74c98 [FIX] fix needed after merge with trunk (active field doesn't belong to product.template object)
bzr revid: qdp-launchpad@openerp.com-20140203184140-bxqvqw0slo9trsw0
2014-02-03 19:41:40 +01:00
Quentin (OpenERP) d676e39094 [FIX] fix needed after merge with trunk (cost_method field doesn't belong to product module anymore)
bzr revid: qdp-launchpad@openerp.com-20140203180044-auj3u263qiji203t
2014-02-03 19:00:44 +01:00
Quentin (OpenERP) 753f7541db [MERGE] main trunk
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00
Launchpad Translations on behalf of openerp ff8f5104b1 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140131062421-oq9ywafamdrwjbtj
2014-01-31 06:24:21 +00:00
Launchpad Translations on behalf of openerp 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
Antony Lesuisse 033c38c304 [MERGE] trunk
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
Launchpad Translations on behalf of openerp 3ce5e01eca Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
Raphael Collet 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
Raphael Collet 17616e08ef [IMP] product: simplify further product_product.copy()
bzr revid: rco@openerp.com-20140127101957-1ywu40m081uo79nl
2014-01-27 11:19:57 +01:00
Raphael Collet 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
Raphael Collet 3ce7ccd57e [IMP] product: Python fixes ('<>' -> '!=')
bzr revid: rco@openerp.com-20140127091856-1cvelz2tq16lfaml
2014-01-27 10:18:56 +01:00
Launchpad Translations on behalf of openerp 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
Antony Lesuisse aa727b9a43 [FIX] product use osv _check_recursion helper
bzr revid: al@openerp.com-20140126210921-0dh2dghkcyymvron
2014-01-26 22:09:21 +01:00
Antony Lesuisse 232475e83a [FIX] product remove arbitrary size limits
bzr revid: al@openerp.com-20140126210506-3kjf53g9uxtvhn40
2014-01-26 22:05:06 +01:00
Antony Lesuisse bd088d8868 [FIX] product rename and reorder variant menu items
bzr revid: al@openerp.com-20140126205954-q33s3h306soh43jc
2014-01-26 21:59:54 +01:00
Antony Lesuisse beb15c52ab [FIX] Softwares is made of datas and codes
bzr revid: al@openerp.com-20140126204334-4ggfsn31zp1yndix
2014-01-26 21:43:34 +01:00
Cedric Snauwaert 70ec840eaf [MERGE]merge with latest wms-trunk
bzr revid: csn@openerp.com-20140124094419-monnhyomr8721nbx
2014-01-24 10:44:19 +01:00
Christophe Simonis 2cf97c76d3 [IMP] product: correct copy() of products variants
bzr revid: chs@openerp.com-20140123183208-jg76zjt7tzd1fl75
2014-01-23 19:32:08 +01:00
Thibault Delavallée 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
Launchpad Translations on behalf of openerp 805d3757e9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055732-ggft6ftma1kfpaq6
2014-01-23 05:57:32 +00:00
Thibault Delavallée 46c55500ff [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20140122171321-6r2q42p7ebfv3kb9
2014-01-22 18:13:21 +01:00
Thibault Delavallée 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
Thibault Delavallée 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
Thibault Delavallée 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
Launchpad Translations on behalf of openerp d5bc07f898 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061335-z6h1dn3yd94l8850
2014-01-22 06:13:35 +00:00
Thibault Delavallée 14bdf21b17 [CLEAN] product: cleaned product template copy method improvements
bzr revid: tde@openerp.com-20140121122139-j4jmr3jfbaoaamyj
2014-01-21 13:21:39 +01:00
Thibault Delavallée b3fa81982b [IMP] product: group_product_mono is default
bzr revid: tde@openerp.com-20140121122120-r2m1r927ne2r12mi
2014-01-21 13:21:20 +01:00
Thibault Delavallée 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
Thibault Delavallée 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
Quentin (OpenERP) 3f8ec15bbe [MERGE] stock, sale, sale_stock: several usability problem fixed.
lp bug: https://launchpad.net/bugs/1269045 fixed

bzr revid: qdp-launchpad@openerp.com-20140120160303-v5hmfmb6roeg56v6
2014-01-20 17:03:03 +01:00
Quentin (OpenERP) fc93025818 [MERGE] merged trunk
bzr revid: qdp-launchpad@openerp.com-20140120144243-5kw535p28t1x7yeg
2014-01-20 15:42:43 +01:00
Launchpad Translations on behalf of openerp 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
Darshan Kalola (OpenERP) 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
Darshan Kalola (OpenERP) 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
Darshan Kalola (OpenERP) 19bc4842c5 [REMOVE]test case of price margin.
bzr revid: dka@tinyerp.com-20140117101353-vbi7u3wfom0dep6j
2014-01-17 15:43:53 +05:30
Darshan Kalola (OpenERP) 132933f991 [IMP]revert margin calculation.
bzr revid: dka@tinyerp.com-20140117100627-s65f1jlv93h4w3p1
2014-01-17 15:36:27 +05:30
Darshan Kalola (OpenERP) 86ec8bd39a [IMP]removed unnecessary code.
bzr revid: dka@tinyerp.com-20140117082647-6aoiouidtl06r3vk
2014-01-17 13:56:47 +05:30
Darshan Kalola (OpenERP) 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
Launchpad Translations on behalf of openerp 216824eae4 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140117070359-ulb46tg4k5pv2xl7
2014-01-17 07:03:59 +00:00
Darshan Kalola (OpenERP) 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
Darshan Kalola (OpenERP) 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
Cedric Snauwaert 3e87ec567e [FIX]remove unneeded code to compute qty available in product module, use the one defined in stock instead
lp bug: https://launchpad.net/bugs/1268989 fixed

bzr revid: csn@openerp.com-20140116133905-en7y1b9tibstcou3
2014-01-16 14:39:05 +01:00
Darshan Kalola (OpenERP) 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
Amit Bhavsar (Open ERP) 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
Thibault Delavallée 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
Thibault Delavallée 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
Darshan Kalola (OpenERP) 79778888e7 [IMP]improved test case in compute_price_margin.
bzr revid: dka@tinyerp.com-20140116084128-4g5cqtuf6bqf9mh8
2014-01-16 14:11:28 +05:30
Darshan Kalola (OpenERP) 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
Darshan Kalola (OpenERP) 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
Launchpad Translations on behalf of openerp f39b8bb436 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140116060347-s1e2v9o33n1cxk2y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140116060418-cw791djr2ebt2wuy
bzr revid: launchpad_translations_on_behalf_of_openerp-20140116060651-x8r0l0m27wcx0yav
2014-01-16 06:06:51 +00:00
Christophe Matthieu 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
Christophe Matthieu 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
Amit Bhavsar (Open ERP) e1d3744589 [IMP] add context on product_tmpl_id.
bzr revid: amb@tinyerp.com-20140115141238-5bydnxn3a2qgfhz6
2014-01-15 19:42:38 +05:30
Amit Bhavsar (Open ERP) 38b47cb029 [IMP] improve _save_product_lst_price.
bzr revid: amb@tinyerp.com-20140115135119-mh7phg952conv2of
2014-01-15 19:21:19 +05:30
Cedric Snauwaert d0cea6ac39 [FIX]rename group_stock_production_lot to match correct group, remove few extra spaces to match standard.
Fix traceback on onchange: product_packaging_change and remove setting default package when creating SOL

lp bug: https://launchpad.net/bugs/1269045 fixed

bzr revid: csn@openerp.com-20140115130123-3ragkt93ukfrfhmq
2014-01-15 14:01:23 +01:00
Amit Bhavsar (Open ERP) 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
Darshan Kalola (OpenERP) 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
Darshan Kalola (OpenERP) 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
Amit Bhavsar (Open ERP) 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
Darshan Kalola (OpenERP) 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
Launchpad Translations on behalf of openerp 5334330d9d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140115062126-ypg4xp33rspusnts
bzr revid: launchpad_translations_on_behalf_of_openerp-20140115062205-ov2axame3z00jkii
2014-01-15 06:22:05 +00:00
Darshan Kalola (OpenERP) 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
Christophe Matthieu 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
Christophe Matthieu 4e94761a8e [IMP] product: category and website_sale controllers
bzr revid: chm@openerp.com-20140114142940-xpshp8e6trio5mxc
2014-01-14 15:29:40 +01:00
Amit Bhavsar (Open ERP) 81c8320a2f [IMP] price computation and yml testcase.
bzr revid: amb@tinyerp.com-20140110132921-klxgy71bas9jjef2
2014-01-10 18:59:21 +05:30
Stephane Wirtel 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
Christophe Matthieu 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
Darshan Kalola (OpenERP) c103be840c [IMP]added test case for extra price and remove copy_translations method from product_product.
bzr revid: dka@tinyerp.com-20140109132515-my03lj9haj9ex90k
2014-01-09 18:55:15 +05:30
Amit Bhavsar (Open ERP) c0076916f3 [IMP] change menu sequence, improve price computation on public price, and add domain on variants.
bzr revid: amb@tinyerp.com-20140109125127-ua8oa9ceyphsxlvo
2014-01-09 18:21:27 +05:30
Christophe Matthieu 24480a2440 [FIX] product: access right. Resolve: Use Superuser in name_get method to fetch partners/sellers
bzr revid: chm@openerp.com-20140109124423-vq7u14q089xiqtt9
2014-01-09 13:44:23 +01:00
Darshan Kalola (OpenERP) 21db945b88 [IMP]Add fields_view_get method to make dynamic view of product.
bzr revid: dka@tinyerp.com-20140109103756-d5f37y2eyxjisvoo
2014-01-09 16:07:56 +05:30
Darshan Kalola (OpenERP) a9e87b56ce [MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: dka@tinyerp.com-20140108093659-c9it34gll0ipcll2
2014-01-08 15:06:59 +05:30
Thibault Delavallée 0b2d085c1b [IMP] shop: added openchatter on product shop
- product.template now inherits from mail.thread
- added opencahtter on product.template form view
- added discussion thread + attachments in product website view
- added file_type field on ir_attachment, that replaces the javascript thing
from mail.js
- added a controller to comment a product.template

bzr revid: tde@openerp.com-20140106135727-uf0zaxav28pdx4sv
2014-01-06 14:57:27 +01:00
Quentin (OpenERP) ee9aa9ffd4 [IMP] mrp, product, stock, project_mrp: usability of product form view
bzr revid: qdp-launchpad@openerp.com-20131220095806-16siwncivyuokrym
2013-12-20 10:58:06 +01:00
Launchpad Translations on behalf of openerp e6a46a855d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131220053413-o3xa4nlpu9snoiq6
2013-12-20 05:34:13 +00:00
Quentin (OpenERP) 1af2ac6f9c [FIX] fixed warnings in runbot
bzr revid: qdp-launchpad@openerp.com-20131211154840-u2nk7ztggcgewm7y
2013-12-11 16:48:40 +01:00
Quentin (OpenERP) a5cc6d6aed [MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-20131211100354-hwlt65vk8p3xih9u
2013-12-11 11:03:54 +01:00
Fabien Pinckaers 59906a3af8 [IMP] allow users to change product price from CMS[FIX] small bug in reordering of PTT
bzr revid: fp@tinyerp.com-20131209210511-5w03vf2wt0pmgdew
2013-12-09 22:05:11 +01:00
Christophe Matthieu 6652856445 [FIX] website_sale: link; product: clean code and use product.template for supplierinfo
bzr revid: chm@openerp.com-20131209163254-k9dwxw48rcgz1hbs
2013-12-09 17:32:54 +01:00
Christophe Matthieu 6aface1bd0 [FIX] product.supplierinfo: product_id is a product.product fields. Rename fields into product_tmpl_id for many2one to product.template model
bzr revid: chm@openerp.com-20131209151135-q54g17zcq1vnshsl
2013-12-09 16:11:35 +01:00
Fabien Pinckaers 66e85ee1e0 [IMP] Product visible discount: discount is expressed based in Public Price
bzr revid: fp@tinyerp.com-20131209142203-20l555dfdyvb60xe
2013-12-09 15:22:03 +01:00
Fabien Pinckaers 20bbabc82b [IMP] Huge speed improvement in price computation on products: 162 to 39 queries to render /shop with 28 products. O(n)->O(1)
bzr revid: fp@tinyerp.com-20131206221809-x1muf0wonl4ated0
2013-12-06 23:18:09 +01:00
Quentin (OpenERP) a0caaa3d6d [FIX] product: moved the standard price historization on product_template table instead of product.product (the column is there)
bzr revid: qdp-launchpad@openerp.com-20131206163054-3lpu43m16lvc8okp
2013-12-06 17:30:54 +01:00
Quentin (OpenERP) f2ef7dc29b [REF] stock_account, product: moved the standard price historization in 'product' module, as it doesn't depend of stock (or account) at all and it was causing problems for products created before stock_account was installed, like all demo data products (no entry for them in prices_history table)
bzr revid: qdp-launchpad@openerp.com-20131206103150-2mnvsipy9uai3xlk
2013-12-06 11:31:50 +01:00
Launchpad Translations on behalf of openerp 379dc8bf98 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054445-5fy8zd7lvnn9mjp2
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055138-hq05otjnuktjpa48
bzr revid: launchpad_translations_on_behalf_of_openerp-20131204055601-tbzqqhperzffjbjt
bzr revid: launchpad_translations_on_behalf_of_openerp-20131204055642-0rwynvhgvs0r14b3
2013-12-04 05:56:42 +00:00
Fabien Pinckaers 773d7a25d1 [IMP] huge speed improvement on computing prices of several products 916 SQL queries to 216. Still too much.
bzr revid: fp@tinyerp.com-20131203223910-l4hbew0f0iquii9x
2013-12-03 23:39:10 +01:00
Launchpad Translations on behalf of openerp 4fd98907ce Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054550-w0k8alfqs2bigurx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055222-2u7o99e48254dceu
bzr revid: launchpad_translations_on_behalf_of_openerp-20131203061621-hyqqh11jt7g0ilqh
2013-12-03 06:16:21 +00:00
Christophe Matthieu fd2821086f [MERGE] sync with trunk
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +01:00
Amit Bhavsar (Open ERP) ca6c085712 [imp] solved image issue when duplicate the product.
bzr revid: amb@tinyerp.com-20131202135105-0gy7pmxgdysi5a9p
2013-12-02 19:21:05 +05:30
Amit Bhavsar (Open ERP) f70b33b5c0 [imp] solved traceback and improve copy method of product template.
bzr revid: amb@tinyerp.com-20131202111516-5010t3n3j4na270i
2013-12-02 16:45:16 +05:30
Fabien Pinckaers 2fee01f084 [IMP] removed a feature nobody used for a huge speed improvement (4 SQL Queries per search/read
bzr revid: fp@tinyerp.com-20131202084517-80d1vdwfwpbdsqdn
2013-12-02 09:45:17 +01:00
Launchpad Translations on behalf of openerp 9f04e0c76c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131130050422-r8hhiot5r58eukys
bzr revid: launchpad_translations_on_behalf_of_openerp-20131130051429-uepuma01yhw11md9
2013-11-30 05:14:29 +00:00
Quentin (OpenERP) df2d5e148e [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20131129165644-fx0m3ok07l41o507
2013-11-29 17:56:44 +01:00
Launchpad Translations on behalf of openerp 1fedbc18f5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131126060718-7io3n16co82qp5pu
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127053913-ypnlpggd4wt58pzx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131128060603-kk12b8iu0uhhtist
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129052938-u0wq863etr3sl1cm
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129053023-zlbrprsiq9e7vs39
2013-11-29 05:30:23 +00:00
Amit Bhavsar (Open ERP) 3c966202ef [imp] improve a typo.
bzr revid: amb@tinyerp.com-20131129052157-snnwkddyb6evdm6w
2013-11-29 10:51:57 +05:30
Amit Bhavsar (Open ERP) 8b75e738c1 [imp] add code note for product.py and improve template demo.
bzr revid: amb@tinyerp.com-20131128110703-hjpru7kjwvaqfg6p
2013-11-28 16:37:03 +05:30
Christophe Matthieu a58a43632d [IMP] product: add fnct_inv for lst_price field
bzr revid: chm@openerp.com-20131128101556-1h4h87va3wuk1kd1
2013-11-28 11:15:56 +01:00
Amit Bhavsar (Open ERP) 82d6ca2363 [imp] add help,typo,improve search and change menu sequence.
bzr revid: amb@tinyerp.com-20131128062151-1614s0dmll83i5q6
2013-11-28 11:51:51 +05:30
Launchpad Translations on behalf of openerp 6fd5575930 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127053957-ekc1bfm5ohug21aa
2013-11-27 05:39:57 +00:00
Fabien Pinckaers 183c75a3c7 [IMP] default values on new events
bzr revid: fp@tinyerp.com-20131126161424-savrp6u63zmpoq5w
2013-11-26 17:14:24 +01:00
Thibault Delavallée 000c38816d [MERGE] [IMP] Addons: updated some field labels to avoid duplicates to ease
the import / export process

Aso includes
- project: deprecated priority field: use sequence instead
- base_calendar: calendar.event: deprecated organizer field: use organize_id instead

bzr revid: tde@openerp.com-20131125093741-hx9hpj85xqfalvqw
2013-11-25 10:37:41 +01:00
Launchpad Translations on behalf of openerp 5f21b4bff9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062620-6obt60lwob64hi98
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054757-4w9nik6wieeqf0yg
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060111-rf445xxiinvazinv
2013-11-25 06:01:11 +00:00
Xavier Morel 61431d0384 [IMP] product: avoid redundant work
bzr revid: xmo@openerp.com-20131121142252-laxz8z457yyebayj
2013-11-21 15:22:52 +01:00
Darshan Kalola (OpenERP) f19a433dbb [MERGE] with lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb and change necessary code.
bzr revid: dka@tinyerp.com-20131121122311-629hbtetmqfrtfyg
2013-11-21 17:53:11 +05:30
Darshan Kalola (OpenERP) 17a5f388eb [IMP]add variant group in product by template menu.
bzr revid: dka@tinyerp.com-20131121055920-fh4e2elnrdy3rz45
2013-11-21 11:29:20 +05:30
Launchpad Translations on behalf of openerp 271ed43e7b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121054848-007arsnnoa8fs65e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063838-blqn6j0yfmrlw5vp
2013-11-21 06:38:38 +00:00
Launchpad Translations on behalf of openerp 17fe569269 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131119052725-2fcjekn5ouumctna
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120052525-2pwf2q3wdcrbqics
2013-11-20 05:25:25 +00:00
Amit Bhavsar (Open ERP) f52b04fee3 [Imp] Remove Unnecessary change.
bzr revid: amb@tinyerp.com-20131119100202-95y4r5t2g74a61of
2013-11-19 15:32:02 +05:30
Thibault Delavallée 9f38df4d57 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131115133635-66u5iuesqb5u6leq
2013-11-15 14:36:35 +01:00
Amit Bhavsar (Open ERP) 9cc4983fb7 Override demo data for prouct_visible_discount and remove unused code from dka merge.
bzr revid: amb@tinyerp.com-20131115124902-om1kduj623f9cub8
2013-11-15 18:19:02 +05:30
Christophe Matthieu 3ef7c80aa6 [WIP] website: remove contraints with many2one to res.partner field. The website field must use a contact/address widget without force user to publish the partner
bzr revid: chm@openerp.com-20131114102033-dfmv019mmqow0ebt
2013-11-14 11:20:33 +01:00
Quentin (OpenERP) b4af523ef4 [IMP] product, usability: added active field in product form view (as it is referenced in a warning message saying we cannot change the uom if it's not in the same uom categ but rather deactivate the product)
bzr revid: qdp-launchpad@openerp.com-20131112102441-cz1vzbxsffv48ab6
2013-11-12 11:24:41 +01:00
Darshan Kalola (OpenERP) e97c4924b7 [IMP]solve yml issue and improve unit price for invoice line.
bzr revid: dka@tinyerp.com-20131111132418-aeazzv8dkyaijgne
2013-11-11 18:54:18 +05:30
Quentin (OpenERP) cd543d96e0 [IMP] misc usability improvements
bzr revid: qdp-launchpad@openerp.com-20131108165217-wk9b079p7jladswm
2013-11-08 17:52:17 +01:00
Darshan Kalola (OpenERP) 7237e7436b [MERGE]with lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb
bzr revid: dka@tinyerp.com-20131108134052-49pappgab0d7j49q
2013-11-08 19:10:52 +05:30
Darshan Kalola (OpenERP) 412ee4bd8a [IMP]add search view for product-variant,solve duplication problem of product variant and solve unit price calculation problem.
bzr revid: dka@tinyerp.com-20131108131416-cyqebxz9zgbjy9nj
2013-11-08 18:44:16 +05:30
Amit Bhavsar (Open ERP) e715a7a019 [imp] Improve product and template view and add menu products by templates.
bzr revid: amb@tinyerp.com-20131108123643-4iwtcuf3p9f14l6z
2013-11-08 18:06:43 +05:30
Launchpad Translations on behalf of openerp eaa917bef9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120054418-15be15rhz84vk0et
2013-11-20 05:44:18 +00:00
Launchpad Translations on behalf of openerp 523b10fe44 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131119055635-19g4i058ihed0ivz
2013-11-19 05:56:35 +00:00
Launchpad Translations on behalf of openerp 108ccbf108 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114062958-ies8xa3pft7n59ms
bzr revid: launchpad_translations_on_behalf_of_openerp-20131106055135-r0xt2vr04710jh1t
bzr revid: launchpad_translations_on_behalf_of_openerp-20131107055120-r8z445ergt50erlx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062620-bvfofx1jl1wb1csh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064525-ioceogsmu0nmx2qj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053908-gbrp09ast5fhr6iw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062316-5uf2bvbzdhkq1b7k
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113060841-bkjcuz4e9rtzn6f9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114063058-rrm2q5lxkyawuvpz
2013-11-14 06:30:58 +00:00
jke-openerp 5308a926d2 [IMP] Improve and fix according to review FP
bzr revid: jke@openerp.com-20131105161517-zm1ks2m8fkcf7v7i
2013-11-05 17:15:17 +01:00
Amit Bhavsar (Open ERP) 9ff3a27488 [MERGE] lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb-dka
bzr revid: amb@tinyerp.com-20131101105321-us7192tfr6k4mxox
2013-11-01 16:23:21 +05:30
Darshan Kalola (OpenERP) 50963cc810 [IMP]improve typo and solve the product duplication problem.
bzr revid: dka@tinyerp.com-20131101102528-21x66oz8wn5uxaq2
2013-11-01 15:55:28 +05:30
Launchpad Translations on behalf of openerp 30e141708b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131031054753-45rivp2vcydq7cv3
2013-10-31 05:47:53 +00:00
Amit Bhavsar (Open ERP) 445fa763a7 [MERGE] lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb-dka
bzr revid: amb@tinyerp.com-20131030114509-iju4k402pmbjbcsa
2013-10-30 17:15:09 +05:30
Darshan Kalola (OpenERP) 8210a9962e [IMP]improve test case and product form view.
bzr revid: dka@tinyerp.com-20131030103521-gmeyqdvug6nt4cd5
2013-10-30 16:05:21 +05:30
Launchpad Translations on behalf of openerp 40c309024c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026062529-74ir3upguunr9mw3
bzr revid: launchpad_translations_on_behalf_of_openerp-20131027061317-d9s440jzv1juvswi
bzr revid: launchpad_translations_on_behalf_of_openerp-20131028054233-15znliqv2eh2jq0i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131029051429-rcytejyrg2s4t9db
bzr revid: launchpad_translations_on_behalf_of_openerp-20131030055438-gp0hyend0jooi941
2013-10-30 05:54:38 +00:00
Darshan Kalola (OpenERP) 960924195e [MERGE]merged with main addons
bzr revid: dka@tinyerp.com-20131030052926-i9c25mf6wpseioh3
2013-10-30 10:59:26 +05:30
jke-openerp 2c65def713 [FIX] According to [wms] APR's Review from 20131022 - Move lead_time in mrp module, trace back on split delivery
bzr revid: jke@openerp.com-20131029074815-mws7cuvqgxr6q2d4
2013-10-29 08:48:15 +01:00
Thibault Delavallée 7da7f0bd63 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131028165203-wgt2qfzhw3kr1pqi
2013-10-28 17:52:03 +01:00
Thibault Delavallée 5bb4fa2b43 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131028163321-5o81wa1m7rzdp1dz
2013-10-28 17:33:21 +01:00
Amit Bhavsar (Open ERP) e80dd25141 [MERGE] lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb-dka
bzr revid: amb@tinyerp.com-20131028094412-512svv3vbqpl55g9
2013-10-28 15:14:12 +05:30
Quentin (OpenERP) 2a982d199e [MERGE] merged with trunk
bzr revid: qdp-launchpad@openerp.com-20131028093247-8eegjl3zle5aoqae
2013-10-28 10:32:47 +01:00
Darshan Kalola (OpenERP) 02dec945de [IMP]improve view,label and help of product.
bzr revid: dka@tinyerp.com-20131028090644-fkmxjbbu5pze5f7h
2013-10-28 14:36:44 +05:30
Darshan Kalola (OpenERP) bc14d3e659 [ADD]test case for computation of price margin.
bzr revid: dka@tinyerp.com-20131028053025-4h9ftnaqtmbzp2yl
2013-10-28 11:00:25 +05:30
Darshan Kalola (OpenERP) 162329ee4a [IMP]demo data of product and yml test of point of sale.
bzr revid: dka@tinyerp.com-20131025122415-b1cssqumzdowxjrb
2013-10-25 17:54:15 +05:30
Darshan Kalola (OpenERP) 21bf32477f [IMP]demo data of product.
bzr revid: dka@tinyerp.com-20131025070047-d7drcy22lclon13d
2013-10-25 12:30:47 +05:30
Launchpad Translations on behalf of openerp 8bc457816f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131024052057-4ai7sltsmuoke8l5
bzr revid: launchpad_translations_on_behalf_of_openerp-20131025060100-ua2rf6g9urivk8bm
2013-10-25 06:01:00 +00:00
Amit Bhavsar (Open ERP) a94b7a2c77 [MERGE] merge with lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb-dka
bzr revid: amb@tinyerp.com-20131024091218-k101jbqmlmj6ae2d
2013-10-24 14:42:18 +05:30
Darshan Kalola (OpenERP) cfb4780369 [IMP]add image field and description field in product_product.
bzr revid: dka@tinyerp.com-20131024065805-lffcw1zq616dwv3m
2013-10-24 12:28:05 +05:30
Amit Bhavsar (Open ERP) 2cf5c977ae [MERGE] merge with latest trunk.
bzr revid: amb@tinyerp.com-20131021072954-i41newfty914azna
2013-10-21 12:59:54 +05:30
Amit Bhavsar (Open ERP) 683443c3ce [imp] On Template view set delete=flase for variant o2m.
bzr revid: amb@tinyerp.com-20131021072456-j2cuh3omwig3geta
2013-10-21 12:54:56 +05:30
Darshan Kalola (OpenERP) 9b8c247195 [MERGE] with main addons
bzr revid: dka@tinyerp.com-20131021060101-93g9tq6dcawhh8r8
2013-10-21 11:31:01 +05:30
Denis Ledoux f2e561afec [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 8960 rev-id: dle@openerp.com-20131018125818-1k168nlo2ferj25w
bzr revid: dle@openerp.com-20131018131007-etdut0wpjqhnexz2
2013-10-18 15:10:07 +02:00
Denis Ledoux a7e05f1af4 [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8793 rev-id: dle@openerp.com-20131018124037-v3501acvv4fh1077
bzr revid: dle@openerp.com-20131018125818-1k168nlo2ferj25w
2013-10-18 14:58:18 +02:00
Denis Ledoux 1a555475cc [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9529 rev-id: mat@openerp.com-20131018120428-2vdmdm2th8rz57zr
bzr revid: dle@openerp.com-20131018121236-zp221von16vekthp
2013-10-18 14:12:36 +02:00
Christophe Matthieu 666387a274 [WIP] payment_acquirer
bzr revid: chm@openerp.com-20131018111530-tjyhp3cu1qlabhij
2013-10-18 13:15:30 +02:00
niv-openerp 67a9fee553 [MERGE] saas2
bzr revid: nicolas.vanhoren@openerp.com-20131018103820-a0sklx6hyx3hx93e
2013-10-18 12:38:20 +02:00
Darshan Kalola (OpenERP) d97e7a6a4e [IMP]kanban view of product-template.
bzr revid: dka@tinyerp.com-20131018091710-mn1mhgx8m2ytixy3
2013-10-18 14:47:10 +05:30
Amit Bhavsar (Open ERP) 96ce32830e [Imp] add product variant group for productlist view.
bzr revid: amb@tinyerp.com-20131017061109-e5fdeli5017obe13
2013-10-17 11:41:09 +05:30
Christophe Matthieu 6b20e1baea [FIX] product: wrong product and supplierinfo demo data. Because product_id of product.supplierinfo is a product.template field and not a product.product field
bzr revid: chm@openerp.com-20131015132738-d1l7bb8vbndz5mu5
2013-10-15 15:27:38 +02:00
Christophe Matthieu 4724266802 [FIX] product: wrong product and supplierinfo demo data. Because product_id of product.supplierinfo is a product.template field and not a product.product field
bzr revid: chm@openerp.com-20131015125308-mzmq1p1nm1kfqd9g
2013-10-15 14:53:08 +02:00
Darshan Kalola (OpenERP) 1b336d74c6 [ADD]kanban view in product-template.
bzr revid: dka@tinyerp.com-20131015095414-aeu0zrmdoowkt1yy
2013-10-15 15:24:14 +05:30
Darshan Kalola (OpenERP) 90d676bc2a [MERGE] with lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb.
bzr revid: dka@tinyerp.com-20131014102139-m63gux5j0pkjbfnj
2013-10-14 15:51:39 +05:30
Darshan Kalola (OpenERP) c1c71c522e [IMP]search,tree and kanban view of product and added search view of product template.
bzr revid: dka@tinyerp.com-20131014094614-m32bm0npqxblz1k0
2013-10-14 15:16:14 +05:30
Launchpad Translations on behalf of openerp 566af6033f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131011052941-f4x7ued38x0siu4u
bzr revid: launchpad_translations_on_behalf_of_openerp-20131013053842-x6nja74l8by5vd1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20131014053313-j22u5qen55na9js8
2013-10-14 05:33:13 +00:00
Olivier Dony 8ac110c4dd [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5098 rev-id: odo@openerp.com-20131011123914-7zuvd9mch21yxgj8
bzr revid: dle@openerp.com-20131009131902-a93nsbou4w8y0vlx
bzr revid: chs@openerp.com-20131009175454-j06y1ngylfbqyrpj
bzr revid: dle@openerp.com-20130918160049-fo88fl7uyhfoofkv
bzr revid: dle@openerp.com-20130924130544-kmkyr0d73cusvdav
bzr revid: odo@openerp.com-20131011134433-nyfjipvlql4xu127
2013-10-11 15:44:33 +02:00
Amit Bhavsar (Open ERP) 7384ea8108 [imp] Improve the price margin calculation and name_search for variant.
bzr revid: amb@tinyerp.com-20131011123024-utkshw2tr1z8y8ah
2013-10-11 18:00:24 +05:30
Darshan Kalola (OpenERP) 3cb95d2227 [IMP] add menu Product Template and improve the form view of product template.
bzr revid: dka@tinyerp.com-20131011110641-q3dcnsfqihbjnfs1
2013-10-11 16:36:41 +05:30
Amit Bhavsar (Open ERP) 1ca616ddfd [imp] changes of cms branch.
bzr revid: amb@tinyerp.com-20131011073225-6xayq84ov0rsnffs
2013-10-11 13:02:25 +05:30
Quentin (OpenERP) 65966940c8 [MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-20131010133212-t058auv973pvvmjm
2013-10-10 15:32:12 +02:00
Christophe Simonis 273face907 [MERGE] forward port of branch saas-1 up to revid 8791 chs@openerp.com-20131009175454-j06y1ngylfbqyrpj
bzr revid: chs@openerp.com-20131009180337-cxgdt6zzd1z68ga9
2013-10-09 20:03:37 +02:00
Thibault Delavallée dd2dd19b23 [MERGE] Sync with trunk until revision 8934
bzr revid: tde@openerp.com-20131007081153-qx4ybltaxbuy3thp
2013-10-07 10:11:53 +02:00
Antony Lesuisse 4c84a49afe [REM] shortcuts, deprecated by browser bookmarks
bzr revid: al@openerp.com-20131006131225-jguvkys2ngwsd6er
2013-10-06 15:12:25 +02:00
Olivier Dony bec80227d9 [FIX] account_voucher, product, stock: use selection widgets for magic context fields, to pass IDs in the context instead of strings
Many2one fields resolve to strings when used
as `self` within the @context or @filter_domain
attributes of a search field, because they
must be able to support partial matches,
e.g. search for "Sto" to match "Stock".
In many case the code was not prepared to accept
string for the magic context values, so the
magic fields now caused crashes.

The widget="selection" attribute was dropped
during the search view cleanup for 7.0,
without noticing this unfortunate side-effect,
at revision:
  addons 7.0 revno 7142 revid:qdp-launchpad@openerp.com-20120731150358-jqd3eoz06imzlx01

lp bug: https://launchpad.net/bugs/1192484 fixed

bzr revid: odo@openerp.com-20131004105218-edvb5ewduqar3x88
2013-10-04 12:52:18 +02:00
Thibault Delavallée 94887c5cb8 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131004085039-is2mi6jlh9avo79k
2013-10-04 10:50:39 +02:00
Launchpad Translations on behalf of openerp 6ad09a8b40 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131004054526-wrer2m4h9u0lpvmm
2013-10-04 05:45:26 +00:00
Christophe Matthieu 16a3aa522b [IMP] website_sale: variant change the price
bzr revid: chm@openerp.com-20131003104701-28mvvte5wa6q8mt7
2013-10-03 12:47:01 +02:00
Paramjit Singh Sahota a3a0d02d19 Added product description for the published products.
bzr revid: psa@tinyerp.com-20131003062124-veb3i998ouxianil
2013-10-03 11:51:24 +05:30
Christophe Matthieu 0a3e643b18 [IMP] product template view
bzr revid: chm@openerp.com-20131002162738-x11l6521o9yonmlp
2013-10-02 18:27:38 +02:00
Thibault Delavallée 607de396ba [MERGE] Sync with trunk, until revision 8927
bzr revid: tde@openerp.com-20131002135442-g8l2vpkq7h0roqdt
2013-10-02 15:54:42 +02:00
Xavier Morel 3b431eec45 [IMP] file read
bzr revid: xmo@openerp.com-20130927121335-iixxhkft8qmii85x
2013-09-27 14:13:35 +02:00
Launchpad Translations on behalf of openerp 23620b2e54 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130925054843-vx0nogr2rpf5amw4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130926055416-ubjv2v9mogsb49f3
bzr revid: launchpad_translations_on_behalf_of_openerp-20130927061626-2rcumswg0tc4e10e
bzr revid: launchpad_translations_on_behalf_of_openerp-20130926055451-072mn28h3ew4cwfp
bzr revid: launchpad_translations_on_behalf_of_openerp-20130927061658-4svrcqcw04av1e5w
2013-09-27 06:16:58 +00:00
Launchpad Translations on behalf of openerp ba95017720 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130925054914-zqgjgcb39ny7ejt5
2013-09-25 05:49:14 +00:00
Christophe Matthieu bd16487da1 [IMP] website_sale: change css and demo data
bzr revid: chm@openerp.com-20130924152639-v6hr0laatjcbxe39
2013-09-24 17:26:39 +02:00
Christophe Matthieu 51fae1fcf8 [IMP] website_sale display only non empty category in non editable mode
bzr revid: chm@openerp.com-20130924102834-op0bm475w20x35j4
2013-09-24 12:28:34 +02:00
Denis Ledoux db84e912bd [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8781 rev-id: dle@openerp.com-20130923165651-0jt823r5wy37enw6
bzr revid: dle@openerp.com-20130923171310-mav1riq3d2rebmv2
2013-09-23 19:13:10 +02:00
Denis Ledoux 274cf1e293 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9475 rev-id: dle@openerp.com-20130923162428-g0s3o9tid09ogfv3
bzr revid: dle@openerp.com-20130923165651-0jt823r5wy37enw6
2013-09-23 18:56:51 +02:00
Fabien Pinckaers 512a9970df [IMP] Shop Improvements
bzr revid: fp@openerp.com-20130922172727-9zvivms9w9v5hv2q
2013-09-22 19:27:27 +02:00
Martin Trigaux 2a6419ea55 [FIX] product: avoid getting date=False in pricelist if wrong value in context, courtesy of Alexis de Lattre
bzr revid: mat@openerp.com-20130920144529-800nviktzebexwtt
2013-09-20 16:45:29 +02:00
Launchpad Translations on behalf of openerp c7471d1bff Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130919045624-x71znzpi3rpnvpcs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130920060145-80h8zse3uw3jg2fx
2013-09-20 06:01:45 +00:00
Denis Ledoux 546a191f0a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9459 rev-id: fva@openerp.com-20130918153347-fy4nuvbm82ngfb8x
bzr revid: mat@openerp.com-20130826135110-f9q4p65ds2aholcw
bzr revid: dle@openerp.com-20130828141129-ecxl2vlpb8vw0o9f
bzr revid: dle@openerp.com-20130828162659-n8a0ku9o3h01qaov
bzr revid: dle@openerp.com-20130830094205-q3itwd7x0246d9n6
bzr revid: dle@openerp.com-20130830133604-mfnfbscn5wdk4vi4
bzr revid: dle@openerp.com-20130902131244-v9uh0s8rg4889i7j
bzr revid: mat@openerp.com-20130903134105-68ziuaccreu6rs61
bzr revid: chs@openerp.com-20130906171851-jtfsf4au1k30wwlr
bzr revid: dle@openerp.com-20130909103120-k5oefxgebhyslac3
bzr revid: dle@openerp.com-20130909170047-pbzw4ernvcpivbhh
bzr revid: chs@openerp.com-20130910122113-171osvcukxffxcry
bzr revid: tde@openerp.com-20130912121059-k840pi4rwdzpez8g
bzr revid: dle@openerp.com-20130913085251-p906ci2divy82jur
bzr revid: tde@openerp.com-20130913092546-kzshg1a7sls566l8
bzr revid: mat@openerp.com-20130917122102-drf8fj9lrjj0fvju
bzr revid: mat@openerp.com-20130917161614-w8u2c1ayeb5kxm30
bzr revid: dle@openerp.com-20130918161305-7ep1642nxzyy3vhd
2013-09-18 18:13:05 +02:00
Launchpad Translations on behalf of openerp a46cbb7a31 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130913060803-zltruvkg213vqm57
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915061052-1kts2jol7uvq1n4f
bzr revid: launchpad_translations_on_behalf_of_openerp-20130917051850-e1s8v09muo1atjwh
bzr revid: launchpad_translations_on_behalf_of_openerp-20130917051903-257acdjbxi60zyv8
2013-09-17 05:19:03 +00:00
Josse Colpaert d3344c6667 [ADD] Add group on route on sales order line (took from sgo branch)
bzr revid: jco@openerp.com-20130916150908-c1yi104t3fbo8q37
2013-09-16 17:09:08 +02:00
Launchpad Translations on behalf of openerp 07f41591af Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130914055308-488d7jp6pk12s4oq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915061118-idedxdulpa7nb0s0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130916061418-3r990vgrtgj1quyt
2013-09-16 06:14:18 +00:00
Launchpad Translations on behalf of openerp 4cb9834833 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130913060838-a2k0hfitlgdrqj0h
2013-09-13 06:08:38 +00:00
Launchpad Translations on behalf of openerp 9dba69ba48 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00
Christophe Simonis 3fa90321e1 [MERGE] forward port of branch saas-1 up to revid 8772 chs@openerp.com-20130910122113-171osvcukxffxcry
bzr revid: chs@openerp.com-20130910124803-wxkb8gkz1tub5qjf
2013-09-10 14:48:03 +02:00
Martin Trigaux d241afa6bd [FIX] product: pass count argument to super call for search (opw #585031)
bzr revid: mat@openerp.com-20130909140414-7mndwgkbwntgcgnj
2013-09-09 16:04:14 +02:00
Olivier Dony 6de0051315 [FIX] product: support string values for context `pricelist` key when computing prices
As of v7 search views will replace the value of any `self`
      literal in a @context attribute by the name of the
      record, whereas it used to be its ID.
      This means that the `Pricelist` filter used to display
      the product list with a specific pricelist would not
      work anymore.
      
      The fix requires a rather hackish name_search()
      override for product.pricelist because the display
      name of pricelists includes their currency, while
      that could be a valid name for a pricelist too.
      
      To avoid side-effects the name_search() override
      only picks up the special case used by the
      product.product._product_price() method when it
      tries to apply the context pricelist, that is
      with operator explicitly set to `=` and no extra
      domain `args`.

lp bug: https://launchpad.net/bugs/1178835 fixed

bzr revid: odo@openerp.com-20130906155047-7dmozy2jpe1ca1p2
2013-09-06 17:50:47 +02:00
Thibault Delavallée 8b48cc9520 [MERGE] addons: added groups when quick creating user in various addons.
bzr revid: tde@openerp.com-20130904141122-uaxlnu7qxzri4q3a
2013-09-04 16:11:22 +02:00
Olivier Dony 04560e356e [FIX] product: avoid triggering warning about pricelist_id being non-searchable
It is a dummy file that is not meant to be used
for filtering, but only for setting the context.

bzr revid: odo@openerp.com-20130904123949-z1zfoxucspx7avwv
2013-09-04 14:39:49 +02:00
Launchpad Translations on behalf of openerp 3ef8dbeac3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130904050344-pjsmx05h22n09162
2013-09-04 05:03:44 +00:00
Launchpad Translations on behalf of openerp cb8f9c5a0d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
2013-09-03 05:48:57 +00:00
Christophe Matthieu 2fab26a2d2 [IMP] point_of_sale, product: change model 'pos.category' of the pos into product.public.category in product. product.public.category is used for eg by pos and website_sale. Add some demo data for this category. Add a domain in pos 'model.js' to select non empty categories
bzr revid: chm@openerp.com-20130828151658-3isgyl93c3hwp1pc
2013-08-28 17:16:58 +02:00
Launchpad Translations on behalf of openerp 642311aa26 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130827050316-c3hzsnzygj4np1qh
2013-08-27 05:03:16 +00:00
Christophe Matthieu 05bb4f2dca [IMP] website_sale: use product.template insead of product.product
bzr revid: chm@openerp.com-20130820141203-vkg93z9odh0rlf4d
2013-08-20 16:12:03 +02:00
Christophe Matthieu 55b1378e77 [IMP] website_sale: add product variants
bzr revid: chm@openerp.com-20130819131929-x75ib5y6dcu4bcu7
2013-08-19 15:19:29 +02:00
Launchpad Translations on behalf of openerp 0e74fd31a4 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130815055122-qjjh1oa8122npkdt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130816060311-osd5epg0pjqggizo
bzr revid: launchpad_translations_on_behalf_of_openerp-20130817061650-b596lee67z2gon1h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130818050503-e1c1ferew0px4k1y
bzr revid: launchpad_translations_on_behalf_of_openerp-20130819045737-ef63g3nwk154ezyw
2013-08-19 04:57:37 +00:00
Amit Bhavsar (Open ERP) 0d01453f81 [MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130813110637-nwi1lao9wegqz5ro
2013-08-13 16:36:37 +05:30
Launchpad Translations on behalf of openerp c46331a3ca Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130729055508-7yza7v2jdny1gear
bzr revid: launchpad_translations_on_behalf_of_openerp-20130730045810-58du4wi80axs0t81
bzr revid: launchpad_translations_on_behalf_of_openerp-20130806050509-v64stuiemu934s7t
bzr revid: launchpad_translations_on_behalf_of_openerp-20130809053600-ssuy8yhd6ve9cse6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130810053806-gx2uwr6zoit4zow2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130811050026-l3omk3m8v7f34dnu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130810053803-dm8ugwnibrznai0t
bzr revid: launchpad_translations_on_behalf_of_openerp-20130811050015-lmxdgm6fks2fyzoe
bzr revid: launchpad_translations_on_behalf_of_openerp-20130812050650-ta4kndyaxthut4tv
2013-08-12 05:06:50 +00:00
Fabien Pinckaers 54631bda2a [MERGE] trunk
bzr revid: fp@openerp.com-20130803175004-ivqkxtsd7vh4npwe
2013-08-03 19:50:04 +02:00
Launchpad Translations on behalf of openerp 7828e44ea5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130727050216-3lqngtzz3y4eal03
bzr revid: launchpad_translations_on_behalf_of_openerp-20130728055452-udjnnr7f174dwx7s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130729052557-z3cyhulfa50uou01
bzr revid: launchpad_translations_on_behalf_of_openerp-20130731051700-toxlygnbrq3rfi75
bzr revid: launchpad_translations_on_behalf_of_openerp-20130802053852-k0z9t3xzddxkqibc
2013-08-02 05:38:52 +00:00
Christophe Matthieu d37aebb7f0 [IMP] website: security and public access
bzr revid: chm@openerp.com-20130802035504-lokijwh57e0q3w6a
2013-08-02 05:55:04 +02:00
Darshan Kalola 9b39fd9f7f [Process]remove process module and all process views
bzr revid: darshankalola@gmail.com-20130730072623-bf1u8y1z0lo4cwrw
2013-07-30 12:56:23 +05:30
Launchpad Translations on behalf of openerp b69a97f2af Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130720062329-mtrdbu252gvcpm7v
bzr revid: launchpad_translations_on_behalf_of_openerp-20130722055939-dhitotmhlxni5rhv
bzr revid: launchpad_translations_on_behalf_of_openerp-20130723053256-3blj73xxu210ln3d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130723053317-s9hfdou4czw2abjh
2013-07-23 05:33:17 +00:00
Launchpad Translations on behalf of openerp 08bf51a608 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130719063647-ajybj58frejzmzi1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130720062338-fgevfrm113ns9ohh
bzr revid: launchpad_translations_on_behalf_of_openerp-20130722055949-auzq29nv6b2f3o10
2013-07-22 05:59:49 +00:00
Launchpad Translations on behalf of openerp d1a4e0aef0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130711062622-v4muic3uqckueux5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063505-m63repwd0zokfibu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063525-b30s09rh63t3zox4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055943-xf6jvk2dpoemt6qx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051357-59o0nkhplh3e58mi
bzr revid: launchpad_translations_on_behalf_of_openerp-20130704054706-ace1fcr1vtruoc4s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130705061311-4735gtnj7xjmuprg
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063510-g2yq0kxqgrx9x1df
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063533-7mjj5a7226xhtob6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055945-h6jn755mtdcubvei
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051400-rra06yzfd7zw4bt0
2013-07-15 05:14:00 +00:00
Quentin (OpenERP) 63111b6510 [WIP] cost_method moved to stock_account + stock_account implementation of stock valuation
bzr revid: qdp-launchpad@openerp.com-20130712141407-amspq13axc7x58l1
2013-07-12 16:14:07 +02:00
Amit Bhavsar (Open ERP) b47a121f44 [Imp] Improve code for pricelists.
bzr revid: amb@tinyerp.com-20130712073654-1fowt1xojgx0pjdc
2013-07-12 13:06:54 +05:30
Fabien Pinckaers 471dd0998d stock.move.group renamed to procurement.group
procurement module (where stock.move.group was defined) does not depend on the stock module
the same grouping system could be used for services too

procurement.group
removed sequence_id field
put a default values on the name field, using a defined sequence
renamed "Move Group" into "Procurement Requisition"

procurement object:
location_id should not come from the customer property but should be stored on the procurement (set by the sale order, using the customer property)

bzr revid: fp@tinyerp.com-20130629091328-5gc39647aa2pymlf
2013-06-29 11:13:28 +02:00
Josse Colpaert 0ad0bcb3ef [IMP] Putaway + change fifo / lifo costing method into real costing method
bzr revid: jco@openerp.com-20130625152620-kz0rxl6622nie8om
2013-06-25 17:26:20 +02:00
Amit Bhavsar (Open ERP) b9ed060fa8 [MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130624141146-sq4rh2q3rqz67mcj
2013-06-24 19:41:46 +05:30
Amit Bhavsar (Open ERP) b35375cc4b [MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130624134518-lc8v8egz5tzomwzf
2013-06-24 19:15:18 +05:30
Quentin (OpenERP) dee5ace29b [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20130624095319-sqkrnk4r1mst8nvk
2013-06-24 11:53:19 +02:00
Quentin (OpenERP) d856e8361b [REF] *: change linked to server revision 4907. Removed deprecated 'view_load' attribute + removed duplicated first argument of property fields which is replaced with 'relation' argument in case where it is really needed (relational fields): indeed this first argument was totally useless for property of float type (for example).
bzr revid: qdp-launchpad@openerp.com-20130624090515-12aeo4k5sz87veqb
2013-06-24 11:05:15 +02:00
Amit Bhavsar (Open ERP) 8448894328 [MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130618071357-uoiim5scph6ffg86
2013-06-18 12:43:57 +05:30
Launchpad Translations on behalf of openerp c0119a87c1 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130706061750-b7mm65zaln6pacmc
bzr revid: launchpad_translations_on_behalf_of_openerp-20130707055412-bb9fnxig7ss4pugc
2013-07-07 05:54:12 +00:00
Launchpad Translations on behalf of openerp 034f7bdb14 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130703060137-kl7z1idur87nzjjm
bzr revid: launchpad_translations_on_behalf_of_openerp-20130704054701-nxvmb94gwr227aby
2013-07-04 05:47:01 +00:00
Launchpad Translations on behalf of openerp b732bb34fe Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130630064129-cou489g4u7gq0ins
bzr revid: launchpad_translations_on_behalf_of_openerp-20130701053720-kg0cbfynk0eznz6q
bzr revid: launchpad_translations_on_behalf_of_openerp-20130702055948-6xe11z6qy0pxhfks
2013-07-02 05:59:48 +00:00
Launchpad Translations on behalf of openerp 89bc6e5e73 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130622062505-fobx7ncp6bkpouyt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130623055452-s77jlu7z6kvjbdlz
bzr revid: launchpad_translations_on_behalf_of_openerp-20130624052557-hsaix5c3fu6opbva
2013-06-24 05:25:57 +00:00
Launchpad Translations on behalf of openerp 4cb1127306 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130621060722-3y4nu7t4kzg3zjua
2013-06-21 06:07:22 +00:00
Launchpad Translations on behalf of openerp 3e269d1572 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130614070428-by6oo1fc0hvfoqc8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130615061319-hikvcj42kmv0fwla
bzr revid: launchpad_translations_on_behalf_of_openerp-20130616053220-l2jj1f2bfhr8s95f
bzr revid: launchpad_translations_on_behalf_of_openerp-20130617062045-ydm23y8oyqt85r6d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130618065045-8n040l4nl7inbsho
bzr revid: launchpad_translations_on_behalf_of_openerp-20130619061621-p7u5tapogm5ao1o2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130620063408-j244y20qpy61d6dn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130615062054-6zhgccaoectf2c0d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130616053235-3eimstk0anu72x9m
bzr revid: launchpad_translations_on_behalf_of_openerp-20130617062114-7wts3fyy6vgqzt8v
bzr revid: launchpad_translations_on_behalf_of_openerp-20130618065127-8w5xbiwnnza5vlo1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130619061719-63jsadfrb1yoqtgz
bzr revid: launchpad_translations_on_behalf_of_openerp-20130620063509-1xk30ymo1f7nn4h0
2013-06-20 06:35:09 +00:00
Christophe Simonis aa133b4d29 [MERGE] forward port of branch saas-1 up to revid 8745 chs@openerp.com-20130613181503-82234mo34wxb0oap
bzr revid: chs@openerp.com-20130614091924-z5ta02kwhmwcrgox
2013-06-14 11:19:24 +02:00
Christophe Simonis 6a9adbca62 [MERGE] forward port of branch 7.0 up to revid 9236 mat@openerp.com-20130613160953-itt79mu5xrl7suv4
bzr revid: chs@openerp.com-20130613181503-82234mo34wxb0oap
2013-06-13 20:15:03 +02:00
Foram Katharotiya (OpenERP) 09c62b0d02 [MERGE] with trunk
bzr revid: fka@tinyerp.com-20130613071422-9iw22gkm33epbkpb
2013-06-13 12:44:22 +05:30
Foram Katharotiya (OpenERP) 83dfd5eab1 [MERGE] with 7.0
bzr revid: fka@tinyerp.com-20130607095729-g7ax7eyt9jcjsdvs
bzr revid: fka@tinyerp.com-20130610045950-ao7icaicrutgw49t
bzr revid: fka@tinyerp.com-20130611045956-f2b037r5d9mzezsg
bzr revid: fka@tinyerp.com-20130612050400-vmpcjy2e93xoykn2
2013-06-12 10:34:00 +05:30
Launchpad Translations on behalf of openerp 75595cc55b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130611063100-w95zvev0e2wme31v
bzr revid: launchpad_translations_on_behalf_of_openerp-20130611063242-nvli6wf9xoxol1i9
bzr revid: launchpad_translations_on_behalf_of_openerp-20130611063247-ed0nk3aer2b28d41
2013-06-11 06:32:47 +00:00
Launchpad Translations on behalf of openerp 3a296f5386 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608070127-tu3wr0ejaojeuizk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061554-vunz3dsqv73j8io4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608074839-suk66wcjidodrzyu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061704-e1t9mv2alygf4g38
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608075116-643xgspj93t8g1y9
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061708-y08i6exqm5v36qg7
2013-06-09 06:17:08 +00:00
Olivier Dony b4976938d2 [MERGE] [I18N] Many translation bugfixes + resync of translation templates with latest source
lp bug: https://launchpad.net/bugs/1165321 fixed

bzr revid: odo@openerp.com-20130607194733-27oiskc6q4fnp476
2013-06-07 21:47:33 +02:00
Olivier Dony 8c33eb76e1 [I18N] Synchronize translation templates with latest source code
bzr revid: odo@openerp.com-20130607194309-eysyrkxpr0dukm07
2013-06-07 21:43:09 +02:00
DBR (OpenERP) 9686f8cf83 [Merge] lp:openobject-addons
bzr revid: dbr@tinyerp.com-20130607133024-b4is88n7xr7k8hrn
2013-06-07 19:00:24 +05:30
Martin Trigaux e8cbc4ed30 [IMP] product: specify max size for product lable with long name
bzr revid: mat@openerp.com-20130607121311-ekuzfz5zm8jz52fc
2013-06-07 14:13:11 +02:00
Josse Colpaert aff96f8ee2 [MERGE] Merge from trunk
bzr revid: jco@openerp.com-20130605200844-38ilgaycxt0lwven
2013-06-05 22:08:44 +02:00
Foram Katharotiya (OpenERP) 6d5cb91043 [MERGE] with 7.0
bzr revid: fka@tinyerp.com-20130515051235-i2opyehkanl77oud
bzr revid: fka@tinyerp.com-20130520051543-kd6e5rhqb3c2j2w2
bzr revid: fka@tinyerp.com-20130522062104-u9f3sec8wxivuouv
bzr revid: fka@tinyerp.com-20130531103058-mu8bja9j90m2newc
bzr revid: fka@tinyerp.com-20130604053616-dq91e11sgmbhqxjz
2013-06-04 11:06:16 +05:30
Josse Colpaert cfbee92a61 [IMP] Change product view for updating price, uom in product margin
bzr revid: jco@openerp.com-20130603151521-88glofqgcnu3u53o
2013-06-03 17:15:21 +02:00
Vo Minh Thu 38d9325f66 [MERGE] views: removed unnecessary `model` attribute used with `ref`.
bzr revid: vmt@openerp.com-20130603144446-ara6oli0her5rdm3
2013-06-03 16:44:46 +02:00
Martin Trigaux 667876728d [MERGE] [FIX] account: use the purchase or sale description for manual invoicing instead of product description, courtesy of Numérigraphe
lp bug: https://launchpad.net/bugs/1101146 fixed

bzr revid: mat@openerp.com-20130603102627-6dokww7uhijvxlfk
2013-06-03 12:26:27 +02:00
Josse Colpaert 26acd62c34 [IMP] Adjust cost_method and standard_price fields of product, refactor price_calculation
bzr revid: jco@openerp.com-20130603085818-8pu3k0pssu97kji0
2013-06-03 10:58:18 +02:00
Amit Bhavsar (Open ERP) 1941b9c244 [Product Pricelist] Default value for based on price
bzr revid: amb@tinyerp.com-20130529135734-62rvtw3yocxvsmq1
2013-05-29 19:27:34 +05:30
Amit Bhavsar (Open ERP) 7c6f6e89b5 [MERGE] merge with latest trunk
bzr revid: vja@tinyerp.com-20130429093627-cpxq3uybwsssrqr5
bzr revid: vja@tinyerp.com-20130430115558-p1aw1zszcur21fj5
bzr revid: vja@tinyerp.com-20130517054712-9o7u266nfm8atgjv
bzr revid: amb@tinyerp.com-20130529122717-lpk7tn30qek2i5yt
2013-05-29 17:57:17 +05:30
Quentin (OpenERP) 96de0c8021 [REF] procurement, product, producT_margin: some comments added during code review
bzr revid: qdp-launchpad@openerp.com-20130528095911-u1qjs0a2233q2shx
2013-05-28 11:59:11 +02:00
Josse Colpaert 8e1dba620a [IMP] Always pass company_id in context, for lifo do id desc and round=False for compute_qty
bzr revid: jco@openerp.com-20130528085654-tkzhgg9td1yywgut
2013-05-28 10:56:54 +02:00
DBR (OpenERP) 470be1459a [Merge] lp:openobject-addons
bzr revid: dbr@tinyerp.com-20130527073407-gmizs4g76qinno80
2013-05-27 13:04:07 +05:30
Josse Colpaert 9b0e6ba425 [MERGE] Merge from trunk
bzr revid: jco@openerp.com-20130523084039-1mb5frj6kkvuopxe
2013-05-23 10:40:39 +02:00
Thibault Delavallée 8aa85c2523 [FORWARD] Forward port of addons until revision 8711
bzr revid: tde@openerp.com-20130521133807-5n97jep45f3lf6uq
bzr revid: tde@openerp.com-20130522083012-4yry4ht2943sjatn
2013-05-22 10:30:12 +02:00
DBR (OpenERP) 6cc1b4ee83 [Merge] lp:openobject-addons
bzr revid: dbr@tinyerp.com-20130522073218-o6m40rskd42idzvg
2013-05-22 13:02:18 +05:30
Launchpad Translations on behalf of openerp 983b17ea0a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130522052736-t0x1wh4cm1tqvfy2
2013-05-22 05:27:36 +00:00
Thibault Delavallée a05b0bebbe [FORWARD] Forward port of 7.0 branch until revision 9143.
bzr revid: tde@openerp.com-20130521122359-b5vii7gv8arluz06
2013-05-21 14:23:59 +02:00
Quentin (OpenERP) e42186bd60 [REF] *: removed useless attributes on definition of property fields (first attribute, because duplicated in 'relation' kwarg, and 'view_load' attribute because it has been deprecated) accordingly to revision qdp-launchpad@openerp.com-20130516152946-s3chj5i05lkf30yk of server.
bzr revid: qdp-launchpad@openerp.com-20130517075245-udn5hug8yq2d1ezc
2013-05-17 09:52:45 +02:00
Alexis de Lattre 8a36d55603 [FIX] product: if 'date' is passed as False in context of price_get_multi(), it should be set to current date and not False (Maintenance Case: 592247)
lp bug: https://launchpad.net/bugs/1175983 fixed

bzr revid: rgo@tinyerp.com-20130517070210-0dno7syscybo0h7j
2013-05-17 12:32:10 +05:30
Alexis de Lattre fd8add387e [FIX] product: if 'date' is passed as False in context of price_get_multi(), it should be set to current date and not False (Maintenance Case: 592247)
lp bug: https://launchpad.net/bugs/1175983 fixed

bzr revid: rgo@tinyerp.com-20130517065744-il8sfm61rlcu9h2f
2013-05-17 12:27:44 +05:30
Alexis de Lattre 1c91bb4b77 [FIX] product: if 'date' is passed as False in context of price_get_multi(), it should be set to current date and not False (Maintenance Case: 592247)
lp bug: https://launchpad.net/bugs/1175983 fixed

bzr revid: rgo@tinyerp.com-20130517063145-va41paqq3pw38x51
2013-05-17 12:01:45 +05:30
Quentin (OpenERP) cf5eed1714 [MERGE] product, stock: improved usability
bzr revid: qdp-launchpad@openerp.com-20130514152724-n6u6ex0tjsg9e1yd
2013-05-14 17:27:24 +02:00
Martin Trigaux 2c7fd66249 [IMP]product: remove space between the price and the currency
lp bug: https://launchpad.net/bugs/1064691 fixed

bzr revid: mat@openerp.com-20130510134944-s8yz9z6g0abdy0i7
2013-05-10 15:49:44 +02:00
Launchpad Translations on behalf of openerp 0934155fa6 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130509061134-n0s13s5mudwpofan
bzr revid: launchpad_translations_on_behalf_of_openerp-20130510065122-6968relnf5rj67w4
2013-05-10 06:51:22 +00:00
Foram Katharotiya (OpenERP) 67c49b597e [IMP] made independant purchase pricelist in supplier
bzr revid: fka@tinyerp.com-20130509103045-4r7b8kacuy9zaf1e
2013-05-09 16:00:45 +05:30
Josse Colpaert 07dc9e827f [FIX] Selection fields cost_method fifo from start
bzr revid: jco@openerp.com-20130508120726-ar1enpakpqkq9f0x
2013-05-08 14:07:26 +02:00
Josse Colpaert 07f4789510 [IMP] Remove relation =
bzr revid: jco@openerp.com-20130508092815-bo03hpo10s7qislw
2013-05-08 11:28:15 +02:00
Launchpad Translations on behalf of openerp 35811ae629 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130508061808-15l9uv7xeeaar0cc
2013-05-08 06:18:08 +00:00
Quentin (OpenERP) 0e33939193 [TODO] code review of the WIP
bzr revid: qdp-launchpad@openerp.com-20130507144728-10cleynxqzu667wd
2013-05-07 16:47:28 +02:00
Launchpad Translations on behalf of openerp a7a4f33d0f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130427063416-maq2j295cuj0d2j4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130429060435-zyumznnykvw92bfg
bzr revid: launchpad_translations_on_behalf_of_openerp-20130501051425-9uhm1n0nmvyus33i
bzr revid: launchpad_translations_on_behalf_of_openerp-20130506063526-tj5l5h3fger6llmw
bzr revid: launchpad_translations_on_behalf_of_openerp-20130501051533-veqndxlj87s13tnp
bzr revid: launchpad_translations_on_behalf_of_openerp-20130502060901-j2v1cs2l31in4q6t
bzr revid: launchpad_translations_on_behalf_of_openerp-20130503062950-h0ojr1tlzqx5nu76
bzr revid: launchpad_translations_on_behalf_of_openerp-20130504071101-jh8a9d3cb8gcz34e
bzr revid: launchpad_translations_on_behalf_of_openerp-20130505060428-4qacudpyuiez39b3
bzr revid: launchpad_translations_on_behalf_of_openerp-20130506063544-ggq3rpht7nsoinxs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130504071108-g8u3u06xpp3g4sks
bzr revid: launchpad_translations_on_behalf_of_openerp-20130506063552-lwxw1ldh3mbflzqf
2013-05-06 06:35:52 +00:00
Foram Katharotiya (OpenERP) bf649e9def [IMP] move company_id in product module and hide storage location group if product of type 'service'
bzr revid: fka@tinyerp.com-20130503091603-oz109cyv0nafqxgt
2013-05-03 14:46:03 +05:30
Josse Colpaert dac1cb78be [IMP] product valuation field as multi-company
bzr revid: jco@openerp.com-20130430140445-fymwzfv6c7ayg1mj
2013-04-30 16:04:45 +02:00
Xavier Morel 07607f054b [REM] more nonsensical @model + @ref
bzr revid: xmo@openerp.com-20130429125217-slmp1v9t7uri6ev6
2013-04-29 14:52:17 +02:00
Josse Colpaert e1aa0da6a6 [MERGE] Merge from trunk + tests added
bzr revid: jco@openerp.com-20130429103914-rrlzb8rfr0k7y8qs
2013-04-29 12:39:14 +02:00
Quentin (OpenERP) 33f27b362b [MERGE] forward port of addons v7 up to revision 9045
bzr revid: qdp-launchpad@openerp.com-20130422153449-c62emljfa4a49758
2013-04-22 17:34:49 +02:00
Josse Colpaert 2509bb8708 [IMP] Return of products average, cost method company dependent, quantity fields company dependent
bzr revid: jco@openerp.com-20130419101701-mc61w0q5hvwq596w
2013-04-19 12:17:01 +02:00
Olivier Dony 26dd9bc343 [MERGE] Sync with 7.0
bzr revid: odo@openerp.com-20130418172123-2ofzftdo2a923nj1
2013-04-18 19:21:23 +02:00
Quentin (OpenERP) 27c3b6cc33 [MERGE][FIX] product: context propagating in res_currency.compute(). Courtesy of Yannick Vaucher @ Camptocamp. Thanks dude
bzr revid: qdp-launchpad@openerp.com-20130418141013-vukxknub32p7djqd
2013-04-18 16:10:13 +02:00
Josse Colpaert e17325325f [IMP] Add view_load
bzr revid: jco@openerp.com-20130418134736-7sln2dbco6yfxf91
2013-04-18 15:47:36 +02:00
Vishmita Jadeja (openerp) fe128d7498 [Merge]Merge lp:openobject-addons
bzr revid: vja@tinyerp.com-20130418090337-51vfkhfl3lzg7mpf
2013-04-18 14:33:37 +05:30
Josse Colpaert 36407b6598 [FIX] eval quotes needed
bzr revid: jco@openerp.com-20130418085903-88wjkvptym7s21d2
2013-04-18 10:59:03 +02:00
Josse Colpaert 8f6223aaae [IMP] demo standard price float property test
bzr revid: jco@openerp.com-20130418085457-5l9x0x25ugy8rana
2013-04-18 10:54:57 +02:00
Josse Colpaert 96ea6418c6 [IMP] Change standard_price field of product into a property: requires changing SQL queries
bzr revid: jco@openerp.com-20130417150213-4nm9tc8nzvsgm5ix
2013-04-17 17:02:13 +02:00
Quentin (OpenERP) 5220d93afd [IMP] product: implemented the store={} to recompute the name_template related field when it needs to be
bzr revid: qdp-launchpad@openerp.com-20130417092914-4g1k94g0rxn5bzcj
2013-04-17 11:29:14 +02:00
Launchpad Translations on behalf of openerp f203d2426b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130417055707-rpdalm7k5efoagz6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130417055742-p9nxg3t2tb0553wn
2013-04-17 05:57:42 +00:00
Vo Minh Thu e69326ee3b [REF] removed explicit model instanciations.
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Cedric Snauwaert f25c5d857b [REF]product: remove one extra loop
bzr revid: csn@openerp.com-20130415102121-u74t7zd3zct3q3ts
2013-04-15 12:21:21 +02:00
Launchpad Translations on behalf of openerp c13ceba6b9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130412060536-q07q8ed9v8ldi2kv
bzr revid: launchpad_translations_on_behalf_of_openerp-20130414055031-dgknuaf8a4dhgt16
bzr revid: launchpad_translations_on_behalf_of_openerp-20130413063110-rtd3r7hxe54yb8eq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130414054933-k6o13mitp3dl62xq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130415060648-klbxmc1afr5jq4vb
bzr revid: launchpad_translations_on_behalf_of_openerp-20130412060533-fq4nwi1i6h39y7pl
bzr revid: launchpad_translations_on_behalf_of_openerp-20130413063146-745583mwivnzgjqj
bzr revid: launchpad_translations_on_behalf_of_openerp-20130414055028-v2dnk713g9ydbvpo
bzr revid: launchpad_translations_on_behalf_of_openerp-20130415060722-gvarcrrppfcq777a
2013-04-15 06:07:22 +00:00
Cedric Snauwaert 41628fc702 [FIX]product: add store=dict to field name_template
bzr revid: csn@openerp.com-20130412130856-3g5e67v2r7y6ep5v
2013-04-12 15:08:56 +02:00
Launchpad Translations on behalf of openerp 75997ddc1c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130410055452-4saqwvwv6cgtil6s
2013-04-10 05:54:52 +00:00
Launchpad Translations on behalf of openerp eb3ffc52ed Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130406063640-151b9f95w2tgiifb
bzr revid: launchpad_translations_on_behalf_of_openerp-20130407060111-hobhqctome9qtz6c
bzr revid: launchpad_translations_on_behalf_of_openerp-20130408062055-hzgkrbw8lvkfphxe
2013-04-08 06:20:55 +00:00
Olivier Dony 438e1c1daf [FIX] res.partner: Hide commercial-related fields on contacts form + autosync them from parent company
Fixes handling of accounting/invoicing-related fields on partners
that are not "commercial entities" (either marked as "is_company"
or parentless).
The corresponding fields are also hidden from form views on these
partners and replaced by a short sentence and a link to edit the
"master fields" on the commercial entity.
This corresponds to part B of the solution described on bug 1160365.

lp bug: https://launchpad.net/bugs/1160365 fixed

bzr revid: odo@openerp.com-20130407235013-j3tv4uxy46eej43i
2013-04-08 01:50:13 +02:00
Quentin (OpenERP) 3bb51ac696 [MERGE] forward port of bugfixes made in 7.0, up to revision 8969.
bzr revid: qdp-launchpad@openerp.com-20130404095257-oek77sijuxjyi0aj
2013-04-04 11:52:57 +02:00
Launchpad Translations on behalf of openerp 665cd6c6ea Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130403150332-0q7u1so0j76xbo3n
bzr revid: launchpad_translations_on_behalf_of_openerp-20130403150338-iksqy6aim64hko1m
2013-04-03 15:03:38 +00:00
Launchpad Translations on behalf of openerp 252bcc802f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060824-pc5f2pj14gj0ak27
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055726-frtzw3gc9ut4wx4y
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053127-tolr13p1b3bhjny1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054749-t3x0zc7qk3n4man2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060920-k0cnlpk0rxcli841
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055741-loojniiz6du9upat
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053211-yvt1h32v41rs6jje
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054814-fwg742kzhsupr6kc
bzr revid: launchpad_translations_on_behalf_of_openerp-20130329051100-3ul1k4qwwm2f49gt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060923-wch1f8ndmb15nu6x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055759-aj1nc93t9420lov0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053215-kqqgqefzp95fa1tk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054817-k33rri349nc2ioiz
2013-04-02 05:48:17 +00:00
Launchpad Translations on behalf of openerp 7a8d71be6d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130329050903-yuxb08q83hlvg6ok
2013-03-29 05:09:03 +00:00
Vo Minh Thu 5639a52431 [MERGE] use new report API.
bzr revid: vmt@openerp.com-20130328121009-r3n63gmhfkv0dnby
2013-03-28 13:10:09 +01:00
Launchpad Translations on behalf of openerp fc04522286 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130328060500-yc40z00ubsz154vw
2013-03-28 06:05:00 +00:00
Vo Minh Thu cf93d5ac92 [REF] product: rml_parse has already a self.pool, not need to call pooler.get_pool().
bzr revid: vmt@openerp.com-20130327091351-wyrttjys8btke9hx
2013-03-27 10:13:51 +01:00
Vo Minh Thu 9b0ced610f [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20130322134958-jhe6m0222jq7wo41
2013-03-22 14:49:58 +01:00
Ajay Chauhan (OpenERP) 76cc5abd98 [MERGE]: merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20130320072744-bs2e9hvc611mf6ci
2013-03-20 12:57:44 +05:30
Thibault Delavallée de5a303c4d [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130318101828-6csyuhmutrvm5ld5
2013-03-18 11:18:28 +01:00
Launchpad Translations on behalf of openerp 4ce8d2697d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130316055338-ogfw01ap8fh1hlaj
bzr revid: launchpad_translations_on_behalf_of_openerp-20130317045918-zi1230lgxjbkqw3x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130318044640-ts2tr31y2gl25rev
2013-03-18 04:46:40 +00:00
Yannick Vaucher 5cb1835e26 [FIX] add missing context on compute call in pricelist price_get_multi context
lp bug: https://launchpad.net/bugs/1155624 fixed

bzr revid: yannick.vaucher@camptocamp.com-20130315142403-gz7fy7etwzls96rt
2013-03-15 15:24:03 +01:00
Thibault Delavallée 4484a3197c [MERGE] Sync with trunk, resolved conflicts due to forward port of 7.0
bzr revid: tde@openerp.com-20130315114338-54scb00rkp7zwr30
2013-03-15 12:43:38 +01:00
Quentin (OpenERP) d0f5b28bd0 [MERGE] merge with main trunk branch to get last translations from launchpad
bzr revid: qdp-launchpad@openerp.com-20130315103116-lxj96usw3ipd11z5
2013-03-15 11:31:16 +01:00
Thibault Delavallée cb6b598763 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20130315093907-8kc28n669unmr1n2
2013-03-15 10:39:07 +01:00
Launchpad Translations on behalf of openerp 72f29d98b8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130315055412-luy9qg1pkdjnqlud
2013-03-15 05:54:12 +00:00
Thibault Delavallée a147b69404 [IMP] addons: add default employee group on default_groups_ref.
bzr revid: tde@openerp.com-20130314162141-skfq5w98zhpn31yh
2013-03-14 17:21:41 +01:00
Quentin (OpenERP) be05b374a1 [MERGE] forwardport of bugfixes made in v7 up to revision 8854.
bzr revid: qdp-launchpad@openerp.com-20130314112740-s01t51p4m7mxcumz
2013-03-14 12:27:40 +01:00
Launchpad Translations on behalf of openerp cdb474f179 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130314053439-q79rdq445kptn3nn
2013-03-14 05:34:39 +00:00
Launchpad Translations on behalf of openerp f79f6a5a25 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130313045907-qk0bmylr4b75nwiq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130313045910-tzs0o1kzuyfhsx05
2013-03-13 04:59:10 +00:00
Ajay Chauhan (OpenERP) 2aab2caba3 [IMP] product: change string of field 'factor_inv' to solve import issue of 'Unit of Measure'
bzr revid: cha@tinyerp.com-20130312113633-2s4d5qw97yjh78p8
2013-03-12 17:06:33 +05:30
Launchpad Translations on behalf of openerp f053d2fb5b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130312051930-f0frlcd04x9qau0w
2013-03-12 05:19:30 +00:00
Ajay Chauhan (OpenERP) 6491fd0bdc [IMP] product: change string of field 'name_template'
bzr revid: cha@tinyerp.com-20130311111116-a2msikzcx8t1fhtj
2013-03-11 16:41:16 +05:30
Launchpad Translations on behalf of openerp c5319f47f7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130309053740-hrhdafa05mp0s6cd
bzr revid: launchpad_translations_on_behalf_of_openerp-20130310051349-azaf8kb3hdi6ux85
bzr revid: launchpad_translations_on_behalf_of_openerp-20130311054204-8yc0hga0v6pkk36x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130309053843-8x3181swnc2x0rim
bzr revid: launchpad_translations_on_behalf_of_openerp-20130310051523-z6034cfpv1qbztzx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130311054303-38ti3nq1h5jfbasa
bzr revid: launchpad_translations_on_behalf_of_openerp-20130309053849-8eqsc9sjxknzfha8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130310051527-tajzx0x6p7mzpg43
bzr revid: launchpad_translations_on_behalf_of_openerp-20130311054307-qgl6ao1a06b9an3a
2013-03-11 05:43:07 +00:00
Launchpad Translations on behalf of openerp cc87ba5db7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130308052354-6aerviht20qnfh26
bzr revid: launchpad_translations_on_behalf_of_openerp-20130308060553-lujyj3qxhqljssu0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130308060749-69tgopwkctb0v5ei
2013-03-08 06:07:49 +00:00