Harry (OpenERP)
b965b2cba2
[MERGE]
...
bzr revid: hmo@tinyerp.com-20120813064510-zrzqw8657t2k6y26
2012-08-13 12:15:10 +05:30
Jigar Amin - OpenERP
954484f96a
[MERGE] lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20120813062321-jkut9gtnnkdhshos
2012-08-13 11:53:21 +05:30
Meera Trambadia
5349f0ec20
[MERGE] with lp:openobject-addons
...
bzr revid: mtr@tinyerp.com-20120813061514-57qe2sg7tmjzg16j
2012-08-13 11:45:14 +05:30
Jigar Amin - OpenERP
260e25084d
[MERGE] lp:openobject-server
...
bzr revid: jam@tinyerp.com-20120713052010-k228m3a5c1zp9gkt
bzr revid: jam@tinyerp.com-20120806065347-w01ssqrxmkyyi7rv
bzr revid: jam@tinyerp.com-20120813060540-4bqbg9ntx0un8qe6
2012-08-13 11:35:40 +05:30
Khushboo Bhatt (Open ERP)
49fe09c1a0
[MERGE]merge with project branch
...
bzr revid: kbh@tinyerp.com-20120813055945-a6joj20xz8dikyt2
2012-08-13 11:29:45 +05:30
f71e64b4cd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120811055952-typ7197zyc2v5scp
bzr revid: launchpad_translations_on_behalf_of_openerp-20120812045640-zto7bzgboyhpb7cr
bzr revid: launchpad_translations_on_behalf_of_openerp-20120813055320-1dinuvvl8tfr9b2p
2012-08-13 05:53:20 +00:00
Mustufa Rangwala (OpenERP)
6fb5055992
[MERGE] l10n_in_hr_payroll: Improve report of head wise salary of employee
...
bzr revid: mra@tinyerp.com-20120813054230-pvq4vzh0jr338q4u
2012-08-13 11:12:30 +05:30
2d10577000
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120813052537-ans6r1oi6i0xrzyy
2012-08-13 05:25:37 +00:00
Atul Patel (OpenERP)
7a1a9460d9
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120813051748-klau4w0nig2apfxb
2012-08-13 10:47:48 +05:30
Rucha (Open ERP)
dd7a2972d8
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5
2012-08-13 10:44:11 +05:30
Rucha (Open ERP)
2aacbb3566
[MERGE]: Merge with latest trunk-server
...
bzr revid: rpa@tinyerp.com-20120813051138-ik70jclmgu1pexxn
2012-08-13 10:41:38 +05:30
Mustufa Rangwala (OpenERP)
952bf3001d
[MERGE] Merge from main addons
...
bzr revid: mra@tinyerp.com-20120813050523-wgxqhbptiy0v75eq
2012-08-13 10:35:23 +05:30
Atul Patel (OpenERP)
0135a1f08b
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120813044845-b26ju3ux5yn4y0ij
2012-08-13 10:18:45 +05:30
Antony Lesuisse
d946d35ee0
oauth wip
...
bzr revid: al@openerp.com-20120813000149-lslqyhszzz8axhrv
2012-08-13 02:01:49 +02:00
Antony Lesuisse
7ff74cc4b1
oauth wip
...
bzr revid: al@openerp.com-20120812232612-9cib8w333no9hg3d
2012-08-13 01:26:12 +02:00
Antony Lesuisse
2a7d95ac75
[IMP] load all modules at boot in single db mode
...
bzr revid: al@openerp.com-20120812222901-tjz9443oylidd7sy
2012-08-13 00:29:01 +02:00
Antony Lesuisse
1d0c2968ce
[FIX] standalone client
...
bzr revid: al@openerp.com-20120812215517-qxqnd1fvc9hcxezh
2012-08-12 23:55:17 +02:00
Antony Lesuisse
aa93e7186d
[IMP] web controller helpers
...
- move helpers on top
- move some code from controllers to helpers
- deprecate module dependecy processing in standalone client
bzr revid: al@openerp.com-20120812214827-m1wrv7y1jvnro9ew
2012-08-12 23:48:27 +02:00
Antony Lesuisse
9e43be663b
[MERGE] trunk
...
bzr revid: al@openerp.com-20120812174337-wcnind98b8uvypf5
2012-08-12 19:43:37 +02:00
Antony Lesuisse
4dc0440cb1
wip options
...
bzr revid: al@openerp.com-20120812174306-p47bfuzo2r030r3t
2012-08-12 19:43:06 +02:00
Antony Lesuisse
875d7541d9
sign up with controller
...
bzr revid: al@openerp.com-20120812170603-mnp54q5xn9htg6vj
2012-08-12 19:06:03 +02:00
Antony Lesuisse
6a78b5dbd9
[FIX] authenticate optional env
...
bzr revid: al@openerp.com-20120812151532-gqt8dcqo6f5t2szb
2012-08-12 17:15:32 +02:00
dd84bffaa8
[MERGE] Latest trunk
...
bzr revid: vta@openerp.com-20120812150835-zv2f1r9bdf9c406u
2012-08-12 17:08:35 +02:00
d0ff623729
[ADD] Basic functionality.
...
bzr revid: vta@openerp.com-20120812150739-nrdwvxmnnnw8yr54
2012-08-12 17:07:39 +02:00
Antony Lesuisse
9211174a6f
[MERGE] document_page aka wiki
...
it still uses the wiki syntax, switch to full html will occur after the
autosizing of cleditor
bzr revid: al@openerp.com-20120812144730-nxgxz8c77afczfr9
2012-08-12 16:47:30 +02:00
Antony Lesuisse
0de43d05c2
fix config wizard
...
bzr revid: al@openerp.com-20120812135319-bcwu9blrd71wepig
2012-08-12 15:53:19 +02:00
Antony Lesuisse
d9624f3e76
[FIX] database manager languages
...
bzr revid: al@openerp.com-20120812134857-yfdwxbszmm8o6q7q
2012-08-12 15:48:57 +02:00
Antony Lesuisse
ecbc9a4446
fix config wizard
...
bzr revid: al@openerp.com-20120812130527-6ffgm7vxjbm2vlft
2012-08-12 15:05:27 +02:00
Antony Lesuisse
d7fc09e8ab
fix config wizard
...
bzr revid: al@openerp.com-20120811234327-5dy2khgh7ldiqvnr
2012-08-12 01:43:27 +02:00
Antony Lesuisse
86fac976de
[MERGE] database manager look
...
bzr revid: al@openerp.com-20120811214809-uhj4hatw5bmi5710
2012-08-11 23:48:09 +02:00
Antony Lesuisse
e1bc12fb27
[MERGE] preference change password fixe
...
bzr revid: al@openerp.com-20120811195354-sayk1u53wy42vqc1
2012-08-11 21:53:54 +02:00
Antony Lesuisse
ddfd83d9ff
fixes test
...
bzr revid: al@openerp.com-20120811185610-o95wfdvtwfg4f4g6
2012-08-11 20:56:10 +02:00
Antony Lesuisse
d2a01d78a4
fixes css, demo, js
...
bzr revid: al@openerp.com-20120811183444-0wwagnum2tm964i6
2012-08-11 20:34:44 +02:00
Antony Lesuisse
2d2cb0b80b
[IMP] act_window allow target inlineview
...
bzr revid: al@openerp.com-20120811182250-c37jbjbh944zzy5m
2012-08-11 20:22:50 +02:00
Antony Lesuisse
683edea774
[IMP] inlineview and minor cleanups
...
bzr revid: al@openerp.com-20120811175852-kde116e50scn9ugs
2012-08-11 19:58:52 +02:00
Fabien Pinckaers
9bc2064028
[FIX] PoS import order from UI, return money
...
bzr revid: fp@openerp.com-20120811143309-pd44zfw6l67j7x7l
2012-08-11 16:33:09 +02:00
Fabien Pinckaers
c17b2443e7
[IMP] improved UI for PoS - mainly forms version=7.0
...
bzr revid: fp@openerp.com-20120811133406-jvso3qhmozmgnj3j
2012-08-11 15:34:06 +02:00
Fabien Pinckaers
c5c7ed79e3
[IMP] better menu tips and todo wizards
...
bzr revid: fp@openerp.com-20120811100322-jeh50k4c4wnbpmom
2012-08-11 12:03:22 +02:00
d402784c74
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120811054547-ebfnq6hteui8geba
bzr revid: launchpad_translations_on_behalf_of_openerp-20120811054607-chyn98m3ivp16qg3
2012-08-11 05:46:07 +00:00
Antony Lesuisse
d8e8f22b3f
fix css
...
bzr revid: al@openerp.com-20120810233534-dqcuim7ip990gj6c
2012-08-11 01:35:34 +02:00
Antony Lesuisse
1f4d92ba8b
fix index
...
bzr revid: al@openerp.com-20120810231307-w9rgwiaybhm1gdyk
2012-08-11 01:13:07 +02:00
Antony Lesuisse
e991f474c3
[MERGE] trunk
...
bzr revid: al@openerp.com-20120810225211-0t3wn5b6u1pdosay
2012-08-11 00:52:11 +02:00
Antony Lesuisse
4e4a7dcbee
document_page ready
...
bzr revid: al@openerp.com-20120810225046-qs3liea2s76lh6v0
2012-08-11 00:50:46 +02:00
Thibault Delavallée
1d00613511
[IMP] mail.thread: res.users: messages appened to res.users are attached to the related partner.
...
bzr revid: tde@openerp.com-20120810155754-c7towsarcawxe1le
2012-08-10 17:57:54 +02:00
Thibault Delavallée
69e00d1e34
[IMP] res.users: default form view is now partner form view. This is done directly in fields_view_get: if no specific id is given, we call the default partner view.
...
bzr revid: tde@openerp.com-20120810155732-zvnr2xb3b0urc8h2
2012-08-10 17:57:32 +02:00
Antonin Bourguignon
a7e21b572f
[MERGE] add options='{"no_open": true} on some fields
...
with this modification, users won't be able to open countries or languages form views anymore, which didn't really make sense
bzr revid: abo@openerp.com-20120810155318-kav9xl5o3pwojz9g
2012-08-10 17:53:18 +02:00
Antonin Bourguignon
c1159a0219
[MERGE] add options='{"no_open": true} on some fields
...
with this modification, users won't be able to open countries or languages form views anymore, which didn't really make sense
also fix indentation in crm/crm_lead_view.xml
bzr revid: abo@openerp.com-20120810155255-2x1maqcoenok6dsv
2012-08-10 17:52:55 +02:00
Antonin Bourguignon
b032b662c0
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120810154007-n5x8zxxlxw5mw6c8
2012-08-10 17:40:07 +02:00
Antonin Bourguignon
72fdeea2d8
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120810153957-asszi74t9dxrzhx7
2012-08-10 17:39:57 +02:00
Quentin (OpenERP)
8b47fc9a32
[MERGE] branch with improvements of refunds handling in account_voucher + whipping of some dead code (in account_voucher too)
...
bzr revid: qdp-launchpad@openerp.com-20120810152331-h837mhhvdq8x0j1y
2012-08-10 17:23:31 +02:00
Harry (OpenERP)