Thibault Delavallée
62b0561a13
[MERGE] [IMP] Alias Improvement
...
Server branch: res.users: improved form view to ease email, login and email preferences clarification.
bzr revid: tde@openerp.com-20130625085406-d4l5uchpumv5adif
2013-06-25 10:54:06 +02:00
Thibault Delavallée
9b791c51d1
[MERGE] [IMP] Alias Improvement
...
Web branch: removed some mail-specific CSS that is now located in the mail module.
bzr revid: tde@openerp.com-20130625085350-eraevdv2odhkhkc8
2013-06-25 10:53:50 +02:00
niv-openerp
1f3b8129f7
[FIX] auth_openid: converted controllers to fit the new API
...
bzr revid: nicolas.vanhoren@openerp.com-20130625085007-6ylj5mzyzp9du5bs
2013-06-25 10:50:07 +02:00
Thibault Delavallée
f4efff8ecb
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130625084653-0r3uezndvn18fc62
2013-06-25 10:46:53 +02:00
Thibault Delavallée
d0aea936ac
[CLEAN] Misc cleaning before merging, mainly in views
...
bzr revid: tde@openerp.com-20130625084630-oqlertvzxl8a8w7f
2013-06-25 10:46:30 +02:00
Thibault Delavallée
27ae6e25a2
[FIX] hr_recruitment: fixed view preventing from creating a new job
...
bzr revid: tde@openerp.com-20130625084621-smra6kdy7fj42o5d
2013-06-25 10:46:21 +02:00
ajay javiya (OpenERP)
730e2b44bb
[IMP]: yml for crm merge lead
...
bzr revid: aja@tinyerp.com-20130625055843-0rogdox72xbsvww0
2013-06-25 11:28:43 +05:30
ajay javiya (OpenERP)
70a1f74269
[MERG] : sync with trunk
...
bzr revid: aja@tinyerp.com-20130625053539-afrjhv9f28zz48pl
2013-06-25 11:05:39 +05:30
Launchpad Translations on behalf of openerp
9102c2c512
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130625051442-1chu4wdtgur1nub1
2013-06-25 05:14:42 +00:00
ajay javiya (OpenERP)
90e2ff1da7
[IMP]: clean yaml for crm,hr_recruitment and project task
...
bzr revid: aja@tinyerp.com-20130625050409-letmh3v98ca6nqob
2013-06-25 10:34:09 +05:30
Chirag Dodiya (OpenERP Trainee)
52cbc9ed3a
[MERGE] merge with trunk server
...
bzr revid: chiragdd7@gmail.com-20130619120454-ax7ejguq1tpblcr0
bzr revid: chiragdd7@gmail.com-20130624053825-8he5eeg9yv9orx8c
bzr revid: chiragdd7@gmail.com-20130625044539-l16wdav0vzep8gq9
2013-06-25 10:15:39 +05:30
Thibault Delavallée
e6ee1d315e
[CLEAN] Misc cleaning before merging
...
bzr revid: tde@openerp.com-20130624162457-8y8eqwebwolvcdc6
2013-06-24 18:24:57 +02:00
Thibault Delavallée
d7e5eb67bc
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130624160023-lhg92flym8svgo0l
2013-06-24 18:00:23 +02:00
Thibault Delavallée
b3a928f78b
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130624160019-ef98nl9gqj57jydh
2013-06-24 18:00:19 +02:00
Thibault Delavallée
9f84cc4968
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130624160006-ndlo68bdmm3ndj21
2013-06-24 18:00:06 +02:00
niv-openerp
f93d10957d
[FIX] bad handling of werkzeug's exceptions
...
bzr revid: nicolas.vanhoren@openerp.com-20130624155634-d5b5998jv01fa1wh
2013-06-24 17:56:34 +02:00
Quentin (OpenERP)
388e82dbe5
[IMP] stock: completing a bit of the packages methods
...
bzr revid: qdp-launchpad@openerp.com-20130624154018-s0dkx0k1eofjwkqv
2013-06-24 17:40:18 +02:00
Thibault Delavallée
fd90140d7b
[REF] mail_thread: refactored message_route improvement, to be closer to the original code + call to a new method that checks the route, instead of doing everything in one method.
...
bzr revid: tde@openerp.com-20130624151827-hxwaelefs540pvca
2013-06-24 17:18:27 +02:00
Denis Ledoux
f4ac9a07a7
[FIX]account: fix of sxw of account_print_invoice, which was using o.address_invoice_id.partner_id instead of o.partner_id
...
bzr revid: dle@openerp.com-20130624145856-vz0d8oezyqoj7gou
2013-06-24 16:58:56 +02:00
Amit Bhavsar (Open ERP)
06fe2460d6
[MERGE] merge with latest trunk
...
bzr revid: amb@tinyerp.com-20130624141838-mevmot56188pkoeo
2013-06-24 19:48:38 +05:30
Amit Bhavsar (Open ERP)
b9ed060fa8
[MERGE] merge with latest trunk
...
bzr revid: amb@tinyerp.com-20130624141146-sq4rh2q3rqz67mcj
2013-06-24 19:41:46 +05:30
Quentin (OpenERP)
31ae5c4058
[IMP] stock: packaging abstract methods
...
bzr revid: qdp-launchpad@openerp.com-20130624135739-1ckisr2sbhdhw9c7
2013-06-24 15:57:39 +02:00
Josse Colpaert
916ad1e130
[MERGE] Merge from trunk
...
bzr revid: jco@openerp.com-20130624152946-bg2w304gam2jcs27
2013-06-24 17:29:46 +02:00
Josse Colpaert
c45c32a164
[ADD] Add removal and putaway strategies
...
bzr revid: jco@openerp.com-20130624152850-7y0t36wcj2hyba4o
2013-06-24 17:28:50 +02:00
Denis Ledoux
b4a9b23f8e
[MERGE]upstream
...
bzr revid: dle@openerp.com-20130624135446-wqzbrpr2b4d13wm3
2013-06-24 15:54:46 +02:00
Denis Ledoux
d40bc9b776
[FIX]google_base_account: typo. (stoi le gogole *priceless*)
...
bzr revid: dle@openerp.com-20130624133950-jcxv0nbn0ke6xzj0
2013-06-24 15:39:50 +02:00
Foram Katharotiya (OpenERP)
e69c92554f
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20130620055021-sll6kxix7xhs02qq
bzr revid: fka@tinyerp.com-20130624050559-saso9gap2f1nelcj
bzr revid: fka@tinyerp.com-20130624133209-hofz15ydbip9gxem
2013-06-24 19:02:09 +05:30
bth-openerp
c851ea40f6
[MERGE]Merge lp;openobject-addons.
...
bzr revid: bth@tinyerp.com-20130624132535-5r60013cyzie603n
2013-06-24 18:55:35 +05:30
bth-openerp
92ad09af86
[MERGE]Merge lp;openobject-addons.
...
bzr revid: bth@tinyerp.com-20130624132004-gnejudu8vdz3jkt1
2013-06-24 18:50:04 +05:30
Paramjit Singh Sahota
0e11737c3f
[MERGE] Sync with lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130624131714-vvdfx8t3j2tf210p
2013-06-24 18:47:14 +05:30
Paramjit Singh Sahota
bcadfb8383
[MERGE] Sync with lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130624131543-q5jao5toays4iqrx
2013-06-24 18:45:43 +05:30
Foram Katharotiya (OpenERP)
95d9bcce6c
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20130620044636-q4q2lxylcx605zms
bzr revid: fka@tinyerp.com-20130621045552-2x9142wov36lkb8x
bzr revid: fka@tinyerp.com-20130624045140-3uq5z920t51cnpkt
bzr revid: fka@tinyerp.com-20130624131337-nyzs74vi74kl4nu3
2013-06-24 18:43:37 +05:30
Paramjit Singh Sahota
a19a887639
[MERGE] Sync with lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130620051858-96jtajxo5qc51v3s
bzr revid: psa@tinyerp.com-20130624131046-m2fq48j84iyqzm2b
2013-06-24 18:40:46 +05:30
Martin Trigaux
db6e3bb4df
[MERGE] [FIX] OPW 590066 account: remove accounting information lines from Journal items
...
bzr revid: mat@openerp.com-20130624124418-r6fkvaokbfn3dvbg
2013-06-24 14:44:18 +02:00
Olivier Dony
9ad04d4e9b
[FIX] report_webkit: writing to disk implies having bytes to write, convert the unicode Jinja2 output to UTF-8
...
Jinja2 always returns unicode strings
http://jinja.pocoo.org/docs/api/#jinja2.Template.render
bzr revid: odo@openerp.com-20130624122842-8gs8by3k8jn7bffx
2013-06-24 14:28:42 +02:00
Quentin (OpenERP)
a0edfd14e8
[FIX] stock: typo in class name
...
bzr revid: qdp-launchpad@openerp.com-20130624114051-tbbsr4fivzyv662z
2013-06-24 13:40:51 +02:00
Josse Colpaert
5608cfbdc2
[IMP] Make sure negative stock works FIFO/LIFO
...
bzr revid: jco@openerp.com-20130624112434-72i2x6rzlict2l8p
2013-06-24 13:24:34 +02:00
Quentin (OpenERP)
dee5ace29b
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20130624095319-sqkrnk4r1mst8nvk
2013-06-24 11:53:19 +02:00
niv-openerp
0b6b7d643d
[FIX] auth_oauth: authentication problem with the new server-side web framework
...
bzr revid: nicolas.vanhoren@openerp.com-20130624095255-uj6702oq6601eql5
2013-06-24 11:52:55 +02:00
Quentin (OpenERP)
8f68e390e2
[IMP] stock: packaging related stuff
...
bzr revid: qdp-launchpad@openerp.com-20130624094150-ql0c8ihs00z863ed
2013-06-24 11:41:50 +02:00
Thibault Delavallée
853951a9d6
[IMP] res.users: improved form view to ease email, login and email preferences clarification
...
bzr revid: tde@openerp.com-20130624093841-6vi3zjcz260dzuig
2013-06-24 11:38:41 +02:00
Quentin (OpenERP)
ea03ed65b6
[FIX] purchase, accont_anglo_saxon: fixed the creation of invoice from PO lines so that it reuse the _prepare_inv_line() method. This code factorization is needed in order to work with account_anglo_saxon module (before the anglo saxon accounting mode was ignored if the PO's invoicing method was 'generate invoices from PO lines')
...
bzr revid: qdp-launchpad@openerp.com-20130624090741-eyy2r22yuti0gqit
2013-06-24 11:07:41 +02:00
Quentin (OpenERP)
d856e8361b
[REF] *: change linked to server revision 4907. Removed deprecated 'view_load' attribute + removed duplicated first argument of property fields which is replaced with 'relation' argument in case where it is really needed (relational fields): indeed this first argument was totally useless for property of float type (for example).
...
bzr revid: qdp-launchpad@openerp.com-20130624090515-12aeo4k5sz87veqb
2013-06-24 11:05:15 +02:00
Quentin (OpenERP)
7e8e2ca75f
[FIX] account_anglo_saxon: fixed the computation of price difference inc costing method != 'standard' + added yaml test for the same feature
...
bzr revid: qdp-launchpad@openerp.com-20130624090329-o423720dp3oc4aez
2013-06-24 11:03:29 +02:00
Quentin (OpenERP)
bcac5bd834
[FIX] ir_property: fixes in property fields related to multi company use cases
...
bzr revid: qdp-launchpad@openerp.com-20130624085731-fthhdpdm4ldi3220
2013-06-24 10:57:31 +02:00
Quentin (OpenERP)
c54bc51eb7
[IMP] ir_property fields: added the possibility to use 'selection' field type as properties
...
bzr revid: qdp-launchpad@openerp.com-20130624085311-ujeahocdp0d2royg
2013-06-24 10:53:11 +02:00
Quentin (OpenERP)
601ee8e030
[REF] ir_property: changed 'value_reference' and 'res_id' fields into char instead of reference fields because the code was fuzzy, the performances very bad (at least since 'view_load' attribute has been removed), and because there were no reason to have them as references (even from an useability point of view)
...
bzr revid: qdp-launchpad@openerp.com-20130624085049-elmhvzkufntlzbf8
2013-06-24 10:50:49 +02:00
Xavier ALT
58badffa74
[MERGE] [FIX] l10n_be_invoice_bba: correctly create bba reference when creating an invoice
...
When creating an invoice from another object (sale: invoice from sale order
line, sale: invoice on delivery order, ...) we have to make sure that newly
created invoice respect partner's default ``communication type``, and
accordingly generate a new BBA if required and none provided.
lp bug: https://launchpad.net/bugs/1135710 fixed
bzr revid: xal@openerp.com-20130624083322-h3h4h8nn876585m3
2013-06-24 10:33:22 +02:00
ajay javiya (OpenERP)
5deb6ed7eb
[REM]: state field from crm_partner_assign
...
bzr revid: aja@tinyerp.com-20130624072459-2h6915rqnakzat9m
2013-06-24 12:54:59 +05:30
ajay javiya (OpenERP)
2f3bbb8c25
[MERGE]: with trunk
...
bzr revid: aja@tinyerp.com-20130624070057-0l0wiwzoblb1tk61
2013-06-24 12:30:57 +05:30