Commit Graph
27469 Commits
Author SHA1 Message Date
Ujjvala Collins (OpenERP) b0e1c25b51 [MERGE]
bzr revid: uco@tinyerp.com-20110304051155-ahhxp2fsbkb7efn8
2011-03-04 10:41:55 +05:30
Bhumika (OpenERP) 1c74497dfc [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20110304043927-9q3rkvmjwwawvn07
2011-03-04 10:09:27 +05:30
Quentin (OpenERP) aadac1dea3 [FIX] account: fixed buildbot. an occurence of removed field 'refund_journal' was forgotten
bzr revid: qdp-launchpad@openerp.com-20110303170700-59jko6gkzr8ozgst
2011-03-03 18:07:00 +01:00
Quentin (OpenERP) 5a2123a9a0 [MERGE] merged the dev3 branch for the last time :-). Contains few bugfixes and refactoring of account
bzr revid: qdp-launchpad@openerp.com-20110303155944-kzs2fjuxewwmnr7q
2011-03-03 16:59:44 +01:00
Quentin (OpenERP) a90aeb8c4a [REF] account: refactored the creation of journals in the generation from templates wizard, removed old deprecated boolean 'refund_journal' on account.journal (use the type field instead)
bzr revid: qdp-launchpad@openerp.com-20110303145900-8ghspjidwb540mhp
2011-03-03 15:59:00 +01:00
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
Quentin (OpenERP) e147c06bc3 [FIX] account: in the wizard for creating the opening entries, restricted the view on opening periods
bzr revid: qdp-launchpad@openerp.com-20110303145256-nuhwuv15u87sgyw8
2011-03-03 15:52:56 +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
Ujjvala Collins (OpenERP) adac07c131 [REM] sync_google_contact: Removed lines for updating model data records.
bzr revid: uco@tinyerp.com-20110303132936-b0cl9i58h0354ok0
2011-03-03 18:59:36 +05:30
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
Ujjvala Collins (OpenERP) acc9dfaff5 [FIX] sync_google_contact: Fixed field error.
bzr revid: uco@tinyerp.com-20110303125959-p9i3np23eemskxhu
2011-03-03 18:29:59 +05:30
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
Ujjvala Collins (OpenERP) 4548040fbf [REF] sync_google_contact: Improved searching of partner addresses from ir.model.data and removed google_id field from it.
bzr revid: uco@tinyerp.com-20110303122347-03hr3oo95nrqim5u
2011-03-03 17:53:47 +05:30
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
Mustufa Rangwala 43309dab99 [MERGE] merge from trunk
bzr revid: mra@mra-laptop-20110228105505-tz775fwdj8b0p94m
bzr revid: mra@mra-laptop-20110301044544-qc33bp07p9l8io4k
bzr revid: mra@mra-laptop-20110302102551-y5i60g2giyjare0c
bzr revid: mra@mra-laptop-20110303052230-nkaffu9gio1qqz90
2011-03-03 10:52:30 +05:30
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
Bhumika (OpenERP) 7c512f970b [MERGE]
bzr revid: sbh@tinyerp.com-20110302122932-00u60lmcfy9j0v8m
2011-03-02 17:59:32 +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
Ujjvala Collins (OpenERP) 4e99e1d07a [MERGE]
bzr revid: uco@tinyerp.com-20110302104931-dk1h1mdd1gb0vq6e
2011-03-02 16:19:31 +05:30
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
Bhumika (OpenERP) d9a53f6a30 [MERGE]
bzr revid: sbh@tinyerp.com-20110302045757-h50y4qu6w5nn0z81
2011-03-02 10:27:57 +05:30
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