Vishmita
f32033d2cd
[MERGE]Merge lp:~openerp-dev/openerp-web/trunk-improve-little-big-details
...
bzr revid: vja@tinyerp.com-20121107122818-gi2z8mnqhl6ashhy
2012-11-07 17:58:18 +05:30
pankita shah (Open ERP)
c6fb0e5d19
[IMP] add seprator string,improve taxname
...
bzr revid: shp@tinyerp.com-20121107122418-px58982yrneqhpsa
2012-11-07 17:54:18 +05:30
Xavier Morel
7959c832cd
[FIX] lost call to setup_default_query during merge
...
bzr revid: xmo@openerp.com-20121107120955-xgnnm2pfvsqch8kn
2012-11-07 13:09:55 +01:00
Tejas Tank
47e028f6c9
Merge with latest.
...
bzr revid: tta@openerp.com-20121107115008-rkt9fpy2r6lgirkk
2012-11-07 17:20:08 +05:30
Frédéric van der Essen
e5ec8d00a9
[IMP] mail: attachments
...
bzr revid: fva@openerp.com-20121107114609-vv1knumnte8b9d5r
2012-11-07 12:46:09 +01:00
Frédéric van der Essen
c63b6a14c8
[MERGE] from chm
...
bzr revid: fva@openerp.com-20121107114516-rby0m0qpwaiut5nr
2012-11-07 12:45:16 +01:00
Frédéric van der Essen
3b1478bf57
[IMP] mail: js dom bindings for the attachments
...
bzr revid: fva@openerp.com-20121107114413-399b2q2b5ziurxvp
2012-11-07 12:44:13 +01:00
Olivier Dony
c9d5148991
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20121107114202-mt3gny8e2497m7qf
2012-11-07 12:42:02 +01:00
Christophe Matthieu
42dd7711b5
[FIX] email_template: change name value and concat test
...
bzr revid: chm@openerp.com-20121107113925-1nmjicj444nez25c
2012-11-07 12:39:25 +01:00
07ec4209ed
[FIX]account_voucher : fixed type of payment voucher
...
for the Sales receipt, payment voucher has type as sale but it should be receipt, so that payment voucher does not list under Customer Payments
bzr revid: mma@tinyerp.com-20121107113344-67scvaqy3qhasf0d
2012-11-07 17:03:44 +05:30
Atul Patel (OpenERP)
04cdfb2cd5
[FIX]: Open invoice view directly from incomming shipment wizard
...
bzr revid: atp@tinyerp.com-20121107113316-9gl01qojb32bmex6
2012-11-07 17:03:16 +05:30
Tejas Tank
1a9f93fc85
[fix] on model form tags issue fixed..
...
bzr revid: tta@openerp.com-20121107113256-ac6znf9m5ibzoovl
2012-11-07 17:02:56 +05:30
Christophe Simonis
9bb5e47baf
merge upstream
...
bzr revid: chs@openerp.com-20121107112830-fi0xu1poqt5cbb8u
2012-11-07 12:28:30 +01:00
Turkesh Patel (Open ERP)
bc6747de0b
[IMP] hr_holidays: show the number of remaining days in the dropdown of leave types.
...
bzr revid: tpa@tinyerp.com-20121107112807-yb3g23qk0hy13lxy
2012-11-07 16:58:07 +05:30
Xavier Morel
36dad4cef9
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20121107112516-64hqps4jjgmrs3a4
2012-11-07 12:25:16 +01:00
Cedric Snauwaert
767e693524
[REFACTOR]some change in run_scheduler and working renew contract button
...
bzr revid: csn@openerp.com-20121107112355-vdy56hilzqj1gx4v
2012-11-07 12:23:55 +01:00
Turkesh Patel (Open ERP)
2840336239
[MRG] merge lp:~openerp-dev/openobject-addons/trunk-pstest-crm-jam-marketig-tpa
...
bzr revid: tpa@tinyerp.com-20121107111735-ixdi2jb40n6y4kni
2012-11-07 16:47:35 +05:30
Khushboo Bhatt (Open ERP)
7d29ca1e31
[FIX]audittrail:can not open form view
...
bzr revid: kbh@tinyerp.com-20121107111554-01za0o8fqfc3ezjb
2012-11-07 16:45:54 +05:30
Fabien Meghazi
8b18d999bd
[FIX] BinaryImage field triggers render_value() two times on file change
...
bzr revid: fme@openerp.com-20121107111247-ge1oi0oxbr7k5dhf
2012-11-07 12:12:47 +01:00
Quentin (OpenERP)
f22e2397d6
[MERGE] staging branch with new version of lunch module, made by api
...
bzr revid: qdp-launchpad@openerp.com-20121107111043-hoxenf5bsl0dmxfl
2012-11-07 12:10:43 +01:00
Xavier Morel
59301c655f
[MERGE] from server
...
bzr revid: xmo@openerp.com-20121107111011-9q0c8kbuype5a8l6
2012-11-07 12:10:11 +01:00
Cedric Snauwaert
452718ff7f
[REFACTOR]some changes in code that takes into account most of quentin commentaries
...
bzr revid: csn@openerp.com-20121107110757-6ckwqydzg2na0mpk
2012-11-07 12:07:57 +01:00
Frédéric van der Essen
4e073ba068
[FIX] filetype and breakwords methods were merged in the wrong class
...
bzr revid: fva@openerp.com-20121107110536-v5yfn0tqopybjqqe
2012-11-07 12:05:36 +01:00
Christophe Matthieu
b348b86a63
[IMP] mail: separator for search filter
...
bzr revid: chm@openerp.com-20121107105624-u4m1bbbchuw34tiq
2012-11-07 11:56:24 +01:00
Thibault Delavallée
f9829bbb93
[FIX] mail_thread: in message_parse, correctly set partner_ids of the message dict. By the way small things in amil module.
...
bzr revid: tde@openerp.com-20121107105148-6o1dvu7f4ms24rbx
2012-11-07 11:51:48 +01:00
Thibault Delavallée
688b6babed
[FIX] tools: html_email_clean: remove blockquote in any node, not just firs childs of root.
...
bzr revid: tde@openerp.com-20121107105031-xf0u71q3chx0chnv
2012-11-07 11:50:31 +01:00
064003797e
[FIX] Issue with py.eval if no options passed.
...
bzr revid: vta@openerp.com-20121107104933-a60t27t1hjyu368f
2012-11-07 11:49:33 +01:00
Quentin (OpenERP)
385bf30ae3
[REN] lunch: renamed security/groups.xml to meet OpenERP standards and conventions
...
bzr revid: qdp-launchpad@openerp.com-20121107104348-9xkt13jmscamgy34
2012-11-07 11:43:48 +01:00
Frédéric van der Essen
41ccce3e53
[MERGE] mail: from chm
...
bzr revid: fva@openerp.com-20121107103530-qk0h13jqp9q2w1te
2012-11-07 11:35:30 +01:00
4b0d99d6c8
[IMP] Now the Many2OneButton accepts an option (label) containing a dict to set the string displayed in the button ({'create':String, 'edit':String}). If no label, the string is empty.
...
bzr revid: vta@openerp.com-20121107103426-u6dfd1vcfu8fwap3
2012-11-07 11:34:26 +01:00
Christophe Matthieu
11f9b954d2
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20121107103359-9ex1ddv3v2m9ki9q
2012-11-07 11:33:59 +01:00
Christophe Matthieu
621c8b4bb7
[IMP] email_template: add test: The fields email_to, email_to_partner and email_cc return the good list of partner_id
...
bzr revid: chm@openerp.com-20121107102745-9d0dt1fkzauvfyjs
2012-11-07 11:27:45 +01:00
Tejas Tank
5ffb938cbc
[IMP] Enable import feature with tree view.
...
bzr revid: tta@openerp.com-20121107102150-8e1wr83hyj0mxqmq
2012-11-07 15:51:50 +05:30
Jalpesh Patel (OpenERP)
d4f4cc3d11
[IMP] phonecalls analysis grouped by salesperson by default
...
bzr revid: pja@tinyerp.com-20121107102038-l3s4s9glh802xpn3
2012-11-07 15:50:38 +05:30
Turkesh Patel (Open ERP)
1797cf8daa
[IMP] account: improve fiscal position form view.
...
bzr revid: tpa@tinyerp.com-20121107102005-mas6cx6amsvvinnv
2012-11-07 15:50:05 +05:30
Thibault Delavallée
c983fba3c3
[FIX] mail: demo data back as noupdate.
...
bzr revid: tde@openerp.com-20121107100206-bi39ap6821woug8x
2012-11-07 11:02:06 +01:00
Foram Katharotiya (OpenERP)
ed25f5a904
[FIX] Uncaught TypeError: Cannot call method 'get_domain' of undefined
...
bzr revid: fka@tinyerp.com-20121107095905-vhmqhu6zgiompby0
2012-11-07 15:29:05 +05:30
Thibault Delavallée
4d89845de6
[IMP] tools: tests: cleaner: cleaned a bit test data. Will have to be improved.
...
bzr revid: tde@openerp.com-20121107093201-s0pco15msilt4erz
2012-11-07 10:32:01 +01:00
Fabien Meghazi
185b32d7d5
[MERGE] trunk
...
bzr revid: fme@openerp.com-20121107091958-f3rqu7nc585umjwq
2012-11-07 10:19:58 +01:00
Divyesh Makwana (Open ERP)
d34199588c
[FIX] marketing_campaign : Create a new campaign, do not save, directly add an activity line and then save. It gives warning 'The following fields are invalid: *Campaign'.
...
bzr revid: mdi@tinyerp.com-20121107091855-zvrv96n9hi7t3vrx
2012-11-07 14:48:55 +05:30
Hiral Patel (OpenERP)
73b6b44329
[IMP] Revert change in MRP
...
bzr revid: hip@tinyerp.com-20121107091423-ohotu1yxca592lz8
2012-11-07 14:44:23 +05:30
Fabien Meghazi
f06b78dbf6
[MERGE] trunk
...
bzr revid: fme@openerp.com-20121107091047-uehws6qa3ouaa4fs
2012-11-07 10:10:47 +01:00
Foram Katharotiya (OpenERP)
b408081195
[FIX] Uncaught TypeError: Cannot read property 'attrs' of undefined
...
bzr revid: fka@tinyerp.com-20121107090944-wvkq0e22v1jxyn2s
2012-11-07 14:39:44 +05:30
Hiral Patel (OpenERP)
cc21560630
[IMP] Could not get field with name 'parent.partner_id'
...
bzr revid: hip@tinyerp.com-20121107090725-n3drjrsjzf2yibr2
2012-11-07 14:37:25 +05:30
Thibault Delavallée
c0e139bd4b
[IMP] mail: displayed messages now goe through html_email_clean to clean their content; added a css because we now have lots of <p> in chatter messages, and default margin is quite big (to be improved maybe); updated demo data.
...
bzr revid: tde@openerp.com-20121107085926-9g609zgmkg4kieqc
2012-11-07 09:59:26 +01:00
Thibault Delavallée
3ba739cbf5
[IMP] tools: mail: improved basic html_email_clean.
...
bzr revid: tde@openerp.com-20121107085807-td2okmbr61pm4g1e
2012-11-07 09:58:07 +01:00
0ad71eb405
[FIX] Hide open m2o icon.
...
bzr revid: vta@openerp.com-20121107084540-iahqvnuh4q9tcejo
2012-11-07 09:45:40 +01:00
Thibault Delavallée
6d0b416980
[MERGE] Sunc with addons/trunk.
...
bzr revid: tde@openerp.com-20121107083851-ksm6i1yktcgd38jo
2012-11-07 09:38:51 +01:00
Thibault Delavallée
ee6e9894a4
[MERGE] Sync with server/trunk.
...
bzr revid: tde@openerp.com-20121107083807-12i51iax0imkhjf1
2012-11-07 09:38:07 +01:00
Christophe Matthieu
e9a24477a8
[FIX] mail: display 'Compose a new message' button; Limit messages: 30
...
bzr revid: chm@openerp.com-20121107082442-t48a3fqheme0r0h4
2012-11-07 09:24:42 +01:00
Vishmita