Commit Graph
27197 Commits
Author SHA1 Message Date
Fabien Meghazi f435d8ca99 Include xml2json_direct in main. Converted node.@attribute to node.attrs = {}
bzr revid: fme@openerp.com-20110303145552-f4cbxu2oi01ykbxl
2011-03-03 15:55:52 +01:00
Fabien Meghazi 3925bdae0f Improved search view
bzr revid: fme@openerp.com-20110303141145-zo4smmdhtb1cfvi5
2011-03-03 15:11:45 +01:00
Fabien Meghazi ae3877b94b Added icons
bzr revid: fme@openerp.com-20110303135424-l425ucr52937k4oq
2011-03-03 14:54:24 +01:00
Vo Minh Thu dd1943c45e [MERGE] merge 6.0 branch.
bzr revid: vmt@openerp.com-20110303133011-758wfx7zompu5ugq
2011-03-03 14:30:11 +01:00
Vo Minh Thu c2ac4494a5 [MERGE] workflow/print: fixes multiple identical subflow occurences.
lp bug: https://launchpad.net/bugs/405962 fixed

bzr revid: vmt@openerp.com-20110303132007-6z9cl03i738ax2lr
2011-03-03 14:20:07 +01:00
Vo Minh Thu 00220a6fc9 [FIX] workflow/print: changed wording for recursive cluster representation.
bzr revid: vmt@openerp.com-20110303125506-pk1hh1oynlz3ssf7
2011-03-03 13:55:06 +01:00
Vo Minh Thu df27a58160 [MERGE] merge changes/bugfixes to ir_rules (multicompany and blank domain).
bzr revid: vmt@openerp.com-20110303122046-onihimxqxoy6gvty
2011-03-03 13:20:46 +01:00
Vo Minh Thu 9534f9ffbf [FIX] res_company: browse (selectable) companies as superuser when choosing user preferences.
bzr revid: vmt@openerp.com-20110303105239-wy9bgdf94irweukh
2011-03-03 11:52:39 +01:00
Thibault Francois 7807d5ee32 [MERGE] fix bug lp:713367
bzr revid: tfr@openerp.com-20110303093457-aeva17wpc6rlq9bb
2011-03-03 10:34:57 +01:00
nel@tinyerp.com 4c46053132 [FIX] add rec_name on account.cashbox.line
bzr revid: nel@tinyerp.com-20110303085222-im7vv52kdthnyb3q
2011-03-03 09:52:22 +01:00
nel@tinyerp.com bdb758ed35 [FIX] add rec_name on account.cashbox.line
bzr revid: nel@tinyerp.com-20110303083943-u2iq2uiq4b0sbpub
2011-03-03 09:39:43 +01:00
Jigar Amin f50bcddc26 [MERGE] with lp:openobject-addons
bzr revid: jam@tinyerp.com-20110303070023-9tq9hsoyzu48pt0q
2011-03-03 12:30:23 +05:30
Launchpad Translations on behalf of openerp d95d102ebe Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110302141435-m0mvq1l2y1icmkz8
bzr revid: launchpad_translations_on_behalf_of_openerp-20110303060152-qtz8ijrlofyw635z
2011-03-03 06:01:52 +00:00
Launchpad Translations on behalf of openerp d1683be192 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110303043944-epd83p1wfzk0zt2b
2011-03-03 04:39:44 +00:00
Antony Lesuisse 4be2aab0f6 more comment
bzr revid: al@openerp.com-20110303000835-6fc9p8vgqy2884m0
2011-03-03 01:08:35 +01:00
Antony Lesuisse 2ab5a94722 comment about SearchViews
bzr revid: al@openerp.com-20110302233442-ggpos7nfls0acqri
2011-03-03 00:34:42 +01:00
Thibault Francois 6f0188c39e [FIX] project : check cycle algorithm
bzr revid: tfr@openerp.com-20110302225259-qhe6ljiuew92qs3e
2011-03-02 23:52:59 +01:00
Thibault Francois c6bffd6467 [FIX] Duplicate parent and child in copy task
bzr revid: tfr@openerp.com-20110302215414-kiq50mw74tz1d28n
2011-03-02 22:54:14 +01:00
Thibault Francois c009f1505c [IMP] copy task
bzr revid: tfr@openerp.com-20110302214356-8x9yg7qjspj64q4b
2011-03-02 22:43:56 +01:00
Fabien Meghazi a4d60f05b6 todos
bzr revid: fme@openerp.com-20110302210942-nd414n1qg6i16mk5
2011-03-02 22:09:42 +01:00
Antony Lesuisse d8570b10c4 simplify openerp-web.cfg
bzr revid: al@openerp.com-20110302192834-hk7s1841wz3uxxr6
2011-03-02 20:28:34 +01:00
Antony Lesuisse 65810f874c README
bzr revid: al@openerp.com-20110302192319-ln0i5riwqrdtys9l
2011-03-02 20:23:19 +01:00
Antony Lesuisse 86f88df082 replace lib by a README
bzr revid: al@openerp.com-20110302190920-5y6sirwyl0l04k8v
2011-03-02 20:09:20 +01:00
Antony Lesuisse 820630a906 openobject is dead long live to openerpweb
bzr revid: al@openerp.com-20110302185606-gcag0tlkcli0kqas
2011-03-02 19:56:06 +01:00
Jay Vora (OpenERP) 5a9f45b46c [FIX] Hr_payroll_account : Fixed the warnings suggested by Buildbot
bzr revid: jvo@tinyerp.com-20110302135316-ta8hjbwcobsb6j55
2011-03-02 19:23:16 +05:30
Jay Vora (OpenERP) 9d806fa751 [FIX] Warning fixes suggested by buildbot
bzr revid: jvo@tinyerp.com-20110302132318-g3828515myshqln9
2011-03-02 18:53:18 +05:30
Vo Minh Thu c36f481194 [FIX] ir_rule: forgot to add the id child_of user.company_id rule.
Also, changed the context={} to context=None.

