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
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
Thibault Delavallée
94887c5cb8
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131004085039-is2mi6jlh9avo79k
2013-10-04 10:50:39 +02: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
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
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
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
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
4cb9834833
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130913060838-a2k0hfitlgdrqj0h
2013-09-13 06:08:38 +00:00
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
3ef8dbeac3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130904050344-pjsmx05h22n09162
2013-09-04 05:03:44 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
4cb1127306
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130621060722-3y4nu7t4kzg3zjua
2013-06-21 06:07:22 +00:00
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
Christophe Matthieu