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
Martin Trigaux
33eb5db0d7
apply missing patch
...
bzr revid: mat@openerp.com-20130523095108-fvdxg2vcsr14ce5z
2013-05-23 11:51:08 +02:00
Alexandre Fayolle
1bf62e51a7
[TEST] [FIX] check_access_rules does not cope with a single id
...
bzr revid: alexandre.fayolle@camptocamp.com-20130523090123-e2o2fzekgy7zqtl8
2013-05-23 11:01:23 +02:00
Alexandre Fayolle
cea92690f7
[FIX] fix exception check
...
bzr revid: alexandre.fayolle@camptocamp.com-20130523090055-4m418aninaczbzcy
2013-05-23 11:00:55 +02:00
Yannick Vaucher
4d7d572ea6
[FIX] l10n_ch - reStructuredText in description file
...
lp bug: https://launchpad.net/bugs/1183248 fixed
bzr revid: yannick.vaucher@camptocamp.com-20130523084702-isu6o2m5j0cw9312
2013-05-23 10:47:02 +02:00
Alexandre Fayolle
cebc5dd29c
[TEST] more test fixing
...
bzr revid: alexandre.fayolle@camptocamp.com-20130523083430-r8towg1vxicmjkhw
2013-05-23 10:34:30 +02:00
Martin Trigaux
951e9b14f6
[MERGE] sync with latest trunk
...
bzr revid: mat@openerp.com-20130523073454-39splxsbbxydzq80
2013-05-23 09:34:54 +02:00
Dharti Ratani (Open ERP)
c877df2ec4
[FIX]Added record rules for documents of a directory as per the permissions defined in document access_permission.rst
...
bzr revid: dhr@tinyerp.com-20130523072549-9gruk52goe4xhvy2
2013-05-23 12:55:49 +05:30
Dharti Ratani (Open ERP)
b203ec812c
[MERGE]merged with 7.0
...
bzr revid: dhr@tinyerp.com-20130523071853-m9yqt1pfs9kxd5sb
2013-05-23 12:48:53 +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
def3ef9003
[FIX] bad call to check_access_rules
...
bzr revid: alexandre.fayolle@camptocamp.com-20130523062022-u5bqrgpc3ctffhmi
2013-05-23 08:20:22 +02:00
55c122c632
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130523062012-lih2yomt8w8vsswa
2013-05-23 06:20:12 +00:00
eeb9d91494
[FIX] bad call to check_access_rules
...
bzr revid: alexandre.fayolle@camptocamp.com-20130523061809-jf3qt56ruiwjnpg4
2013-05-23 08:18:09 +02:00
a1c18b87f2
[TEST] fix name error in test
...
bzr revid: alexandre.fayolle@camptocamp.com-20130523061748-0dzsi5hk18u3cdv2
2013-05-23 08:17:48 +02: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
aa33867973
[FIX] check_access does not return bool, it raises
...
bzr revid: alexandre.fayolle@camptocamp.com-20130523055345-gg007ad9j457l0gl
2013-05-23 07:53:45 +02:00
653495b23f
[FIX] missing import in previous commmit
...
bzr revid: alexandre.fayolle@camptocamp.com-20130523053949-cvvc8k9y0clx5pot
2013-05-23 07:39:49 +02:00
bth-openerp
4d4385d8ca
[MERGE]Merge lp:openobject-addons.
...
bzr revid: bth@tinyerp.com-20130523052542-y1gs9h3na12pxlrr
2013-05-23 10:55:42 +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
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
d46d988234
[FIX] syntax error in test
...
bzr revid: alexandre.fayolle@camptocamp.com-20130522202108-kv2oasnuxuf7erke
2013-05-22 22:21:08 +02:00
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
Alexandre Fayolle
0418aee3c7
[TEST] new tests for lp:118211 on mrp
...
bzr revid: alexandre.fayolle@camptocamp.com-20130522153705-vivt0a2wb4xwesco
2013-05-22 17:37:05 +02:00
Alexandre Fayolle
486116588f
[TEST] add new tests and refactor
...
bzr revid: alexandre.fayolle@camptocamp.com-20130522153203-wp45pyicciktg8m8
2013-05-22 17:32:03 +02:00
Alexandre Fayolle
1658325f39
[FIX] actually fix lp:118211 by adding an explicit call to check_access_rule
...
bzr revid: alexandre.fayolle@camptocamp.com-20130522151216-6cz0kb6abwwr5zsv
2013-05-22 17:12:16 +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
Mohammed Shekha
a74fa6ed73
[FIX]Fixed the issue of timezone on total attendance on My current timesheet view.
...
bzr revid: msh@openerp.com-20130522125350-b6yj2mpqosfwajkc
2013-05-22 18:23:50 +05:30
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
Parth Gajjar (Open ERP)