bzr revid: vmt@openerp.com-20110302110816-09nslq9snkd0rp4r
2011-03-02 12:08:16 +01:00
Jay Vora (OpenERP) c5ca4b925f [FIX] Hr_Holidays : Refusal of a leave was broken, corrected by changing the datatype of case_id into hr.holidays model ( Ref : Revision 4935 mra@mra-laptop-20110201124038-fwehl3uq7qo3tp6v from branch trunk-dev-addons3 )
lp bug: https://launchpad.net/bugs/709130 fixed

bzr revid: jvo@tinyerp.com-20110302102750-au1j2gyasyhlqj3k
2011-03-02 15:57:50 +05:30
Jay Vora (OpenERP) 1cf4261d0f [MERGE] Corrected the payslip approval if proper configuration is missing
bzr revid: jvo@tinyerp.com-20110302100328-4y94qos6uu6xta2t
2011-03-02 15:33:28 +05:30
Thibault Francois d492e36d36 [MERGE] crm : bug fix 726455
bzr revid: tfr@openerp.com-20110302095850-7pxb1lq32fj87lku
2011-03-02 10:58:50 +01:00
Jay Vora (OpenERP) 6805f7a822 [FIX] Hr_payroll_account : Payslip approval crashes without notification if Property accounts are not configured
bzr revid: jvo@tinyerp.com-20110302093722-9g2upvvd731vw91x
2011-03-02 15:07:22 +05:30
Thibault Francois 1ca0f2d5df [MERGE] bug fix 719932
bzr revid: tfr@openerp.com-20110302090156-dljrgeftyyviyhk0
2011-03-02 10:01:56 +01:00
Jigar Amin abbcb0c4ea [BUG/FIX] lp:713367 - Creating New task from Template will preserve the previous relation of task of the same project
bzr revid: jam@tinyerp.com-20110302084554-y9owzzncl02gvl6w
2011-03-02 14:15:54 +05:30
Vo Minh Thu a5bb7c001f [FIX] ir_rule: fix the recursive checking of a rule applied to res_company.
lp bug: https://launchpad.net/bugs/720175 fixed

