odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
83,357 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

4254 Commits

Author SHA1 Message Date
Launchpad Translations on behalf of openerp 5f1bd401f8 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140508063251-ztdomqygi2izm2o3
 2014-05-08 06:32:51 +00:00
Denis Ledoux b6255eb55d [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10005 revid:dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5 
bzr revid: dle@openerp.com-20140422162028-2icoebrb5q4tg3t3
 2014-04-22 18:20:28 +02:00
Denis Ledoux b981f3f8ef [FIX] *: in search views, use operator=child_of instead of filter_domain with a child_of domain 
operator child_of has the advantage to do exact ID matching for many2one, and not just matching on the name

bzr revid: dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5
 2014-04-22 17:07:10 +02:00
Martin Trigaux 322eebf3f7 [FIX] sale: move demo data from sale to sale_stock 
A better fix would be to create a sale_procurement module (sale_stock has sale, procurement and stock as dependecies) but a bit overkill for simple demo data

bzr revid: mat@openerp.com-20140422105039-vqvxejd123cmtc0s
 2014-04-22 12:50:39 +02:00
Launchpad Translations on behalf of openerp 001a034e58 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094159-mhy3v2prb3ctx32k
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094217-3u3f03f0wjhbzyo4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140413062047-z833pejjrtuhfygs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140414055948-intynzk8l823ukei
 2014-04-14 05:59:48 +00:00
Launchpad Translations on behalf of openerp 63e9150cff Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140411055930-7coykr7rveqsucp3
 2014-04-11 05:59:30 +00:00
Denis Ledoux 7715bf1823 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9969 revid:dle@openerp.com-20140409162932-y5fxd5wbojing2t2 
bzr revid: dle@openerp.com-20140409163132-n3apqh6nvfg2qof9
 2014-04-09 18:31:32 +02:00
Denis Ledoux 32f4824434 [MERGE][FIX] sale: sale order report, pto in invoice template should not cover the whole document 
Courtesy of Stefan Rijnhart (Therp)

bzr revid: dle@openerp.com-20140408193910-2vztatyowndyasj9
 2014-04-08 21:39:10 +02:00
Launchpad Translations on behalf of openerp 8f174e13bd Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140404070722-99m3lomg172fzapc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140404070759-302tyo6k09v8arhz
 2014-04-04 07:07:59 +00:00
Christophe Simonis db6fb31870 [MERGE] forward port of branch 7.0 up to revid 9954 chs@openerp.com-20140403153129-jq9zc7ityoy25c73 
bzr revid: chs@openerp.com-20140403155904-ya5mas5s3g7ivihb
 2014-04-03 17:59:04 +02:00
Launchpad Translations on behalf of openerp 4612b417af Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140403060213-netdplm9jzfr9yy6
 2014-04-03 06:02:13 +00:00
Martin Trigaux 7ee65aa181 [FIX] sale: remove useless write call (problematic when invoice on delivery order) 
bzr revid: mat@openerp.com-20140331104448-4omzqnist6wlmakd
 2014-03-31 12:44:48 +02:00
Launchpad Translations on behalf of openerp 16ce262c33 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
 2014-04-02 06:44:59 +00:00
Launchpad Translations on behalf of openerp 598cf8d9b3 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140328064440-1ja0p23itklkg7yk
 2014-03-28 06:44:40 +00:00
Denis Ledoux e61d12bfa7 [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9160 revid:dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd 
bzr revid: dle@openerp.com-20140325112909-zpfi67tx8yfxwnqe
 2014-03-25 12:29:09 +01:00
Denis Ledoux 02459f8d4a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9929 revid:dle@openerp.com-20140325104921-x8zjx5p71l1o3uif 
bzr revid: dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140311164146-2s599kogbqj8e94l
bzr revid: dle@openerp.com-20140312111149-u6y036aej3ywq7et
bzr revid: dle@openerp.com-20140312121145-06s1jvct9v4m7l6s
bzr revid: mat@openerp.com-20140313084409-c0kckxemy3in0mlo
bzr revid: chs@openerp.com-20140313163420-ifa4hyixj722d6jo
bzr revid: chs@openerp.com-20140314102034-g0nzryvwhrpzdas9
bzr revid: chs@openerp.com-20140314104803-19c5snl2fcuih91o
bzr revid: odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
bzr revid: chs@openerp.com-20140318110229-y8098w3shdpmoig2
bzr revid: dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: dle@openerp.com-20140320112618-yfyihlwz66ryeqf5
bzr revid: dle@openerp.com-20140320161003-j01cc6sqves2wnp2
bzr revid: dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
bzr revid: dle@openerp.com-20140321140450-8ulnhr76qybiadks
bzr revid: dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
bzr revid: dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
 2014-03-25 12:24:13 +01:00
Denis Ledoux 8310cd1920 [FIX] sale: make invoice for SO grouped by partner based on partner_invoice_id instead of just partner_id 
For two sale order, if the partner_id were different but the partner_invoice_id were identical, the make invoice grouped by partner created two different invoices

bzr revid: dle@openerp.com-20140325103226-vusygdpd74yha91m
 2014-03-25 11:32:26 +01:00
Denis Ledoux f4b1d23cf2 [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9159 revid:dle@openerp.com-20140324104743-ubvu8st7emq9pg1q 
bzr revid: dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
 2014-03-24 12:03:49 +01:00
Denis Ledoux 04f632820b [FIX] sale: trigger signal manual invoice for make invoices wizard (not advance) 
bzr revid: dle@openerp.com-20140324103427-yckncrnynvs5si8i
 2014-03-24 11:34:27 +01:00
Denis Ledoux 4235dc8e88 [REVERT]9882 revid:jri@openerp.com-20140307160945-r2t5pbl2bb7yaw9n 
While it seems right to only show the partner addresses in invoice and shipping addresses, this fix will prevent to use sibling addresses (the address of another contact in the same company), which is a requirement for several users. Therefore, this fix causes more problems than it resolves. 

Moreover, these addresses are displayed on the invoice form as following: Company Name / Partner Name / Address Name. Therefore, if you want to change the address while seeing only the partner addresses, you just have to remove the "Address Name", leaving "Company Name / Partner Name".

bzr revid: dle@openerp.com-20140310133314-5mv4h2h5zmqlw4d2
 2014-03-10 14:33:14 +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
Juan Rial f631757f37 [FIX] [MERGE] [SALE] Filter invoice and ship address on sales order to contacts of the selected customer (#592166) 
bzr revid: jri@openerp.com-20140307160945-r2t5pbl2bb7yaw9n
 2014-03-07 17:09:45 +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 6deae9e9ea [FIX] *: replace various widgets selection by option no_create, as the purpose of these widgets selection were to actually hide the create and edit and quick create 
bzr revid: dle@openerp.com-20140306113021-r280g41vkdyf5ew8
 2014-03-06 12:30:21 +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
Christophe Simonis d5106a4d34 [MERGE] forward port of branch saas-2 up to revid 9136 dle@openerp.com-20140219170746-3yjvjyc2wwrb7rvd 
bzr revid: chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
 2014-02-20 16:45:17 +01:00
Denis Ledoux 8edb7c556b [FIX]sale: post message of mail_thread only accept 0, False, an ID or a list with one ID 
bzr revid: dle@openerp.com-20140219170746-3yjvjyc2wwrb7rvd
 2014-02-19 18:07:46 +01:00
Olivier Dony ed355097fe [FIX] sale: avoid resetting groups for editable mode at each update/upgrade (no noupdate flag on this record) 
bzr revid: odo@openerp.com-20140218174805-4qak0esqpikt372q
 2014-02-18 18:48:05 +01:00
Launchpad Translations on behalf of openerp 5d2f1c68ac Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140216064134-tam102h50au851o1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140215073800-2219ymc7ijxq57aa
bzr revid: launchpad_translations_on_behalf_of_openerp-20140216064223-17h9wz07b2siswzs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140217060328-7qh928zk8ro30qzb
 2014-02-17 06:03:28 +00: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
Launchpad Translations on behalf of openerp 9554c144ff Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140212062357-8n13ec90bnclm1ek
 2014-02-12 06:23:57 +00:00
Denis Ledoux 0043f81e33 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9824 revid:dle@openerp.com-20140210134603-ck0jr56xhl8xgzg2 
bzr revid: dle@openerp.com-20140210141704-sjzjwhe7fh5gszxr
 2014-02-10 15:17:04 +01:00
Denis Ledoux 6e3d193517 [FIX] sale, sale_stock: send by email button visible when sent, progress or manual 
+ remove 'invoiced' from statusbar_visible, as there is no such state
+ proper inherit in sale_stock form view

bzr revid: dle@openerp.com-20140210134603-ck0jr56xhl8xgzg2
 2014-02-10 14:46:03 +01:00
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
Launchpad Translations on behalf of openerp f6696383d6 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140207071400-b3u1081zn9icp7xw
 2014-02-07 07:14:00 +00:00
Launchpad Translations on behalf of openerp 2bebb9cd4d Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201065304-8md3g4d14l1b51ii
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202060105-bnt8nw1mcbg2c3m3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203055609-uxdqgnistwilvo2v
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204064835-qdcrcxldc5zsutio
 2014-02-04 06:48:35 +00:00
Antony Lesuisse 4b30f1fcbd [MERGE] trunk-website-al 
bzr revid: al@openerp.com-20140131005157-jkf8hz6fh2buml2c
 2014-01-31 01:51:57 +01:00
Gery Debongnie 9cdcf812a6 [MERGE] merge from trunk into local branch 
bzr revid: ged@openerp.com-20140130135251-ahk515cy0wc87kyr
 2014-01-30 14:52:51 +01:00
Gery Debongnie 7fd82bc83b [FIX] remove references to 'month' account.invoice.report field in sale/board_sale_view.xml. That field was removed in the model (addon sale) 
bzr revid: ged@openerp.com-20140130091816-y7w38epdk440t44m
 2014-01-30 10:18:16 +01:00
Christophe Simonis c202dc1c52 merge upstream 
bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn
 2014-01-29 20:08:34 +01:00
Christophe Simonis 731019154a [MERGE] forward port of branch saas-2 up to revid 9109 dle@openerp.com-20140129171022-wf6244k90lpncmah 
bzr revid: chs@openerp.com-20140129184703-ypd7iqnor5m5lr3d
 2014-01-29 19:47:03 +01: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 dc439ea9ca [FIX] ir.model.data conversion typo 
bzr revid: al@openerp.com-20140129053533-dcx97b9opmqzrhmw
 2014-01-29 06:35:33 +01:00
Antony Lesuisse 6b7d9f2bac [IMP] ir.model.data new api 
bzr revid: al@openerp.com-20140129030853-aqm4nu8buhj9gu7n
 2014-01-29 04:08:53 +01:00
Antony Lesuisse 033c38c304 [MERGE] trunk 
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
 2014-01-29 03:19:16 +01:00
Olivier Dony 39c27c72d0 [MERGE] Sync with trunk rev. 9064 rev-id ged@openerp.com-20140127161718-uo6pperke86pqq5v 
bzr revid: odo@openerp.com-20140128175835-jannyh3cv3gi1sxn
 2014-01-28 18:58:35 +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 4c2cc018b1 [FIX] in ir_model_data.get_object(), rename parameter 'check' into 'raise_exception' 
bzr revid: rco@openerp.com-20140127152112-s9ft7q9xlixedjew
 2014-01-27 16:21:12 +01:00
Gery Debongnie e4cb7e5aa1 [FIX] change the name of the sales filter to Sales -> this is the name required in some other places that inherits it (addon sale) 
bzr revid: ged@openerp.com-20140127143219-2ljcrieylv3pdz8c
 2014-01-27 15:32:19 +01:00
Gery Debongnie fcb9f7a76e [IMP] improves the Sales Analysis reporting views (add filters and changes the row/col definitions) in pivot table mode (addon sale) 
bzr revid: ged@openerp.com-20140127110102-so4cma7679uvdwtk
 2014-01-27 12:01:02 +01:00
Raphael Collet b8fec90fb4 [FIX] sale: ir_model_data.get_object(..., check=False) may return False 
bzr revid: rco@openerp.com-20140127103505-kujpcjpgr5rdxni9
 2014-01-27 11:35:05 +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 fe59f115c0 [FIX] sale/res_config get_object raise by default 
bzr revid: al@openerp.com-20140126194921-ef6uqsgqqmbar0du
 2014-01-26 20:49:21 +01:00
Fabien Pinckaers fafc132188 [IMP] website_quotation -> website_quote 
bzr revid: fp@tinyerp.com-20140125230847-qzls5kjbxj51scze
 2014-01-26 00:08:47 +01:00
Fabien Pinckaers b15dbfa3a6 [IMP] mini imp 
bzr revid: fp@openerp.com-20140125123758-4fhewd19ib38oal3
 2014-01-25 13:37:58 +01:00
Denis Ledoux 1fb1a6f2af [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9789 revid:dle@openerp.com-20140124120102-we2yxio553ws2yz4 
bzr revid: dle@openerp.com-20140120174449-tui0a24zgn9bien2
bzr revid: dle@openerp.com-20140121125538-ke7i6kaz486hwgl8
bzr revid: dle@openerp.com-20140122134115-0ogjemlqe327xoac
bzr revid: dle@openerp.com-20140123103655-mf2zslfbgue97ed2
bzr revid: dle@openerp.com-20140124121027-uk9zy4dx9tqlsblr
 2014-01-24 13:10:27 +01:00
Denis Ledoux 27224c9b9e [FIX] sale, purchase, sale_stock: on orders lines, on product changed, change the uom (even if the uom is in the same category) 
bzr revid: dle@openerp.com-20140123103505-7pm9526ot2f5u7wa
 2014-01-23 11:35:05 +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
ajay javiya (OpenERP) 2577be53ac [MERGE]: with main 
bzr revid: aja@tinyerp.com-20140123050930-nxq5nnc3y6q0i2lv
 2014-01-23 10:39:30 +05:30
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
Pooja Zankhariya (OpenERP) 6d105922bd [IMP]Removed . near Allow online quotation, Added Partner to Quotation view. 
bzr revid: pza@tinyerp.com-20140121135849-59hs0usf3i36efox
 2014-01-21 18:58:49 +05: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
Launchpad Translations on behalf of openerp 698e2de138 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140121062040-gq8r12g3ypksxa4t
 2014-01-21 06:20:40 +00: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
Pooja Zankhariya (OpenERP) 722aee5336 [MERGE]Merge with Parent 
bzr revid: pza@tinyerp.com-20140117062056-yaw069hktnsk3iwj
 2014-01-17 11:20:56 +05:00
Denis Ledoux 5649e0bbf2 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9770 revid:chs@openerp.com-20140116154645-sy4zhdgqc48xaqbx 
bzr revid: dle@openerp.com-20131224112612-5gjit5uu1aaaqstx
bzr revid: dle@openerp.com-20140103094532-mbczi9ssr3gc90o1
bzr revid: dle@openerp.com-20140108105833-gblxqdw3if1gt35k
bzr revid: dle@openerp.com-20140115121441-bskbyxxbc09ubavh
bzr revid: dle@openerp.com-20140115165506-yuux9km39gbv7k4n
bzr revid: dle@openerp.com-20140116161415-0y9m0kgavcytzj9z
 2014-01-16 17:14:15 +01:00
Gery Debongnie 00c6d55ac9 [MERGE] merge trunk into local branch 
bzr revid: ged@openerp.com-20140116144326-8kwqab71zp8s7a8e
 2014-01-16 15:43:26 +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 Simonis 91aaaec0a5 [MERGE] forward port of branch saas-2 up to revid 9092 dle@openerp.com-20140115165506-yuux9km39gbv7k4n 
bzr revid: chs@openerp.com-20140115214454-dhl8xzr429co0j5d
 2014-01-15 22:44:54 +01:00
Martin Trigaux 2aa8a38447 [IMP] sale,purchase order: order the field based on date_order instead of name 
This avoids getting irrelevent order based on sequences without padding (eg: SO10 between SO1 and SO2)

bzr revid: mat@openerp.com-20140115140527-pztwh3kl6y9y7jbe
 2014-01-15 15:05:27 +01:00
Pooja Zankhariya (OpenERP) ba458f6abc [MERGE]Merge with Parent 
bzr revid: pza@tinyerp.com-20140115123052-n9pfmaoh5jzev28d
 2014-01-15 17:30:52 +05:00
Christophe Matthieu 320a0bc28c [IMP] website/website_sale: Use group to display shipping address in frontend like the backend. Use group for product facet caracteristique (backend/frontend). Customize templates is displayed function of groups of ir.ui.view templates. 
bzr revid: chm@openerp.com-20140115110547-v0nllq0f800tlhpg
 2014-01-15 12:05:47 +01:00
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
Mahendra Barad (OpenERP) 6b90f0a6d5 [IMP]fix typo and improved layout 
bzr revid: mba@tinyerp.com-20140113103617-vu9hftagrqx0dqa2
 2014-01-13 16:06:17 +05:30
Gery Debongnie 0c24b69db2 [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20140113081030-74nfutdr5le70dz4
 2014-01-13 09:10:30 +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
Launchpad Translations on behalf of openerp ad17716632 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140109053828-gmi203xa8tx1nnnp
 2014-01-09 05:38:28 +00:00
Thibault Delavallée 49c0b7a820 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
 2014-01-06 14:57:00 +01:00
Launchpad Translations on behalf of openerp b1af63310c Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131219061324-aw7yvvnjapbx5x1i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131220053354-9ybfurq6yvrliqge
bzr revid: launchpad_translations_on_behalf_of_openerp-20131223054728-1db5iqqokg67bcyr
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231052619-5szmeohg88k0m4xt
bzr revid: launchpad_translations_on_behalf_of_openerp-20140101054325-pww3zkiyzxll4qy7
bzr revid: launchpad_translations_on_behalf_of_openerp-20140102054504-671epcsd8458kil8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140103062350-h5v8idg6hlix6rnx
bzr revid: launchpad_translations_on_behalf_of_openerp-20140104061853-bndte11d6k8po640
bzr revid: launchpad_translations_on_behalf_of_openerp-20140105054743-exo0ixnpjkfwfstl
bzr revid: launchpad_translations_on_behalf_of_openerp-20140106050440-fme1x3f2g4s1dxqk
bzr revid: launchpad_translations_on_behalf_of_openerp-20140103062427-4v5wusiplrcj4jjd
bzr revid: launchpad_translations_on_behalf_of_openerp-20140104061934-r5xq4gfoy22w6nll
bzr revid: launchpad_translations_on_behalf_of_openerp-20140105054800-delmrxbtcvm3xxyw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140106050503-xu0r3lopkkfn20ca
 2014-01-06 05:05:03 +00:00
Gery Debongnie bc19dec67c [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20140102090034-q44kafh11u0frjv2
 2014-01-02 10:00:34 +01:00
Launchpad Translations on behalf of openerp e0951d6e18 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227053952-0hms21l5679mfv9d
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228053802-9q255pplfsr06jvf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230050715-gywiu51n8ejcvnkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231052701-yjrbqgyv2os2z8gt
bzr revid: launchpad_translations_on_behalf_of_openerp-20140101054400-7tz7obdh31v8log8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140102054530-gtwf0yp277zkqm0i
 2014-01-02 05:45:30 +00:00
Gery Debongnie 9477cacd5f [IMP] removes old tree view in reporting (sales, sales_crm, sales_stock) and replaces them by the new graph view in pivot mode by default (addon sale, sale_crm, sale_stock) 
bzr revid: ged@openerp.com-20131231111824-1altk73m9l4iszkq
 2013-12-31 12:18:24 +01:00
Launchpad Translations on behalf of openerp 67e479e96e Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131225060225-zss93rqqqz3holkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131226060540-odnnltlm0bobiqp9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227052235-xq201ghozcgucfuq
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228051943-jo247cfuiyx4w767
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230043947-d1jcf2vpf9go93ec
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231044745-8v24a0fydnvde3js
 2013-12-31 04:47:45 +00:00
Gery Debongnie bdcb7fcc17 [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20131227152252-5kz11jpespxg1h5w
bzr revid: ged@openerp.com-20131230090844-9vugoov6jsc6z5j0
 2013-12-30 10:08:44 +01:00
Gery Debongnie 9dfb5de2f8 [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20131224112327-r1evm1pcw2gpn8dh
bzr revid: ged@openerp.com-20131226132625-33fgmyb0fbu0c9ia
 2013-12-26 14:26:25 +01:00
Gery Debongnie ae13bea0d8 [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon sale) 
bzr revid: ged@openerp.com-20131224102942-5g4gchmgyloo2s06
 2013-12-24 11:29:42 +01:00
Martin Trigaux 54be818a3b [MERGE] forward port of latest saas-2 until rev 9051 dle@openerp.com-20131217142126-1lbim47d2m2x4bb0 
bzr revid: mat@openerp.com-20131218155715-khb909yy99cbmna8
 2013-12-18 16:57:15 +01:00
Thibault Delavallée e883b15c48 [FIX] sale, delivery: _amount_all function used in function field is now wrapper. Indeed as 
we give the function pointer when creating the fields, inheritance is not taken into
account. This is done by adding a wrapper that calls _amount_all, using this time correct
inheritance.

bzr revid: tde@openerp.com-20131218131942-9lzrxbscb4lu4rj8
 2013-12-18 14:19:42 +01:00
Launchpad Translations on behalf of openerp 94b4618c13 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131215054553-py8zfwrk3bir6m1l
bzr revid: launchpad_translations_on_behalf_of_openerp-20131212055820-zh0fqpweezvphdc6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131213064308-hil3cycv38im8qds
bzr revid: launchpad_translations_on_behalf_of_openerp-20131215054616-uyc9y42oetvmq1cs
bzr revid: launchpad_translations_on_behalf_of_openerp-20131216053557-w3gf0jlw5wrtzllr
 2013-12-16 05:35:57 +00:00
Thibault Delavallée fab63158a1 [CLEAN] sale: removed code that should not lie here. website code has nothing to do in the base sale module. website_sale: renamed website_sale file into sale_order and added the get_website_data method. 
bzr revid: tde@openerp.com-20131213110629-rhgpqpy2dj03ng8h
 2013-12-13 12:06:29 +01:00
Thibault Delavallée d9343e2d27 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20131213094016-ylqkilyo4190g81w
 2013-12-13 10:40:16 +01:00
Launchpad Translations on behalf of openerp 45e34f2f6b Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211053249-7onr7u94z5rfg60p
bzr revid: launchpad_translations_on_behalf_of_openerp-20131212051525-n6q6vsucee027ihr
 2013-12-12 05:15:25 +00:00
Denis Ledoux 942a10f2b3 [REVERT] rev 9007 dle@openerp.com-20131122150606-ruqe2l0e7gn84upf 
default_model and default_res_id were not present when doing this fix, because in the web client, we prevented the propagation of the context keys beginning with "_default" in some cases.
The fact is that, in this specific case, the keys "default_" should not have been removed. This has been fix in web client in 
rev 3892 revid:chs@openerp.com-20131211163609-i3s2mlncf5n91uda

Besides, active_model cannot be used here, as active_model is not 'sale.order' but the model of the wizard.

bzr revid: dle@openerp.com-20131211171429-6bxuh7o4ueiy9dd1
 2013-12-11 18:14:29 +01:00
Launchpad Translations on behalf of openerp 767207aa23 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211062724-zxcigdht6w71xy7v
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211062802-mh61vodnsw0sr8im
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211062808-o9fkpg2cg9cb403z
 2013-12-11 06:28:08 +00:00
Thibault Delavallée 4b96e85a30 [MERGE] [FORWARD] Forward port of saas-2 branch until revision 9036 (revid tde@openerp.com-20131209102019-kjeg0rx2au1d5e5v) 
bzr revid: tde@openerp.com-20131209105031-17920wsidpqrwmxj
 2013-12-09 11:50:31 +01:00
Denis Ledoux 5200639f39 [FIX]sale: on sale order creation, apply on_change if needed (if required value are not set and can be computed from other values (onchange) 
bzr revid: dle@openerp.com-20131206135111-nh31jgspelvwnhat
 2013-12-06 14:51:11 +01:00
Denis Ledoux f653a7e7da [REVERT] revision 9031, dle@openerp.com-20131205170917-7cdzghsa5690xvux 
Because the xml parser needs to be fixed before this fix can be commited

bzr revid: dle@openerp.com-20131206112738-wu35g157v6myipbx
 2013-12-06 12:27:38 +01:00
Denis Ledoux cbe553505e [FIX]sale: on sale order creation, apply on_change if needed (if required value are not set and can be computed from other values (onchange) 
bzr revid: dle@openerp.com-20131205170917-7cdzghsa5690xvux
 2013-12-05 18:09:17 +01:00
Thibault Delavallée f28d5f47b8 [MERGE] Sync with trunk, notably for bootstrap that landed in trunk 
bzr revid: tde@openerp.com-20131205102352-ncx6whb8r0fejgcc
 2013-12-05 11:23:52 +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