Vijaykumar Baladaniya
d6e87438d9
[IMP] Add a group by on invoice tree for salesteam.
...
bzr revid: vba@tinyerp.com-20121121050215-jswj8y7khi6ap37n
2012-11-21 10:32:15 +05:30
Jigar Amin
902507d67a
[MERGE] sync with trunk
...
bzr revid: jam@tinyerp.com-20121121045755-bbso1f97uxx5w8wl
2012-11-21 10:27:55 +05:30
ajay javiya (OpenERP)
1ba8ba7ba8
[IMP]: Replace empty messages exclamation mark
...
bzr revid: aja@tinyerp.com-20121121045742-pshwk91y27vw29ws
2012-11-21 10:27:42 +05:30
Jigar Amin
42e2cb61fd
[MERGE] Sync with trunk
...
bzr revid: jam@tinyerp.com-20121121045625-nl82coj2lk2lumhw
2012-11-21 10:26:25 +05:30
e5133ecca4
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121121044818-2zv06h9572h362aw
2012-11-21 04:48:18 +00:00
3eb3d5bb6b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121121044755-oo3gvj8xlcswn1xq
2012-11-21 04:47:55 +00:00
Jigar Amin
dee1af1c9d
[MERGE] Sync with trunk
...
bzr revid: jam@tinyerp.com-20121121044515-kwjy3okxx13nzeo4
2012-11-21 10:15:15 +05:30
ajay javiya (OpenERP)
277fbe16ae
[FIX]: Fix issue in sale module
...
bzr revid: aja@tinyerp.com-20121121043126-0ej6ij6f0dr7ysn8
2012-11-21 10:01:26 +05:30
Christophe Simonis
1782d61e44
[FIX] web: pass env in login_and_redirect
...
bzr revid: chs@openerp.com-20121120180933-ktarob0a3ll4ccsn
2012-11-20 19:09:33 +01:00
Olivier Dony
437833ba43
[MERGE] Review/Update EDI features for 7.0:
...
Some EDI features replaced by the improved 7.0 portal (with auth_signup)
------------------------------------------------------------------------
- remove the static export of EDI document and the persistence of these EDI blobs, replaced by the live portal access to the document (via portal module)
- remove all the qweb templates and web controllers that were previously used to give access to the EDI document preview
- preserve the web controllers/URLs that were use for the direct EDI import (so that a document from a 6.1 system can still be imported in a 7.0 system)
- temporarily remove the EDI export UI, replaced for the time being by the portal view. => It is planned in 7.1 to provide a new EDI export system via email notification and attaching JSON EDI blobs to outgoing emails. Thanks to the mail gateway integration and a whitelist/certificate system it will be possible to setup end-to-end B2B EDI automation.
- EDI email notifications now integrated in Sales/Invoicing flows via an explicit "Send by Email" step
- PDF version of the document now sent along with the notification (instead of a simple link to view it)
- Portal signup link integrated in this notification when the portal module is installed (via glue module sale_portal)
Online Payment (Paypal) features preserved in a different form
--------------------------------------------------------------
- as the EDI preview was removed, the payment button was moved to a new banner in the portal view of relevant documents, as follows:
- addition of a new portal.payment_acquirer model to define online payment gateways such as Paypal, Google Checkout, etc. (Paypal included by default)
- new payment banner added to the portal form view of Sale Orders and Customer Invoices, allowing online payment via defined payment_acquirers
- new settings item in Settings>Invoicing>Banks&Cash to make the payment banner visible to all employees as well (normally it's only visible in the portal)
+ minor cleanup and removal of deprecated fields
bzr revid: odo@openerp.com-20121120170915-cmb77iubyrwmib2l
2012-11-20 18:09:15 +01:00
Olivier Dony
b770240247
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20121120113600-4oyx9sziigbxn8w8
bzr revid: odo@openerp.com-20121120163429-l4cf6r75vwqfvxty
2012-11-20 17:34:29 +01:00
Christophe Matthieu
53d35debfd
[FIX] mail followers: invisible attribute and mode create
...
bzr revid: chm@openerp.com-20121120162434-g5wfgwndozrcstld
2012-11-20 17:24:34 +01:00
bdca6b0925
[FIX]Fix bug lp:1080997. Add option 'disable_editable_mode' which disable editable widget when setted to true. This is because search popups should not be editable. 'search more...' was not clickable in fields with many2many_tags widget and default tree view with flag editable setted
...
bzr revid: dle@openerp.com-20121120161634-xc0qxyz6x1ccrl2o
2012-11-20 17:16:34 +01:00
niv-openerp
3edac34949
[IMP] mail: changed controller due to modification in the clear_action() method
...
bzr revid: nicolas.vanhoren@openerp.com-20121120155258-32chebnbcrz37tks
2012-11-20 16:52:58 +01:00
niv-openerp
6bc1e836a7
[FIX] pad: very bad conception that produced html injection that produced a lot of incorrect css
...
bzr revid: nicolas.vanhoren@openerp.com-20121120155155-y1wd0px4trljf453
2012-11-20 16:51:55 +01:00
6c921f84eb
[FIX] Minor fixes all around portal.
...
bzr revid: vta@openerp.com-20121120155010-rl1aei08bjm7v0wu
2012-11-20 16:50:10 +01:00
Christophe Matthieu
5bbce53e35
[FIX] tools mail : html_email_clean
...
bzr revid: chm@openerp.com-20121120154217-4ewxir45q1wtjoax
2012-11-20 16:42:17 +01:00
08e0522ad6
[FIX]Add option 'disable_editable_mode' which disable editable widget when setted to true. This is because search popups should not be editable. 'search more...' was not clickable in fields with many2many_tags widget and default tree view with flag editable setted
...
lp bug: https://launchpad.net/bugs/1080997 fixed
bzr revid: dle@openerp.com-20121120153958-jopkpxmz38b78phj
2012-11-20 16:39:58 +01:00
Stephane Wirtel
5f4f975d30
[FIX] auth_oauth: set the right copyright and change the description of the module
...
bzr revid: stw@openerp.com-20121120141921-y8yk0q19n2jhgw8p
2012-11-20 15:19:21 +01:00
Fabien Meghazi
c9de04d796
[FIX] Fixed wrong width computing in Dialog. Removed extraneous call to init_dialog(). Remove Dialog#$buttons dom manipulation hack.
...
bzr revid: fme@openerp.com-20121120141807-pvdryoib39eqh1u7
2012-11-20 15:18:07 +01:00
Christophe Matthieu
50f09660fb
[FIX] tools mail: html_email_clean return False (standard OpenERP) if the param is False
...
bzr revid: chm@openerp.com-20121120134001-ivw9dqxha2du70o6
2012-11-20 14:40:01 +01:00
Vijaykumar Baladaniya
76376ed19c
[IMP] Improve sales team invoice.
...
bzr revid: vba@tinyerp.com-20121120133940-dnu83uuxqkqg1tto
2012-11-20 19:09:40 +05:30
Tejas Tank
68ec7ac94e
Improved English Typos.
...
bzr revid: tta@openerp.com-20121120132926-zbczsj0p61ti1y57
2012-11-20 18:59:26 +05:30
c275e9e52a
[IMP] Send email notifications on confirm sale order and validate invoice.
...
bzr revid: vta@openerp.com-20121120132300-ddr67vhaqzb6ytps
2012-11-20 14:23:00 +01:00
Olivier Dony
caa51abb34
[MERGE] fields_view_get: avoid messing up selection fields' _domain attributes, courtesy of Stefan Rijnhart (Therp)
...
lp bug: https://launchpad.net/bugs/1081092 fixed
bzr revid: odo@openerp.com-20121120132230-7xb6d2xxwcgn7ipn
2012-11-20 14:22:30 +01:00
Olivier Dony
f0ef9bda04
[IMP] Model.default_get: allows setting user default values of x2m to False (for consistency with write())
...
bzr revid: odo@openerp.com-20121120131839-1kdzevubi74ibthy
2012-11-20 14:18:39 +01:00
Olivier Dony
4f58796e38
[IMP] res.users: avoid spurious warnings when last login date cannot be updated
...
bzr revid: odo@openerp.com-20121120131610-v0xwu5zsbmxwvcwe
2012-11-20 14:16:10 +01:00
41dad5cf02
[IMP] General improvements to issues and claims.
...
bzr revid: vta@openerp.com-20121120130824-zmx5yhaalwf3potd
2012-11-20 14:08:24 +01:00
Jiten (OpenERP)
c1da45fade
[Merged] Merged trunk.
...
bzr revid: jra@tinyerp.com-20121120125207-gjcwghoi0fjm88q4
2012-11-20 18:22:07 +05:30
Vishmita
4eae01b9d8
[IMP]Improve code
...
bzr revid: vja@tinyerp.com-20121120124438-c727ibwv4r1kg9qw
2012-11-20 18:14:38 +05:30
Sanjay Gohel (Open ERP)
2091dae491
[IMP]remove print survey button
...
bzr revid: sgo@tinyerp.com-20121120124156-sii5zvwbue0vlfvo
2012-11-20 18:11:56 +05:30
Jiten (OpenERP)
beeaf61b21
[MERGE] Merged trunk.
...
bzr revid: jra@tinyerp.com-20121120123652-ezrem00a8t8xbi7c
2012-11-20 18:06:52 +05:30
Vishmita
b8836ee809
[IMP]Set Priority to display warning messages for change password dialog
...
bzr revid: vja@tinyerp.com-20121120123131-9boe1y6ki0sy2h3c
2012-11-20 18:01:31 +05:30
Stefan Rijnhart
d924cec182
[FIX] Append view domain (in case of selection widget) to a copy of the field's domain
...
lp bug: https://launchpad.net/bugs/1081092 fixed
bzr revid: stefan@therp.nl-20121120121936-8b1wiho0q96ckeqk
2012-11-20 13:19:36 +01:00
Nimesh (Open ERP)
8a59fa0199
[IMP] correct the total for contract and fix problem of number of qty in for the same product.
...
bzr revid: nco@tinyerp.com-20121120115127-4zb0hpcqpzvqffc2
2012-11-20 17:21:27 +05:30
Raphael Collet
bd7090d0d1
[IMP] auth_oauth: restrict menuitem 'OAuth Providers' to group Technical Features
...
bzr revid: rco@openerp.com-20121120113725-w3wezijifdg21hr7
2012-11-20 12:37:25 +01:00
Sanjay Gohel (Open ERP)
06a9cf6e1c
[IMP]remove unnecessary tooltip
...
bzr revid: sgo@tinyerp.com-20121120113308-i3ibj30m17ginea4
2012-11-20 17:03:08 +05:30
Thibault Delavallée
cf04a17078
[MERGE] [DEMO] mail, crm: improved demo data.
...
Misc :
- added message subtypes to CRM
- archives and sent mailboxes unified
- mail.group description displayed in discussion view
- fixe some issues in Chatter
- fixed some action rules now having user_id = False; otherwise they could not be used to anybody else than admin, leading to a crash
bzr revid: tde@openerp.com-20121120112022-hzdt2x29wvlhs0nz
2012-11-20 12:20:22 +01:00
Sanjay Gohel (Open ERP)
7a8a15ddce
[IMP]add function for open timesheets from employee form view
...
bzr revid: sgo@tinyerp.com-20121120112009-3a5k48dr1otlgs1v
2012-11-20 16:50:09 +05:30
Thibault Delavallée
35323f7426
[MERGE] [DEMO] mail, crm: improved demo data.
...
This server branch holds the avatars for admin and demo.
bzr revid: tde@openerp.com-20121120112007-nuvqalc2tr9cqe49
2012-11-20 12:20:07 +01:00
niv-openerp
ade1a5df87
[IMP] allows to specify a specific eval domain in /web/action/load
...
bzr revid: nicolas.vanhoren@openerp.com-20121120110748-5idnflvmxx0jibwe
2012-11-20 12:07:48 +01:00
Fabien Meghazi
6c07b70017
[FIX] Fixed Export dialog buttons. Cleanup openerp.web.Dialog
...
lp bug: https://launchpad.net/bugs/1078640 fixed
bzr revid: fme@openerp.com-20121120110104-ge6k5n22cul5jrax
2012-11-20 12:01:04 +01:00
Stefan Rijnhart
977e86263d
[FIX] Comment on general voucher view definition
...
lp bug: https://launchpad.net/bugs/1081056 fixed
bzr revid: stefan@therp.nl-20121120104207-l88t2dqnzwj5f2fy
2012-11-20 11:42:07 +01:00
Cedric Snauwaert
6f489aeb9a
[REF]improvement of constraint from rev id : csn@openerp.com-20121120085452-pvvu2aamy2zthwo3 to an sql constraint
...
bzr revid: csn@openerp.com-20121120103738-fqgi10ucuw9ca735
2012-11-20 11:37:38 +01:00
Thibault Delavallée
99a3ef8860
[CLEAN] Demo data: fixed some typos, cleaned a bit before merging.
...
bzr revid: tde@openerp.com-20121120102325-5xts5n801p9islgy
2012-11-20 11:23:25 +01:00
Xavier Morel
5a9f78302f
[MERGE] from trunk
...
when creating the instance, set instance.session.uid to 42 so the evaluator has something to chew on when it tries to create the evaluation context
bzr revid: xmo@openerp.com-20121120101733-b0ire11bbuywfi8u
2012-11-20 11:17:33 +01:00
niv-openerp
999c0b2cab
[FIX] Modified behavior when we click on an action in the 'More' menu.
...
Since revision 1517, when using the sidebar from a form view, it merged all the fields of the form view in the context of the action.
It was modified to avoid that context pollution, now it only uses those fields to evaluate the context of that action. So it allows
specifying contexts like "{'invoice_id': invoice_id}", but invoice_id will not be propagated any more to the new action context if not
explicitely specified.
bzr revid: nicolas.vanhoren@openerp.com-20121120100620-ig4e02uctysk7oj8
2012-11-20 11:06:20 +01:00
Cedric Snauwaert
0e3d3328cc
[FIX]fix constraint to an SQL constraint
...
bzr revid: csn@openerp.com-20121120100252-ieznyh43zanv2w7q
2012-11-20 11:02:52 +01:00
Christophe Matthieu
ceefb58670
[IMP] tools mail: remove one line test (double)
...
bzr revid: chm@openerp.com-20121120100225-it12j6qgxjn3ilbg
2012-11-20 11:02:25 +01:00
ajay javiya (OpenERP)
d1a5526035
[FIX]:Fix customer, delete the contact Administrator
...
bzr revid: aja@tinyerp.com-20121120095553-eqy877z8qrodhsua
2012-11-20 15:25:53 +05:30
Vijaykumar Baladaniya