pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,399 Commits 1 Branch 0 Tags
5ed41bcea4c5b0f4e4afdd45c8a114cf3ca144fc
Commit Graph
72399 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric van der Essen a036561b53 [MERGE] app_descr: typo fixes 
bzr revid: fva@openerp.com-20130523131217-vru3hbmldd7q25d0
 2013-05-23 15:12:17 +02:00
Frédéric van der Essen 1e9b3733b4 [FIX] app_descriptions: typo 
bzr revid: fva@openerp.com-20130523131139-5efifdek3f5bccqa
 2013-05-23 15:11:39 +02:00
Martin Trigaux 116bfc7fa7 [MERGE] note: Rename Categories into Stages 
bzr revid: mat@openerp.com-20130523125350-2kpxpxx7oec1eb58
 2013-05-23 14:53:50 +02:00
Vidhin Mehta 41fd5d657d [IMP]Change Variable name. 
bzr revid: vme@tinyerp.com-20130523124117-g6hnj394fndmookq
 2013-05-23 18:11:17 +05:30
Quentin (OpenERP) d9c00b129b [FIX] account: divide the residual amount of invoices proportionally to the number of invoices partially reconciled together if needed + if necessary, do a conversion at the right currency rate 
bzr revid: qdp-launchpad@openerp.com-20130523122855-n0o1rz9ajxkbgsnj
 2013-05-23 14:28:55 +02:00
Quentin (OpenERP) 7ca85ffbba [FIX] account: exclude company_id from build_ctx_periods()'s criteria to allow printing consolidated reports 
bzr revid: qdp-launchpad@openerp.com-20130523122756-tpkc268q107hiqvy
 2013-05-23 14:27:56 +02:00
Randhir Mayatra (OpenERP) dc36531d7c [IMP] change currency for diffrent invoice methods 
bzr revid: rma@tinyerp.com-20130523122045-zy0nf24nkbepymd8
 2013-05-23 17:50:45 +05:30
Vidhin Mehta 841accd179 [IMP]Introduce float_time concept in Timesheet Widget. 
bzr revid: vme@tinyerp.com-20130523120517-y281pkgqj66atthr
 2013-05-23 17:35:17 +05:30
Randhir Mayatra (OpenERP) c96dc3303f [IMP] code improve 
bzr revid: rma@tinyerp.com-20130523110343-owr25x1mmr2joheu
 2013-05-23 16:33:43 +05:30
Randhir Mayatra (OpenERP) 821e05f477 [IMP] upadte the currency in invoices 
bzr revid: rma@tinyerp.com-20130523104820-1qp3zcd8oubz2329
 2013-05-23 16:18:20 +05:30
Parth Gajjar (Open ERP) 5b9b00631d [ADD] Added OAuth integration through python, Added Documentation 
bzr revid: pga@tinyerp.com-20130523104155-83gmp2gucvackppv
 2013-05-23 16:11:55 +05:30
Vidhin Mehta 5fa8cdd305 bzr revid: vme@tinyerp.com-20130523071814-o5suitn0hcy12mie 2013-05-23 12:48:14 +05:30
Vidhin Mehta 82657c43a8 [IMP]Make indentation as it is. 
bzr revid: vme@tinyerp.com-20130523070624-8q2d2zj2zjnn8l31
 2013-05-23 12:36:24 +05:30
Randhir Mayatra (OpenERP) 58cff7a418 [MERGE] merge with latest trunk 
bzr revid: rma@tinyerp.com-20130523065553-7fobc4curgpnqtrw
 2013-05-23 12:25:53 +05:30
Launchpad Translations on behalf of openerp 55c122c632 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130523062012-lih2yomt8w8vsswa
 2013-05-23 06:20:12 +00:00
Vidhin Mehta 2f15045af4 [FIX]Fixes on, need fixing issues by MAT. 
bzr revid: vme@tinyerp.com-20130523060223-hupizjpulghv8gsy
 2013-05-23 11:32:23 +05:30
Nimesh Contractor (OpenERP) b2c84a8310 [IMP] when create company form supplier it should be supplier by default, same for the customer and when both the company should be both customer and supplier. 
bzr revid: nco@tinyerp.com-20130523052403-lk8e1ghfglwtavg5
 2013-05-23 10:54:03 +05:30
Launchpad Translations on behalf of openerp e16f5b6e11 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130523051951-q7enzsoh36nps9nk
 2013-05-23 05:19:51 +00:00
