Commit Graph

847 Commits

Author SHA1 Message Date
Quentin (OpenERP) 398d96f273 [MERGE] merged trunk up to revision 9327
bzr revid: qdp-launchpad@openerp.com-20140414094743-hv0u7qhigv1to2uc
2014-04-14 11:47:43 +02: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
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
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 51aa261b44 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +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
Martin Trigaux 91c3673949 [MERGE] [FIX] purchase_requisition: when getting the price based on the pricelist for a supplier, pass the missing supplier id (useful for pricelist based on supplier price) (opw 601890)
bzr revid: mat@openerp.com-20140325104613-t79wxl4y38ll82h0
2014-03-25 11:46:13 +01:00
Quentin (OpenERP) da210e4b5e [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20140311132813-0gmbof2u8nmgv9p3
2014-03-11 14:28:13 +01: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
Quentin (OpenERP) 65aa1424f7 [FIX] purchase_requisition: fix missing coma
bzr revid: qdp-launchpad@openerp.com-20140302190407-77cnjpxf6rmwzieg
2014-03-02 20:04:07 +01:00
Quentin (OpenERP) e36b32a661 [MERGE] merged with main trunk (revision 9186)
bzr revid: qdp-launchpad@openerp.com-20140228131516-ihigousbe5p1nt68
2014-02-28 14:15:16 +01:00
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
Quentin (OpenERP) 4a1eb6eb12 [FIX] purchase_requisition: fixed warning (field purchase_requisition_id does not exist in purchase.order.line)
bzr revid: qdp-launchpad@openerp.com-20140217204104-o2329ec8fz0hwyo0
2014-02-17 21:41:04 +01:00
Quentin (OpenERP) 8d389015d4 [FIX] purchase_requisition: fixed flows related to procurement and purchase_requisition
bzr revid: qdp-launchpad@openerp.com-20140217150538-i321idcf68ux5h8h
2014-02-17 16:05:38 +01:00
openerp-sle bccafbdae0 [IMP] Converted the mrp production production order to QWeb
bzr revid: openerp-sle@openerp-sle.home-20140214180052-pbluhvtg0ptl7m2c
2014-02-14 19:00:52 +01:00
openerp-sle a88f73b3a5 [IMP] Purchase requisition converted to QWeb. Minor changes into purchase_* views
bzr revid: openerp-sle@openerp-sle.home-20140214165550-s4lffhih8107pehl
2014-02-14 17:55:50 +01: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 033c38c304 [MERGE] trunk
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
Launchpad Translations on behalf of openerp 3ce5e01eca Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
Cedric Snauwaert 9596fd7077 [FIX]condition to generate purchase requisition from procurement was uncomplete
lp bug: https://launchpad.net/bugs/1269504 fixed

bzr revid: csn@openerp.com-20140121145444-oaceg3qwdzgb5gss
2014-01-21 15:54:44 +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
Dharti Ratani (Open ERP) 02224a3f11 [FIX]Added the refernce of the supplier in price_get method while creating purchase order from purchase requisition, as without supplier the price unit in PO was 0 when the pricelist item was based on Supplier Price in the product form
bzr revid: dhr@tinyerp.com-20131212052544-skljxsrxea4o8efm
2013-12-12 10:55:44 +05:30
Quentin (OpenERP) 2d56a2d9bc [FIX] purchase_requisition: error in report printing
bzr revid: qdp-launchpad@openerp.com-20131211162630-1cv0tnno6oel2sht
2013-12-11 17:26:30 +01:00
Quentin (OpenERP) 1af2ac6f9c [FIX] fixed warnings in runbot
bzr revid: qdp-launchpad@openerp.com-20131211154840-u2nk7ztggcgewm7y
2013-12-11 16:48:40 +01:00
Christophe Matthieu d0bdb21eb2 [IMP] purchase_requisition: remove unused import
bzr revid: chm@openerp.com-20131211090146-rafbej67r9ssj8zg
2013-12-11 10:01:46 +01:00
Christophe Matthieu 6652856445 [FIX] website_sale: link; product: clean code and use product.template for supplierinfo
bzr revid: chm@openerp.com-20131209163254-k9dwxw48rcgz1hbs
2013-12-09 17:32:54 +01:00
Christophe 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 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
Christophe Simonis 49fa5cab61 [FIX] purchase_requisition: copy method _get_warehouse from purchase module to avoid crash if purchase_requisition is updated but not purchase
bzr revid: chs@openerp.com-20131126180726-ng0gue9pedmuykj9
2013-11-26 19:07:26 +01:00
Christophe Simonis b1b787545b [FIX] purchase_requisition: choose the right warehouse when creating purchase requisitions from procurement orders + allow to work in batch.
bzr revid: chs@openerp.com-20131126135254-96l4xk9q4fd0iwpu
2013-11-26 14:52:54 +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
Launchpad Translations on behalf of openerp eaa917bef9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120054418-15be15rhz84vk0et
2013-11-20 05:44:18 +00:00
Launchpad Translations on behalf of openerp 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
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 15062bdffe Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131105060056-7xuq20lqt1upcdc6
2013-11-05 06:00:56 +00:00
Quentin (OpenERP) 3df02e56a5 [MERGE] merged the branch from camptocamp with enhancements in purchase_requisition: it includes a bugfix and the introduction of 2 methods to prepare values before theh creatino of objects (to ease the inheritancy)
bzr revid: qdp-launchpad@openerp.com-20131104140724-z6kt0zqwrtbjso5a
2013-11-04 15:07:24 +01:00
Guewen Baconnier 99b27fa6b4 [FIX] open_product_line() returns an action, the action should not propagate the current context but use its own one (so it will have the correct active_model, active_ids and so on, otherwise, it propagates a wrong active_ids and active_model).
bzr revid: guewen.baconnier@camptocamp.com-20131104102646-pjdorjqfaic3sw7b
2013-11-04 11:26:46 +01:00
Guewen Baconnier 0cf5e41afc [IMP] extracted '_prepare' method to be able to customize the creation of po from tenders
bzr revid: guewen.baconnier@camptocamp.com-20131104101957-krpkp24ctc4k3zjy
2013-11-04 11:19:57 +01: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
Quentin (OpenERP) 2a982d199e [MERGE] merged with trunk
bzr revid: qdp-launchpad@openerp.com-20131028093247-8eegjl3zle5aoqae
2013-10-28 10:32:47 +01:00
Launchpad Translations on behalf of openerp e142005a01 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131028052339-0v9n7leiirwlacok
2013-10-28 05:23:39 +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
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 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
Launchpad Translations on behalf of openerp bc0d066505 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130914054213-dq0kt273ooy6fozn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915055539-hzmy1ws1il6z8fji
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915054954-zisp7huxai3ew84l
bzr revid: launchpad_translations_on_behalf_of_openerp-20130916054225-m0j262vooofcavqz
bzr revid: launchpad_translations_on_behalf_of_openerp-20130917043759-tke0eln0ca01hsm7
2013-09-17 04:37:59 +00:00
Launchpad Translations on behalf of openerp 07f41591af Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130914055308-488d7jp6pk12s4oq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915061118-idedxdulpa7nb0s0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130916061418-3r990vgrtgj1quyt
2013-09-16 06:14:18 +00:00
Launchpad Translations on behalf of openerp 4cb9834833 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130913060838-a2k0hfitlgdrqj0h
2013-09-13 06:08:38 +00:00
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 9dba69ba48 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00