7ecc59bde9
[IMP]conflicts resolved
...
bzr revid: kbh@tinyerp.com-20120320103846-gt5dalg2tejw98lv
2012-03-20 16:08:46 +05:30
4606fe32b7
[IMP]help changed.
...
bzr revid: kbh@tinyerp.com-20120320102454-4q2hvlbg2rsouj1r
2012-03-20 15:54:54 +05:30
00f7fbe550
[IMP]:event:remove mouse hover for subscribe button.
...
bzr revid: apa@tinyerp.com-20120320102217-80icy0kj5ronpfq4
2012-03-20 15:52:17 +05:30
3f122c7edf
[IMP] account_menuitem.xml: apply group_no_one on menu Currencies
...
bzr revid: jap@tinyerp.com-20120320100603-kwpryjovy5hvpo01
2012-03-20 15:36:03 +05:30
09152cd66c
[IMP] sale_order_action_data.xml: remove menu Email Templates from sale>>Configuration
...
bzr revid: jap@tinyerp.com-20120320094856-ctcbyt7t7sf8ifwt
2012-03-20 15:18:56 +05:30
3830e9903c
[IMP] crm,crm_partner_assign,crm_profiling,report_intrastat,product,sale : apply group_no_one on menus Pricelist Versions,Price Types,Product Categories, Packaging, Intrastat Code
...
bzr revid: jap@tinyerp.com-20120320093943-pana5qyrdhi0ye28
2012-03-20 15:09:43 +05:30
e1f575fe61
[IMP] res_country_view.xml, res_partner_view.xml: apply group_no_one on menus Countries, Fed. States, Partner Categories, Partner Titles..
...
bzr revid: jap@tinyerp.com-20120320092539-83abg4l8xz0vq2ra
2012-03-20 14:55:39 +05:30
b2b85029ee
[FIX] backport of branch trunk-bug-937194-nco (mail: remove character from message)
...
bzr revid: rco@openerp.com-20120320082059-w3zm7pyicbb79inh
2012-03-20 09:20:59 +01:00
efa32c3ed1
[MERGE] lp:937194 (mail: remove character from message)
...
bzr revid: rco@openerp.com-20120320081523-nz35q1lwfwmzbo3s
2012-03-20 09:15:23 +01:00
14cd8fd357
[MERGE] Merge with project branch
...
bzr revid: kjo@tinyerp.com-20120320071302-hja4o3mebjyn6ryt
2012-03-20 12:43:02 +05:30
85d25e5e10
[IMP] res_partner_view.xml: change the sequence of Address Book menu
...
bzr revid: jap@tinyerp.com-20120320064955-82vqaqsqu1376suo
2012-03-20 12:19:55 +05:30
c5f809c34a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120320055601-bwqdbhlwia54tei2
bzr revid: launchpad_translations_on_behalf_of_openerp-20120320055645-t3o0d8nias5rtztz
bzr revid: launchpad_translations_on_behalf_of_openerp-20120315051852-429l1mehe05oexze
bzr revid: launchpad_translations_on_behalf_of_openerp-20120316053023-0twqqm3ibl1vthnd
bzr revid: launchpad_translations_on_behalf_of_openerp-20120317053247-pqw1jfjqieabw8w5
bzr revid: launchpad_translations_on_behalf_of_openerp-20120319050839-1yhld5a7clnzjs01
bzr revid: launchpad_translations_on_behalf_of_openerp-20120320055658-lv5pkf0apvcgxejb
2012-03-20 05:56:58 +00:00
cd70c5ba24
[FIX] event: set the string
...
bzr revid: sbh@tinyerp.com-20120320053216-4x72cj3p312z0f6b
2012-03-20 11:02:16 +05:30
2e402d5c3e
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20120320052258-4g8zcpd248do6tw9
2012-03-20 10:52:58 +05:30
5704fccaec
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120316050922-okri3tsqp522c128
bzr revid: launchpad_translations_on_behalf_of_openerp-20120317045527-tp2gnkhtw9g1aeck
bzr revid: launchpad_translations_on_behalf_of_openerp-20120319044111-hx6a1shyurrbofkt
bzr revid: launchpad_translations_on_behalf_of_openerp-20120320045612-fzt50kiv2pqwzofa
2012-03-20 04:56:12 +00:00
c67f68f50c
[FIX] Adding module icon after installing now works, courtesy of Carlos Vásquez (CLEARCORP)
...
lp bug: https://launchpad.net/bugs/927675 fixed
bzr revid: odo@openerp.com-20120319183445-uuti8xkh8slksxsu
2012-03-19 19:34:45 +01:00
a87ee6e423
[FIX] res.users: properly generate XML of dynamic group list, courtesy of Valentin Lab
...
Using a proper XML library to create
the necessary XML architecture for the
dynamic view helps avoid classical
mistakes with escaping of XML special
characters.
lp bug: https://launchpad.net/bugs/950118 fixed
bzr revid: odo@openerp.com-20120319170454-cjzbtk2aqodaz2xm
2012-03-19 18:04:54 +01:00
d71340e21a
[FIX] res.country name_search
...
* also returns name-matched countries when a country matches by code
* same for states
* extract almost-identical implementations of name_search in country and state
* remove useless explicit setting of context (also wrong)
bzr revid: xmo@openerp.com-20120319162424-aycjfr0rpca3yico
2012-03-19 17:24:24 +01:00
35c0c36816
[REF] use single implementation for name_search of Country and CountryState
...
bzr revid: xmo@openerp.com-20120319162256-2wcmges2o1gqpb3e
2012-03-19 17:22:56 +01:00
f1bbbaa5f8
[FIX] res.country (and res.country.state) name_search so it returns all countries matching even when there's a country matching by code
...
bzr revid: xmo@openerp.com-20120319161526-txd1eiomjrntgmxi
2012-03-19 17:15:26 +01:00
ce2f1173a9
[FIX] mail.message: allow reading msg even if author belongs to another company
...
lp bug: https://launchpad.net/bugs/944813 fixed
bzr revid: odo@openerp.com-20120319145331-thrtlzardl8rikkf
2012-03-19 15:53:31 +01:00
3f5fb80a76
[FIX] res.users: proper multicompany record rule for users, courtesy of Valentin Lab
...
Contrary to regular records, the company_id field
on res_users does not represent a permanent
relationship, this field is rather used by the
user to select the 'company context' in which
she would like to work.
We don't want the list of assignable users on
a task to change depending on which company
these users are currently viewing data, for
example.
The real field that holds the list of companies
a user belongs to is the 'company_ids' field.
lp bug: https://launchpad.net/bugs/944813 fixed
bzr revid: odo@openerp.com-20120319145216-j1t0d4zjxn9vn058
2012-03-19 15:52:16 +01:00
98238da50e
[IMP]delivery/membership: remove res.partner.address and set string
...
bzr revid: kjo@tinyerp.com-20120319132923-8pwhh68x0syb5drt
2012-03-19 18:59:23 +05:30
aaf84ed646
[IMP] base_contact_process.xml: remove reference menu_partner_address_form
...
bzr revid: jap@tinyerp.com-20120319132021-kor3p4else60pch6
2012-03-19 18:50:21 +05:30
baa522eba1
[FIX] res_partner_address: make name_search consistent with respect to name_get
...
bzr revid: rco@openerp.com-20120319130422-wc6icri4v0o3z8wg
2012-03-19 14:04:22 +01:00
b017031599
[Fix]stock,hr: fix demo data
...
bzr revid: sbh@tinyerp.com-20120319122822-qutq72eyyode0ktb
2012-03-19 17:58:22 +05:30
55ac4f44f1
[IMP] sale:change the sequence of menus under Configuration
...
bzr revid: jap@tinyerp.com-20120319122413-aytom21csngf9bi3
2012-03-19 17:54:13 +05:30
43aecaa545
[MERGE] branch merged with main addons
...
bzr revid: jap@tinyerp.com-20120319111711-ftpilcx9cwx0i1hz
2012-03-19 16:47:11 +05:30
cdb52c2ae7
[MERGE]
...
bzr revid: apa@tinyerp.com-20120313052925-0nq5ytco5vdymbml
bzr revid: apa@tinyerp.com-20120315093000-obam7lzrwboeiq5q
bzr revid: apa@tinyerp.com-20120319111324-nm7sxkn0qy4om7g4
2012-03-19 16:43:24 +05:30
e02eab8d97
[IMP] ignores file
...
bzr revid: xmo@openerp.com-20120319103317-8jvvhivavjjomlqy
2012-03-19 11:33:17 +01:00
7427dcd7b1
[IMP] base_*,crm*,plugin_*,product,sale:-added group no_one and reorganised menus
...
bzr revid: mtr@tinyerp.com-20120319100954-zjkb81m63v5irf4t
2012-03-19 15:39:54 +05:30
99a12a9216
[FIX] account: build_ctx_period must always return a list of ids
...
bzr revid: qdp-launchpad@openerp.com-20120319095227-1d7k2zq4ats038em
2012-03-19 10:52:27 +01:00
8552e65120
[IMP] crm,crm_claim,crm_helpdesk,crm_fundraising,document,hr_expense,sale, purchasse,project: apply the group_no_one on field header
...
bzr revid: jap@tinyerp.com-20120319084304-iewe0e4coo7di7qq
2012-03-19 14:13:04 +05:30
1cebf6aa13
[MERGE] report_intrastat: remove res.partner.address ref
...
bzr revid: sbh@tinyerp.com-20120319064702-dh5ll3ohsi0r1qte
2012-03-19 12:17:02 +05:30
acc4ec0db8
[MERGE] Project: remove res.partner.address
...
bzr revid: sbh@tinyerp.com-20120319064154-lgg6hrnhmwddhdta
2012-03-19 12:11:54 +05:30
14399475b5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120317053244-0uj5epbyw7sb511o
bzr revid: launchpad_translations_on_behalf_of_openerp-20120318050753-4sqrakfazltjt0l9
bzr revid: launchpad_translations_on_behalf_of_openerp-20120319050833-o186lk5tmza7qtqv
2012-03-19 05:08:33 +00:00
307726c6ba
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120317053202-5bxlhemh854fhpus
bzr revid: launchpad_translations_on_behalf_of_openerp-20120318050731-qyse7r2iw9ctmx1j
bzr revid: launchpad_translations_on_behalf_of_openerp-20120319050803-zzuvnk6ylhqlozk4
2012-03-19 05:08:03 +00:00
f12797a11f
[MERGE] Currency symbol for INR, courtesy of Serpent Consulting Services
...
bzr revid: odo@openerp.com-20120316161259-n1bdkjh8qzzdc5z3
2012-03-16 17:12:59 +01:00
fb12f0d522
[FIX] Avoid endless loops when processing graphs for diagram view
...
lp bug: https://launchpad.net/bugs/932830 fixed
bzr revid: odo@openerp.com-20120316160731-k6gmfsti3g38t1qr
2012-03-16 17:07:31 +01:00
224dc24dac
[MERGE] Try to terminate psql connections before dropping database
...
bzr revid: odo@openerp.com-20120316160216-enjjiyw8t6457tqj
2012-03-16 17:02:16 +01:00
b7f4423ced
[FIX] Fix broken creation of database in previous commit - d'oh
...
bzr revid: odo@openerp.com-20120316155554-uq32b9ken6rcm02p
2012-03-16 16:55:54 +01:00
61ee0dc8ee
[MERGE] base.action.rule: better handle non-ASCII data
...
Also fixes the `regex_history` expression
that should search on the `subject` field
now (it was renamed in 6.1).
lp bug: https://launchpad.net/bugs/921442 fixed
bzr revid: odo@openerp.com-20120316144251-ks16hvvfgh2hiduk
2012-03-16 15:42:51 +01:00
7f8965a00a
[IMP] tools.ustr: allow specific error-handling flags a la `unicode`
...
Also cleaned up docstrings
bzr revid: odo@openerp.com-20120316144002-og07it5u7x2azhu4
2012-03-16 15:40:02 +01:00
8bc627669f
[FIX] removed uncessary import
...
bzr revid: guewen.baconnier@camptocamp.com-20120316134052-yc2r2ux44t1urvhg
2012-03-16 14:40:52 +01:00
c5f01ad903
[FIX] mail.message: when auto-deleting a message, only delete attachments it owns
...
There's a peculiar way to manage attachments on
mail messages, as there is an explicit many2many
on top of regular attachments like for any
record, so it is possible to link a mail
to attachments that are owned by other records.
Such attachments must not be deleted along with
the message when the auto-delete flag is set.
bzr revid: odo@openerp.com-20120316133026-4wbrwx64nqkeyaou
2012-03-16 14:30:26 +01:00
6242bb6a22
[FIX] ir.mail_server: now that server time is UTC, outgoing msg Date header should too
...
bzr revid: odo@openerp.com-20120316132022-j17inidkutkxclvd
2012-03-16 14:20:22 +01:00
972a0a4557
[FIX] ir_mail_server: make attachment filename work properly on GMail
...
The default Python encoding for mail header parameters
is RFC2231, which produces headers of the form:
Content-Disposition: attachment; filename*="utf-8abcd%C3%A9.pdf"
This works fine for e.g. Thunderbird but on GMail
such headers appear as `noname`.
We are therefore falling back to RFC2047 encoding
which will instead give something like:
Content-Disposition: attachment; filename="=?utf-8?b?UmVxdWVzdCf?="
bzr revid: odo@openerp.com-20120316130803-zo4fwuk7h6bq6k54
2012-03-16 14:08:03 +01:00
bf4b395e1c
[IMP] Account: apply group_no_one on menus Periods,Account Types,Tax codes,Fiscal Positions, CODA Bank Account Configuration, CODA Transaction Types, CODA Transaction Codes,CODA Transaction Categories, CODA Structured Communication Types, Payment Mode, Types of Invoicing
...
bzr revid: jap@tinyerp.com-20120316122308-vv2w1488eoqxgpis
2012-03-16 17:53:08 +05:30
0b1efcf9d3
[IMP] Event:apply group_no_one on menu Types of Events
...
bzr revid: jap@tinyerp.com-20120316112817-564chfn63zbrv90p
2012-03-16 16:58:17 +05:30
4af38cc64a
[IMP] attempt to dump uid performing operation along with thread stacks
...
bzr revid: odo@openerp.com-20120316111218-o963t7xm4r4honoy
2012-03-16 12:12:18 +01:00
Khushboo Bhatt (Open ERP)
Amit Patel (OpenERP)
Jagdish Panchal (Open ERP)
Raphael Collet
Kuldeep Joshi (OpenERP)
Launchpad Translations on behalf of openerp
Bhumika (OpenERP)
Olivier Dony
Xavier Morel
Meera Trambadia (OpenERP)
Quentin (OpenERP)
