Commit Graph
55622 Commits
Author SHA1 Message Date
Thibault Delavallée 5132619e76 [MERGE] Fix of the customer portal wizard. Override of schedule_with_attach was wrong: 1-behavior specific to purchase.order was always executed; it is now ecexuted only for purchase.order objects, and the method checks that model and res_id are set; 2-subtype field was wrong, it is now named content_subtype.
bzr revid: tde@openerp.com-20120806122835-fxzgmhogbh6do8bz
2012-08-06 14:28:35 +02:00
vta vta@openerp.com 22b25ce40b [MERGE] Latest trunk.
bzr revid: vta@openerp.com-20120806122324-scngm3qpi7qfblvm
2012-08-06 14:23:24 +02:00
vta vta@openerp.com 9d15842745 [ADD] Added some imgs to draw the stagesbar accordingly to the new design, very awful (just for testing)).
bzr revid: vta@openerp.com-20120806122150-sqq650v7vmvy34i6
2012-08-06 14:21:50 +02:00
Pinakin Nayi (OpenERP) 3aab9f4f56 [IMP]accounting-option-wizard
bzr revid: pna@tinyerp.com-20120806121722-w2r8givb32dl0mn3
2012-08-06 17:47:22 +05:30
Thibault Delavallée 57b5b87215 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120806115018-jmhfqmw5vikjb3ow
2012-08-06 13:50:18 +02:00
Mayur Maheshwari (OpenERP) 485dbf6c6d [FIX]all :set a no_open widget in this filed(country_id,state_id,user_id)
bzr revid: mma@tinyerp.com-20120806114314-m3133wnd5wph2aqm
2012-08-06 17:13:14 +05:30
Jigar Amin - OpenERP 193ea9bcb7 merge lp:~openerp-dev/openobject-server/trunk-sloppy-rng-jam-base-tch
bzr revid: jam@tinyerp.com-20120806111908-fep93k1960300925
2012-08-06 16:49:08 +05:30
Twinkle Christian (OpenERP) b5545b5198 [FIX] Removed unnecessary file
bzr revid: tch@tinyerp.com-20120806111454-fslhhcsjfmhe5a4u
2012-08-06 16:44:54 +05:30
Twinkle Christian (OpenERP) 3362a202c0 [IMP]Improve view
bzr revid: tch@tinyerp.com-20120806110947-m08td4hle8zdolno
2012-08-06 16:39:47 +05:30
Mayur Maheshwari (OpenERP) 7c51b1811d [FIX]all :set a no_open widget in this filed(country_id,state_id,title,context_id,timebox_id,user_id)
bzr revid: mma@tinyerp.com-20120806110307-nj7qipixr14puhub
2012-08-06 16:33:07 +05:30
Stephane Wirtel 3155c9b075 [MERGE] lp:~openerp-dev/openobject-addons/trunk-addons-issues3-account-pso
bzr revid: stw@openerp.com-20120806110035-mkegg0b6x5oom1mr
2012-08-06 13:00:35 +02:00
Twinkle Christian (OpenERP) 6ae59edf60 [IMP]Improved views
bzr revid: tch@tinyerp.com-20120806105801-r5h3ypkkxwebq7pr
2012-08-06 16:28:01 +05:30
Thibault Delavallée b0d95be968 [FIX] subtype -> content_subtype.
bzr revid: tde@openerp.com-20120806105138-ipcsz8yscof5eg0f
2012-08-06 12:51:38 +02:00
Twinkle Christian (OpenERP) 6fad1f239f merge bzr+ssh://bazaar.launchpad.net/~openerp-dev/openobject-server/trunk-sloppy-rng-jam
bzr revid: tch@tinyerp.com-20120806104628-5gs73b3hp3rekmji
2012-08-06 16:16:28 +05:30
Antony Lesuisse 67a9ddd3f8 [REM] fields float integer useless warning, required can be used to color the field in blue on form view
bzr revid: al@openerp.com-20120806104514-3cx1dm2bewhmlvbo
2012-08-06 12:45:14 +02:00
Twinkle Christian (OpenERP) 3d16cbb9a5 [IMP]improvr viewa in base
bzr revid: tch@tinyerp.com-20120806104213-3xmv2tzk85ilstef
2012-08-06 16:12:13 +05:30
pso (OpenERP) 3bbe3ddbd5 Improvements
bzr revid: pso@tinyerp.com-20120806104204-yd7mqqttglgaer8h
2012-08-06 16:12:04 +05:30
Jigar Amin - OpenERP 0632619b27 merge lp:~openerp-dev/openobject-server/trunk-sloppy-rng-vmt
bzr revid: jam@tinyerp.com-20120806103914-2wz2xsxeu2vhrfy6
2012-08-06 16:09:14 +05:30
Jigar Amin - OpenERP 6c48585a91 [FIX] impoved the message
bzr revid: jam@tinyerp.com-20120806103631-tzmpq4g48urbic5l
2012-08-06 16:06:31 +05:30
Fabien Meghazi 8cecaa14f3 [ADD] Added 'home' and 'history_back' client actions
[MOV] Moved client actions from coresetup.js to chrome.js

