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

4511 Commits

Author SHA1 Message Date
Randhir Mayatra rma-openerp e8f488065a [MERGE] merge with latest trunk and resolve conflicts 2014-04-14 14:06:31 +05:30
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 e82fbf7d91 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
 2014-04-12 08:31:53 +00:00
Randhir Mayatra rma-openerp 6da28202f3 [MERGE] merge with latest trunk 2014-04-11 12:36:24 +05:30
Randhir Mayatra rma-openerp 85714eabb6 [MERGE] merge with latest trunk 
bzr revid: rma@tinyerp.com-20140411062328-srzutp1ln9xe7sxq
 2014-04-11 11:53:28 +05:30
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
Gery Debongnie 2e9ee9c76e [MERGE] merge from rma branch 
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
 2014-04-10 16:51:31 +02: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
Ravish (Open ERP) 31c7c33260 [imp]improve the code 2014-04-09 19:10:28 +05:30
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
DJ Patel c20483a1dd [FIX] sale : Don't allow line creation in confirmed sale oder. 
bzr revid: mdi@tinyerp.com-20140408053552-ovo33f2nkhaj6goe
 2014-04-08 11:05:52 +05:30
Christophe Simonis 0fad8159f3 [MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx 
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
 2014-04-07 18:33:18 +02:00
Randhir Mayatra rma-openerp 9dbaa58694 [MERGE] merge with latest trunk 
bzr revid: rma@tinyerp.com-20140407102440-ngtr58o2w2ypqrol
 2014-04-07 15:54:40 +05:30
Simon Lejeune e1bf5bd97c [IMP] Report: renamed 'render_doc' method as 'translate_doc' for better understanding and added it a 'lang_field' attribute to explicitely set the lang. Adapted report_invoice, report_saleorder, report_overdue and report_intrastatinvoice this way. 
bzr revid: sle@openerp.com-20140408134953-vql9ft8cosoanixt
 2014-04-08 15:49:53 +02:00
Simon Lejeune 4983f86d81 [MERGE] trunk 
bzr revid: sle@openerp.com-20140407174534-pk6b5lozvik78fom
 2014-04-07 19:45:34 +02:00
Simon Lejeune dc8246eb03 [ADD] sale_layout module allowing to set categories and subtotals on invoice and sale order 
bzr revid: sle@openerp.com-20140404112308-aopihnefnf55b4er
 2014-04-04 13:23:08 +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
Simon Lejeune 33471e966f [FIX] missing dependancies of report module 
bzr revid: sle@openerp.com-20140403091818-6evr0k4r2k4818j1
 2014-04-03 11:18:18 +02:00
Quentin (OpenERP) ff4726ea7d [MERGE] merged trunk up to revision 9281 
bzr revid: qdp-launchpad@openerp.com-20140403081427-7xpn57wdfv08v2al
 2014-04-03 10:14:27 +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
Ravish (Open ERP) 194005512d [update with trunk] 2014-04-01 12:54:14 +05:30
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
Yogesh Parekh (OpenERP) 9aadda1e1e [MERGE]: Merge with addons branch 
bzr revid: ypa@tinyerp.com-20140331095310-wkmxt02x6l85zho0
 2014-03-31 15:23:10 +05:30
Randhir Mayatra rma-openerp 77ff3a69b8 [IMP] improve icons and views 
bzr revid: rma@tinyerp.com-20140328133051-2amm63n2vy3bj3xe
 2014-03-28 19:00:51 +05:30
Ravish (Open ERP) 7699504d62 [Add new sale_team module] 2014-03-28 15:28:35 +05:30
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
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
 2014-03-27 07:35:04 +00:00
Quentin (OpenERP) e0b27b4ee8 [MERGE] merged trunk up to revision 9251 
bzr revid: qdp-launchpad@openerp.com-20140326152751-b6bo0fawrzmd71f0
 2014-03-26 16:27:51 +01:00
Randhir Mayatra rma-openerp c086291ddd [MERGE] merge with latest trunk 
bzr revid: rma@tinyerp.com-20140325135635-rev8asknqwk08svy
 2014-03-25 19:26:35 +05:30
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
Randhir Mayatra rma-openerp 96ea9392aa [IMP] convert button into stat button for products 
bzr revid: rma@tinyerp.com-20140324135621-13t191kmnn6t22jk
 2014-03-24 19:26:21 +05:30
Christophe Simonis d93b79e6f4 [MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k 
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
 2014-03-24 14:38:11 +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
Randhir Mayatra rma-openerp b51066b500 [IMP] convert button into stat button for customer 
bzr revid: rma@tinyerp.com-20140320134414-mk1ie8okynrtudsq
 2014-03-20 19:14:14 +05:30
Launchpad Translations on behalf of openerp 948799e259 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140315070651-iyi1g70tarcqvhdc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140315064235-n9sb0125g9bboyb4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140316054224-hr4a70bglfizxqyy
 2014-03-16 05:42:24 +00:00
Yogesh Parekh (OpenERP) c4424b597d [MERGE]: Merge with addons 
bzr revid: ypa@tinyerp.com-20140312095556-d0pmfd7kw9fyy7u2
 2014-03-12 15:25:56 +05:30
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
Yogesh Parekh (OpenERP) 9338207e1f [IMP]: Improve reference terms for partner 
bzr revid: ypa@tinyerp.com-20140311094911-7oc1il3jl2ktlb09
 2014-03-11 15:19:11 +05:30
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
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
Sunil Sharma (OpenERP) dd4813e360 [mrg]:lp:openobject-addons 
bzr revid: sunilsharma.sharma07@gmail.com-20140304063937-vyrt063gzfhsoy4k
 2014-03-04 12:09:37 +05:30
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
Simon Lejeune 35b64811e9 [MERGE] trunk 
bzr revid: sle@openerp.com-20140221095425-9043pbzjy7rtbxd1
 2014-02-21 10:54:25 +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
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
Simon Lejeune fabc1cdd40 [FIX] renamed ir.actions.report.paperformat model to report.paperformat, renamed html_skeleton to html_container in report layouts and renamed paperformat.py file to report_paperformat.py 
bzr revid: sle@openerp.com-20140218155347-tfxlndg9wgaw0bv1
 2014-02-18 16:53:47 +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
openerp-sle f51ffe6227 [FIX] Minor fixes in sale and tax views 
bzr revid: openerp-sle@openerp-sle.home-20140214094834-x3trvtnbmffo1dtb
 2014-02-14 10:48:34 +01:00
openerp-sle a2805ee6d7 [FIX] Sale: QWeb action returned when clicking on print button on form view 
bzr revid: openerp-sle@openerp-sle.home-20140212230002-4e1rsmeutg45h237
 2014-02-13 00:00:02 +01:00
openerp-sle 12e9d218b0 [IMP] Sale order report converted to QWeb 
bzr revid: openerp-sle@openerp-sle.home-20140212182247-0ahbbrgob4ssz9bn
 2014-02-12 19:22:47 +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
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
Cedric Snauwaert 9b249181e3 [MERGE]merge with latest trunk 
bzr revid: csn@openerp.com-20140210161556-qq52vvhdegyda7k6
 2014-02-10 17:15:56 +01: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
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
Quentin (OpenERP) f9d3e8a39e [REF] some refactoring, bug fixes made during code review 
bzr revid: qdp-launchpad@openerp.com-20140207111349-2zjysk3w1p0daeaj
 2014-02-07 12:13:49 +01:00
Quentin (OpenERP) 860cdf9d34 [MERGE] main trnk-wms branch 
bzr revid: qdp-launchpad@openerp.com-20140207085946-iwwnyivpsl6r2af8
 2014-02-07 09:59:46 +01: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
Thibault Delavallée 1b13217838 [MERGE] sales/crm: minor improvements in account_analytic_analysis, crm, event_sale, hr_timesheet_invoice, sale views 
bzr revid: tde@openerp.com-20140205160347-nptajwoxfl5ylfa9
 2014-02-05 17:03:47 +01: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
Quentin (OpenERP) 753f7541db [MERGE] main trunk 
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
 2014-02-03 18:30:00 +01: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
Sunil Sharma (OpenERP) b2ac002e1b [MRG]:merge lp:openobject-addons 
bzr revid: sunilsharma.sharma07@gmail.com-20140130044953-qfg8wbm6835hi9dz
 2014-01-30 10:19:53 +05:30
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
Sunil Sharma (OpenERP) 685121bea3 [rem]:sale and crm :remove image 
bzr revid: sunilsharma.sharma07@gmail.com-20140129133115-mqozdx23ctzbmct5
 2014-01-29 19:01:15 +05:30
Sunil Sharma (OpenERP) f7431f7a9d [remove]sale:remove sale dashboard description and image 
bzr revid: sunilsharma.sharma07@gmail.com-20140129120425-kk2g4hg3yxb4fwki
 2014-01-29 17:34:25 +05:30
Sunil Sharma (OpenERP) 80be3a2c53 [imp]sale:remove comment line 
bzr revid: sunilsharma.sharma07@gmail.com-20140129113252-i71mk96ohkpp3zg8
 2014-01-29 17:02:52 +05:30
Sunil Sharma (OpenERP) 4c0f46178e [remove]sale:remove sale dashboard 
bzr revid: sunilsharma.sharma07@gmail.com-20140129113004-y2gndgsqkif3g43k
 2014-01-29 17:00:04 +05:30
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
Cedric Snauwaert 08cf92d5a8 [FIX]sale order workflow: fix problem when clicking on ignore delivery exception 
bzr revid: csn@openerp.com-20140124092758-tur7cs4d6br30x48
 2014-01-24 10:27:58 +01:00
Cedric Snauwaert 1e662896fe [FIX]when copy sale_order, don't copy procurement_group_id 
bzr revid: csn@openerp.com-20140123162141-rjd2vyml1d65ayn3
 2014-01-23 17:21:41 +01:00
Cedric Snauwaert 8c00eddd04 [FIX]sale order, when in shipping exception, don't cancel procurement, re-run it instead. Also run of procurement should take into account previously done move for quantities 
bzr revid: csn@openerp.com-20140123160638-4dgq1h1yugt6m6zt
 2014-01-23 17:06:38 +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
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) b6a51daf90 [MERGE] merged csn branch with fixes of access rights on prices.history table 
bzr revid: qdp-launchpad@openerp.com-20140120150334-8h6jg5wkwklc2c42
 2014-01-20 16:03:34 +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
Cedric Snauwaert 9cb7aab2d0 [FIX]access right for prices.history (should be the same as the one for product) 
bzr revid: csn@openerp.com-20140117135034-8m7798nqu1spz370
 2014-01-17 14:50:34 +01: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
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
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
Quentin (OpenERP) f5718efa6e [MERGE] merged with trunk 
bzr revid: qdp-launchpad@openerp.com-20131230102802-y1ux8470wxnj4yfr
 2013-12-30 11:28:02 +01: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
Quentin (OpenERP) b2fed7e0b2 [FIX] sale: after a shipping exception, when recreating the procurements from a SO, cancel first existing ones (if any) 
bzr revid: qdp-launchpad@openerp.com-20131218101717-c4womsacvkkzmr37
 2013-12-18 11:17:17 +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
Quentin (OpenERP) a5cc6d6aed [MERGE] merged with main trunk 
bzr revid: qdp-launchpad@openerp.com-20131211100354-hwlt65vk8p3xih9u
 2013-12-11 11:03:54 +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
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
Fabien Pinckaers ed7623fc45 [IMP] Performance improvement: improved cache with context, better get_object 
bzr revid: fp@tinyerp.com-20131130154659-uqis34x2cemmocly
 2013-11-30 16:46:59 +01:00
Christophe Simonis 289023d92f [MERGE] forward port of branch saas-2 up to revid 9024 chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp 
It’s over NINE THOUSAAAAAAAND!

bzr revid: chs@openerp.com-20131130130725-9ntxdr5r7r04uoht
 2013-11-30 14:07:25 +01:00
Christophe Simonis 0ac4a8f696 [MERGE] forward port of branch 7.0 up to revid 9668 launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf 
bzr revid: chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp
 2013-11-30 14:00:14 +01: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
Martin Trigaux d4edeaaabe [MERGE] [FIX] sale: use client ref on invoice val instead of name for make invoice wizard, same behaviour as creation of invoice in classic _prepare_invoice of sale.py. Courtsey of Yannick Vaucher (Camptocamp) 
bzr revid: mat@openerp.com-20131128113232-aun2h9fbrfxwffqt
 2013-11-28 12:32:32 +01:00
Christophe Simonis 0521d1aab3 [MERGE] forward port of branch saas-2 up to revid 9017 chs@openerp.com-20131127110552-3u2nxwu01gxj9i7m 
bzr revid: chs@openerp.com-20131127111208-iclt7a9ib7oucumh
 2013-11-27 12:12:08 +01:00
Christophe Simonis 0d13df5a57 [MERGE] remove warnings 
bzr revid: chs@openerp.com-20131127110552-3u2nxwu01gxj9i7m
 2013-11-27 12:05:52 +01:00
Christophe Simonis 6b05beecc1 [MERGE] forward port of branch 7.0 up to revid 9651 chs@openerp.com-20131127104459-jb77x7quwcvtifm7 
bzr revid: dle@openerp.com-20131126171210-jovr7e7efehuq3s2
bzr revid: chs@openerp.com-20131127110046-4ow36dkuuyzgf1pl
 2013-11-27 12:00:46 +01:00
Quentin (OpenERP) 7c0c95b1a4 [FIX] sale, purchase: don't copy the customer/supplier reference when copying a SO/PO 
bzr revid: qdp-launchpad@openerp.com-20131127084625-dqgoloz4q47zlpti
 2013-11-27 09:46:25 +01:00
Turkesh Patel (Open ERP) b08503e373 [MRG] merge with lp:openobject-addons 
bzr revid: tpa@tinyerp.com-20131126052924-xn4qn67lehe6x2pj
 2013-11-26 10:59:24 +05:30
Christophe Simonis bb1e256f5b [MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3 
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
 2013-11-25 16:00:54 +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
Christophe Simonis 0244543c71 [MERGE] forward port of branch 7.0 up to revid 9636 mat@openerp.com-20131122165504-tmbg0ixhqed4kdkz 
bzr revid: chs@openerp.com-20131122193122-wpdfsfn24ezj1qrp
 2013-11-22 20:31:22 +01:00
Denis Ledoux c782692d56 [FIX]sale: quotation/sale order sent by email were not anymore set to state quotation sent, because the workflow was triggered according to a specific value in the context, which was not there anymore(default_model changed to active_mode, default_res_id changed to active_ids 
bzr revid: dle@openerp.com-20131122150606-ruqe2l0e7gn84upf
 2013-11-22 16:06:06 +01:00
Martin Trigaux 56d579b1e0 [FIX] email.template: add missing parenthesis to filter all data on email and not the last one 
bzr revid: mat@openerp.com-20131122104509-g2pii4m5rj8qpk7w
 2013-11-22 11:45:09 +01:00
Olivier Dony 2cba6a5355 [MERGE] Forward-port of latest 7.0 fixes up to rev 9629 rev-id odo@openerp.com-20131121153230-keie85rmes2zh2o8 
bzr revid: chs@openerp.com-20131121112139-aw2ara1i1xymue62
bzr revid: odo@openerp.com-20131121154205-ul9hf9tz3h0x2n7m
 2013-11-21 16:42:05 +01:00
Martin Trigaux c3063778ce [FIX] email.template: add safe filter over email address to allow emails to be sent in the format 'Name <name@company.com>' and avoid escaping 
bzr revid: mat@openerp.com-20131121151305-t5je12s4w5uctu0k
 2013-11-21 16:13:05 +01:00
Christophe Simonis 6f67143908 [FIX] *: do not call deprecated method LocalService() 
bzr revid: chs@openerp.com-20131121120611-06h1pki3460tzj1s
 2013-11-21 13:06:11 +01:00
Martin Trigaux 0a60ad5aee [MERGE] [FIX] sale: sale.order.line, remove duplicated state field that made the statusbar in the header to be incorrectly rendered (opw 598572) 
lp bug: https://launchpad.net/bugs/1233567 fixed

bzr revid: mat@openerp.com-20131121113304-kntnvmdmoll2n6hl
 2013-11-21 12:33:04 +01:00
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
Christophe Simonis 82da5541e2 [MERGE] remove warnings 
bzr revid: chs@openerp.com-20131120161051-pk7n0itjcxx06uwm
 2013-11-20 17:10:51 +01:00
Olivier Dony 44664076da [MERGE] Forward-port of latest 7.0 fixes up to rev 9618 rev-id: dle@openerp.com-20131120142131-s333lyva85cyn41o 
bzr revid: odo@openerp.com-20131120144059-yyh7emvgdarff09b
bzr revid: odo@openerp.com-20131120144318-11nmn1zj00zmi10z
 2013-11-20 15:43:18 +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
Launchpad Translations on behalf of openerp 6f10f3ae24 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131116054548-3p5ym1d6w40ctn2i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131117052157-8zpcgl9vc9s80s5c
bzr revid: launchpad_translations_on_behalf_of_openerp-20131118052246-2yk6opkjie1zcpw1
 2013-11-18 05:22:46 +00:00
Fabien Pinckaers b61ac1998e [FIX] access right with sale with event crashed [NEW] website_sale_delivery module 
bzr revid: fp@openerp.com-20131116224306-7is2hawhhpzazie3
 2013-11-16 23:43:06 +01:00
Turkesh Patel (Open ERP) a254e5fca9 [ADD] added record rules for analysis report objects. 
bzr revid: tpa@tinyerp.com-20131115104909-izjhuoy3eyy1vfjk
 2013-11-15 16:19:09 +05:30
Christophe Simonis 636ac0f61e merge upstream 
bzr revid: chs@openerp.com-20131108215612-e5f01a1kvyevlry9
 2013-11-08 22:56:12 +01: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
Launchpad Translations on behalf of openerp 2160342cea Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131116062538-hsi3j63m1pw01qem
bzr revid: launchpad_translations_on_behalf_of_openerp-20131117054515-0jw3bd84wk546u6j
bzr revid: launchpad_translations_on_behalf_of_openerp-20131118055319-wz4qa3cxwowlonxt
 2013-11-18 05:53:19 +00:00
Quentin (OpenERP) 6ec682a59f [FIX] sale: do not copy procurements when copying a sale order (or a sale order line) 
bzr revid: qdp-launchpad@openerp.com-20131106075522-36q9vq1ihh6q7lm3
 2013-11-06 08:55:22 +01:00
Mohammed Shekha (OpenERP) f3ff6b4bfb [FIX]Fixed the issue of active state does not get highlighted in sale order line, the issue raised due to double state field in the view. 
bzr revid: msh@openerp.com-20131106072745-5ssemxhquw2343by
 2013-11-06 12:57:45 +05:30
Olivier Dony 0f7099bb30 [FIX] sale,sale_stock: sales analysis view using incorrect JOIN and group by clause 
Similarly to the recent fixes in Purchase Analysis,
the Sales Analysis view must not group on the quantity
field. It is one of the columns that must be aggregated,
not used to fold PO lines into the same
result row.
The line count was also incorrect because of this, and
had to be corrected to actually count() the underlying
SO lines.

In addition, the JOINs were done in the wrong order,
which could cause problems (e.g. if an empty SO ever
landed in the database, all the SO line columns
would be empty in the JOIN, and cause errors)

bzr revid: odo@openerp.com-20131105103011-vkix07lsb6q3y9fd
 2013-11-05 11:30:11 +01:00
Launchpad Translations on behalf of openerp 15062bdffe Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131105060056-7xuq20lqt1upcdc6
 2013-11-05 06:00:56 +00:00
Launchpad Translations on behalf of openerp 9d4c7f4db9 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131101062724-823uztz81d48e7zk
bzr revid: launchpad_translations_on_behalf_of_openerp-20131102062340-1guhkeb34orj1d77
bzr revid: launchpad_translations_on_behalf_of_openerp-20131103054341-mg7xr0dkzd2rp6rx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131104060249-fio493wxgjvvlthm
 2013-11-04 06:02:49 +00:00
Christophe Simonis c59474804b [FIX] sale/edi: do not import non-existing field date_planned 
bzr revid: chs@openerp.com-20131031185633-qf5eus62nwf3xs0m
 2013-10-31 19:56:33 +01:00
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
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
Atul Patel (OpenERP) 89c428bd84 [MERGE]: Merged with addons 
bzr revid: atp@tinyerp.com-20131029133906-xrxccq8zm285m2zw
 2013-10-29 19:09:06 +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 5bb4fa2b43 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20131028163321-5o81wa1m7rzdp1dz
 2013-10-28 17:33:21 +01:00
Quentin (OpenERP) 2a982d199e [MERGE] merged with trunk 
bzr revid: qdp-launchpad@openerp.com-20131028093247-8eegjl3zle5aoqae
 2013-10-28 10:32:47 +01:00
Turkesh Patel (Open ERP) dcc739abed [MRG] merge with lp:openobject-addons 
bzr revid: tpa@tinyerp.com-20131023054724-aocpge4eta3z93gb
 2013-10-23 11:17:24 +05:30
Launchpad Translations on behalf of openerp 16fd47c3e1 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131019052801-ouw53m70o0eabxnv
bzr revid: launchpad_translations_on_behalf_of_openerp-20131020050509-ar8koyz20p82rdjq
bzr revid: launchpad_translations_on_behalf_of_openerp-20131021045723-bkmqoimoalwb3lzq
 2013-10-21 04:57:23 +00:00
niv-openerp 67a9fee553 [MERGE] saas2 
bzr revid: nicolas.vanhoren@openerp.com-20131018103820-a0sklx6hyx3hx93e
 2013-10-18 12:38:20 +02:00
Launchpad Translations on behalf of openerp afe290b844 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131018061129-4wcyxayj6darv5op
 2013-10-18 06:11:29 +00:00
Quentin (OpenERP) 63701a0634 [MERGE] trunk 
bzr revid: qdp-launchpad@openerp.com-20131016085338-wj2lh9v96n6aniua
 2013-10-16 10:53:38 +02:00
Quentin (OpenERP) 75a9f5323f [FIX] sale, sale_stock: fixing problems and workflow related to the shipping_except state 
bzr revid: qdp-launchpad@openerp.com-20131015150035-ccdbua7e881adwx7
 2013-10-15 17:00:35 +02:00
Christophe Matthieu d2108bf33c [FIX] sale: change test because product's demo datas have changed 
bzr revid: chm@openerp.com-20131015102133-s78olcy53ypu21c5
 2013-10-15 12:21:33 +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
Turkesh Patel (Open ERP) 0d840256c5 [MRG] merge with lp:openobject-addons 
bzr revid: tpa@tinyerp.com-20131011061203-z13xuqw5fzznr6qc
 2013-10-11 11:42:03 +05:30
Launchpad Translations on behalf of openerp 5050231a9c Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131010044138-9giz2wpfhyq0u3h1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131011044929-d9u1r6i67x2ru3jp
 2013-10-11 04:49:29 +00:00
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
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
Martin Trigaux a7ddaa29c6 [FIX] sale: don't set mrp_properties by default for root user (adding sale order lines in a popup instead of editable mode) 
bzr revid: mat@openerp.com-20131007123318-v40lxc3yafb0cwv3
 2013-10-07 14:33:18 +02:00
Thibault Delavallée 9e85aa3e72 [FORWARD] Forward port of saas-2 branch until revision 8931 tde@openerp.com-20131003140458-ztnd9taih2rcq8ty 
bzr revid: tde@openerp.com-20131004081915-4i2rn3fsj8qzov63
 2013-10-04 10:19:15 +02:00
Martin Trigaux 11308f37dd [FIX] test: avoid getting error when trying to send an email to the newly created user (email replaced by login) 
bzr revid: mat@openerp.com-20131003143234-8tu732aa4rmycoif
 2013-10-03 16:32:34 +02: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
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
Launchpad Translations on behalf of openerp 5d89ca5f6d Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130919045555-o80w0vjyl4g3d2qn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130920060115-eauj5wlxmkpyxwys
bzr revid: launchpad_translations_on_behalf_of_openerp-20130922053444-ai66yjl1419gee8h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130923053502-xuqx6gazdvsak6e5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130921055928-8y21w291t5w0k13o
bzr revid: launchpad_translations_on_behalf_of_openerp-20130922053456-pcgrwl35kk8b7ff8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130923053531-3twd4g12gj4iqmv3
 2013-09-23 05:35:31 +00:00
Martin Trigaux 773d6bd2cd [FIX] sale: duplication of an existing sale order should change the date 
bzr revid: mat@openerp.com-20130920150010-zj6ug2mdvagr9dv0
 2013-09-20 17:00:10 +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
Josse Colpaert 9494290cb1 [FIX] Try to fix mrp tests and mrp 
bzr revid: jco@openerp.com-20130918135612-n8d1qqbxh0rbgtcw
 2013-09-18 15:56:12 +02:00
Darshan Kalola (OpenERP) d1a23edd2e [IMP]align multi-line string 
bzr revid: dka@tinyerp.com-20130917130814-wikgcy25594gk8dx
 2013-09-17 18:38:14 +05:30
Darshan Kalola (OpenERP) 21876a5810 [MERGE]merged with main addons 
bzr revid: dka@tinyerp.com-20130917123814-wqx07inh0ckcqdgw
 2013-09-17 18:08:14 +05:30
Josse Colpaert e3c5b48264 [FIX] Prints dropship 
bzr revid: jco@openerp.com-20130917102301-hqjwoq92w1km8mod
 2013-09-17 12:23:01 +02:00
Quentin (OpenERP) e12c9ab5ec [FIX] sale, project_mrp, sale_stock: fixed problems related to the procurement workflow 
bzr revid: qdp-launchpad@openerp.com-20130917064359-jwque36uwouac61p
 2013-09-17 08:43:59 +02:00
Turkesh Patel (Open ERP) a2b6b5df02 [MRG] merge with lp:openobejct-addons contains changes on justguage and sparklinebar library. 
bzr revid: tpa@tinyerp.com-20130916070618-l59jaz9tbrmv5y6r
 2013-09-16 12:36:18 +05:30
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
Cedric Snauwaert c401c9027c [FIX]sale: add a condition to avoid creating procurement when we only have sale installed 
bzr revid: csn@openerp.com-20130913131007-ppku5ppy7oj7vt7y
 2013-09-13 15:10:07 +02:00
Frédéric van der Essen 0554984deb [FIX] sale.shop: The pricelist should be a required field 
bzr revid: fva@openerp.com-20130913125748-x5wa2zsyc7rijim2
 2013-09-13 14:57:48 +02:00
Cedric Snauwaert 212be5e67c [WIP]fix sale workflow in the case we only have sale and not stock installed. 
bzr revid: csn@openerp.com-20130913093815-m6luad9cnhykbcha
 2013-09-13 11:38:15 +02: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
Martin Trigaux ab7d8c4ccf [MERGE] refactoring of tests to be executed as normal users instead of administrator, fixed some security rules 
bzr revid: mat@openerp.com-20130912085812-xvmjoa5fjis0l2ws
 2013-09-12 10:58:12 +02:00
Launchpad Translations on behalf of openerp a71caa14d6 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130911051954-5q0wh820h5himluq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912071731-lxe3j09ejij11oty
 2013-09-12 07:17:31 +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
Cedric Snauwaert 2452ef4404 [FIX]_prepare_order_line_procurement should not return False (cause problem with super), instead add another function to know if the so can create a procurement or not 
bzr revid: csn@openerp.com-20130911140034-5so2qbe4rd2m6131
 2013-09-11 16:00:34 +02:00
Martin Trigaux c48504fdba [MERGE] sync with trunk (state -> stage removed some test) 
bzr revid: mat@openerp.com-20130911110755-zf3ytf9m27im6x9k
 2013-09-11 13:07:55 +02:00
Josse Colpaert d207edc369 [IMP] Move sale_stock_workflow towards sale_workflow and make sure project_mrp tests pass 
bzr revid: jco@openerp.com-20130910154822-u2if98d4r32rtibi
 2013-09-10 17:48:22 +02:00
Josse Colpaert 30f27b8cbb [IMP] Move route_ids from product from stock_location to stock and remove supply_method (change with route) 
bzr revid: jco@openerp.com-20130909115515-7z6ixaxe7bpxxe73
 2013-09-09 13:55:15 +02:00
Launchpad Translations on behalf of openerp 1b3e67fc72 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130908050306-6ff4thsz8hd67x3z
bzr revid: launchpad_translations_on_behalf_of_openerp-20130909045922-jrx0xd00p3nszc9r
 2013-09-09 04:59:22 +00: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
Thibault Delavallée ed0a829cb3 [MERGE] [IMP] addons: improved name and tooltips of groupby date in various addons. 
bzr revid: tde@openerp.com-20130904141053-yustqiuzynbettq8
 2013-09-04 16:10:53 +02:00
Turkesh Patel (Open ERP) 6e1b899aa9 [IMP] improved code 
bzr revid: tpa@tinyerp.com-20130904114335-jfptxzwdgt2xjzm1
 2013-09-04 17:13:35 +05:30
Turkesh Patel (Open ERP) b63f89a74e [RMV] remove improvemets to calculate amount based on currency from analysis reports. 
bzr revid: tpa@tinyerp.com-20130904112540-4ovecz1mpjkok7ge
 2013-09-04 16:55:40 +05:30
Turkesh Patel (Open ERP) b867a9b800 [MRG] merge with lp:openobject-addons 
bzr revid: tpa@tinyerp.com-20130904062219-c067v8v866syvz0b
 2013-09-04 11:52:19 +05:30
Josse Colpaert 5ef4e485ff [FIX] Add extra base menu for invoicing 
bzr revid: jco@openerp.com-20130903161651-he9hvw18yetykocq
 2013-09-03 18:16:51 +02:00
Launchpad Translations on behalf of openerp 043a93132d Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903060845-m8b568p0wk2zcy20
 2013-09-03 06:08:45 +00:00