Commit Graph
81391 Commits
Author SHA1 Message Date
Stephane Wirtel fe4f647996 [MERGE] point_of_sale: Fix a problem with the buttons in the pos session object, we can close a session if we don't have a closing control
bzr revid: stw@openerp.com-20120824125443-6y4816v3pep1yuxm
2012-08-24 14:54:43 +02:00
Amit Patel (OpenERP) 5529dd17c7 [MERGE]:
bzr revid: apa@tinyerp.com-20120824125426-uxtyb4e7ngf7iucg
2012-08-24 18:24:26 +05:30
Antonin Bourguignon 7ac661a814 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120824124434-dnq8eptnttr3cnko
2012-08-24 14:44:34 +02:00
Antonin Bourguignon af60c27ea7 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120824124426-wzvo50olkspnvy5a
2012-08-24 14:44:26 +02:00
Antonin Bourguignon b24789a965 [IMP] reorganize columns
bzr revid: abo@openerp.com-20120824124334-xegqtgy4na1ytrbr
2012-08-24 14:43:34 +02:00
Quentin (OpenERP) 6f58426c10 [MERGE] lp: 1015697
bzr revid: qdp-launchpad@openerp.com-20120824124058-pvug7v1auro79w2h
2012-08-24 14:40:58 +02:00
Hardik Sanchawat (OpenERP) c53a15ef83 [IMP] Improved rate of currencies
bzr revid: pso@tinyerp.com-20120824124013-d81zzicddughxs13
2012-08-24 18:10:13 +05:30
Dharti Ratani (OpenERP) d67d8ebdd1 [FIX]Fixed for 'Procurement Method' and 'Stock and Expected Variations' section should be hide for none type product
bzr revid: dhr@tinyerp.com-20120824123826-57g7ieosoyrjvpeo
2012-08-24 18:08:26 +05:30
Antonin Bourguignon 33f03a839a [IMP] remove useless <br/> and space
bzr revid: abo@openerp.com-20120824123613-sijnk7hovy2dl4kw
2012-08-24 14:36:13 +02:00
Sanjay Gohel (Open ERP) 27010a32ec [IMP]add access rights
bzr revid: sgo@tinyerp.com-20120824123203-4kmu02cyehbqd48v
2012-08-24 18:02:03 +05:30
Thibault Delavallée fb76f9f037 [IMP] [FIX] crm_partner_assign: as it inherits from mail.compose.message, updated the form view to avoid crashe; updated mail.compose.message composition mode, that is now an updatable selection field. crm_partner_assign will habe to be massively cleaned with the new mail module.
bzr revid: tde@openerp.com-20120824122928-dof1y1uxv3lkiwly
2012-08-24 14:29:28 +02:00
Ravish Murari (OpenERP) 0516472570 [merge] change in code
bzr revid: rmu@tinyerp.com-20120824120425-5v2nx6jt58ium1ee
2012-08-24 17:34:25 +05:30
Olivier Dony 545d7843e3 [FIX] marketing_campaign: make tests pass again, move partner resolution to mail_compose_message
email_template's job is to generate a mail.mail record, but it
does not care about linking it automatically to a partner
(and certainly not creating new partners) as this must be
usable for mass mailing and for marketing campaign,
and we don't want to pollute the partners database with
possibly thousands of partially fake emails

bzr revid: odo@openerp.com-20120824120102-jycs8x4vkxdmrvge
2012-08-24 14:01:02 +02:00
Minh Tran 4ac06cf5b0 merge from mit-trunk
bzr revid: mit@openerp.com-20120824115821-5fp4ks5ch6czs5vf
2012-08-24 13:58:21 +02:00
Antonin Bourguignon 4b3e060247 [IMP] company: keep the complete footer example, like it was before
alose remove some whitespaces

