Foram Katharotiya (OpenERP)
1a203c4328
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121121045112-60ua4lrarhn4n0ye
2012-11-21 10:21:12 +05:30
Divyesh Makwana (Open ERP)
d57d78cbb4
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121121045109-pcm8ld8svcbrj16z
2012-11-21 10:21:09 +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
Antonin Bourguignon
342680e244
[IMP] code style and documentation
...
bzr revid: abo@openerp.com-20121120181536-vmgw4a5qo03qs5ga
2012-11-20 19:15:36 +01:00
Antonin Bourguignon
4e64f8e96f
[WIP] redirect to the right view (opp or lead)
...
improve documentation and code style
bzr revid: abo@openerp.com-20121120181333-ho2zu27q1qs2hoe5
2012-11-20 19:13:33 +01:00
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
Cedric Snauwaert
d9c266eeb4
[FIX]some minor corrections and TODO comments
...
bzr revid: csn@openerp.com-20121120162930-hwj1ilshe99uvyau
2012-11-20 17:29:30 +01:00
Christophe Simonis
e7b2ec50fe
merge upstream
...
bzr revid: chs@openerp.com-20121120162812-wb04dwv62v25evtj
2012-11-20 17:28:12 +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
Josse Colpaert
532a4dddef
[IMP] security
...
bzr revid: jco@openerp.com-20121120154103-fs8cehu8qdg3v3m2
2012-11-20 16:41:03 +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
Josse Colpaert
c6080b4fe2
[IMP] fix functional fields, security
...
bzr revid: jco@openerp.com-20121120152959-oz4in39d77ny65xl
2012-11-20 16:29:59 +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
3224274600
[FIX]account_analytic_analysis: account Report for Sales Print False if the value is not specified in respective fields
...
bzr revid: mma@tinyerp.com-20121120131312-oia9o2o07fjh52bv
2012-11-20 18:43:12 +05:30
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
Foram Katharotiya (OpenERP)
e6a7f91925
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121120124426-eyc3m8qbf00p728d
2012-11-20 18:14:26 +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
Josse Colpaert
feaa99bdb4
[IMP] action adds instead of replace, when no email, use of credit field
...
bzr revid: jco@openerp.com-20121120124026-xkdw3vjj71monlf8
2012-11-20 13:40:26 +01:00
Quentin (OpenERP)
01985e9cdb
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20121120141500-2wuk83zchrmstww2
2012-11-20 15:15:00 +01:00
Jiten (OpenERP)
beeaf61b21
[MERGE] Merged trunk.
...
bzr revid: jra@tinyerp.com-20121120123652-ezrem00a8t8xbi7c
2012-11-20 18:06:52 +05:30
Randhir Mayatra (OpenERP)
78a4f3eab2
[IMP] add the state chnage in project issue
...
bzr revid: rma@tinyerp.com-20121120123513-or712ebsxk5ao2rq
2012-11-20 18:05:13 +05:30
Foram Katharotiya (OpenERP)
b22ca1096c
[IMP] improve code
...
bzr revid: fka@tinyerp.com-20121120123448-tke4jtzpwje1dlne
2012-11-20 18:04:48 +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
Ajay Chauhan (OpenERP)
df6c3c29ab
[IMP] crm: changed _sql_constraints
...
bzr revid: cha@tinyerp.com-20121120122705-ioqxdvf4e1as30zy
2012-11-20 17:57:05 +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
Foram Katharotiya (OpenERP)
a12d901e9c
[IMP] arrenge subtype
...
bzr revid: fka@tinyerp.com-20121120120503-xl0wucde6ve7fnq3
2012-11-20 17:35:03 +05:30
Ajay Chauhan (OpenERP)
74825e615c
[MERGE] merge with parent branch
...
bzr revid: cha@tinyerp.com-20121120115934-i1a6yru1p5cw6tp8
2012-11-20 17:29:34 +05:30
Divyesh Makwana (Open ERP)
0eb1d5ba65
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121120115512-l36ib5zrd7odkj0x
2012-11-20 17:25:12 +05:30
Divyesh Makwana (Open ERP)
799b65ade1
[Merge] Merge the sales/crm section.
...
bzr revid: mdi@tinyerp.com-20121120115209-7fdpk42s99tnezwr
2012-11-20 17:22:09 +05:30
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
Foram Katharotiya (OpenERP)