Olivier Dony
f5a306feb6
[MERGE] OPW 575293: purchase: Supplier references not displayed on purchase order (courtesy of Alexis Delattre)
...
lp bug: https://launchpad.net/bugs/993177 fixed
bzr revid: odo@openerp.com-20120725170719-w8to6f3ab1w0q5j9
2012-07-25 19:07:19 +02:00
Stephane Wirtel
bf7514d6a6
[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue2-stw
...
bzr revid: stw@openerp.com-20120725165856-x4gncnayenhte2eh
2012-07-25 18:58:56 +02:00
Quentin (OpenERP)
0f7f3a06e6
[MERGE] partial revert of commit 7101, that was renaming the column product_id into product_template_id on supplierinfo table because it was not passing the runbot tests
...
bzr revid: qdp-launchpad@openerp.com-20120725164959-capumyjm76ac1puv
2012-07-25 18:49:59 +02:00
Olivier Dony
dc19d69058
[MERGE] tools.email_send: never close the request's cursor
...
bzr revid: odo@openerp.com-20120725164813-merhc8f7deet090j
2012-07-25 18:48:13 +02:00
Antonin Bourguignon
8ea8f1da5b
[IMP] put groups attributes in the product's form view in order to hide qty incoming, qty outgoing, qty available, procurement method and costing method from portal users
...
also remove some code commented out since 2010 (written by qdp, commented by sbh)
bzr revid: abo@openerp.com-20120725162306-n4ypzds4ltsrhy6j
2012-07-25 18:23:06 +02:00
Olivier Dony
4e372be92d
[FIX] tools.email_send: never close the request's cursor
...
bzr revid: odo@openerp.com-20120725162039-3gjf30hgh2hxhmk2
2012-07-25 18:20:39 +02:00
Stephane Wirtel
6dc97324f4
[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue2-stw
...
bzr revid: stw@openerp.com-20120725161621-vxhphmultvih6xwz
2012-07-25 18:16:21 +02:00
Stephane Wirtel
341330aadd
[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue2_manufacturing-rpr
...
bzr revid: stw@openerp.com-20120725161521-xpvxqr5sx7egzkvy
2012-07-25 18:15:21 +02:00
Olivier Dony
6bdcc1760a
[FIX] contract: fix expired contracts reminder job to actually work
...
The API for sending emails has changed in 6.1, use the new one.
Also fix the expired contract filter to behave similarly to the
"Contracts To Renew" menu inside OpenERP.
bzr revid: odo@openerp.com-20120725160807-xzngv988dso9z6zj
2012-07-25 18:08:07 +02:00
Antonin Bourguignon
e7f3b6f14c
[IMP] hide current registrations for portal members in the event form view
...
also, identation
bzr revid: abo@openerp.com-20120725154246-wx7et6nwi3f8n37v
2012-07-25 17:42:46 +02:00
Raphael Collet
a679622cac
[MERGE] trunk-first_10_clicks_crm_m2m_new-mdi (in crm, change category into m2m_tags)
...
bzr revid: rco@openerp.com-20120725153217-hsf80zd3wfal7h13
2012-07-25 17:32:17 +02:00
Quentin (OpenERP)
4153becb28
[MERGE] lp:1003849
...
bzr revid: qdp-launchpad@openerp.com-20120725152935-ycderrb47z0u8l0s
2012-07-25 17:29:35 +02:00
Raphael Collet
df1ac9a46d
[MERGE] trunk-hr_recruitment_10_clicks-psi (usability improvements in hr_recruitment)
...
bzr revid: rco@openerp.com-20120725152734-e2kul4gil21ufpgn
2012-07-25 17:27:34 +02:00
Antonin Bourguignon
e2107d35d1
[IMP] use const SUPERUSER_ID insteand of int 1
...
bzr revid: abo@openerp.com-20120725152455-9q5kkogalmzmul4y
2012-07-25 17:24:55 +02:00
Raphael Collet
723cdb3257
[MERGE] trunk-first_10_clicks_sale-rco (usability improvements)
...
bzr revid: rco@openerp.com-20120725151923-47wtfb28y97h4car
2012-07-25 17:19:23 +02:00
Raphael Collet
e1da6b961d
[MERGE] trunk-first_10_clicks_sale-rco (usability improvements)
...
bzr revid: rco@openerp.com-20120725151855-gdvlymw9p5vuvhp7
2012-07-25 17:18:55 +02:00
Raphael Collet
df723a0b6c
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120725133932-0cvvngral6nt8ixj
bzr revid: rco@openerp.com-20120725151612-lp3bozy0xb0gjrvp
2012-07-25 17:16:12 +02:00
Antonin Bourguignon
73b4690bae
[FIX] remove empty folder
...
bzr revid: abo@openerp.com-20120725151452-lnxij2xsy776lcs1
2012-07-25 17:14:52 +02:00
Raphael Collet
34c67e6b83
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120725151127-9n7oyn1egedm7nqn
2012-07-25 17:11:27 +02:00
Raphael Collet
32ea77e355
[MERGE] trunk-first_10_clicks_crm-mdi (usability in crm)
...
bzr revid: rco@openerp.com-20120725150249-aydwrulkbnkfpymp
2012-07-25 17:02:49 +02:00
Raphael Collet
695d0fd7ab
[MERGE] trunk-first_10_clicks_crm-mdi (usability in crm)
...
bzr revid: rco@openerp.com-20120725150230-dbqxzvoeiq07yru1
2012-07-25 17:02:30 +02:00
Raphael Collet
750f6d0f47
[IMP] crm: improve inherited search view
...
bzr revid: rco@openerp.com-20120725145457-q342sj4wwgnqzdpm
2012-07-25 16:54:57 +02:00
Quentin (OpenERP)
a65b47f051
[MERGE] lp:1027581
...
bzr revid: qdp-launchpad@openerp.com-20120725145202-3x0c6qdf1lraf82a
2012-07-25 16:52:02 +02:00
Raphael Collet
a06f3df144
[IMP] crm: indentation
...
bzr revid: rco@openerp.com-20120725145144-kqtnpbj8b1p28qcq
2012-07-25 16:51:44 +02:00
Raphael Collet
07825bbb8f
[MERGE] trunk-first_10_clicks_hr_expense-mdi (small usability improvements)
...
bzr revid: rco@openerp.com-20120725144041-nesixx3gi70ym5an
2012-07-25 16:40:41 +02:00
Antonin Bourguignon
74aa5cfa8e
[IMP] identation, also remove useless 'noupdate=0' attribute
...
bzr revid: abo@openerp.com-20120725144039-o3kjxo065qhode33
2012-07-25 16:40:39 +02:00
Raphael Collet
0f2cd6cdcc
[IMP] hr_expense: I am picky about indentation, I know.
...
bzr revid: rco@openerp.com-20120725143946-og73z315389lcgne
2012-07-25 16:39:46 +02:00
Raphael Collet
2217c0577f
[MERGE] trunk-first_10_clicks_warehouse-mdi (usability improvements in stock)
...
bzr revid: rco@openerp.com-20120725143543-n7o7fv379ah1fmer
2012-07-25 16:35:43 +02:00
Stephane Wirtel
6a84f697b1
[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-mma
...
bzr revid: stw@openerp.com-20120725143446-2ir9qawtn20iimz2
2012-07-25 16:34:46 +02:00
niv-openerp
e406b7759a
Fixed problem with m2mtags
...
bzr revid: nicolas.vanhoren@openerp.com-20120725143150-x6u8pfira3wbc8mg
2012-07-25 16:31:50 +02:00
Raphael Collet
c24ce8448d
[IMP] stock: fix groups in views
...
bzr revid: rco@openerp.com-20120725143016-aukz7yf3ksw94qsx
2012-07-25 16:30:16 +02:00
Quentin (OpenERP)
75e923d63d
[MERGE] lp:985823
...
bzr revid: qdp-launchpad@openerp.com-20120725143007-k4acilksblpoavlv
2012-07-25 16:30:07 +02:00
Quentin (OpenERP)
0bc828b75e
[MERGE] account/account.py: use of tools.float_utils float_round() method instead of round(). lp: 977300
...
bzr revid: qdp-launchpad@openerp.com-20120725142836-mtts1wub192861pw
2012-07-25 16:28:36 +02:00
Frédéric van der Essen
4201c58f36
[IMP] point_of_sale: edit ean wizards for users and products
...
bzr revid: fva@openerp.com-20120725142608-tsvrxvvxg42sx1yr
2012-07-25 16:26:08 +02:00
Antonin Bourguignon
eb4f3cecb6
[IMP] in the portal's contact form, only show the 'email' field to anonymous users
...
bzr revid: abo@openerp.com-20120725142024-btojdzrsvqru4dlk
2012-07-25 16:20:24 +02:00
niv-openerp
fe8b2937c9
Solved problems with switch_mode
...
bzr revid: nicolas.vanhoren@openerp.com-20120725141832-4zqw6g0zf9m4hfro
2012-07-25 16:18:32 +02:00
niv-openerp
31621f412a
wip
...
bzr revid: nicolas.vanhoren@openerp.com-20120725141333-ueaj3e0i8imlwvre
2012-07-25 16:13:33 +02:00
Raphael Collet
82f87ca7f9
[IMP] stock: simplify double browse used for chaining relations
...
bzr revid: rco@openerp.com-20120725135127-6y3km4b35ebx96lr
2012-07-25 15:51:27 +02:00
niv-openerp
c9cbaf70f2
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20120725133917-9azjb6n59xqiz56l
2012-07-25 15:39:17 +02:00
niv-openerp
00ca8067a9
[FIX] re-enable thobber that was desactivated due to previous bug
...
bzr revid: nicolas.vanhoren@openerp.com-20120725133740-m06but4htp4bkb1q
2012-07-25 15:37:40 +02:00
Raphael Collet
f5b6da1b46
[FIX] mail: put the notification on the group *after* the definition of the group
...
bzr revid: rco@openerp.com-20120725133519-vd8ehps85cr77q5h
2012-07-25 15:35:19 +02:00
Purnendu Singh (OpenERP)
ce5869d39d
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120725133352-rniisz0hwc20hg85
2012-07-25 19:03:52 +05:30
Purnendu Singh (OpenERP)
b362ec2e8d
[IMP] hr_expense: improve to support multi currency payment
...
bzr revid: psi@tinyerp.com-20120725133154-gxjoahiuis5108g7
2012-07-25 19:01:54 +05:30
Raphael Collet
35f890ae5d
[IMP] event, mail, mrp, purchase, stock: add OpenChatter notification after module installation
...
bzr revid: rco@openerp.com-20120725132217-5ic33f2z2lch161s
2012-07-25 15:22:17 +02:00
Ravish Murari (OpenERP)
f693a7d900
[FIX] When duplication of event on calender The invitations are there but not shown on the calendar
...
lp bug: https://launchpad.net/bugs/1028825 fixed
bzr revid: rmu@tinyerp.com-20120725131751-26slqnee04irjt7m
2012-07-25 18:47:51 +05:30
Frédéric van der Essen
ff4f70f120
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120725125407-fp7fasquds5oy0xv
2012-07-25 14:54:07 +02:00
pso (OpenERP)
e5da0e191b
[MERGE] Merged with main branch
...
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
2012-07-25 18:23:32 +05:30
Frédéric van der Essen
26001a9b3c
[wip] point_of_sale: ean template last fixes
...
bzr revid: fva@openerp.com-20120725125115-dnvslwyo6m6q0xw7
2012-07-25 14:51:15 +02:00
Saurang Suthar(OpenERP)
082513a805
[IMP] Improved warning messages for resource module
...
bzr revid: pso@tinyerp.com-20120725124945-pgebt9fh69mpb82i
2012-07-25 18:19:45 +05:30
niv-openerp
03ea71a4aa
[IMP] cosmetic improvement in partner view
...
bzr revid: nicolas.vanhoren@openerp.com-20120725124757-hwd01ddf5emsudau
2012-07-25 14:47:57 +02:00