bzr revid: abo@openerp.com-20120824115800-177ba0eajjqu1ypb
2012-08-24 13:58:00 +02:00
Amit (OpenERP) 5d4ffef43e [MERGE]: Merge with lp:openobject-addons
bzr revid: amp@tinyerp.com-20120824115723-0053kjqpdkx7vsde
2012-08-24 17:27:23 +05:30
Mustufa Rangwala (OpenERP) 239012ff9d [FIX] l10n_in_hr_payroll: small fix
bzr revid: mra@tinyerp.com-20120824114341-cah1258419d439ge
2012-08-24 17:13:41 +05:30
Stephane Wirtel ec6bd9c649 [FIX] point_of_sale: Review the buttons for the pos.session object
bzr revid: stw@openerp.com-20120824114300-jdax2175w9mbcb2n
2012-08-24 13:43:00 +02:00
niv-openerp 589eee5f8b [IMP] web_linkedin: changed wizard to have better html output
bzr revid: nicolas.vanhoren@openerp.com-20120824114253-8vbyhlh83vjaf85z
2012-08-24 13:42:53 +02:00
niv-openerp 7c334cfb5a [IMP] Improved css to support semantic html
bzr revid: nicolas.vanhoren@openerp.com-20120824114204-i6qprxhwczkkem6z
2012-08-24 13:42:04 +02:00
Antonin Bourguignon 9b4b784878 [IMP] company's field's name
also fix RML indentation

