Commit Graph
61575 Commits
Author SHA1 Message Date
Mayur Maheshwari (OpenERP) 2bf21d63e5 [IMP]project_gtd: added string timeframe
bzr revid: mma@tinyerp.com-20121012093332-noo1hs6e86e2wmlh
2012-10-12 15:03:32 +05:30
vta vta@openerp.com 30c3602d03 [MERGE] trunk-trigger-on_controller_inited.
bzr revid: vta@openerp.com-20121012093328-hr52zgwk5ygdh9mu
2012-10-12 11:33:28 +02:00
Rajesh Prajapati (OpenERP) e54ae5ae76 [MERGE] merge with main addons
bzr revid: rpr@tinyerp.com-20121012093201-53p10pdv05jqm80u
2012-10-12 15:02:01 +05:30
vta vta@openerp.com fb865d1871 [MERGE] Latest trunk.
bzr revid: vta@openerp.com-20121012092939-a90zcuh4r605n7en
2012-10-12 11:29:39 +02:00
Mayur Maheshwari (OpenERP) 3a6f2942d6 [IMP]product: remove conflicts
bzr revid: mma@tinyerp.com-20121012092330-j8r0kbmbx5pawrxf
2012-10-12 14:53:30 +05:30
vta vta@openerp.com ff40df4e66 [MERGE] trunk-trigger-on_pager_action.
bzr revid: vta@openerp.com-20121012091915-0pqfqkhd7ysrc0vd
2012-10-12 11:19:15 +02:00
vta vta@openerp.com 885f9c4042 [MERGE] Latest trunk.
bzr revid: vta@openerp.com-20121012090105-d6ggjdyjh70zxbdv
bzr revid: vta@openerp.com-20121012091841-cg9ief3mm8jrnjhq
2012-10-12 11:18:41 +02:00
niv-openerp dbe370f585 Ported m2mkanban and corrected bug in selection
bzr revid: nicolas.vanhoren@openerp.com-20121012091820-u712bie1h2a84l8a
2012-10-12 11:18:20 +02:00
pankita shah (Open ERP) b39b0139bf [IMP] remove menu event and event anaylasis
bzr revid: shp@tinyerp.com-20121012091429-02i5f9v3szb4rm3i
2012-10-12 14:44:29 +05:30
niv-openerp bb2d99c007 merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20121012090736-edqy00ejzfoxi7tv
2012-10-12 11:07:36 +02:00
pankita shah (Open ERP) 71dcfd4f35 [MERGED] merged with lp:openobject-addons
bzr revid: shp@tinyerp.com-20121012090649-oo3u11l9ompemgi7
2012-10-12 14:36:49 +05:30
niv-openerp d17b33aea6 [FIX] problem with field reference
bzr revid: nicolas.vanhoren@openerp.com-20121012090644-8wy3z4mr6080oa7b
2012-10-12 11:06:44 +02:00
Khushboo Bhatt (Open ERP) 06ae4d8913 [IMP]project_timesheet:added method for setting default type of invoicing
bzr revid: kbh@tinyerp.com-20121012090527-zn9ngz25ylbio2nx
2012-10-12 14:35:27 +05:30
Vishmita f5216c706a [FIX]move the trigger function
bzr revid: vja@tinyerp.com-20121012085417-rrql4iyrevscyt80
2012-10-12 14:24:17 +05:30
Harry (OpenERP) bfba3deb93 [MERGE]
bzr revid: hmo@tinyerp.com-20121012085357-9h4kw3ozaq29z7ex
2012-10-12 14:23:57 +05:30
Jalpesh Patel (OpenERP) a0308e0b6a [Merge] Merge with lp:openobject-addons
bzr revid: pja@tinyerp.com-20121010050854-jl6pyydhr7un9pp6
bzr revid: pja@tinyerp.com-20121012085235-dy62vb0q5xbwy2cm
2012-10-12 14:22:35 +05:30
Vishmita 31a42989a7 [IMP]Improve Code
bzr revid: vja@tinyerp.com-20121012084900-zja87nszeh3q1ree
2012-10-12 14:19:00 +05:30
niv-openerp 7314375aca Ported m2m, still has to port m2mtags
bzr revid: nicolas.vanhoren@openerp.com-20121012084337-7etwh54ugl4k01mu
2012-10-12 10:43:37 +02:00
Khushboo Bhatt (Open ERP) fce8bb9c29 [IMP]project_timesheet:added method for setting default product uom.
bzr revid: kbh@tinyerp.com-20121012083906-3ab8ephqoc09dx7z
2012-10-12 14:09:06 +05:30
Vidhin Mehta (OpenERP) ffb5a9c802 [IMP]method name change.
bzr revid: vme@tinyerp.com-20121012083827-hq8xrnn333foyiu3
2012-10-12 14:08:27 +05:30
Khushboo Bhatt (Open ERP) 86676cf1c9 [IMP]project_timesheet:added method for setting default product.
bzr revid: kbh@tinyerp.com-20121012082525-y600x8lv0xteej6a
2012-10-12 13:55:25 +05:30
Quentin (OpenERP) 56477a1063 [IMP] hr: usability in hr.employee form view
bzr revid: qdp-launchpad@openerp.com-20121012075137-fmfeehwehsbvh8ez
2012-10-12 09:51:37 +02:00
Quentin (OpenERP) 4d95ab9924 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121012073837-fba6n3mvk4htuxw2
2012-10-12 09:38:37 +02:00
Turkesh Patel (Open ERP) 73a139d72d [MRG] lp:~openerp-dev/openobject-server/trunk-warning-fix-tch
bzr revid: tpa@tinyerp.com-20121012073546-s3cs1nhxomvmfyu2
2012-10-12 13:05:46 +05:30
Turkesh Patel (Open ERP) 78d52f14aa [FIX] do not read depricated fields.
bzr revid: tpa@tinyerp.com-20121012073308-3eewtgihpnr6ri1z
2012-10-12 13:03:08 +05:30
Nimesh (Open ERP) baca14c1d7 [MERGE] merge with lp:openobject-server
bzr revid: nco@tinyerp.com-20121012073051-em68jc553jixr6op
2012-10-12 13:00:51 +05:30
pankita shah (Open ERP) 022a7c5de0 [IMP] move schedule meeting and convert to opportunity to the right of contact
bzr revid: shp@tinyerp.com-20121012072825-oplxmiuqnrszygfz
2012-10-12 12:58:25 +05:30
Quentin (OpenERP) 00f3dfc6d8 [MERGE] use of formatLAng(amount, currency_obj=...) and use of display_address() in reports
bzr revid: qdp-launchpad@openerp.com-20121012071640-sxhy9xnat65r8158
2012-10-12 09:16:40 +02:00
pankita shah (Open ERP) 35d3027fdf [IMP] Order Lines to Invoice create new you can not select product there
bzr revid: shp@tinyerp.com-20121012065533-mvmorbar8675k5uk
2012-10-12 12:25:33 +05:30
vta vta@openerp.com d0c88ce9cb [MERGE] Latest trunk.
bzr revid: vta@openerp.com-20121012065521-838keuv5tdk1w3qg
2012-10-12 08:55:21 +02:00
Twinkle Christian (OpenERP) 374ca00f4a [Merge]Merge with project branch
bzr revid: tch@tinyerp.com-20121012064623-7166g1m213juqvjq
2012-10-12 12:16:23 +05:30
pankita shah (Open ERP) 63c072bb11 [IMP] reference of sale order which is in done state
bzr revid: shp@tinyerp.com-20121012064042-8l255iecqqs68rx9
2012-10-12 12:10:42 +05:30
Jalpesh Patel (OpenERP) 7c3b223618 [IMP] remove unnecessary code
bzr revid: pja@tinyerp.com-20121012063925-eerqul5b3rl83ds0
2012-10-12 12:09:25 +05:30
RGA(OpenERP) 25ac221a0f [IMP] improve code
bzr revid: rgaopenerp-20121012063004-cdgbq4w4pa1io9u2
2012-10-12 12:00:04 +05:30
Jalpesh Patel (OpenERP) 4e088306d1 [IMP]interchange sequence of buttons in Purchase order form like: [Receive Products] [Receive Invoice]
bzr revid: pja@tinyerp.com-20121012062846-27zef8nxmwiaz5wz
2012-10-12 11:58:46 +05:30
Saurang Suthar 40c43f21d3 [MERGE]:merged with latest addons
bzr revid: ssu@tinyerp.com-20121012062337-4cjzskoxb77d5dme
2012-10-12 11:53:37 +05:30
Vishmita 833c7bdc52 [FIX]Change name of the event and 'on_pager_action' function
bzr revid: vja@tinyerp.com-20121012062004-2an59ci8z5o9ijpu
2012-10-12 11:50:04 +05:30
Twinkle Christian (OpenERP) 7bef5e5162 [FIX]fix test case warning
bzr revid: tch@tinyerp.com-20121012061035-xfuez2o9x9k1m5r4
2012-10-12 11:40:35 +05:30
pankita shah (Open ERP) bf3dd9918d [IMP] partner tree view when group by company
bzr revid: shp@tinyerp.com-20121012060036-n91al0zj4qq0pt4p
2012-10-12 11:30:36 +05:30
Mayur Maheshwari (OpenERP) 3079bf9ce0 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121012055106-eu39hyg4vt2mxr07
2012-10-12 11:21:06 +05:30
Turkesh Patel (Open ERP) bb9e1825bc [MRG] merge with lp:openobject-server
bzr revid: tpa@tinyerp.com-20121012054854-zjikywjs63jjzt4p
2012-10-12 11:18:54 +05:30
pankita shah (Open ERP) 17f1e6a12c [IMP] default value for Planned Date field
bzr revid: shp@tinyerp.com-20121012052927-y7njhusx5emlxf4j
2012-10-12 10:59:27 +05:30
Divyesh Makwana (Open ERP) fb87569289 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121011045301-ttt0tzlrk8ge06db
bzr revid: mdi@tinyerp.com-20121012052424-z2toltq0vw0pnyk9
2012-10-12 10:54:24 +05:30
Mayur Maheshwari (OpenERP) 0a44106cff [MERGE]: Merge with lp:openobject-server
bzr revid: mma@tinyerp.com-20121010054128-vxfn678x1d7i23qy
bzr revid: mma@tinyerp.com-20121012051742-ds6ve0vsa08zzc3v
2012-10-12 10:47:42 +05:30
pankita shah (Open ERP) 935314ea26 [IMP] move type of defaults in sale. and increase the priority of the product tree view defined in hr_epense.
bzr revid: shp@tinyerp.com-20121012051640-4i0eyltyuvpq57vc
2012-10-12 10:46:40 +05:30
Mayur Maheshwari (OpenERP) 4cd1892a72 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121012050950-6equxe83zfxlynpg
2012-10-12 10:39:50 +05:30
Launchpad Translations on behalf of openerp 53e6a97f33 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121012050942-nfure19k43lzib3e
2012-10-12 05:09:42 +00:00
Divyesh Makwana (Open ERP) 1cd25702a0 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121012050705-3mjloiqkfgz6q8jr
2012-10-12 10:37:05 +05:30
Mayur Maheshwari (OpenERP) ec271479fa [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121012050513-9pogrlr28f130jsf
2012-10-12 10:35:13 +05:30
Mayur Maheshwari (OpenERP) 646914c12d [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121012050224-w5qgi0uan9phcgyc
2012-10-12 10:32:24 +05:30