Vidhin Mehta c745a1d882 [MERGE]Trunk. 
bzr revid: vme@tinyerp.com-20130514120110-gi2oehiapff1n3p0
bzr revid: vme@tinyerp.com-20130523051758-70etk8qp90k8e9ou
 2013-05-23 10:47:58 +05:30
Vidhin Mehta e9fadb6ff8 [MERGE]Trunk. 
bzr revid: vme@tinyerp.com-20130514120256-0xob1bgm77zrsp27
bzr revid: vme@tinyerp.com-20130523051407-vyl5oy2ubm1on2r3
 2013-05-23 10:44:07 +05:30
Nimesh Contractor (OpenERP) be683318ef [MERGE] lp:~openerp-dev/openobject-server/trunk-bug-1128656-nco, supplier contact should be the suppier by default. 
bzr revid: nco@tinyerp.com-20130523050632-bujvgr6j1lhj2or3
 2013-05-23 10:36:32 +05:30
Nimesh Contractor (OpenERP) 7396ebdb20 [MERGE] with trunk. 
bzr revid: nco@tinyerp.com-20130422050242-md9rj6bqpu0n78m1
bzr revid: nco@tinyerp.com-20130523044625-vwbcktuz9dsswnv6
 2013-05-23 10:16:25 +05:30
Quentin (OpenERP) 5bf349766b [FIX] hr_expense: 1) added a 'paid' status on hr.expense. 2) don't copy the account_move on duplication of an hr.expense 
bzr revid: qdp-launchpad@openerp.com-20130522174945-02smgv1jpheo3zcc
 2013-05-22 19:49:45 +02:00
Olivier Dony 823439f7e1 [FIX] res.groups: ensure predictable sort order 
Unfortunately the group names are translatable,
and the display name is based on the hierarchy
of groups, so this will not give a satisfactory
result. What we would need ideally is to be able
to sort on the translated "full name" value,
but this is not supported by the ORM yet.
But a stable order is still better than no
order at all

bzr revid: odo@openerp.com-20130522163201-f9zo7xnjvbs2mi97
 2013-05-22 18:32:01 +02:00
Thibault Delavallée 13a68f8511 [MERGE] [FORWARD] Forward port of server 7.0 until revision 4988 
bzr revid: tde@openerp.com-20130528114534-6n11i1fkoyr0t5p8
 2013-05-28 13:45:34 +02:00
Thibault Delavallée 1d5068b63e [FORWARD] Forward port of server 7.0 until revision 4988 
bzr revid: tde@openerp.com-20130528102733-bsszxp6nvy8yws3t
 2013-05-28 12:27:33 +02:00
Thibault Delavallée 13caa128a6 [FIX] FieldMany2One: avoid displaying a crash when name_getting an invisible many2one due to an always_reload. 
bzr revid: tde@openerp.com-20130527144927-9c9ivhskyiv66fnh
 2013-05-27 16:49:27 +02:00
Christophe Simonis c05abdc22d [FIX] corelib.js: use this instead of self 
bzr revid: chs@openerp.com-20130528114400-jhjmk7hhg60o5871
 2013-05-28 13:44:00 +02:00
Olivier Dony 9bd1be36ee [FIX] portal: access management wizard needs to search for existing users as super-user 
bzr revid: odo@openerp.com-20130528110210-70u81w5u21xxzg54
 2013-05-28 13:02:10 +02:00
Christophe Simonis d086a71131 [IMP] web: allow manifest files to contain remote js/css/qweb files 
bzr revid: chs@openerp.com-20130528104352-b1qf79d6bdm8x2ec
 2013-05-28 12:43:52 +02:00
Christophe Simonis 6a3ace331d [REVERT] release.pu don't need to be forward ported 
bzr revid: chs@openerp.com-20130522150912-rn45l1k5b831mqk6
 2013-05-22 17:09:12 +02:00
Christophe Matthieu 2f73d494d2 [FIX] crm_helpdesk: change test's email data 
bzr revid: chm@openerp.com-20130522144819-a7tyhde8gu0n9ej2
 2013-05-22 16:48:19 +02:00
Thibault Delavallée 3f5c738084 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20130522110325-hos9ocph7yo9ae7w
bzr revid: tde@openerp.com-20130522143206-uv1f6lj6xsenzj6u
 2013-05-22 16:32:06 +02:00
Olivier Dony bf67507fdd [FIX] portal: avoid errors during portal access management if users already exists (and thus will not cause problems) 
This allows more complex cases like having a login
that is different from the email of the related
partners, but the same as the email of another
user

