Vo Minh Thu
7d1d7affc5
[MERGE] fix: renamed thousand_sep to thousands_sep in test_impex, removed rml_footer1 and rml_footer2 from data as the fields were removed.
...
bzr revid: vmt@openerp.com-20120913124448-ba4kgi0brmyldkaf
2012-09-13 14:44:48 +02:00
Raphael Collet
d8aeaddc4b
[IMP] account: in settings, open the company form to change bank accounts (and company footer)
...
bzr revid: rco@openerp.com-20120913124332-hooc2b9pxuqjrpmj
2012-09-13 14:43:32 +02:00
Khushboo Bhatt (Open ERP)
2ef470f717
[FIX]account:fix the issue of customer/supplier journal items
...
bzr revid: kbh@tinyerp.com-20120913124136-ygcr1666kzmcm3bp
2012-09-13 18:11:36 +05:30
Amit Patel
0b1cd66d1b
[MERGE]:merged hr expense
...
bzr revid: apa@tinyerp.com-20120913123908-mmp08uyxwb2a3vwd
2012-09-13 18:09:08 +05:30
Randhir Mayatra (OpenERP)
db6f8dc681
[MERGE] merge with parent branch
...
bzr revid: rma@tinyerp.com-20120913123842-kh54lf033cxdiicw
2012-09-13 18:08:42 +05:30
Mayur Maheshwari (OpenERP)
761ea0f89c
[IMP]account : improve tool tip
...
bzr revid: mma@tinyerp.com-20120913123736-87k2n9a595qej21x
2012-09-13 18:07:36 +05:30
Thibault Delavallée
1c85cb8b78
[MERGE] [FIX] Fixed image sharpening in tools; this requires an image converted into RGB.
...
bzr revid: tde@openerp.com-20120913123250-e2ueblluch4aa41p
2012-09-13 14:32:50 +02:00
Mayur Maheshwari (OpenERP)
834bcdfb1a
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120913122649-oe7fq5q0ntwinoss
2012-09-13 17:56:49 +05:30
Antonin Bourguignon
0986f13047
[FIX] recurring line's model form view
...
properly set a company id when a journal is selected and, therefore, correctly display available accounts
bzr revid: abo@openerp.com-20120913122312-v2zz8m4r8wcxovtx
2012-09-13 14:23:12 +02:00
Raphael Collet
e768bf46ab
[IMP] res.company: rewrite onchange method to compute rml_footer
...
bzr revid: rco@openerp.com-20120913122011-h9qsqizhmsibndf3
2012-09-13 14:20:11 +02:00
Raphael Collet
8ca8589b78
[IMP] res.partner.bank: make _prepare_name_get more robust (field 'id' not required)
...
bzr revid: rco@openerp.com-20120913121830-fzkkdekrxwdq421w
2012-09-13 14:18:30 +02:00
Thibault Delavallée
b2c79d266b
[FIX] mail_message: fixed record_name, because we could call a name_get on a document we can not see (if we are in the recipints of a document we can not access). name_get is therefore inside a try/except statement, getting a void string as result if AccessDenied is raised. Updated JS to avoid displaying the record name on a void string.
...
bzr revid: tde@openerp.com-20120913121110-bd0syf813h0e39gk
2012-09-13 14:11:10 +02:00
niv-openerp
6c97d377b2
added return statements
...
bzr revid: nicolas.vanhoren@openerp.com-20120913121014-bu2o3sboo2xd4731
2012-09-13 14:10:14 +02:00
niv-openerp
b7923e45be
beautify js
...
bzr revid: nicolas.vanhoren@openerp.com-20120913120826-ar7dnrfmka7oebyp
2012-09-13 14:08:26 +02:00
niv-openerp
ff4c8c0c60
corrected javascript crap
...
bzr revid: nicolas.vanhoren@openerp.com-20120913120000-8lttbfrbgekz32ui
2012-09-13 14:00:00 +02:00
Olivier Dony
e808baf4d6
[FIX] account_analytic_analysis: reminder should report consumed hours using the correct field
...
As the hours_quantity field is used to flag an account
as `to renew`, it should be used as well when reporting
the consumed quantity.
bzr revid: odo@openerp.com-20120913115446-ed9jrq2bode3kboq
2012-09-13 13:54:46 +02:00
Sanjay Gohel (Open ERP)
2fbc7e9d04
[IMP]improve subtype in crm_claim
...
bzr revid: sgo@tinyerp.com-20120913115138-4rrsmwmlfh4f25s1
2012-09-13 17:21:38 +05:30
Thibault Delavallée
0e4422809b
[IMP] email_template: now inherit from TestMailMockups test class.
...
bzr revid: tde@openerp.com-20120913114917-na341w0ja7n0ditu
2012-09-13 13:49:17 +02:00
Randhir Mayatra (OpenERP)
faf895d4be
[IMP] solve issues in purchase
...
bzr revid: rma@tinyerp.com-20120913114910-tz83d1m14q17h6uf
2012-09-13 17:19:10 +05:30
Raphael Collet
a44eb10af4
[IMP] account: adapt _prepare_name_get() of res.partner.bank to its new api
...
bzr revid: rco@openerp.com-20120913114609-pff1x0spvb0gja2u
2012-09-13 13:46:09 +02:00
Raphael Collet
a5d6044651
[IMP] res.partner.bank: change _prepare_name_get() to make it usable by onchange methods
...
bzr revid: rco@openerp.com-20120913114403-ny6h6vpijymj6o4s
2012-09-13 13:44:03 +02:00
Sanjay Gohel (Open ERP)
f554db5c6b
[IMP]add subtype for crm_claim
...
bzr revid: sgo@tinyerp.com-20120913114044-0spnm47pty5g04wu
2012-09-13 17:10:44 +05:30
Thibault Delavallée
5451ff85f9
[FIX] mail_mail: added security rules for mail.mail, to allow users to send emails.
...
This fixes notably the crash when Demo User tries to send
a quotation by email.
bzr revid: tde@openerp.com-20120913113931-x31vkhihikfdn4bc
2012-09-13 13:39:31 +02:00
Mayur Maheshwari (OpenERP)
7ee881b98d
[IMP]stock : add button claim on right side of delivery order and added data file for claim and give a acces right of borad to warehouse user
...
bzr revid: mma@tinyerp.com-20120913113832-80jmjtoj83pjflra
2012-09-13 17:08:32 +05:30
Thibault Delavallée
fd4b83e8d1
[FIX] tools.image: added an image conversion before sharpening; otherwise the filter could crash.
...
bzr revid: tde@openerp.com-20120913113655-t5o3wk3r0tkp203m
2012-09-13 13:36:55 +02:00
Jigar Amin - OpenERP
e18762e891
[merge] lp:~openerp-dev/openobject-addons/trunk-addons9-accounting-apa-customer-payment-sgo
...
bzr revid: jam@tinyerp.com-20120913112859-333bb6fs2f925clr
2012-09-13 16:58:59 +05:30
Harry (OpenERP)
0ae33fff39
[MERGE]
...
bzr revid: hmo@tinyerp.com-20120913112408-0b7vxalqhrohk06e
2012-09-13 16:54:08 +05:30
Jigar Amin - OpenERP
1ff7c428e5
[merge] lp:~openerp-dev/openobject-addons/trunk-addons9-accounting-apa-assets-kbh
...
bzr revid: jam@tinyerp.com-20120913111827-y5irvn9nz0sjh1kb
2012-09-13 16:48:27 +05:30
Frédéric van der Essen
b7d56a0b04
[IMP] point_of_sale: some improvements to the debug window
...
bzr revid: fva@openerp.com-20120913104621-zryga82o3d4vq174
2012-09-13 12:46:21 +02:00
Sanjay Gohel (Open ERP)
d5687b3ed0
[IMP]crm yml improve
...
bzr revid: sgo@tinyerp.com-20120913104518-6cse5m221l8n5yc4
2012-09-13 16:15:18 +05:30
Jigar Amin - OpenERP
a7a3735200
Merge lp:~openerp-dev/openobject-addons/trunk-addons9-accounting-apa-periodical-processing-aja
...
bzr revid: jam@tinyerp.com-20120913104032-f34n72eralb7p74w
2012-09-13 16:10:32 +05:30
Thibault Delavallée
25734f2cfd
[IMP] mail, portal: improved tests. A new TestMailMockup class has been defined, holding the various mockups for the mail gateway, to avoid having duplicate code in tests using emails. Added tests in portal about the invite mechanism.
...
bzr revid: tde@openerp.com-20120913103529-410g9sk32sbbmkgn
2012-09-13 12:35:29 +02:00
Bhumi Thakkar (Open ERP)
228a19d6c2
[IMP] In help field define type='html'.
...
bzr revid: bth@tinyerp.com-20120913103447-ag5p3yhzi59tp3uo
2012-09-13 16:04:47 +05:30
Thibault Delavallée
01f6ac8d16
[FIX] portal invite wizard: generated URL improvement (partner_id and portal_group_id should be correct now).
...
bzr revid: tde@openerp.com-20120913103401-waepkmjq8flsu13j
2012-09-13 12:34:01 +02:00
Thibault Delavallée
8868fa2810
[IMP] mail_wizard_invite: message is now an html field, and default values embedded inside a div. Added a subject to email sent to newly added followers.
...
bzr revid: tde@openerp.com-20120913103319-6jg5moa0tl9p6ujn
2012-09-13 12:33:19 +02:00
Jigar Amin - OpenERP
3deede1faf
Merge lp:~openerp-dev/openobject-addons/trunk-addons9-accounting-apa-account-configuration-aja
...
bzr revid: jam@tinyerp.com-20120913103300-c84d7fk6rymygdod
2012-09-13 16:03:00 +05:30
Amit Patel
e7cb7fd18f
[MERGE]:merged timetracking changes.
...
bzr revid: apa@tinyerp.com-20120913102648-dom11isset01lj4w
2012-09-13 15:56:48 +05:30
Sanjay Gohel (Open ERP)
17987c7e2c
[IMP]crm yml improve for subtype
...
bzr revid: sgo@tinyerp.com-20120913102456-c74asnmmh6kx5270
2012-09-13 15:54:56 +05:30
Harry (OpenERP)
868d236c3a
[MERGE] issue of send mail after finish import data
...
bzr revid: hmo@tinyerp.com-20120913102221-5bp2tli2hy70v1by
2012-09-13 15:52:21 +05:30
Antonin Bourguignon
5de520e4da
[FIX] remove previous erroneous bugfix
...
bzr revid: abo@openerp.com-20120913100628-oojngjznaeu0txyb
2012-09-13 12:06:28 +02:00
Sanjay Gohel (Open ERP)
458899673b
[IMP]change in mrp operations openerp.py
...
bzr revid: sgo@tinyerp.com-20120913100307-4f49x1my6ajzzfiz
2012-09-13 15:33:07 +05:30
niv-openerp
d9629687e9
[IMP] removed default_selection
...
bzr revid: nicolas.vanhoren@openerp.com-20120913095414-n0r5veemxniao6hi
2012-09-13 11:54:14 +02:00
Antonin Bourguignon
49fae6fcba
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120913095002-oohnjqtm0bvkmjax
2012-09-13 11:50:02 +02:00
Khushboo Bhatt (Open ERP)
2bd286e93a
[REM]account_assets:removed graph view form assets
...
bzr revid: kbh@tinyerp.com-20120913094611-4k5itc8wlo7w68tv
2012-09-13 15:16:11 +05:30
Sanjay Gohel (Open ERP)
53a67e0652
[IMP]change in mrp
...
bzr revid: sgo@tinyerp.com-20120913094209-4r0laz8gtmcz1tsq
2012-09-13 15:12:09 +05:30
Vishmita
f35f86745e
[FIX]change image path of node.
...
bzr revid: vja@tinyerp.com-20120913093921-hv1jgfahc1cn2ef7
2012-09-13 15:09:21 +05:30
Pinakin Nayi (OpenERP)
ec11502e3c
[IMP]send mail
...
bzr revid: pna@tinyerp.com-20120913093717-8lh5k3ntmzof2fnd
2012-09-13 15:07:17 +05:30
Jigar Amin - OpenERP
23951e1e0d
Merge lp:~openerp-dev/openobject-addons/trunk-addons9-contract-apa-contract-kbh
...
bzr revid: jam@tinyerp.com-20120913093622-71bbdyz3l7ilb2ls
2012-09-13 15:06:22 +05:30
Pinakin Nayi (OpenERP)
55f8867670
[MERGE]:with parent branch
...
bzr revid: pna@tinyerp.com-20120913093444-n06lxdnyrap84w3x
2012-09-13 15:04:44 +05:30
Thibault Delavallée
b183962347
[IMP] mail_wizard_invite: updated default message. An override of default_get allows to have a more precise message.
...
bzr revid: tde@openerp.com-20120913093320-mhwp43kkgoqd0h33
2012-09-13 11:33:20 +02:00
Vo Minh Thu