Mustufa Rangwala (OpenERP)
e6d0b95665
[IMP] l10n_in_hr_payroll: typo
...
bzr revid: mra@tinyerp.com-20120726063314-67w4cbokejy6eat7
2012-07-26 12:03:14 +05:30
Mustufa Rangwala (OpenERP)
286cb1fdb9
[FIX] l10n_in_hr_payroll: Fix access rights
...
[IMP] l10n_in_hr_payroll: Code clean
bzr revid: mra@tinyerp.com-20120726062917-2l6hb3y0nh9svda1
2012-07-26 11:59:17 +05:30
pso (OpenERP)
167614c6d8
[IMP] procurement: Initialize get_phantom_bom_id method as it is raising an error from yml of mrp_jit when one install first mrp and after that, mrp_jit. get_phantom_bom_id defined in mrp module which is not dependent for mrp_jit.
...
bzr revid: pso@tinyerp.com-20120726060836-jcbx6d95pl4nbx9m
2012-07-26 11:38:36 +05:30
Mustufa Rangwala (OpenERP)
c77fecd8f7
[IMP] l10n_in_hr_payroll: Menu name chagne to payroll statement
...
bzr revid: mra@tinyerp.com-20120726055602-ny4ldaoxg1mog2gw
2012-07-26 11:26:02 +05:30
Mustufa Rangwala (OpenERP)
8a9c1618f2
[IMP] l10n_in_hr_payroll: Small improvement
...
bzr revid: mra@tinyerp.com-20120726055406-h3pibgj7fw5r038v
2012-07-26 11:24:06 +05:30
Mustufa Rangwala (OpenERP)
56e10a0ef0
[IMP] l10n_in_hr_payroll: Small improvement
...
bzr revid: mra@tinyerp.com-20120726055237-fe2trv4lispbqx2o
2012-07-26 11:22:37 +05:30
Mustufa Rangwala (OpenERP)
7fa1140ca6
[IMP] l10n_in_hr_payroll: Improve Report of salary register
...
bzr revid: mra@tinyerp.com-20120726054102-w4xqw5u08r3lg0ii
2012-07-26 11:11:02 +05:30
Rucha (Open ERP)
4eb76030a6
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120726053855-8j8c70xqc0ynikx1
2012-07-26 11:08:55 +05:30
f1f4799c1a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120726052140-anp77y0py9g2tcs0
2012-07-26 05:21:40 +00:00
Amit Patel (OpenERP)
9f9d66f86d
[MERGE]
...
bzr revid: apa@tinyerp.com-20120726051837-2ji74tf8ejtf5kai
2012-07-26 10:48:37 +05:30
Dharti Ratani (OpenERP)
68d1496658
merge with trunk
...
bzr revid: dhr@tinyerp.com-20120726051441-g0lo0zsw3fjujdl9
2012-07-26 10:44:41 +05:30
Digvijay Singh
2c8c4e3bec
[IMP]l10n_in_hr_payroll: add yaml file for payment advice
...
bzr revid: dsi@tinyerp.com-20120726050518-ew9n44q0fs4vfze1
2012-07-26 10:35:18 +05:30
Rajesh Prajapati (OpenERP)
968a0de2e0
[IMP] project : string rename to Contact and traceback of escalate button
...
bzr revid: rpr@tinyerp.com-20120726045804-g8kn4cx01klawdr6
2012-07-26 10:28:04 +05:30
3d769b791f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120726043951-szroslwg9qznbwtq
bzr revid: launchpad_translations_on_behalf_of_openerp-20120726045038-jmmedz7bhfwg6evv
2012-07-26 04:50:38 +00:00
Mustufa Rangwala (OpenERP)
bc2ef16941
[MERGE] l10n_in_hr_payroll: Report employee wise yearly salary (Still need to improve query)
...
bzr revid: mra@tinyerp.com-20120726044935-cjmm90uilmq14os8
2012-07-26 10:19:35 +05:30
Divyesh Makwana (Open ERP)
8869ec7392
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20120726043610-q6p3ur9n124qga9r
2012-07-26 10:06:10 +05:30
Divyesh Makwana (Open ERP)
dad21b2edb
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20120726043232-360x7ita5e0e2prf
2012-07-26 10:02:32 +05:30
Divyesh Makwana (Open ERP)
b8221e8f7d
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20120726042316-1lricsztfdwmx500
2012-07-26 09:53:16 +05:30
Mustufa Rangwala (OpenERP)
0317659d33
[MERGE] Merge from main addons
...
bzr revid: mra@tinyerp.com-20120726040038-rgbre9qnlcvykot3
2012-07-26 09:30:38 +05:30
Antony Lesuisse
775b1db3bf
[FIX] email_template chatter icons
...
bzr revid: al@openerp.com-20120726021434-fsrca98mrw905dmi
2012-07-26 04:14:34 +02:00
Antony Lesuisse
678eab6132
[IMP] convert login and database manager into client actions
...
bzr revid: al@openerp.com-20120726013628-23xi8czcxl8jymbn
2012-07-26 03:36:28 +02:00
Antony Lesuisse
3a6f429d0d
[FIX] support arbitrary icons
...
bzr revid: al@openerp.com-20120726005835-g1l6kg8yge225fd8
2012-07-26 02:58:35 +02:00
Antony Lesuisse
3a793019b6
[FIX] client action urls
...
bzr revid: al@openerp.com-20120726004227-w9vqt8jv6gtn7l9p
2012-07-26 02:42:27 +02:00
Antony Lesuisse
5d0839264b
[MERGE] bounce effects, minor fixes in saas
...
bzr revid: al@openerp.com-20120726002318-m6bjvivktv16s8re
2012-07-26 02:23:18 +02:00
Antony Lesuisse
7d9a84a43c
rename signup
...
bzr revid: al@openerp.com-20120725230217-8wc7fjcs0hwfa1yg
2012-07-26 01:02:17 +02:00
Antony Lesuisse
2ceb36a09b
reset_password cleanups
...
bzr revid: al@openerp.com-20120725225828-ai1uvon05e48p69t
2012-07-26 00:58:28 +02:00
Antony Lesuisse
ecd5ca73c8
[MERGE] trunk
...
bzr revid: al@openerp.com-20120725205840-8d86kc0zr0uwb6j2
2012-07-25 22:58:40 +02:00
Antony Lesuisse
4b073c0a88
rename reset_password
...
bzr revid: al@openerp.com-20120725205726-gh71ztclpnvhn97e
2012-07-25 22:57:26 +02:00
Antony Lesuisse
649fa8798e
[MERGE] signup
...
bzr revid: al@openerp.com-20120725204606-x8rxuasn52z0ps97
2012-07-25 22:46:06 +02:00
Antony Lesuisse
643d8944b9
[MERGE] trunk
...
bzr revid: al@openerp.com-20120725195859-6rn6imydm373g102
2012-07-25 21:58:59 +02:00
Antony Lesuisse
4e21ad0fdc
[MERGE] minor cleanups
...
bzr revid: al@openerp.com-20120725195540-a9pmm432dae9s8pd
2012-07-25 21:55:40 +02:00
Quentin (OpenERP)
962ab82207
[MERGE] fixed error in account.account.__compute(). Courtesy of Guewen Baconnier (Camptocamp)
...
bzr revid: qdp-launchpad@openerp.com-20120725192632-n5x1h25gugb2icue
2012-07-25 21:26:32 +02:00
Antonin Bourguignon
d92994caa6
[IMP] remove a bunch of wtf comments in XML (horrifying things like === comment === or --- comment ---, without any XML comment tags)
...
improve identation in a few files
remove some spaces preceding closing tags
bzr revid: abo@openerp.com-20120725181610-oq0ug3u9t7fgpy3h
2012-07-25 20:16:10 +02:00
Antonin Bourguignon
7350bdb271
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120725180118-l6flsrakml2ijxqy
2012-07-25 20:01:18 +02:00
Antonin Bourguignon
be24d83ce4
[IMP] put groups attribute refund/payment's form view in order to hide the payment information tab from portal users
...
also, identation
bzr revid: abo@openerp.com-20120725175750-4tqhkheyue0yak0j
2012-07-25 19:57:50 +02:00
Antonin Bourguignon
011f1ab2ab
[IMP] put groups attributes in the job's form view in order to hide number of employees, interview form and total employees from portal users
...
also, identation
bzr revid: abo@openerp.com-20120725174049-pnwp3fqg4o1mxs02
2012-07-25 19:40:49 +02:00
Quentin (OpenERP)
e5dcb6d833
[MERGE] staging branch with misc fixes and improevmeents
...
bzr revid: qdp-launchpad@openerp.com-20120725171054-ulo0febioz2n7wry
2012-07-25 19:10:54 +02:00
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
Mustufa Rangwala (OpenERP)