bzr revid: odo@openerp.com-20130522143017-pr30b3g6j8ht0ma6
 2013-05-22 16:30:17 +02:00
Fabien Meghazi 3c0b65f5d1 [MERGE] application descriptions 
bzr revid: fme@openerp.com-20130522140734-j6gw2u68zuu0suyf
 2013-05-22 16:07:34 +02:00
Najlaâ 361cd5fc40 [FIX] remove index on SO line text field 
bzr revid: nel@tinyerp.com-20130522130842-whn5n8fbc0gv34jx
 2013-05-22 15:08:42 +02:00
Thibault Delavallée f6326c6917 [MERGE] [IMP] mail: improved management of links in notification emails. 
A new server action is defined that handles the redirection. If the user has access to the document, it opens the form view of the document. A method is called that allows to define the form view to open in some specific models (such as lead/opportunities). If the user has no access to the document, it opens the inbox, filtered on the discussion. The inbox opened is different for employees and portal users.

This server action is called by the link included in notification emails. This way the redirection Inbox/document is done dynamically at login, and not statically when generating the email.

Added tests.

bzr revid: tde@openerp.com-20130522124930-21tgj52v83hw8cj0
 2013-05-22 14:49:30 +02:00
Thibault Delavallée 978c76c5ea [MERGE] [IMP] mail: improved management of links in notification emails. 
This branch adds the URL parameters in context.params.

bzr revid: tde@openerp.com-20130522124012-pf2m5efmmz1vuilc
 2013-05-22 14:40:12 +02:00
Olivier Dony e6a8f9aac0 [FIX] portal: typos/wording in error messages 
bzr revid: odo@openerp.com-20130522122556-mq3402op1n1315ae
 2013-05-22 14:25:56 +02:00
Thibault Delavallée 6b572b8d90 [CLEAN] portal/mail_thread: cleaned a bit new code, using is_portal. 
bzr revid: tde@openerp.com-20130522115549-ot3f31c5oty0zqya
 2013-05-22 13:55:49 +02:00
Olivier Dony 8def4f274a [IMP] crm: partner merge wizard: prevent merging more than 3 contacts together + log note in partner history 
bzr revid: odo@openerp.com-20130522115408-ef82getdyo2otg3q
 2013-05-22 13:54:08 +02:00
Thibault Delavallée cd278d83ab [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20130522103305-yi5ql1chdx9qxxlx
bzr revid: tde@openerp.com-20130522114236-qi2s3i2dl2lemdvh
 2013-05-22 13:42:36 +02:00
Thibault Delavallée d4d6e88266 [IMP] [IMP] mail: now defines a catchall email alias, used to format the 
reply_to of notification emails when having a document without alias, or for
private discussions.

bzr revid: tde@openerp.com-20130522114007-vlbkzghz278545zn
 2013-05-22 13:40:07 +02:00
Olivier Dony a5bf0f3181 [FIX] crm: partner merge wizard: fix detection of duplicate emails + improve error messages 
bzr revid: odo@openerp.com-20130522111131-y1urx7qx280f3tdl
 2013-05-22 13:11:31 +02:00
Thibault Delavallée c4a019bbfd [CLEAN] mail: added CSS from web to mail module. 
bzr revid: tde@openerp.com-20130522105434-nqmao3fyxy8on1rl
 2013-05-22 12:54:34 +02:00
Thibault Delavallée 7de4d5b568 [CLEAN] web: removed mail-related CSS to the mail module. 
bzr revid: tde@openerp.com-20130522105414-n405ipqbjgsarauq
 2013-05-22 12:54:14 +02:00
Olivier Dony 710d2a37cc [MERGE] auth_signup, portal: fix error handling when granting portal access + always send notification message including signup URL 
bzr revid: odo@openerp.com-20130522105332-nl2gq346nb95wbru
 2013-05-22 12:53:32 +02:00
Christophe Matthieu 35cd85b0ba [FIX] sale: overwrite _make_invoice and get section_id in sale_crm module 
bzr revid: chm@openerp.com-20130522104858-zlhe453zu9r41lqx
 2013-05-22 12:48:58 +02:00
Thibault Delavallée faefb9fad1 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20130522103426-wjn0ttqdbf72g713
 2013-05-22 12:34:26 +02:00
Parth Gajjar (Open ERP) b4e6c2109c [IMP]Google client id in ir.config_parameter 
bzr revid: pga@tinyerp.com-20130522102857-fehfsdks1fq3zc1i
 2013-05-22 15:58:57 +05:30