Commit Graph
58809 Commits
Author SHA1 Message Date
Harry (OpenERP) 927e3abe2b [MERGE]
bzr revid: hmo@tinyerp.com-20120907114436-9qw3gakx3fmn9xwy
2012-09-07 17:14:36 +05:30
Harry (OpenERP) ba8901928a [IMP] google_base_account: refacor
bzr revid: hmo@tinyerp.com-20120907113750-pwhxhhil3p5r5u82
2012-09-07 17:07:50 +05:30
Ajay Chauhan (OpenERP) e89e8c75c0 [IMP] sale: added function field & did some other changes
bzr revid: cha@tinyerp.com-20120907112834-affnrfgzjc3hsnu1
2012-09-07 16:58:34 +05:30
Amit Patel (OpenERP) 60bbe365ec [IMP]:typo
bzr revid: apa@tinyerp.com-20120907112745-w5usrzo3lrtqeglv
2012-09-07 16:57:45 +05:30
Harry (OpenERP) 9ae32955a4 [MERGE]
bzr revid: hmo@tinyerp.com-20120907112429-c75gre4x6ovvqd3d
2012-09-07 16:54:29 +05:30
Turkesh Patel (Open ERP) 7475938ec4 [IMP] remove warnings from document_page.
bzr revid: tpa@tinyerp.com-20120907112025-zv1sfm60ry7lojth
2012-09-07 16:50:25 +05:30
Harry (OpenERP) ee061a25f1 [MERGE]
bzr revid: hmo@tinyerp.com-20120907110205-d3v9c7lc9kcd8g5c
2012-09-07 16:32:05 +05:30
Turkesh Patel (Open ERP) a02f31c34c [IMP] crm: improved yml test case to sen mail.
bzr revid: tpa@tinyerp.com-20120907105543-jfxuqmnjckvmi4wx
2012-09-07 16:25:43 +05:30
Raphael Collet 3b3279c77e [FIX] orm: adapt tests of method resolve_2many_commands
bzr revid: rco@openerp.com-20120907104448-9b9aeenmqz5m5du2
2012-09-07 12:44:48 +02:00
Harry (OpenERP) b2dcd27b18 [MERGE]
bzr revid: hmo@tinyerp.com-20120907104042-g3yeh0wdht6wea8q
2012-09-07 16:10:42 +05:30
Turkesh Patel (Open ERP) 024506b63b [IMP] project_issue: improved yml test case.
bzr revid: tpa@tinyerp.com-20120907101907-xi9vxrns0zdid6wf
2012-09-07 15:49:07 +05:30
Raphael Collet 1a6aaed52a [IMP] res_company: make report flag on bank accounts visible only from the company form
bzr revid: rco@openerp.com-20120907101707-f2jiszy90yojbihf
2012-09-07 12:17:07 +02:00
Harry (OpenERP) b39bc8ea52 [MERGE]
bzr revid: hmo@tinyerp.com-20120907100212-3h0lnywg5x3dg0x0
2012-09-07 15:32:12 +05:30
Turkesh Patel (Open ERP) 8d1b195172 [IMP] purchase_requisition: remove street,city as street,city fields does not exist in event.registration
bzr revid: tpa@tinyerp.com-20120907100050-u1lxnmbwvrh6ixg3
2012-09-07 15:30:50 +05:30
Raphael Collet 2716c0e063 [IMP] company rml template: add greyed 'produced by OpenERP' in the left margin
bzr revid: rco@openerp.com-20120907100030-1ss6k27t7vrncntb
2012-09-07 12:00:30 +02:00
Thibault Delavallée 3982e5ba7a [IMP] mail_group, point of sale, hr: updated image fields help, as small and medium sizes are now 64x64 ans 128x128, to match more closely OpenERP image sizes. product: image_medium are not up-sized when resizing them. This means that images smaller than 128x128 won't be resized in image_medium. The purpose is to avoid having unwanted blank frame around images in POS.
bzr revid: tde@openerp.com-20120907095155-i5hlmidnkq7r2r7b
2012-09-07 11:51:55 +02:00
Thibault Delavallée 02c14543da [IMP] tools: image: added the option to choose whether to upsize or not images when resizing them. Also cleaned a bit the comments and overall code. small and medium images are nos 64x64 ans 128x128, to be closer to iamge sized used through OpenERP.
bzr revid: tde@openerp.com-20120907094957-clozwgu5qd3jh42h
2012-09-07 11:49:57 +02:00
Raphael Collet 329b7cdcfe [FIX] res_company: fix method _get_rml_footer_by_line when rml_footer is empty
bzr revid: rco@openerp.com-20120907093643-wec8s0wvmvc68rj4
2012-09-07 11:36:43 +02:00
Turkesh Patel (Open ERP) 49b46f47a7 [IMP] purchase_requisition: remove notes as notes field removed from purchase.order.line
bzr revid: tpa@tinyerp.com-20120907093642-6v16d6qws1tghf0n
2012-09-07 15:06:42 +05:30
Raphael Collet 8c8e128d21 [FIX] orm: fix wrong method name
bzr revid: rco@openerp.com-20120907093337-jvg72kp572dj110z
2012-09-07 11:33:37 +02:00
Harry (OpenERP) 13dac299fa [REVERT] project: remove user group, long_term_planning.it's confusing. put resource_calendar_id into technical group.
bzr revid: hmo@tinyerp.com-20120907092536-i7wdp43lamq7k7tk
2012-09-07 14:55:36 +05:30
Thibault Delavallée b086b8a584 [CLEAN] mail_group, product, point_of_sale, hr: cleaned help of image, because it was too technical-related. Added a comment in code instead about PIL and base64. By the way, small cleaning of the white spaces.
bzr revid: tde@openerp.com-20120907092333-9f745210yr3p22ay
2012-09-07 11:23:33 +02:00
Thibault Delavallée 171533d8dc [IMP] res_partner: moved the avatar colorize part of the image code to tools/image.py, where it should have been placed at revs 4373-4375.
bzr revid: tde@openerp.com-20120907092206-1pgbcvt8tn23m114
2012-09-07 11:22:06 +02:00
Christophe Matthieu 481c300cc5 [IMP] note: add button and search filters on kanban view for active/inactive notes. Add note.tag. Html field on form view.
bzr revid: chm@openerp.com-20120907091708-z9x8g9tzdu6e7oad
2012-09-07 11:17:08 +02:00
Amit Patel (OpenERP) cbed185b60 [IMP]:indentation
bzr revid: apa@tinyerp.com-20120907084736-a5tctj9nnn8og1u5
2012-09-07 14:17:36 +05:30
niv-openerp 6e2b27e7a9 [MERGE] hr_attendance: removed some wizard and added widget to sign in/sign out
bzr revid: nicolas.vanhoren@openerp.com-20120907084438-bnxmscn1zt8u0aex
2012-09-07 10:44:38 +02:00
Amit Patel (OpenERP) 59aac0beb4 [IMP]:improved code
bzr revid: apa@tinyerp.com-20120907084310-nl68lqrpf7exzjls
2012-09-07 14:13:10 +05:30
Harry (OpenERP) 49e81d654a [FIX] project_issue: escalate button near project_id
bzr revid: hmo@tinyerp.com-20120907083336-94r5wefpet2787zt
2012-09-07 14:03:36 +05:30
Harry (OpenERP) 487610dc0c [FIX] project: remaining to remove after merge
bzr revid: hmo@tinyerp.com-20120907080951-uayzps33yn3632fm
2012-09-07 13:39:51 +05:30
Thibault Delavallée 8c0cf0ae9a [MERGE] Merged with server/trunk.
bzr revid: tde@openerp.com-20120907075922-kqd5q0u0couhbnas
2012-09-07 09:59:22 +02:00
Harry (OpenERP) f7d5567691 [MERGE]
bzr revid: hmo@tinyerp.com-20120907074548-jybqvq191mb96km2
2012-09-07 13:15:48 +05:30
Amit Patel (OpenERP) 5a66e9fe71 [MERGE/IMP]:portal_event:improved view and merged with trunk
bzr revid: apa@tinyerp.com-20120907073648-z4pfduxmzh6gzn11
2012-09-07 13:06:48 +05:30
Harry (OpenERP) 7bbfab7d27 [MERGE]
bzr revid: hmo@tinyerp.com-20120907073152-pjl8ln7l3vrey65g
2012-09-07 13:01:52 +05:30
Twinkle Christian (OpenERP) cbd5cff60c [MERGE]merge with project barch main branch
bzr revid: tch@tinyerp.com-20120907073038-ezgc5cpmnost9zcm
2012-09-07 13:00:38 +05:30
Antony Lesuisse 6fe350a21b [FIX] crm kanban
bzr revid: al@openerp.com-20120907072949-vt87yih1mo1voazb
2012-09-07 09:29:49 +02:00
Amit Patel (OpenERP) f4d67deeea [MERGE]:merged blocking point related hr view
bzr revid: apa@tinyerp.com-20120907071419-yw37hc1f4r3259ha
2012-09-07 12:44:19 +05:30
Harry (OpenERP) f90ee4cd4e [REVERT] crm: revert changes regarding remove option google map in sale setting
bzr revid: hmo@tinyerp.com-20120907070053-7ps2jiosimhygdct
2012-09-07 12:30:53 +05:30
Turkesh Patel (Open ERP) ac75763855 [MRG] merge with lp:openobjec-addons.
bzr revid: tpa@tinyerp.com-20120907063657-l0eve7vwo9w3jij1
2012-09-07 12:06:57 +05:30
Sanjay Gohel (Open ERP) cd025ef084 [MERGE][IMP]merge with parent branch and change in employee form view as per suggestion
bzr revid: sgo@tinyerp.com-20120907063220-2cu64hfk0rq8vwyh
2012-09-07 12:02:20 +05:30
Harry (OpenERP) c2e6900ffd [MERGE]
bzr revid: hmo@tinyerp.com-20120906154204-b4gmfv90e9i6kpdr
bzr revid: hmo@tinyerp.com-20120907062717-mmlvxs4khvwyg7sj
2012-09-07 11:57:17 +05:30
Harry (OpenERP) a423dd14c8 [MERGE]
bzr revid: hmo@tinyerp.com-20120907062123-zfxba3n2ut2vu8jl
2012-09-07 11:51:23 +05:30
Twinkle Christian (OpenERP) 8a06dd37ef [IMP]remove server warning while installing nite module
bzr revid: tch@tinyerp.com-20120907055129-d7svb2033gn5vcno
2012-09-07 11:21:29 +05:30
Amit Patel (OpenERP) 8d76935198 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20120907051457-30yc63nfla1vvwm1
2012-09-07 10:44:57 +05:30
Launchpad Translations on behalf of openerp ffc320dcc7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120907045929-grtx16xxp1c4m6rh
bzr revid: launchpad_translations_on_behalf_of_openerp-20120907050524-07x2fgbr194czqbs
2012-09-07 05:05:24 +00:00
Launchpad Translations on behalf of openerp 0f0a665c33 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120907045553-mg1y2dezmwei1mqx
2012-09-07 04:55:53 +00:00
Atul Patel (OpenERP) 07f4c3f166 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120907045501-t1z6sl9nhogfuksz
2012-09-07 10:25:01 +05:30
Divyesh Makwana (Open ERP) 1e0731ca96 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120907042141-yqyodwytx8m771vi
2012-09-07 09:51:41 +05:30
Antony Lesuisse a158707ad8 [MERGE] process view (manual merge, moved the code from web_process)
bzr revid: al@openerp.com-20120906224123-walwe4rc3x4wycsc
2012-09-07 00:41:23 +02:00
Antony Lesuisse d86d0f51b4 [FIX] ulgy grey topbar border
bzr revid: al@openerp.com-20120906215509-z6mexulridkcwgjv
2012-09-06 23:55:09 +02:00
Antony Lesuisse 1bd76b27fa [REM] process view (moved to module process)
bzr revid: al@openerp.com-20120906215448-klli6wpvce97vcb1
2012-09-06 23:54:48 +02:00