bzr revid: vmt@openerp.com-20110302083538-0dnp74tas6wg9zhn
2011-03-02 09:35:38 +01:00
Launchpad Translations on behalf of openerp 0033dd0a59 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110302043901-hinshf78fz65fwl6
2011-03-02 04:39:01 +00:00
Thibault Francois eb99d89003 [MERGE] fix bug 724788
bzr revid: tfr@openerp.com-20110301171514-pw8dptkflutzg1hl
2011-03-01 18:15:14 +01:00
Thibault Francois f8d6c3410e [MERGE] bug fix 724841
bzr revid: tfr@openerp.com-20110301170135-ve0iube0ul1v645l
2011-03-01 18:01:35 +01:00
Thibault Francois efe79324a7 [FIX] crm bug introduce after conflict solving
bzr revid: tfr@openerp.com-20110301133225-ov0fy1re2oloobt9
2011-03-01 14:32:25 +01:00
Bhumika (OpenERP) 2eb5727a4f [Fix] crm : if contact is exist then call onchange_partner_address_id
bzr revid: sbh@tinyerp.com-20110301125042-n3wlq2mldeq4mdm8
2011-03-01 18:20:42 +05:30
Jay Vora (OpenERP) a7f069b4ad Merged the branch of Dhruti for company_id fix
bzr revid: jvo@tinyerp.com-20110301115706-5azga38hpdp0dyno
2011-03-01 17:27:06 +05:30
Dhruti Shahstri(OpenERP) 601ad94c2a [IMP] Account_voucher : made company_id field visible to multicompany user by shifting it to header panel (Ref: Case 4006)
bzr revid: jvo@tinyerp.com-20110301114927-cf6kpi3h6hj6auvp
2011-03-01 17:19:27 +05:30
Thibault Francois 9da7e92f30 [MERGE] bug fix 722579
bzr revid: tfr@openerp.com-20110301113415-cblv1h29s8ug3z79
2011-03-01 12:34:15 +01:00
Vo Minh Thu 741b5def48 [ADD] ir_rule: added some test cases.
bzr revid: vmt@openerp.com-20110301102501-2vv5gyh51zxekjre
2011-03-01 11:25:01 +01:00
Launchpad Translations on behalf of openerp 5179d14dc6 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110301060134-h4v5yqqy6j4a3nup
2011-03-01 06:01:34 +00:00
Launchpad Translations on behalf of openerp b4a966d0dd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110301060015-g4fb6kfszjwqs9f8
2011-03-01 06:00:15 +00:00
Launchpad Translations on behalf of openerp 9c7afeb2c8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110301043841-ufga2xxsn0e0jxpz
2011-03-01 04:38:41 +00:00
Olivier Dony 4017c9da74 [MERGE] merged multi-company rules fix from 6.0
bzr revid: odo@openerp.com-20110228104936-7o281husy5j1hz8l
bzr revid: odo@openerp.com-20110228140001-eo18g7ncst04v0lg
2011-02-28 15:00:01 +01:00
Olivier Dony beac68b7d2 [REVERT] all: revert incorrect change of default ir.rules for multi-company
By default only records belonging to the user's company or descendant companies
should be visible. The original patch introduced visibility of records
from ancestor companies, which should be suited only for a few cases, such
as res.patner.
Original revision: 3164.24.175  sbh@tinyerp.com-20101223095216-n6psmzicdcs8is8x

lp bug: https://launchpad.net/bugs/720175 fixed

bzr revid: odo@openerp.com-20110228135754-6skiy4fb9dg54xb6
2011-02-28 14:57:54 +01:00
Vo Minh Thu 1c7f70e245 [FIX] correct two problems with domains:
- an empty domain is treated as equivalent to []
- AND and OR symbols are introduced more carefully

lp bug: https://launchpad.net/bugs/719406 fixed

bzr revid: vmt@openerp.com-20110228114420-pdk1x41b55flx2y7
2011-02-28 12:44:20 +01:00
RME (OpenERP) 8ae87e3568 [FIX] crm : attachment_ids(o2m) having No-Name and that's why it choose name as 'unknown'
lp bug: https://launchpad.net/bugs/726455 fixed

bzr revid: rme@tinyerp.com-20110228110804-mcmqi5ooykhnynoy
2011-02-28 16:38:04 +05:30