bzr revid: abo@openerp.com-20120824112434-m3nw1l3292r74yly
2012-08-24 13:24:34 +02:00
Olivier Dony f4c2bd121f [IMP] mail.compose.message: cascade delete attachments upon vacuum-clean
bzr revid: odo@openerp.com-20120824112312-zs5raruc4qdprlnp
2012-08-24 13:23:12 +02:00
Antonin Bourguignon f6a818f683 [IMP] fix a typo
bzr revid: abo@openerp.com-20120824110912-0sdtpd1udzrgvli5
2012-08-24 13:09:12 +02:00
Mustufa Rangwala (OpenERP) 47e33a1d70 [FIX] l10n_in_hr_payroll: small fix
bzr revid: mra@tinyerp.com-20120824110146-n70knsb0c1fn5sfe
2012-08-24 16:31:46 +05:30
Jignesh Rathod (Open ERP) f37ef70b66 [MERGE]: Merge with lp:openobject-addons
bzr revid: jir@tinyerp.com-20120824105752-hz9ho2vf0jeiwg5a
2012-08-24 16:27:52 +05:30
Mustufa Rangwala (OpenERP) 599ef6b960 [FIX] l10n_in_hr_payroll:access for payslip report object
bzr revid: mra@tinyerp.com-20120824105441-zpmeznbhwkdznr3e
2012-08-24 16:24:41 +05:30
Mustufa Rangwala (OpenERP) 76bbd83c30 [MERGE] l10n_in_hr_payrol: typo
bzr revid: mra@tinyerp.com-20120824105120-vzp8avej8tyofwx5
2012-08-24 16:21:20 +05:30
Vishmita 884fc88106 [Merge]Merge trunk
bzr revid: vja@tinyerp.com-20120824104842-53uvwrf393oo25al
2012-08-24 16:18:42 +05:30
niv-openerp ee8b4c6c64 [IMP] web_linkedin: Added server domain and corrected html display
bzr revid: nicolas.vanhoren@openerp.com-20120824104730-f7p8lqibovjzo3vz
2012-08-24 12:47:30 +02:00
niv-openerp e28ec55117 [IMP] added oe_semantic_html
bzr revid: nicolas.vanhoren@openerp.com-20120824104436-er3w1zdijvcv9j04
2012-08-24 12:44:36 +02:00
Vo Minh Thu 0b464f0882 [FIX] custom models: avoid calling twice __init__, use a correct _rec_name (calling twice __init__ caused the _rec_name to be name which does not exist on a custom model, and caused the assert on the _rec_name to fail.
bzr revid: vmt@openerp.com-20120824104242-wa5jq8h47im79ayd
2012-08-24 12:42:42 +02:00
Mustufa Rangwala (OpenERP) 8335b55e87 [FIX] l10n_in_hr_payrol: Remove food coupan register for dedcution
bzr revid: mra@tinyerp.com-20120824104031-0je3kogotvsh7i64
2012-08-24 16:10:31 +05:30
Thibault Delavallée 18f6fd8990 [FIX] email_template: fixed inherited view.
bzr revid: tde@openerp.com-20120824103845-7g1jzgtcctry6nod
2012-08-24 12:38:45 +02:00
Khushboo Bhatt (Open ERP) bcf9ef416e [FIX]l10n_in_hr_payroll:changed name of inputs
bzr revid: kbh@tinyerp.com-20120824103410-lvecrt1ov2szsjvw
2012-08-24 16:04:10 +05:30
Mustufa Rangwala (OpenERP) 9d96cf77b0 [MERGE] l10n_in_hr_payroll: Add payslip analysis report
bzr revid: mra@tinyerp.com-20120824103056-x0ag10f4ih6awrcl
2012-08-24 16:00:56 +05:30
Divyesh Makwana (Open ERP) 540502bc7f [FIX] product : Error when group by 'type'.
lp bug: https://launchpad.net/bugs/1041129 fixed

bzr revid: mdi@tinyerp.com-20120824102227-1yrv9y4ww6vy3o7p
2012-08-24 15:52:27 +05:30
801e3275f2 [FIX] display input for url fields in translation dialog
bzr revid: guewen.baconnier@camptocamp.com-20120824101819-d4n83x30mugn54h3
2012-08-24 12:18:19 +02:00
Amit (OpenERP) a1f3b23d3e [MERGE]: Merge with lp:openobject-addons
bzr revid: amp@tinyerp.com-20120824101622-56or4xwn145e24zi
2012-08-24 15:46:22 +05:30
Ravish Murari (OpenERP) 286bed2682 [merge] with latest addons
bzr revid: rmu@tinyerp.com-20120824101100-5opxku51rtk2z8h3
2012-08-24 15:41:00 +05:30
Thibault Delavallée 70b90a2343 [FIX] mail_followers: when sending the notification email, it could be interesting to have something in the body. Well, receiving void emails ensure that your spam is not a time-consuming one, but I am not sure this was the intended purpose.
bzr revid: tde@openerp.com-20120824100451-82crb3j7i0ki2h9h
2012-08-24 12:04:51 +02:00
Thibault Delavallée 36c3a308e6 [TOCHECK] crm_lead: commented statemetns that make no sense abotu changing partner of emails when converting a lead into an oportunity.
bzr revid: tde@openerp.com-20120824100335-1kso3qphdh8piq32
2012-08-24 12:03:35 +02:00
Thibault Delavallée c5cfb049f8 [FIX] Fixed last commit (forgotten a ','), fixed demo data about non-existing fields.
bzr revid: tde@openerp.com-20120824100205-nm4vjw13qx363cb5
2012-08-24 12:02:05 +02:00
Ravish Murari (OpenERP) 10bfadb670 [merge] with latest addons
bzr revid: rmu@tinyerp.com-20120824094459-q4euumikhm3596q8
2012-08-24 15:14:59 +05:30
Khushboo Bhatt (Open ERP) d3eac6d18a [ADD]l10n_in_hr_payroll:added postgres report for payslip and palyslip lines
bzr revid: kbh@tinyerp.com-20120824093657-dlw1d0bh39cg7h79
2012-08-24 15:06:57 +05:30
Amit (OpenERP) ea6ef069d0 [MERGE]: Merge with lp:openobject-addons
bzr revid: amp@tinyerp.com-20120824093439-qhfybkn4crjonepz
2012-08-24 15:04:39 +05:30
Jignesh Rathod (Open ERP) 3b73e7e173 [MERGE]: Merge with lp:openobject-addons
bzr revid: jir@tinyerp.com-20120824093240-xu2vnw5pfnlt3437
2012-08-24 15:02:40 +05:30
Thibault Delavallée 6a386dc762 [FIX] crm_forward_to_partner: to_email is now tools.email_split.
bzr revid: tde@openerp.com-20120824093130-e24hm16pq14x84zb
2012-08-24 11:31:30 +02:00
Quentin (OpenERP) 25dd249ecb [MERGE] lp:1034799
bzr revid: qdp-launchpad@openerp.com-20120824090849-v7imbkj2q74ywq3q
2012-08-24 11:08:49 +02:00
Antonin Bourguignon 59f37f712f [MERGE] module: improve modules' descriptions rendering and keep it translatable
bzr revid: abo@openerp.com-20120824085944-ocfg80ve695ipdm7
2012-08-24 10:59:44 +02:00
Twinkle Christian (OpenERP) 7e59db5f0f [MERGE]merge with main branch
bzr revid: tch@tinyerp.com-20120824085918-y69p2653fsqw5t9y
2012-08-24 14:29:18 +05:30