Commit Graph
26678 Commits
Author SHA1 Message Date
Sbh (OpenERP) 93e9857b3f [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20110131041205-ba3ssk6uthq1m6fe
2011-01-31 09:42:05 +05:30
Launchpad Translations on behalf of openerp 61a62b1dfe Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110129045401-1zezcgk719d3dm0t
bzr revid: launchpad_translations_on_behalf_of_openerp-20110130044958-yshcathln43o1wdz
bzr revid: launchpad_translations_on_behalf_of_openerp-20110131045457-rzhwci5po7ea72bd
bzr revid: launchpad_translations_on_behalf_of_openerp-20110129045641-xfn2nij4y67wyq3h
bzr revid: launchpad_translations_on_behalf_of_openerp-20110130045141-vh5ecttx8tj5vdg4
bzr revid: launchpad_translations_on_behalf_of_openerp-20110131045711-41727n3c4e3wi0t9
2011-01-31 04:57:11 +00:00
Olivier Dony 880b89a343 [FIX] orm: incorrect braces when processing default values for o2m/m2m
lp bug: https://launchpad.net/bugs/704311 fixed

bzr revid: odo@openerp.com-20110128160322-loi7i2te6d1rsn6p
2011-01-28 17:03:22 +01:00
qdp-launchpad@tinyerp.com 828481bc6a [MERGE] merged dev2 branch
bzr revid: qdp-launchpad@tinyerp.com-20110128112532-b2te782ia9ku7g94
2011-01-28 12:25:32 +01:00
Sbh (OpenERP) 3f9d527e42 [MERGE] MERGE with lp:~openerp-dev/openobject-addons/jam-dev-addons1
bzr revid: sbh@tinyerp.com-20110128110334-0gxuzfiywsvwwyt2
2011-01-28 16:33:34 +05:30
jam-openerp ab6c863f4b [FIX] Outlok : Removed un-used Message box
bzr revid: jam@tinyerp.com-20110128105657-1n2hh4hjnfq9y0jw
2011-01-28 16:26:57 +05:30
qdp-launchpad@tinyerp.com 9fb4e60e68 [FIX] hr, access rights: a simple employee should be able to see the list of departments
bzr revid: qdp-launchpad@tinyerp.com-20110128092939-u6lpij6zexv6qztl
2011-01-28 10:29:39 +01:00
Sbh (OpenERP) 0180966dd5 [MERGE] MERGE with lp:~openerp-dev/openobject-addons/jam-dev-addons1
bzr revid: sbh@tinyerp.com-20110128092056-mioaapmlpk8hq0lr
2011-01-28 14:50:56 +05:30
jam-openerp 44df5025df [BUG/FIX] lp:707906
lp bug: https://launchpad.net/bugs/707906 fixed

bzr revid: jam@tinyerp.com-20110128085356-1bcr6apwu7o5u0bi
2011-01-28 14:23:56 +05:30
Sbh (OpenERP) 5b1602e079 [MERGE] MERGE lp:~openerp-dev/openobject-addons/trunk-dev-addons1-atp
bzr revid: sbh@tinyerp.com-20110128083518-um3mq6bnnvxg1yqe
2011-01-28 14:05:18 +05:30
Atul Patel (OpenERP) 7a161a2139 [FIX]: Fixed bug-708660
bzr revid: atp@tinyerp.com-20110128072317-4pgnvmw7rnj21lsc
2011-01-28 12:53:17 +05:30
Atul Patel (OpenERP) ea825dd237 [MERGE]: Merge with trunk-dev-addons1
bzr revid: atp@tinyerp.com-20110128071342-qzohdcm3c0vbag41
2011-01-28 12:43:42 +05:30
Sbh (OpenERP) 5974788bb8 [MERGE] Merge lp:~openerp-dev/openobject-addons/jam-dev-addons1
bzr revid: sbh@tinyerp.com-20110128061216-uzhs38ltyxis3pxo
2011-01-28 11:42:16 +05:30
Sbh (OpenERP) 7a11d7d6f2 [MERGE] Merge lp:~openerp-dev/openobject-addons/uco-dev-addons1
bzr revid: sbh@tinyerp.com-20110128055706-wwnzpmm3uvwm6lj2
2011-01-28 11:27:06 +05:30
rpa (Open ERP) 8a6d2875fb [MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-20110128053114-ei5ru08mrv1nqvy9
2011-01-28 11:01:14 +05:30
Ujjvala Collins (OpenERP) 87ae3bb4eb [MERGE]
bzr revid: uco@tinyerp.com-20110128050304-brmu6n6hdghggbi6
2011-01-28 10:33:04 +05:30
Launchpad Translations on behalf of openerp f25fb5f4d4 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110128044458-rmemxsynuxmrp9pl
bzr revid: launchpad_translations_on_behalf_of_openerp-20110128044655-31s27yl2cpkov2g5
2011-01-28 04:46:55 +00:00
Sbh (OpenERP) 57d8752254 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20110128044047-il9c6373ljd4y5ev
2011-01-28 10:10:47 +05:30
Olivier Dony 79cd0848c1 [FIX] ir_attachment: typo introduced in previous fix (3318)
Original revision: 3318 - nel@tinyerp.com-20110121084241-10kfmgd16vt19vkv
The consequence is that access rights on attachments would be incorrectly checked, using the
intersection of the attachment IDs and the resource IDs.

bzr revid: odo@openerp.com-20110127154532-v18l28qk8ysi02sb
2011-01-27 16:45:32 +01:00
rpa (Open ERP) a3a191bc0d [MERGE]: Merge with lp:~openerp-dev/openobject-addons/ron-dev-addons2
bzr revid: rpa@tinyerp.com-20110127132839-s7joeoppr0ozom1e
2011-01-27 18:58:39 +05:30
Ujjvala Collins (OpenERP) fdd8a68cf2 [REF] crm: Code optimization on next/previous stages for lead and opportunities.
bzr revid: uco@tinyerp.com-20110127125829-1oc4dexmi48tggr2
2011-01-27 18:28:29 +05:30
ron@tinyerp.com 8644377cd9 [MERGE]Merged with trunk-dev-addons2
bzr revid: ron@tinyerp.com-20110127123624-5v656see7lq24a2c
2011-01-27 18:06:24 +05:30
ron@tinyerp.com 949b71a0c9 [FIX]stock :UnicodeEncodeError in stock_change_product_qty.py
lp bug: https://launchpad.net/bugs/707809 fixed

bzr revid: ron@tinyerp.com-20110127114701-yilw96l2f3bxnbh2
2011-01-27 17:17:01 +05:30
Ujjvala Collins (OpenERP) 41fafc4ae7 [FIX] project_retro_planning: Fixed yml.
bzr revid: uco@tinyerp.com-20110127110513-bo02efgj3jr4qjdg
2011-01-27 16:35:13 +05:30
Sbh (OpenERP) d5d18ea957 [Fix] fix buildbot warning
bzr revid: sbh@tinyerp.com-20110127105333-ufjh65jmz21uzdsu
2011-01-27 16:23:33 +05:30
Olivier Dony ce4675876f [FIX] project_retro_planning: correct invalid yml test data, that does not work at the end of the month
bzr revid: odo@openerp.com-20110127104103-q9zfadnjurtxkl19
2011-01-27 11:41:03 +01:00
Olivier Dony 01669a452a [I18N] es_CL: attempt to reset translations, as requested by es_CL translation team
bzr revid: odo@openerp.com-20110127101331-1j1z974pr41q2617
2011-01-27 11:13:31 +01:00
Olivier Dony 4ebc3b55f0 [FIX] addons: restore proper loading of custom osv models (manual customizations)
bzr revid: odo@openerp.com-20110127095505-6wiq7jwkzylsc2i6
2011-01-27 10:55:05 +01:00
jam-openerp 0109ea2adb [FIX] outlook : If server is running with --no-database-list than outllook shoud show the Blank text box for database input
bzr revid: jam@tinyerp.com-20110127093757-38e32v8fk1eigbal
2011-01-27 15:07:57 +05:30
jam-openerp 3381127292 [MERGE]with trink-dev-addons1
bzr revid: jam@tinyerp.com-20110125052727-x29zkiabdgt55uqj
bzr revid: jam@tinyerp.com-20110127091642-uj8zetxdd07zi9fx
2011-01-27 14:46:42 +05:30
Ujjvala Collins (OpenERP) 07cd879c3e [FIX] analytic: Fixed analytic chart of accounts problem defined on lp:681463 using suggested patch.
bzr revid: uco@tinyerp.com-20110127091553-8fn70mh3tyqaxdax
2011-01-27 14:45:53 +05:30
Ujjvala Collins (OpenERP) b4cb096a84 [MERGE]
bzr revid: uco@tinyerp.com-20110127061033-1p7i3ci81l3157c5
2011-01-27 11:40:33 +05:30
Ujjvala Collins (OpenERP) 317c7f038a [MERGE] Merge with lp:openobject-addons
bzr revid: uco@tinyerp.com-20110127052023-qb8h4flfjj9c7xed
2011-01-27 10:50:23 +05:30
rpa (Open ERP) 918a399c22 [MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-20110127050432-1crz6pkqo77v0ejw
2011-01-27 10:34:32 +05:30
ron@tinyerp.com 3925c26765 [MERGE]Merged with trunk-dev-addons2
bzr revid: ron@tinyerp.com-20110121044011-erf15lv18jizhaig
bzr revid: ron@tinyerp.com-20110124052212-r4wjx2he3ozsrik1
bzr revid: ron@tinyerp.com-20110125065901-6mp9qwac69evgdw5
bzr revid: ron@tinyerp.com-20110127044809-psfq2zs37fk3xwzg
2011-01-27 10:18:09 +05:30
Launchpad Translations on behalf of openerp c456ff0d76 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110127043453-7iocd8dbvj0edxzt
bzr revid: launchpad_translations_on_behalf_of_openerp-20110126044003-z1ltdzbzu9trb8qo
bzr revid: launchpad_translations_on_behalf_of_openerp-20110127043733-5jad7vpuuti1my8y
2011-01-27 04:37:33 +00:00
Olivier Dony c57ab8210f [REVERT] revisions 3324, 3325, 3326, to be merged globally after complete cleanup
This corresponds to revids:
 - vmt@openerp.com-20110126142219-18j842m60diwsdph (3324)
 - vmt@openerp.com-20110126144255-t8p6g1ggjb7f1dmt (3325)
 - vmt@openerp.com-20110126151717-tf0q2mx2inj21jls (3326)

bzr revid: odo@openerp.com-20110126165030-su3zeobaj7v9d95f
2011-01-26 17:50:30 +01:00
Vo Minh Thu e52c477dfe [IMP] parse_config is called in openerp-server.py, the direct cycle in convert.py is removed
bzr revid: vmt@openerp.com-20110126151717-tf0q2mx2inj21jls
2011-01-26 16:17:17 +01:00
Vo Minh Thu 0e39f07490 [IMP] tools/netsvc: removed direct dependency of tools on netsvc
bzr revid: vmt@openerp.com-20110126144255-t8p6g1ggjb7f1dmt
2011-01-26 15:42:55 +01:00
Vo Minh Thu 7bf401381d [IMP] netsvc/tools.config: the part of netsvc tools.config needs is moved in a new loglevels module.
bzr revid: vmt@openerp.com-20110126142219-18j842m60diwsdph
2011-01-26 15:22:19 +01:00
Launchpad Translations on behalf of openerp b0bdfb1c24 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110122045105-6bb15gpfqxvqoqhp
bzr revid: launchpad_translations_on_behalf_of_openerp-20110123045627-dg9tpwjxlisdl3ge
bzr revid: launchpad_translations_on_behalf_of_openerp-20110124045322-s2fdn393vljjl85m
bzr revid: launchpad_translations_on_behalf_of_openerp-20110125045312-dfqahig9ymkhcyg2
bzr revid: launchpad_translations_on_behalf_of_openerp-20110126043658-k5o2c5r7ymqxv844
2011-01-26 04:36:58 +00:00
nel@tinyerp.com e902f2ac86 [FIX] wizard stock partial picking: when no currency defined on product
bzr revid: nel@tinyerp.com-20110125162815-xk5ymun6nx0ud3jz
2011-01-25 17:28:15 +01:00
qdp-launchpad@tinyerp.com afca671b1b [FIX] account: invoice analysis enhanced in order to avoid having crashes because of zero division (if a line has qtty = 0..)
bzr revid: qdp-launchpad@tinyerp.com-20110125162808-v8c5y97800szf741
2011-01-25 17:28:08 +01:00
nel@tinyerp.com d9985ed3b6 [FIX] account_payment: openerp file
bzr revid: nel@tinyerp.com-20110125141950-2tmmidixnfjtky4h
2011-01-25 15:19:50 +01:00
Sbh (OpenERP) efc7696624 [FIX] crm: Revert back change of Task ID-1796
bzr revid: sbh@tinyerp.com-20110125132051-lqol7xcqi6ozibpv
2011-01-25 18:50:51 +05:30
rpa (Open ERP) bc6beff902 [MERGE]: Merge with lp:~openerp-dev/openobject-addons/rpa-dev-addons2
bzr revid: rpa@tinyerp.com-20110125100635-a1gyqpbj1d1nbolf
2011-01-25 15:36:35 +05:30
Harry (OpenERP) ee2b1b8aa9 [FIX] backport product_visible_discout fix from stable/6.0 at rev#4350
bzr revid: hmo@tinyerp.com-20110125095111-9ke4m8tq8g3tvyul
2011-01-25 15:21:11 +05:30
rpa (Open ERP) edf0c07db4 [FIX]: stock: Fixed domain of act_window in order to work with webclient
lp bug: https://launchpad.net/bugs/706776 fixed

bzr revid: rpa@tinyerp.com-20110125093723-33508cbtwd6xvwx3
2011-01-25 15:07:23 +05:30
rpa (Open ERP) 0befcb4fb8 [MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
bzr revid: rpa@tinyerp.com-20110125093142-s1pugzqxws9hwl00
2011-01-25 15:01:42 +05:30
Sbh (OpenERP) 4624e5279a [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20110121050406-riqq1t3bqddz9exr
bzr revid: sbh@tinyerp.com-20110124042003-5jhccwrwtqs2w5zh
bzr revid: sbh@tinyerp.com-20110125050259-qktlkl3d88jd7zsp
2011-01-25 10:32:59 +05:30