ee36f30a15
[MERGE]merge to resolve error
...
bzr revid: sgo@tinyerp.com-20130225045615-28oh27mrk9ms9z33
2013-02-25 10:26:15 +05:30
Foram Katharotiya (OpenERP)
ca1bf8f8f7
[IMP] add access rights of ir_property in crm
...
bzr revid: fka@tinyerp.com-20130222132940-2r0kuv66ul3k3pdu
2013-02-22 18:59:40 +05:30
d1575cad29
[MERGE]merge branch in which improved yml and give access rights puchase crm and hr module and related module
...
bzr revid: sgo@tinyerp.com-20130222095017-fna505ye9nsny7ic
2013-02-22 15:20:17 +05:30
Foram Katharotiya (OpenERP)
bf814eb414
[IMP] improve yml string
...
bzr revid: fka@tinyerp.com-20130222093315-efl5r3wjwn7wu2nd
2013-02-22 15:03:15 +05:30
Foram Katharotiya (OpenERP)
edc4077c54
[IMP] remove access rights in mail,crm,event
...
bzr revid: fka@tinyerp.com-20130222072757-0fain23pzyb8dzk9
2013-02-22 12:57:57 +05:30
Foram Katharotiya (OpenERP)
a1cdf1b61d
[MERGE] with parent
...
bzr revid: fka@tinyerp.com-20130222044845-q0garo17cwuwbe1k
2013-02-22 10:18:45 +05:30
fc3fc1c0d7
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130222044328-88u0w9m244fe9wuv
2013-02-22 10:13:28 +05:30
Raphael Collet
55d652e778
[FIX] mail: test 'id not in record_list'
...
bzr revid: rco@openerp.com-20130221142249-a8go4wtcbi6v1ymb
2013-02-21 15:22:49 +01:00
Thibault Delavallée
3c0ba99dff
[FWD] [MERGE] Forward port of addons-v7 until rev. 8736.
...
bzr revid: tde@openerp.com-20130221120402-qgywhwpq7qvr9p0p
2013-02-21 13:04:02 +01:00
Thibault Delavallée
28e97400d4
[FWD] [MERGE] Foward port of web-7.0 until rev 3771.
...
bzr revid: tde@openerp.com-20130221120334-l9rqz3g28nb655yu
2013-02-21 13:03:34 +01:00
fa94d5e112
[IMP]improve yml for account_voucher
...
bzr revid: sgo@tinyerp.com-20130221111728-jlvv0lf5w258ujbz
2013-02-21 16:47:28 +05:30
Thibault Delavallée
5e09c5c361
[FWD] [MERGE] Foward port of web-7.0 until rev 3771.
...
bzr revid: tde@openerp.com-20130221110355-p00935eqn4tstkx9
2013-02-21 12:03:55 +01:00
Thibault Delavallée
e0372e8c6d
[FWD] [MERGE] Forward port of addons-v7 until rev. 8736.
...
bzr revid: tde@openerp.com-20130221105247-ezl63lpl4vdjxtys
2013-02-21 11:52:47 +01:00
Foram Katharotiya (OpenERP)
8d7669d0ad
[IMP] add access rights in hr_recruitment
...
bzr revid: fka@tinyerp.com-20130221103922-tczeru30rer8ae6e
2013-02-21 16:09:22 +05:30
Foram Katharotiya (OpenERP)
d9d8abd8b0
[IMP] add access rights in hr_attendance
...
bzr revid: fka@tinyerp.com-20130221090300-is57aytddja1m4f5
2013-02-21 14:33:00 +05:30
Foram Katharotiya (OpenERP)
794926267e
[IMP] add hr_users.yml in hr
...
bzr revid: fka@tinyerp.com-20130221070128-bycahqtp3sqjm06d
2013-02-21 12:31:28 +05:30
12701f01a6
[IMP]add manager in supplier invoice yml
...
bzr revid: sgo@tinyerp.com-20130221064944-zhgumhtnum6z21jz
2013-02-21 12:19:44 +05:30
Foram Katharotiya (OpenERP)
c7a417ea03
[IMP] improve code
...
bzr revid: fka@tinyerp.com-20130221061737-d7vyr9lpwnas1qay
2013-02-21 11:47:37 +05:30
c63d1f9100
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130221054453-qm6cwyky3hp17ap5
2013-02-21 05:44:53 +00:00
Foram Katharotiya (OpenERP)
d73f1e1dbd
[MERGE] with parent
...
bzr revid: fka@tinyerp.com-20130221053057-pu0atfh3fte2152c
2013-02-21 11:00:57 +05:30
a29cdb13e9
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130221053055-ub6cvh8orz8q9v10
2013-02-21 11:00:55 +05:30
56cb7db019
[IMP]improve yml for account
...
bzr revid: sgo@tinyerp.com-20130221052958-metvr090gsubdc5u
2013-02-21 10:59:58 +05:30
Foram Katharotiya (OpenERP)
5252d9ac9c
[IMP] add yml file in purchase_reqisition
...
bzr revid: fka@tinyerp.com-20130221051459-v20ilhc128ipw6yi
2013-02-21 10:44:59 +05:30
8da860b5ba
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130221051427-ly9013a06yxiy5wj
2013-02-21 05:14:27 +00:00
Antony Lesuisse
d5a140fabf
[MERGE] account_analytic_analysis disable quickcreate on contracts, add group by pricelist
...
bzr revid: al@openerp.com-20130221015720-1w7qduk9ivzgdd9r
2013-02-21 02:57:20 +01:00
Antony Lesuisse
2a805abfbc
[FIX] contract disable quickcreate, add group_by pricelist
...
bzr revid: al@openerp.com-20130221012920-o2034onrq76dje78
2013-02-21 02:29:20 +01:00
Antony Lesuisse
d19777aa1d
[FIX] tools image thumbnailing jpg into png
...
bzr revid: al@openerp.com-20130220222612-g0j6d2a7az0u53hi
2013-02-20 23:26:12 +01:00
Christophe Simonis
544c8f2dd7
[MERGE] correct hashchange check of current_state to do not coerce values. only push active_ids in state if relevant
...
bzr revid: chs@openerp.com-20130220174455-gsobu19naslo1h73
2013-02-20 18:44:55 +01:00
Olivier Dony
a961e5e377
[MERGE] search: when count=True, execute main query as a subquery to avoid side effects with offset and limit
...
Granted, calling search() with both count=True and
offset or limit is not extremely useful, but
it is still better to accept it and apply it
to the inner query rather than have silly
errors
bzr revid: odo@openerp.com-20130220174416-yoos2py8dc9jc3md
2013-02-20 18:44:16 +01:00
Fabien Meghazi
919690a417
[MERGE] [IMP] Custom filters: restore checkboxes and make them exclusive
...
bzr revid: fme@openerp.com-20130220165347-p64fqa7pa1eat0mo
2013-02-20 17:53:47 +01:00
Fabien Meghazi
f20c884cf5
[IMP] Custom filters: restore checkboxes and make them exclusive
...
bzr revid: fme@openerp.com-20130220163306-14xwsgvu8rw2ciny
2013-02-20 17:33:06 +01:00
Antonin Bourguignon
e860f7cfc7
[IMP] exceptions tests: use another xml_menu_id that leads directly to the tests wizard.
...
also use an int instead of a tuple in the exception's constructor
bzr revid: abo@openerp.com-20130220153737-2mvc6aonxsyuv4u6
2013-02-20 16:37:37 +01:00
Fabien Meghazi
a7376a5686
[MERGE] [FIX] viewmanager handles the wrong view dom node in some cases.
...
Example of the problem:
When the first view is a form and contains a *2many field (with embedded list view),
the viewmanager wrongly handle the embedded list view instead of the main list view (if any)
This could be experienced in HR > My Current Timesheet
bzr revid: fme@openerp.com-20130220152152-hgqwqju34167l9x9
2013-02-20 16:21:52 +01:00
Antonin Bourguignon
13afc3b9e2
[IMP] use another xml_menu_id that leads directly to the tests wizard
...
bzr revid: abo@openerp.com-20130220145613-2tnid02oatds2gmy
2013-02-20 15:56:13 +01:00
Vo Minh Thu
73bf45f9a4
[REM] product: removed dead price list report.
...
bzr revid: vmt@openerp.com-20130220144129-nxwkh9vi64oafca9
2013-02-20 15:41:29 +01:00
Quentin (OpenERP)
8711625764
[FIX] merge of leads/opps with attachments
...
bzr revid: qdp-launchpad@openerp.com-20130220140936-qy04t7hjebsc9tgg
2013-02-20 15:09:36 +01:00
Vidhin Mehta
4212725417
[FIX]select accurate element with use of 'child selector'.
...
bzr revid: vme@tinyerp.com-20130220132634-6ycdntomequypxfw
2013-02-20 18:56:34 +05:30
Vidhin Mehta
ca912e0975
[MERGE]7.0
...
bzr revid: vme@tinyerp.com-20130220131956-hrnbak55i9qdpe4y
2013-02-20 18:49:56 +05:30
Foram Katharotiya (OpenERP)
96ec54e330
[IMP] add yml file in purchase
...
bzr revid: fka@tinyerp.com-20130220131524-joc0qyy5dfdc1o6j
2013-02-20 18:45:24 +05:30
Josse Colpaert
22184bda0e
[FIX] Will bring attachments together when merging leads/opportunities
...
bzr revid: jco@openerp.com-20130220124052-8zf2pkqn4oy4y4qw
2013-02-20 13:40:52 +01:00
Quentin (OpenERP)
c54a7c4910
[IMP] stock: added a prodlot_id field in the return picking view
...
bzr revid: qdp-launchpad@openerp.com-20130220110529-7edaj0o9riyvzyu0
2013-02-20 12:05:29 +01:00
Quentin (OpenERP)
f69ede5bfc
[IMP] ir_filers: added an order in the construction of the list of available models
...
bzr revid: qdp-launchpad@openerp.com-20130220103459-1wnu06p3fbaaoz83
2013-02-20 11:34:59 +01:00
Quentin (OpenERP)
faa08bd2c9
[MERGE] marketing, usaibility: removing groups attribute from categorization group when installing marketing module (that uses some fields of that group)
...
bzr revid: qdp-launchpad@openerp.com-20130220093651-j9sdc05fhz7uc0vx
2013-02-20 10:36:51 +01:00
Foram Katharotiya (OpenERP)
49ef7d89a8
[IMP] add yml file & add access rights in event
...
bzr revid: fka@tinyerp.com-20130220093227-uf6oom9fginl2jdc
2013-02-20 15:02:27 +05:30
Quentin (OpenERP)
d996cc131a
[MERGE] account: error message when trying to delete an invoice that already received a number
...
bzr revid: qdp-launchpad@openerp.com-20130220092832-cvge2q1xxw2aya4c
2013-02-20 10:28:32 +01:00
Fabien Meghazi
ee4bc76f14
[IMP] Do not push active_ids in state if active_ids == [active_id]
...
bzr revid: fme@openerp.com-20130220091226-akczbmurjvn5jzjl
2013-02-20 10:12:26 +01:00
Quentin (OpenERP)
e206e71e55
[MERGE] project_issue, usability: removed group no one from create_date field in tree view
...
bzr revid: qdp-launchpad@openerp.com-20130220085921-tnoz66c7sb0aa1yy
2013-02-20 09:59:21 +01:00
Quentin (OpenERP)
4ac0178c37
[MERGE] crm_lead, usability: removing the label on subject field
...
bzr revid: qdp-launchpad@openerp.com-20130220085319-luj1r2w4bwywzyvb
2013-02-20 09:53:19 +01:00
Fabien Meghazi
364ea001f9
[FIX] stringify states (patch from chs)
...
bzr revid: fme@openerp.com-20130220084437-cyb0pi8nw71bl5mx
2013-02-20 09:44:37 +01:00
Quentin (OpenERP)
7daccf5074
[IMP] product: re-enabled the multi variant feature
...
bzr revid: qdp-launchpad@openerp.com-20130220082707-x6r4pwcscmymkrz2
2013-02-20 09:27:07 +01:00
sgo@tinyerp.com