Harry (OpenERP) [Wed, 23 Jun 2010 10:50:49 +0000 (16:20 +0530)]
[ADD] Document: Search View of Document Directory
bzr revid: hmo@tinyerp.com-
20100623105049-ljrwb0w3axw5dk0d
Harry (OpenERP) [Wed, 23 Jun 2010 10:31:44 +0000 (16:01 +0530)]
[FIX] Document: Document directory strcuture could not open. Give 'field_parent' into tree view of document directory
bzr revid: hmo@tinyerp.com-
20100623103144-083549ttpjc6ftj0
Harry (OpenERP) [Wed, 23 Jun 2010 10:19:16 +0000 (15:49 +0530)]
[FIX] Document: string attribute is not support in tree tag. so removed it into tree view of document
bzr revid: hmo@tinyerp.com-
20100623101916-6d8yo6szm74pn1kw
P. Christeas [Tue, 22 Jun 2010 15:03:47 +0000 (18:03 +0300)]
Document: fix spelling of personal folders.
bzr revid: p_christ@hol.gr-
20100622150347-g9wi75dmxule6hwq
P. Christeas [Tue, 22 Jun 2010 15:03:44 +0000 (18:03 +0300)]
Document: default storage should be into db.
.. because db works without settings, and ir.attachment defaults to it
before document is installed.
bzr revid: p_christ@hol.gr-
20100622150344-zlklaz5uldeict3h
P. Christeas [Tue, 22 Jun 2010 15:03:42 +0000 (18:03 +0300)]
Document: show storage path for any type except 'db'
bzr revid: p_christ@hol.gr-
20100622150342-jo41vtxhkq4ff5rz
P. Christeas [Tue, 22 Jun 2010 15:03:39 +0000 (18:03 +0300)]
Doc webdav: temp fixes
Including a meaningful exception when range of data (chunked transfer)
is requested.
bzr revid: p_christ@hol.gr-
20100622150339-e93xs3dw0kw1ni3y
Olivier Dony [Tue, 22 Jun 2010 13:09:09 +0000 (15:09 +0200)]
[IMP] document_ftp: config wizard should use same rules as FTP server for determining FTP Host and Port
bzr revid: odo@openerp.com-
20100622130909-vxx9oq95rlnxilfo
Olivier Dony [Tue, 22 Jun 2010 10:45:21 +0000 (12:45 +0200)]
[IMP] product: minor line move to match 5.0
bzr revid: odo@openerp.com-
20100622104521-b4ynyl2e4rbff1sy
Antony Lesuisse [Tue, 22 Jun 2010 12:20:30 +0000 (14:20 +0200)]
Don't bind ftpserver on detected ip address, bind it to 127.0.0.1 or the provided config value.
bzr revid: al@openerp.com-
20100622122030-56azfsum3gjjgvp8
Vir (Open ERP) [Tue, 22 Jun 2010 12:26:04 +0000 (17:56 +0530)]
[ADD] idea, lunch : lunch order analysis and vote reports added
bzr revid: vir@tinyerp.com-
20100622122604-7t4i0d2durfqz8n1
rch(OpenERP) [Tue, 22 Jun 2010 11:39:04 +0000 (17:09 +0530)]
[IMP] Improved sale dashboard.
bzr revid: jni@tinyerp.com-
20100622113904-75gojl7iaaxybs23
Fabien Pinckaers [Tue, 22 Jun 2010 07:51:03 +0000 (09:51 +0200)]
merge
bzr revid: fp@tinyerp.com-
20100622075103-px644w6t3bx1xkbk
Fabien Pinckaers [Tue, 22 Jun 2010 07:28:54 +0000 (09:28 +0200)]
[IMP] better data scrap location -> inventory type
bzr revid: fp@tinyerp.com-
20100622072854-9i4kxs8hwjweex05
Jay (Open ERP) [Tue, 22 Jun 2010 07:26:35 +0000 (12:56 +0530)]
[IMP/FIX] Account : view improved for template
bzr revid: jvo@tinyerp.com-
20100622072635-l3dmrlz2pqywxnvk
UCO(Open ERP) [Tue, 22 Jun 2010 05:33:22 +0000 (11:03 +0530)]
[IMP] account, account_budget, email_template : Usability improvements in Menus
bzr revid: vir@tinyerp.com-
20100622053322-lvfu6brpde40tsvm
uco [Tue, 22 Jun 2010 04:39:09 +0000 (10:09 +0530)]
[MERGE]
bzr revid: uco@tinyerp.com-
20100622043909-8jofjsbi50hisluz
Launchpad Code Hosting [Tue, 22 Jun 2010 04:20:50 +0000 (05:20 +0100)]
Launchpad automatic translations update.
bzr revid: codehost@crowberry-
20100622042050-gbet3uvllvx7vhyu
Launchpad Code Hosting [Tue, 22 Jun 2010 03:52:13 +0000 (04:52 +0100)]
Launchpad automatic translations update.
bzr revid: codehost@crowberry-
20100622035213-0dgn4rr7vqo1e167
Fabien Pinckaers [Mon, 21 Jun 2010 21:52:24 +0000 (23:52 +0200)]
modifs
bzr revid: fp@tinyerp.com-
20100621215224-ehh5oz2z1cup7kep
Fabien Pinckaers [Mon, 21 Jun 2010 21:51:07 +0000 (23:51 +0200)]
removed multi-company default
bzr revid: fp@tinyerp.com-
20100621215107-n1vl0iwtsqbtjs1e
Fabien Pinckaers [Mon, 21 Jun 2010 21:50:54 +0000 (23:50 +0200)]
improve
bzr revid: fp@tinyerp.com-
20100621215054-aog8glnkl8corg6o
Fabien Pinckaers [Mon, 21 Jun 2010 21:22:07 +0000 (23:22 +0200)]
imp
bzr revid: fp@tinyerp.com-
20100621212207-v4xxa3x82sydd0np
Fabien Pinckaers [Mon, 21 Jun 2010 21:20:55 +0000 (23:20 +0200)]
[IMP] better useability
bzr revid: fp@tinyerp.com-
20100621212055-qxs8t6d1u6q73qwz
Fabien Pinckaers [Mon, 21 Jun 2010 21:16:27 +0000 (23:16 +0200)]
[IMP] better useability
bzr revid: fp@tinyerp.com-
20100621211627-2dhjebvnrdqzf710
Fabien Pinckaers [Mon, 21 Jun 2010 19:48:42 +0000 (21:48 +0200)]
[FIX] improvements in views
bzr revid: fp@tinyerp.com-
20100621194842-c0ccgv8r36kh4grz
Fabien Pinckaers [Mon, 21 Jun 2010 18:59:54 +0000 (20:59 +0200)]
merge
bzr revid: fp@tinyerp.com-
20100621185954-bx6u3vd9tpaygkq7
Fabien Pinckaers [Mon, 21 Jun 2010 18:58:08 +0000 (20:58 +0200)]
merge
bzr revid: fp@tinyerp.com-
20100621185808-ffoiamidk7szdwqg
Fabien Pinckaers [Mon, 21 Jun 2010 18:40:58 +0000 (20:40 +0200)]
[FIX] sale,purchase,stock
bzr revid: fp@tinyerp.com-
20100621184058-try3rw3m59uc4e55
nel@tinyerp.com [Mon, 21 Jun 2010 16:12:29 +0000 (18:12 +0200)]
[IMP] point of sale
bzr revid: nel@tinyerp.com-
20100621161229-xtb82392avghya68
nel@tinyerp.com [Mon, 21 Jun 2010 15:55:51 +0000 (17:55 +0200)]
[FIX] stock: function create
bzr revid: nel@tinyerp.com-
20100621155551-47idl8ntymw48le6
nel@tinyerp.com [Mon, 21 Jun 2010 15:43:46 +0000 (17:43 +0200)]
[FIX] stock: function create
bzr revid: nel@tinyerp.com-
20100621154346-fuwv231eo4gc7lpa
Aline Preillon [Mon, 21 Jun 2010 13:20:31 +0000 (15:20 +0200)]
[MERGE]
bzr revid: aline@aline-laptop-
20100621132031-drpix8vlh4c22dux
Aline Preillon [Mon, 21 Jun 2010 13:19:51 +0000 (15:19 +0200)]
[IMP] avoid crash when qty set to zero
bzr revid: aline@aline-laptop-
20100621131951-nutuf5s1qragki1l
Vir (Open ERP) [Mon, 21 Jun 2010 13:02:43 +0000 (18:32 +0530)]
[IMP] Survey :Usability improvements
bzr revid: vir@tinyerp.com-
20100621130243-pw2i9zucrpf8h7ey
Fabien Meghazi [Mon, 21 Jun 2010 12:34:44 +0000 (14:34 +0200)]
[IMP] CRM: Allow to specify the crm email subject via context.
bzr revid: amigrave@agr-
20100621123444-bsltgn31tdaskaxy
uco [Mon, 21 Jun 2010 10:57:10 +0000 (16:27 +0530)]
[REF] account,account_budget,email_template: Remaining changes of menus.
bzr revid: uco@tinyerp.com-
20100621105710-fhp6y2ek6df7rs5h
Vir (Open ERP) [Mon, 21 Jun 2010 10:17:10 +0000 (15:47 +0530)]
[Fix,ADD] idea : problem of vote_id is solved, open button added
bzr revid: vir@tinyerp.com-
20100621101710-zvz52nvql5ybsrae
uco [Mon, 21 Jun 2010 09:18:18 +0000 (14:48 +0530)]
[MERGE]: Merged with trunk-addons
bzr revid: uco@tinyerp.com-
20100621091818-n36xqcp6kgvuaq48
Vir (Open ERP) [Mon, 21 Jun 2010 08:50:32 +0000 (14:20 +0530)]
[MOD,ADD] subscription, idea : menu sequence changed, lunch : Search view added for lunch order and cashmove
bzr revid: vir@tinyerp.com-
20100621085032-a3p3ywxnrnooue5r
Launchpad Code Hosting [Mon, 21 Jun 2010 03:42:50 +0000 (04:42 +0100)]
Launchpad automatic translations update.
bzr revid: codehost@crowberry-
20100619035141-puifl9zhhni1ci9t
bzr revid: codehost@crowberry-
20100620033445-89hed877mztohneu
bzr revid: codehost@crowberry-
20100621034250-kohum7teripm1319
Launchpad Code Hosting [Mon, 21 Jun 2010 03:42:37 +0000 (04:42 +0100)]
Launchpad automatic translations update.
bzr revid: codehost@crowberry-
20100619035123-ft81ao6has1a8odq
bzr revid: codehost@crowberry-
20100620033429-jrwbiyxuli9jydj9
bzr revid: codehost@crowberry-
20100621034237-prs8jk50499ij8it
qdp-launchpad@tinyerp.com [Fri, 18 Jun 2010 14:22:30 +0000 (16:22 +0200)]
[IMP] account: improved icon on account_reconcile_partner_process wizard
bzr revid: qdp-launchpad@tinyerp.com-
20100618142230-jpiqb4gshtr41o4l
qdp-launchpad@tinyerp.com [Fri, 18 Jun 2010 14:03:04 +0000 (16:03 +0200)]
[MERGE] merge team3's work of sprint 22-23
bzr revid: qdp-launchpad@tinyerp.com-
20100618140304-yxomezlycdidk98c
qdp-launchpad@tinyerp.com [Fri, 18 Jun 2010 13:59:04 +0000 (15:59 +0200)]
[MERGE]
bzr revid: qdp-launchpad@tinyerp.com-
20100618135904-yaeuvylyoqytksyw
qdp-launchpad@tinyerp.com [Fri, 18 Jun 2010 13:55:20 +0000 (15:55 +0200)]
[IMP] account, hr_attendance, hr_timesheet: typo, remove empty lines
[FIX] account_coda: remove wrong comment
bzr revid: qdp-launchpad@tinyerp.com-
20100618135520-b1k3la6hsfxs7xuh
Mustufa Rangwala [Fri, 18 Jun 2010 13:31:02 +0000 (19:01 +0530)]
[MERGE]
bzr revid: mra@mra-laptop-
20100618133102-n2awq78aueh5igd0
Mustufa Rangwala [Fri, 18 Jun 2010 13:16:51 +0000 (18:46 +0530)]
clean
bzr revid: mra@mra-laptop-
20100618131651-507dye32t6srxo3x
Mustufa Rangwala [Fri, 18 Jun 2010 13:09:34 +0000 (18:39 +0530)]
clean
bzr revid: mra@mra-laptop-
20100618130934-r8zvtq6w6683gwoh
Mustufa Rangwala [Fri, 18 Jun 2010 13:08:43 +0000 (18:38 +0530)]
clean
bzr revid: mra@mra-laptop-
20100618130843-q2qwhmklf1dyxlpt
Vir (Open ERP) [Fri, 18 Jun 2010 12:40:25 +0000 (18:10 +0530)]
[MOD] point of sale : modification in pos report, menu change in email gateway
bzr revid: vir@tinyerp.com-
20100618124025-nps509alfp6g1gl3
Jay (Open ERP) [Fri, 18 Jun 2010 12:21:59 +0000 (17:51 +0530)]
[IMP] Project_long_term : Unnecessary menuitem commented
bzr revid: jvo@tinyerp.com-
20100618122159-uqtxo53sac349l9n
Mustufa Rangwala [Fri, 18 Jun 2010 11:23:29 +0000 (16:53 +0530)]
[MERGE]
bzr revid: mra@mra-laptop-
20100618112329-20lm2kf1x6ipz6yj
Mustufa Rangwala [Fri, 18 Jun 2010 11:15:59 +0000 (16:45 +0530)]
[IMP] account: account reconcile partner process
bzr revid: mra@mra-laptop-
20100618111559-knik7r51ry3se6wh
vra [Fri, 18 Jun 2010 10:20:47 +0000 (15:50 +0530)]
[FIX] account : minor fix.
bzr revid: vra@tinyerp.com-
20100618102047-qk0q60951hltc17q
Mustufa Rangwala [Fri, 18 Jun 2010 09:14:40 +0000 (14:44 +0530)]
[IMP] account: menu stucture minor change for bank recocilation wizard
bzr revid: mra@mra-laptop-
20100618091440-c89k9og5qojcaol7
Mustufa Rangwala [Fri, 18 Jun 2010 08:49:14 +0000 (14:19 +0530)]
[FIX]
bzr revid: mra@mra-laptop-
20100618084914-f6ntbt2p76953x89
Mustufa Rangwala [Fri, 18 Jun 2010 08:38:59 +0000 (14:08 +0530)]
[MERGE] merge with trunk addons and remove conficts
bzr revid: mra@mra-laptop-
20100618083859-5jbrk4u9l2vojxu6
Christophe Simonis [Fri, 18 Jun 2010 08:28:36 +0000 (10:28 +0200)]
[FIX] crm_profiling: query parameter
bzr revid: chs@openerp.com-
20100618082836-wd3ej6tobx5ukj2z
Mustufa Rangwala [Fri, 18 Jun 2010 08:28:11 +0000 (13:58 +0530)]
[FIX] account: pay and reconcile with creation of move with good type
bzr revid: mra@mra-laptop-
20100618082811-ky4wb3w14f8sd6iw
vra [Fri, 18 Jun 2010 07:36:46 +0000 (13:06 +0530)]
[MERGE] SQL-Injection Fixes
bzr revid: vra@tinyerp.com-
20100618073646-edml7q843xzkq84x
Mustufa Rangwala [Fri, 18 Jun 2010 07:34:50 +0000 (13:04 +0530)]
[IMP] creation of invoice and its payment now with in account.move with good type
bzr revid: mra@mra-laptop-
20100618073450-9nu8eh0o9zlxxygl
Mustufa Rangwala [Fri, 18 Jun 2010 07:23:59 +0000 (12:53 +0530)]
[REF]
bzr revid: mra@mra-laptop-
20100618072359-a860w5bc6y9i56wi
Mustufa Rangwala [Fri, 18 Jun 2010 07:19:12 +0000 (12:49 +0530)]
[REF]
bzr revid: mra@mra-laptop-
20100618071912-t2pfa227jp2xcxlb
nch@tinyerp.com [Fri, 18 Jun 2010 07:12:04 +0000 (12:42 +0530)]
[REVERT]:Integration script,Makefile changes need to create diff repository as it is affecting test.openobject.com:8010
bzr revid: nch@tinyerp.com-
20100618071204-44ftuhvtun3yerzt
vra [Fri, 18 Jun 2010 06:55:05 +0000 (12:25 +0530)]
[MERGE] merge the changes from trunk main branch.
bzr revid: vra@tinyerp.com-
20100618065505-qwivms0atr8ld3zr
Mustufa Rangwala [Fri, 18 Jun 2010 06:40:43 +0000 (12:10 +0530)]
[FIX] conflicts solve for menu account strutur
bzr revid: mra@mra-laptop-
20100618064043-9gnokcgtre9lu89c
Mustufa Rangwala [Fri, 18 Jun 2010 06:21:43 +0000 (11:51 +0530)]
[MERGE]
bzr revid: mra@mra-laptop-
20100618043703-1f7cn3iilchx7vxa
bzr revid: mra@mra-laptop-
20100618062143-vkgjue5qzdimp96z
vra [Fri, 18 Jun 2010 06:05:59 +0000 (11:35 +0530)]
[REF] ref.
bzr revid: vra@tinyerp.com-
20100618060559-wslsjxa4t4aw97vz
UCO(Open ERP) [Fri, 18 Jun 2010 06:04:00 +0000 (11:34 +0530)]
[MOD] Changes in main menu sequence, Reoraganization of Tools menu
bzr revid: vir@tinyerp.com-
20100618060400-1alih9oe4ewwhmwz
UCO(Open ERP) [Fri, 18 Jun 2010 05:58:58 +0000 (11:28 +0530)]
[MOD] Small change in menu sequence
bzr revid: vir@tinyerp.com-
20100618055858-s1ilio4v2zxwl6cl
Vir (Open ERP) [Fri, 18 Jun 2010 05:21:58 +0000 (10:51 +0530)]
[MERGE] Merge with Trunk Addons
bzr revid: vir@tinyerp.com-
20100618052158-why0uz9oiltw8h1h
vra [Fri, 18 Jun 2010 05:21:16 +0000 (10:51 +0530)]
[MERGE] Merge the changes from main trunk branch.
bzr revid: vra@tinyerp.com-
20100618052116-lbcdxkqh4cqv1xlt
uco (OpenERP) [Fri, 18 Jun 2010 04:35:43 +0000 (10:05 +0530)]
[MERGE]: Merged with trunk-server
bzr revid: uco@tinyerp.com-
20100618043543-vy1f34tly0lwrz14
uco (OpenERP) [Fri, 18 Jun 2010 04:32:47 +0000 (10:02 +0530)]
[MERGE]: Merged with trunk-addons
bzr revid: uco@tinyerp.com-
20100618043247-89skoxkyj967xuv3
Launchpad Code Hosting [Fri, 18 Jun 2010 03:33:08 +0000 (04:33 +0100)]
Launchpad automatic translations update.
bzr revid: codehost@crowberry-
20100618033308-7p6kb07l11bx3hgc
Launchpad Code Hosting [Fri, 18 Jun 2010 03:32:34 +0000 (04:32 +0100)]
Launchpad automatic translations update.
bzr revid: codehost@crowberry-
20100618033234-85ymlh6ucg7eynam
Mantavya Gajjar [Fri, 18 Jun 2010 03:11:40 +0000 (08:41 +0530)]
[IMP]: enable holiday calculation with payslip
bzr revid: mga@tinyerp.com-
20100618031140-eqg2negwaggok5tf
Mantavya Gajjar [Fri, 18 Jun 2010 00:51:41 +0000 (06:21 +0530)]
[IMP]: improvements to payroll module
bzr revid: mga@tinyerp.com-
20100618005141-bh618yzj9ucz1jt5
uco (OpenERP) [Thu, 17 Jun 2010 13:44:20 +0000 (19:14 +0530)]
[IMP]: Re-organized Tools menu structure.
bzr revid: uco@tinyerp.com-
20100617134420-52257h3u0w6y7iux
Mustufa Rangwala [Thu, 17 Jun 2010 13:22:01 +0000 (18:52 +0530)]
[IMP] account: menu strcuture changes (ref: pap)
bzr revid: mra@mra-laptop-
20100617132201-1fqjju5vlar0qo92
Mustufa Rangwala [Thu, 17 Jun 2010 13:12:01 +0000 (18:42 +0530)]
[MERGE]
bzr revid: mra@mra-laptop-
20100617071519-u4kb74yay8v55q08
bzr revid: mra@mra-laptop-
20100617103236-ac03zl97wcvuu7bu
bzr revid: mra@mra-laptop-
20100617131201-lorh9maj58oagbnh
uco (OpenERP) [Thu, 17 Jun 2010 12:18:04 +0000 (17:48 +0530)]
[REF]: Changed sequence of Administration menu.
bzr revid: uco@tinyerp.com-
20100617121804-8hur2x0ftaxurr8j
uco (OpenERP) [Thu, 17 Jun 2010 12:16:52 +0000 (17:46 +0530)]
[IMP]: Changed sequences of all main menus.
bzr revid: uco@tinyerp.com-
20100617121652-5n6zb5zbk07pztn3
nel@tinyerp.com [Thu, 17 Jun 2010 11:43:18 +0000 (13:43 +0200)]
[MERGE]
bzr revid: nel@tinyerp.com-
20100617114318-ozi57u9u55fcjh38
nel@tinyerp.com [Thu, 17 Jun 2010 11:42:24 +0000 (13:42 +0200)]
[IMP] stock views
bzr revid: nel@tinyerp.com-
20100617114224-fdegrmygwfefxcpg
UCO(Open ERP) [Thu, 17 Jun 2010 10:39:55 +0000 (16:09 +0530)]
[MOD] Small changes in menus
bzr revid: vir@tinyerp.com-
20100617103955-fqzfqh0ezllo9c1f
UCO(Open ERP) [Thu, 17 Jun 2010 10:36:06 +0000 (16:06 +0530)]
[MOD] bank,country,crm and partner view : modification in menu sequence
bzr revid: vir@tinyerp.com-
20100617103606-f3fans7y2e7qrcba
uco (OpenERP) [Thu, 17 Jun 2010 10:05:47 +0000 (15:35 +0530)]
[IMP]: Menu Re-organization.
bzr revid: uco@tinyerp.com-
20100617100547-zwn0ri6cm8ggkycp
uco (OpenERP) [Thu, 17 Jun 2010 10:04:51 +0000 (15:34 +0530)]
[IMP] crm, hr, project, stock, sale: Menu Re-organization.
bzr revid: uco@tinyerp.com-
20100617100451-75hoxnbpjoo1clie
nel@tinyerp.com [Thu, 17 Jun 2010 09:55:52 +0000 (11:55 +0200)]
[IMP] stock split into add condition qty <=0
bzr revid: nel@tinyerp.com-
20100617095552-teeaeyd2yuwb46y0
Jay (Open ERP) [Thu, 17 Jun 2010 09:38:45 +0000 (15:08 +0530)]
[FIX] Tools : Safe_eval should support make_function and map.
lp bug: https://launchpad.net/bugs/595275 fixed
bzr revid: jvo@tinyerp.com-
20100617093845-qgwrma8khcgv8f5h
nch@tinyerp.com [Thu, 17 Jun 2010 08:42:09 +0000 (14:12 +0530)]
[IMP]:Integration Server Script and Makefile for installing all addons modules and performing tests
bzr revid: nch@tinyerp.com-
20100617084209-qw9dd3rxw6yg1e70
nel@tinyerp.com [Thu, 17 Jun 2010 08:12:06 +0000 (10:12 +0200)]
[MERGE]
bzr revid: nel@tinyerp.com-
20100617081206-clo884lxc66jxjkt
nel@tinyerp.com [Thu, 17 Jun 2010 08:11:22 +0000 (10:11 +0200)]
[IMP] stock: set use exist to true when outgoing
bzr revid: nel@tinyerp.com-
20100617081122-rfnwk4e5jh5sw7g1
Mustufa Rangwala [Thu, 17 Jun 2010 07:10:42 +0000 (12:40 +0530)]
[FIX] Purchase: calculation of amount untax was wrong (ref: mtr)
bzr revid: mra@mra-laptop-
20100617071042-or2igo5wjty708fv
uco (OpenERP) [Thu, 17 Jun 2010 06:35:37 +0000 (12:05 +0530)]
[MERGE]: Merged with trunk-server.
bzr revid: uco@tinyerp.com-
20100617063537-8cv03xltm7fqw6rh
UCO(Open ERP) [Thu, 17 Jun 2010 06:12:02 +0000 (11:42 +0530)]
[MOD/IMP] account,sale,stock,mrp,purchase,warehouse,hr,project : Improvements in menus, in well structred manner
bzr revid: vir@tinyerp.com-
20100617061202-ygn1bw404h6j0olr
uco (OpenERP) [Thu, 17 Jun 2010 05:03:09 +0000 (10:33 +0530)]
[MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-
20100617050309-t7nuiyu6ns6i10qx
Mustufa Rangwala [Thu, 17 Jun 2010 04:33:49 +0000 (10:03 +0530)]
[MERGE]
bzr revid: mra@mra-laptop-
20100617043349-f8lcffbdb4q8j4as