Commit Graph
70704 Commits
Author SHA1 Message Date
Harry (OpenERP) f8a53f979c [MERGE]
bzr revid: hmo@tinyerp.com-20121128062514-23mom0yb4199rmhx
2012-11-28 11:55:14 +05:30
Harry (OpenERP) 164449edc4 [MERGE]
bzr revid: hmo@tinyerp.com-20121128062336-2n50t2242a9fbpbk
2012-11-28 11:53:36 +05:30
Amit Dodiya (OpenERP) e9cb8f9a6f [FIX]warning: In warning module onchange_partner_id has some re assignation of values
lp bug: https://launchpad.net/bugs/920530 fixed

bzr revid: mma@tinyerp.com-20121128061754-bkccr0wdts8jygr0
2012-11-28 11:47:54 +05:30
Khushboo Bhatt (Open ERP) 2a5e4e9308 [IMP]improve code
bzr revid: kbh@tinyerp.com-20121128055337-0s5cz2gkaou7unj0
2012-11-28 11:23:37 +05:30
Khushboo Bhatt (Open ERP) 3f626523ac [IMP]improve code for merge lead/opportunity message
bzr revid: kbh@tinyerp.com-20121128053658-kiosagyvz7s78x4s
2012-11-28 11:06:58 +05:30
Tejas Tank 81a2e23dd6 [FIX] clean the code.
bzr revid: tta@openerp.com-20121128053540-01z3yiooq83foyew
2012-11-28 11:05:40 +05:30
Randhir Mayatra (OpenERP) f967d0282f [MERGE] merge with parent
bzr revid: rma@tinyerp.com-20121128052007-0zbqsgxa5ut0iict
2012-11-28 10:50:07 +05:30
Divyesh Makwana (Open ERP) 08eb7c44cc [IMP] project_timesheet : Hide the Contracts to Renew from the project/user.
bzr revid: mdi@tinyerp.com-20121128051659-r3b2x7fngn5bai4x
2012-11-28 10:46:59 +05:30
Khushboo Bhatt (Open ERP) 1ed7f35860 [MERGE]merge with trunk
bzr revid: kbh@tinyerp.com-20121128051612-ikk4lsa9v0jh76kb
2012-11-28 10:46:12 +05:30
Sanjay Gohel (Open ERP) c5fe07802e [IMP]improve code
bzr revid: sgo@tinyerp.com-20121128051414-el91llx1d1i4i565
2012-11-28 10:44:14 +05:30
Randhir Mayatra (OpenERP) 6c1fd54347 [MERGE] merge with parent
bzr revid: rma@tinyerp.com-20121128051306-zjgjro0yjwjbgzmz
2012-11-28 10:43:06 +05:30
Randhir Mayatra (OpenERP) a913fa634d [MERGE] merge with parent
bzr revid: rma@tinyerp.com-20121128050912-0a81b3iq00jpl5hu
2012-11-28 10:39:12 +05:30
Randhir Mayatra (OpenERP) 02ac3a71f4 [MERGE] merge with parent
bzr revid: rma@tinyerp.com-20121128050843-2rf4nu1rjvlkrap4
2012-11-28 10:38:43 +05:30
Khushboo Bhatt (Open ERP) 5781ff89fa [MERGE]merge with trunk
bzr revid: kbh@tinyerp.com-20121128050816-c905s2qqccux5v1z
2012-11-28 10:38:16 +05:30
Khushboo Bhatt (Open ERP) 88c715485c [MERGE]merge with trunk
bzr revid: kbh@tinyerp.com-20121128050621-n5whn4pnyi7q79kk
2012-11-28 10:36:21 +05:30
Launchpad Translations on behalf of openerp 09eccd07dc Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121128044150-jz3ll5wdeuxmt0uq
bzr revid: launchpad_translations_on_behalf_of_openerp-20121128045740-q3cav2rhekdy6gq8
2012-11-28 04:57:40 +00:00
Sanjay Gohel (Open ERP) 069d2878d3 [MERGE]merge with trunk
bzr revid: sgo@tinyerp.com-20121128045539-fgmakwnhizu321rv
2012-11-28 10:25:39 +05:30
Nimesh (Open ERP) e957a933cb [MERGE] with lp:openobject-addons
bzr revid: nco@tinyerp.com-20121128044958-72vkd6tb3snbmgr3
2012-11-28 10:19:58 +05:30
Launchpad Translations on behalf of openerp 3c92e1f62b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121128044032-avm584dzac8w8wf3
2012-11-28 04:40:32 +00:00
Divyesh Makwana (Open ERP) 39c47913a8 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121128042501-z1xmyu5mmown0ac0
2012-11-28 09:55:01 +05:30
Divyesh Makwana (Open ERP) c56c35f9b0 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121128042311-283p5q84yyum4nkb
2012-11-28 09:53:11 +05:30
Divyesh Makwana (Open ERP) 6b13002e04 [Merge] Merge with main server.
bzr revid: mdi@tinyerp.com-20121128042307-b2ukazq07mdzgp02
2012-11-28 09:53:07 +05:30
Divyesh Makwana (Open ERP) 91b19d1a7c [Merge] Merge with trunk.
bzr revid: mdi@tinyerp.com-20121128042303-eu3ttdp9nvt99o2k
2012-11-28 09:53:03 +05:30
Antony Lesuisse eb4d14cd86 [IMP] auth_signup remove all css, better wording, auth_oauth align button better wording
bzr revid: al@openerp.com-20121128001449-jy86hb86eyv0milv
2012-11-28 01:14:49 +01:00
Antony Lesuisse f63bdc67e2 [FIX] Login button left for better looking signup and oauth integration
bzr revid: al@openerp.com-20121127235942-oudu8auo2f9ctulo
2012-11-28 00:59:42 +01:00
Antony Lesuisse db26909b8a [MERGE] signup with oauth by rco
bzr revid: al@openerp.com-20121127234543-apz9ddxzp3vntorj
2012-11-28 00:45:43 +01:00
Fabien Pinckaers 432715b184 [IMP] category -> tag
bzr revid: fp@openerp.com-20121127221111-vbguuof91pjri4nr
2012-11-27 23:11:11 +01:00
Fabien Pinckaers 854284b6af [MERGE] fgi improve
bzr revid: fp@openerp.com-20121127215908-q5yt8nwna6gmdu88
2012-11-27 22:59:08 +01:00
Fabien Pinckaers fdabe41ed7 [IMP] Hidden -> Technical Settings
bzr revid: fp@openerp.com-20121127212707-evwe56zhgie621mt
2012-11-27 22:27:07 +01:00
Fabien Pinckaers 10afab6eb6 [MERGE] addons 24
bzr revid: fp@openerp.com-20121127212322-soubdlrcgqx4cz88
2012-11-27 22:23:22 +01:00
Fabien Pinckaers d5d270e9a3 [IMP] ir.rule better filters
bzr revid: fp@openerp.com-20121127210609-zp7c3c071mwunqx3
2012-11-27 22:06:09 +01:00
Thibault Delavallée 2fcaf2252c [IMP] mail_message model: now uses _auto_join.
bzr revid: tde@openerp.com-20121127181138-1mdebb6ehal2r973
2012-11-27 19:11:38 +01:00
Atul Patel (OpenERP) 9cade6e471 [MERGE]: Merged regarding product usability issue.
bzr revid: atp@tinyerp.com-20121127173127-gbwl7i71q86uqtgk
2012-11-27 23:01:27 +05:30
niv-openerp 60b5420094 Made the users nice
bzr revid: nicolas.vanhoren@openerp.com-20121127172248-l737z0vebm9c3y0g
2012-11-27 18:22:48 +01:00
Josse Colpaert b86902814d [IMP] Adding Python tests
bzr revid: jco@openerp.com-20121127171141-kqqvyvvdcrd2vrq2
2012-11-27 18:11:41 +01:00
Thibault Delavallée 9b196638cb [IMP] expression: replaced field paths now use an alias.field leaf style to prepare the inclusion of joins. In leaf_to_sql, handle this case accordingly.
bzr revid: tde@openerp.com-20121127170117-qlhfs0r1ned5uz3c
2012-11-27 18:01:17 +01:00
Antonin Bourguignon 26492d98d5 [IMP] properly cycle through the salesmen (round-robin) while converting leads into opps with salesmen assignation
bzr revid: abo@openerp.com-20121127165401-s8fgs553gr2amj3u
2012-11-27 17:54:01 +01:00
Josse Colpaert f41866a703 [IMP] Adding Python tests
bzr revid: jco@openerp.com-20121127165317-v5rmrw5wvx6yykyr
2012-11-27 17:53:17 +01:00
Antonin Bourguignon 34aa66449c [IMP] indentation
bzr revid: abo@openerp.com-20121127164940-g31ywi5abnfslyfl
2012-11-27 17:49:40 +01:00
Xavier Morel e705fccdfc [FIX] edi: remove eval_context ref, fix clean_action call
bzr revid: xmo@openerp.com-20121127164801-dbzgsz67u94yux4g
2012-11-27 17:48:01 +01:00
Xavier Morel 06122bce12 [FIX] base_import: eval_context ref
bzr revid: xmo@openerp.com-20121127164543-xizox8d20e93lx21
2012-11-27 17:45:43 +01:00
Thibault Delavallée 873d6cd5b1 [CLEAN] expression.py: self.__exp -> self.exp, because too much underscores kill my eyes. Added a bit of comments. Please note that the behavior has still not changed.
bzr revid: tde@openerp.com-20121127164531-hbsyhshmefdw0f93
2012-11-27 17:45:31 +01:00
niv-openerp 39ed7b144d Fixed problem with button.
bzr revid: nicolas.vanhoren@openerp.com-20121127164432-jeo0us54m99etzij
2012-11-27 17:44:32 +01:00
niv-openerp e7067407dd Improved design of button and search
bzr revid: nicolas.vanhoren@openerp.com-20121127164341-ilp6wgetkr9lbdv3
2012-11-27 17:43:41 +01:00
Thibault Delavallée 07f26441bb [IMP] expression.parse: improved code about extracting inherits\'d fields. I do not like while True statements, I prefer having a clear condition. Behavior should still be the same as before.
bzr revid: tde@openerp.com-20121127163758-tddhbglygcbkvzed
2012-11-27 17:37:58 +01:00
Thibault Delavallée 48138c9d26 [IMP] [DOC] expression.py: renamed field_obj to relational_table, that make more sens to me. Added comments in the code to understand the algorithm. Please note that currently, no logic has been altered.
bzr revid: tde@openerp.com-20121127163014-5ww5mre6j7opmzp1
2012-11-27 17:30:14 +01:00
Xavier Morel 6a3b91e6d5 [FIX] web_shortcuts: remove server-side eval, move all logic to js
bzr revid: xmo@openerp.com-20121127161913-46ita3emgjan7diu
2012-11-27 17:19:13 +01:00
Thibault Delavallée 53efed664d [IMP] expression.py: _leaf_to_sql now uses a table_alias instead of table._table for query generation. Currently table_alias equals table._table, so the behavior has not changed.
bzr revid: tde@openerp.com-20121127161354-fskwsmfvx3j8nto6
2012-11-27 17:13:54 +01:00
Thibault Delavallée 8163c0027b [IMP] [TEST] orm: updated order_by generation by adding the root table name to the order by condition generated based on self._order. Added a mockup of where_calc in test_expression, to be able to track generated Query objects. Added a first test on a one2many query, to track current behavior.
bzr revid: tde@openerp.com-20121127160627-qs1tupvgr8ypexoo
2012-11-27 17:06:27 +01:00
niv-openerp 5a57546a1c better algo for moves
bzr revid: nicolas.vanhoren@openerp.com-20121127155725-ee18sox7pfjz0xxo
2012-11-27 16:57:25 +01:00