Turkesh Patel (Open ERP)
81656c3e7e
[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-v62_config_product-uco
...
bzr revid: tpa@tinyerp.com-20120313093252-y1hduni2ptvjanb9
2012-03-13 15:02:52 +05:30
Ujjvala Collins (OpenERP)
e53252a565
[FIX] account: Fixed installing chart of account problem.
...
bzr revid: uco@tinyerp.com-20120313093232-2wwiiz8nznc82q5c
2012-03-13 15:02:32 +05:30
Jagdish Panchal (Open ERP)
5f61cb054f
[IMP] purchase: renamed menu Purchase management => Purchase
...
bzr revid: jap@tinyerp.com-20120313092850-kzgb867h3i4fp5re
2012-03-13 14:58:50 +05:30
Turkesh Patel (Open ERP)
48e4959eda
[IMP] remove new uom group
...
bzr revid: tpa@tinyerp.com-20120313092721-qlacpvejyb2r8rhc
2012-03-13 14:57:21 +05:30
Thibault Delavallée
0790cbbfd7
[IMP] res.users: code cleaning
...
bzr revid: tde@openerp.com-20120313091651-6jvvuljjrlpjsto6
2012-03-13 10:16:51 +01:00
Turkesh Patel (Open ERP)
4fceaf43e0
[IMP] improved code
...
bzr revid: tpa@tinyerp.com-20120313090412-5p6skrd0xkkkj4kl
2012-03-13 14:34:12 +05:30
Thibault Delavallée
6c4ccf9bd5
[DOC] Added merge proposal documentation
...
bzr revid: tde@openerp.com-20120313085743-oa9jrbvnqwklpnlb
2012-03-13 09:57:43 +01:00
Bhumika (OpenERP)
18d103344d
[MERGE] Merge improverment of demo data
...
bzr revid: sbh@tinyerp.com-20120313084101-e5i3x4dcliejdc8g
2012-03-13 14:11:01 +05:30
Thibault Delavallée
85397bd1f5
[MERGE] Merged with main addons
...
bzr revid: tde@openerp.com-20120313081916-pp84ief25ons0sqq
2012-03-13 09:19:16 +01:00
Fabien Meghazi
42f813f7dc
[WIP] Nested groups working
...
bzr revid: fme@openerp.com-20120313081251-9ht80pktzsolkf91
2012-03-13 09:12:51 +01:00
Kuldeep Joshi (OpenERP)
888ba2bf3e
[IMP]base/res_partner: remove photo field
...
bzr revid: kjo@tinyerp.com-20120313073307-61xlb1fgkeiv3rqp
2012-03-13 13:03:07 +05:30
Kuldeep Joshi (OpenERP)
3b56005bcb
[IMP]base/res_partner: set indentation in demo
...
bzr revid: kjo@tinyerp.com-20120313063906-3gv0qpr9fafmj8el
2012-03-13 12:09:06 +05:30
Bhumika (OpenERP)
18d4bee835
[IMP]base/res :set photo when create company from childs
...
bzr revid: sbh@tinyerp.com-20120313061338-dh2i2ve0rhbl1jha
2012-03-13 11:43:38 +05:30
Anup (SerpentCS)
289e318773
[IMP] base : Added Symbol of INR
...
bzr revid: anup.chavda@serpentcs.com-20120313055424-jss671oiu8eeosra
2012-03-13 11:24:24 +05:30
Kuldeep Joshi (OpenERP)
41fd7fca03
[IMP]base/res_partner: set indentation and merge with main branch
...
bzr revid: kjo@tinyerp.com-20120313055125-fhdw31q7qheih9ob
2012-03-13 11:21:25 +05:30
Launchpad Translations on behalf of openerp
98a6a99173
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120313053503-xvlvyuystb8tvif8
2012-03-13 05:35:03 +00:00
Kuldeep Joshi (OpenERP)
41a5021110
[IMP]base/res_partner : demo data change
...
bzr revid: kjo@tinyerp.com-20120313053048-jmybumt3hif622y2
2012-03-13 11:00:48 +05:30
Meera Trambadia (OpenERP)
440037d7bc
[MERGE] branch merged with openobject-addons
...
bzr revid: mtr@tinyerp.com-20120313051730-3rmlg1z493owjtzo
2012-03-13 10:47:30 +05:30
Launchpad Translations on behalf of openerp
8dc8016a37
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120313050811-m4u0qfmbq2k6omd6
2012-03-13 05:08:11 +00:00
Fabien Meghazi
03cbb105a7
[WIP] Nested groups fails
...
bzr revid: fme@openerp.com-20120312204117-xg6ybzdhleonmvmf
2012-03-12 21:41:17 +01:00
Olivier Dony
e74c011a60
[FIX] ir.mail_server: SMTP user and pass should be passed as bytes to login()
...
Passing a unicode used to work in Python 2.5 but that
changed in 2.6 due to a change in the hmac module.
In any case the various RFCs that describe such
authentication mechanism do specify that UTF-8 encoded
values should be used, so we should be safe coercing
the user and passsword to UTF-8 bytes strings.
And of course it should not change anything for
the ASCII passwords out there anyway.
For references, see:
- Zope bug https://bugs.launchpad.net/zope.sendmail/+bug/597143
- Python issue http://bugs.python.org/issue5285
- http://tools.ietf.org/html/draft-ietf-sasl-crammd5-10#section-4
bzr revid: odo@openerp.com-20120312174348-iiqfa2toupn3udr3
2012-03-12 18:43:48 +01:00
Fabien Meghazi
ec8c17161c
[REM] Removed forgotten console.log
...
bzr revid: fme@openerp.com-20120312153743-i6qi3fzmondezrdh
2012-03-12 16:37:43 +01:00
Fabien Meghazi
e125dd5f63
[WIP] Form v2
...
bzr revid: fme@openerp.com-20120312153452-x6zhyeheu4579ak3
2012-03-12 16:34:52 +01:00
Vaibhav (OpenERP)
2da2d8ba5e
[FIX] Week,Day mode should able to save/delete event.
...
lp bug: https://launchpad.net/bugs/946378 fixed
bzr revid: vda@tinyerp.com-20120312125812-k6swcoskhn134ba2
2012-03-12 18:28:12 +05:30
Quentin (OpenERP)
16c9a25c0d
[MERGE] merged few enhancements related to event* modules (better demo data in event_sale + new module to fix incompatibility with event_sale and sale_layout modules)
...
bzr revid: qdp-launchpad@openerp.com-20120312120145-2ahlt8jnh9pm1p1w
2012-03-12 13:01:45 +01:00
Turkesh Patel (Open ERP)
d3d94e833b
[IMP] remove conflicts
...
bzr revid: tpa@tinyerp.com-20120312115853-t1xdfjm6hc6rbs0b
2012-03-12 17:28:53 +05:30
Quentin (OpenERP)
3dd0a4c334
[IMP] event_sale_layout: better module description
...
bzr revid: qdp-launchpad@openerp.com-20120312115601-ne4dwkl76o6jeo8a
2012-03-12 12:56:01 +01:00
Quentin (OpenERP)
d0c2d2c45f
[FIX] event_sale: fields set back to invisible on sale.order.line
...
bzr revid: qdp-launchpad@openerp.com-20120312114602-ckonmf9044u1m4ej
2012-03-12 12:46:02 +01:00
Turkesh Patel (Open ERP)
5339bb0353
[IMP] improved code
...
bzr revid: tpa@tinyerp.com-20120312114547-x5eqebcspzazfo32
2012-03-12 17:15:47 +05:30
Quentin (OpenERP)
6a5e210d49
[IMP] event_sale: better demo data
...
bzr revid: qdp-launchpad@openerp.com-20120312114404-2ter4n11mkyy85gh
2012-03-12 12:44:04 +01:00
Olivier Dony
5492dbe760
[FIX] project_issue: global CC fields contains email(s), not a URL
...
bzr revid: odo@openerp.com-20120312112931-3oeretod35lsgmug
2012-03-12 12:29:31 +01:00
Bhumika (OpenERP)
7288a49499
[IMP]base: res.company set logo field realted to partner
...
bzr revid: sbh@tinyerp.com-20120312111228-7zy1o4q2vykayuwy
2012-03-12 16:42:28 +05:30
Ujjvala Collins (OpenERP)
9e475bc8f4
[MERGE]: Add common changes for product UoM.
...
bzr revid: uco@tinyerp.com-20120312110750-3h8yx4z046qagvn4
2012-03-12 16:37:50 +05:30
Ujjvala Collins (OpenERP)
1f55d40f18
[REM] product: Removed common changes done for product.
...
bzr revid: uco@tinyerp.com-20120312110509-j6pbm1agzc2875ds
2012-03-12 16:35:09 +05:30
Ujjvala Collins (OpenERP)
65d466b4fe
[ADD]: Added remaining groups for suppliers and stock packaging.
...
bzr revid: uco@tinyerp.com-20120312105655-gzs4nci80gzlsnld
2012-03-12 16:26:55 +05:30
Stephane Wirtel
f817f3f340
[FIX] In the case where the user has no signature, we set up a default value to avoid to have a body with 'False'.
...
bzr revid: stephane@openerp.com-20120312103025-dn5q7hml9sy5u0t7
2012-03-12 11:30:25 +01:00
Ujjvala Collins (OpenERP)
e2c8783f1b
[ADD]: Added common configuration for UoM per product group.
...
bzr revid: uco@tinyerp.com-20120312102702-xp63smj3qcn1eu31
2012-03-12 15:57:02 +05:30
Ujjvala Collins (OpenERP)
8b7aeb05b3
[MERGE]: Merged tpa's branch. Added tooltips.
...
bzr revid: uco@tinyerp.com-20120312102349-oijh20ouvo9h3qll
2012-03-12 15:53:49 +05:30
Olivier Dony
b3c0d126e9
[FIX] project: project preference field must be editable
...
The user preferences screen is kind of a hack
because it lets the user modify fields on a
model that is normally read-only for her (res.users).
This is accomplished by a custom write() method
on res.users combined with a view on which some
fields are forced to be read-write using a
trick: @readonly=0.
bzr revid: odo@openerp.com-20120312102001-aas39wknhsyxkhbx
2012-03-12 11:20:01 +01:00
Atul Patel (OpenERP)
5bf4aa302a
[ADD]: ADd condition for insert constraint if not exists.
...
bzr revid: atp@tinyerp.com-20120312095355-q3r8bz8i7n50bf47
2012-03-12 15:23:55 +05:30
Kuldeep Joshi (OpenERP)
d8f4e75733
[IMP]base/res_partner: change demo data
...
bzr revid: kjo@tinyerp.com-20120312094429-fpmceeizvbn8eraa
2012-03-12 15:14:29 +05:30
Bhumika (OpenERP)
20aa7d6fe8
[Fix]: Improve display adress for print company name
...
bzr revid: sbh@tinyerp.com-20120312093332-oucqpsrcn33o82me
2012-03-12 15:03:32 +05:30
Olivier Dony
49459c7219
[FIX] hr_holidays: Leaves calendar view should be filtered by users, not description
...
bzr revid: odo@openerp.com-20120312090809-rloqoz5lb3rr7a9a
2012-03-12 10:08:09 +01:00
Turkesh Patel (Open ERP)
3b381dc5b3
[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-v62_config_account-uco
...
bzr revid: tpa@tinyerp.com-20120312090221-y0ucnrhtpze51zfz
2012-03-12 14:32:21 +05:30
Turkesh Patel (Open ERP)
506bc466de
[IMP] added tooltip
...
bzr revid: tpa@tinyerp.com-20120312085044-qmh71xu0xa0jac8f
2012-03-12 14:20:44 +05:30
Kuldeep Joshi (OpenERP)
c6e04a4739
[IMP]base/res_company and res_partner: add photo field and readonly address
...
bzr revid: kjo@tinyerp.com-20120312084636-ew5j4arua8hjdpih
2012-03-12 14:16:36 +05:30
Atul Patel (OpenERP)
7cf78f08db
[FIX]: FIX query groupby problem for string
...
bzr revid: atp@tinyerp.com-20120312084217-jixwo97b30qht158
2012-03-12 14:12:17 +05:30
Turkesh Patel (Open ERP)
e7299f1bc4
[MRG] merge with main addons
...
bzr revid: tpa@tinyerp.com-20120312072551-xewmnp2iklr37ihe
2012-03-12 12:55:51 +05:30
Turkesh Patel (Open ERP)
8f5c20094f
[MRG] merge with main addoons
...
bzr revid: tpa@tinyerp.com-20120312072520-c58jvcgvdq7ezenl
2012-03-12 12:55:20 +05:30
Turkesh Patel (Open ERP)
76895108c8
[MRG] merge with main addons
...
bzr revid: tpa@tinyerp.com-20120312072348-t9i3il0xc6j9ptbn
2012-03-12 12:53:48 +05:30