bzr revid: fme@openerp.com-20120806103330-xt5gjcntaho4qq7k
2012-08-06 12:33:30 +02:00
Fabien Meghazi b950d2c785 [FIX] Fixed breadcrumb's history_back
bzr revid: fme@openerp.com-20120806103242-p3mhze2rgmmwchdx
2012-08-06 12:32:42 +02:00
Olivier Dony 985263519e [FIX] hr_recruitment: cleanup mail alias creation
bzr revid: odo@openerp.com-20120806102854-u31ig9kxxm76d53v
2012-08-06 12:28:54 +02:00
Vo Minh Thu 66d054471c [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120806102630-psx2mywo3w5da81i
2012-08-06 12:26:30 +02:00
Thibault Delavallée 4c2a3f4969 [FIX] purchase_requisition: fixed mail.message inheritance, where behavior specific to this module was executed for every composed message.
bzr revid: tde@openerp.com-20120806102431-2vw87hw656kss0q0
2012-08-06 12:24:31 +02:00
niv-openerp 873b491359 wip
bzr revid: nicolas.vanhoren@openerp.com-20120806100730-jnsx4mx6o9ykdz2y
2012-08-06 12:07:30 +02:00
Jigar Amin - OpenERP 3614cc9aaa [FIX] fixed the predicated for tree view must have string and field and button attrib only
bzr revid: jam@tinyerp.com-20120806095854-6vwpgzjqtc0qwn5b
2012-08-06 15:28:54 +05:30
Christophe Simonis 6f2582afd8 merge upstream
bzr revid: chs@openerp.com-20120806094842-n6343neiod65gwa2
2012-08-06 11:48:42 +02:00
Christophe Simonis 5b960994db [REM] remove empty modules
bzr revid: chs@openerp.com-20120806094757-0gnaf0j3xwdfut6v
2012-08-06 11:47:57 +02:00
pso (OpenERP) 389f8d6803 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120806094234-1b145yrjixy5yrsg
2012-08-06 15:12:34 +05:30
Vo Minh Thu be06e66caa [IMP] xml validation: added logging for invalid input.
bzr revid: vmt@openerp.com-20120806091852-yftb14cw1mrvc3hu
2012-08-06 11:18:52 +02:00
Fabien Meghazi 6510cdb047 [ADD] Added breadcrumb history_back. Fix create/discard
bzr revid: fme@openerp.com-20120806091609-1klmk7gwreumwszg
2012-08-06 11:16:09 +02:00
Vo Minh Thu 4a8668589a [IMP] xml validation: white spaces.
bzr revid: vmt@openerp.com-20120806091144-t5jjnbnyqu6sk8wf
2012-08-06 11:11:44 +02:00
Vo Minh Thu b00e6af86c [FIX] xml validation: removed duplicated tests.
bzr revid: vmt@openerp.com-20120806091008-b4ve91aholkm67l4
2012-08-06 11:10:08 +02:00
Rucha (Open ERP) 70ce4530ce [IMP]: crm: Improved section in lead demo
bzr revid: rpa@tinyerp.com-20120806090859-73z86bhmdxa50g86
2012-08-06 14:38:59 +05:30
Christophe Simonis 7405345d62 merge upstream
bzr revid: chs@openerp.com-20120806090843-h0m53tbfiu146afe
2012-08-06 11:08:43 +02:00
Xavier Morel 44b662b5bb [IMP] merge group count into group title in grouped list, as requested by al
bzr revid: xmo@openerp.com-20120806080846-w4r7t84gbpf9o47o
2012-08-06 10:08:46 +02:00
Xavier Morel ff801ce499 [FIX] trailing comma in array literal (creates 'undefined' element in some browsers e.g. IE8)
bzr revid: xmo@openerp.com-20120806075822-az334r7zqf0fljpv
2012-08-06 09:58:22 +02:00
Stephane Wirtel 2f4d4320e2 [MERGE]
bzr revid: stw@openerp.com-20120806075624-ukz8lrnp1li67zft
2012-08-06 09:56:24 +02:00
Xavier Morel 2fc0ac8ce3 [FIX] placeholder styling for webkit and firefox, to better differentiate between placeholder text and actual data
also use existing sass variable for all instances of #afafb6

bzr revid: xmo@openerp.com-20120806073620-tza9gggwter1ud30
2012-08-06 09:36:20 +02:00
Xavier Morel df53003aea [FIX] unbound variable usage, courtesy of xal
also use $.ui.keyCode rather than hardocded key code, and normalized attribute e.which

bzr revid: xmo@openerp.com-20120806072732-fprp6l8zv1yexk3d
2012-08-06 09:27:32 +02:00
Xavier Morel 76f885299f [IMP] code style improvements
* Remove unused variables
* Simplify dict.get call in conditionals (default is None)
* Simplify dict.update calls (use kwargs)
* Merge dict.copy() with dict.update() as dict()
* Use isinstance instead of type() equality tests
* Simplify deeply nested code: merge conditionals and remove useless
  conditional, use dict.iteritems()
* Log traceback in exception handler logging

bzr revid: xmo@openerp.com-20120806071249-heh32pi1v0qd3m2j
2012-08-06 09:12:49 +02:00
Saurang Suthar (OpenERP) b8e21e9799 [IMP] base_calendar: Improved meeting view
bzr revid: pso@tinyerp.com-20120806063102-vt359ei5ez33djmc
2012-08-06 12:01:02 +05:30
Purnendu Singh (OpenERP) 2bbdc47dc8 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120806061113-1ck1nrda2sdq06im
2012-08-06 11:41:13 +05:30
Purnendu Singh (OpenERP) bbf4bfe78c [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120806060602-ph2s5sx6tebomcs3
2012-08-06 11:36:02 +05:30
pso (OpenERP) c7581d70ac [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120806055519-5mtg1amkn6qeeqq3
2012-08-06 11:25:19 +05:30
Bharat Devnani (Open ERP) d6f1cdbe5c [IMP] crm: Added default true in schedule call object
bzr revid: pso@tinyerp.com-20120806055213-s2aa2mvntbzdazc8
2012-08-06 11:22:13 +05:30
Pinakin Nayi(OpenERP) a343339149 [IMP] project: Improved task view
bzr revid: pso@tinyerp.com-20120806053615-0nv0ent4qr8wdakw
2012-08-06 11:06:15 +05:30
Ajay Chauhan (OpenERP) bd19887191 [IMP]account : remove conflicts
bzr revid: cha@tinyerp.com-20120806053447-shfvzo9i26xmalx1
2012-08-06 11:04:47 +05:30
Ajay Chauhan (OpenERP) fe54bc7b88 [Merge] Merge with main addons.
bzr revid: cha@tinyerp.com-20120806052353-8tp9p3bbood6b8pj
2012-08-06 10:53:53 +05:30
Ajay Chauhan (OpenERP) c0e417b505 [Merge] Merge with main server.
bzr revid: cha@tinyerp.com-20120806051725-i2g57astkro2udfn
2012-08-06 10:47:25 +05:30