pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,417 Commits 1 Branch 0 Tags
d3a14cd5b4276abc7bfa7f2bee9fc2d321a9bc41
Commit Graph
2163 Commits
Author SHA1 Message Date
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 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
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
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
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
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
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
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
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
Christophe Matthieu fd2821086f [MERGE] sync with trunk 
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
 2013-12-02 16:09:25 +01:00
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
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
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
Xavier Morel 61431d0384 [IMP] product: avoid redundant work 
bzr revid: xmo@openerp.com-20131121142252-laxz8z457yyebayj
 2013-11-21 15:22:52 +01: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
Thibault Delavallée 9f38df4d57 [MERGE] Sync with website-al 
bzr revid: tde@openerp.com-20131115133635-66u5iuesqb5u6leq
 2013-11-15 14:36:35 +01:00
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
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
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
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
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
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