Turkesh Patel (Open ERP)
8abb1113f9
[IMP] mrp: improved search views.
...
bzr revid: tpa@tinyerp.com-20120720121349-b63t3xan09un5qe6
2012-07-20 17:43:49 +05:30
Antonin Bourguignon
a4fba2145b
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120718131530-a90b062c769y0u0e
bzr revid: abo@openerp.com-20120719164208-xj75h0socxc3p6jb
2012-07-19 18:42:08 +02:00
Antonin Bourguignon
391a35389c
[IMP] remove deprecated attributes 'icon', 'web_icon' and 'web_icon_hover' from top menu items
...
bzr revid: abo@openerp.com-20120718131403-6pzpzhhqbxhtub9b
2012-07-18 15:14:03 +02:00
Antonin Bourguignon
c7f4b5ead1
[IMP] format all the top menu items' XML the same way, prefixed by the comment '<- Top menu item -->', making them easier to spot
...
also fix some identation
bzr revid: abo@openerp.com-20120718103429-98gl4oe0hkmmf35k
2012-07-18 12:34:29 +02:00
Antonin Bourguignon
2b59d63699
[IMP] give higher sequence numbers (with wider gaps) to top menu items
...
it should now be easier to insert new elements wherever we want in the main menu
bzr revid: abo@openerp.com-20120717162528-0kkk32mjeoyda9c4
2012-07-17 18:25:28 +02:00
Kuldeep Joshi (OpenERP)
a8db458c54
[IMP]mrp: assign group
...
bzr revid: kjo@tinyerp.com-20120716085557-yipr924zh1bfpems
2012-07-16 14:25:57 +05:30
Kuldeep Joshi (OpenERP)
efe9365e44
[IMP]mrp: remove unused code
...
bzr revid: kjo@tinyerp.com-20120716084932-9k6epzcpjjf0ukev
2012-07-16 14:19:32 +05:30
Kuldeep Joshi (OpenERP)
13e691d4da
[IMP]mrp: set groups
...
bzr revid: kjo@tinyerp.com-20120716074559-5ert6z9zlz3b7j1p
2012-07-16 13:15:59 +05:30
Kuldeep Joshi (OpenERP)
c146212da5
[IMP]mrp: set group and remove separator
...
bzr revid: kjo@tinyerp.com-20120716072002-n4qznh0zxgten01c
2012-07-16 12:50:02 +05:30
Kuldeep Joshi (OpenERP)
414fe39fc0
[MERGE] lp:openobject-addons
...
bzr revid: kjo@tinyerp.com-20120716054943-sjte659y2ryh3aa6
2012-07-16 11:19:43 +05:30
Kuldeep Joshi (OpenERP)
84d5f7b709
[IMP]mrp: remove sheet from Bill of Materials
...
bzr revid: kjo@tinyerp.com-20120714065327-qof2fo89wt7ysazc
2012-07-14 12:23:27 +05:30
Kuldeep Joshi (OpenERP)
09dda00b77
[IMP]mrp: revert change
...
bzr revid: kjo@tinyerp.com-20120714062755-fyu9lqgn7xpmylz8
2012-07-14 11:57:55 +05:30
Harry (OpenERP)
9cf644cc61
[MERGE] upstream
...
bzr revid: hmo@tinyerp.com-20120712111945-syycevo2dywbvfw0
2012-07-12 16:49:45 +05:30
Fabien Pinckaers
be58e60bb7
[IMP] properties as m2m_tags
...
bzr revid: fp@tinyerp.com-20120705150010-79nnaos25o45wdcy
2012-07-05 17:00:10 +02:00
Amit Patel (OpenERP)
4cbc8a921b
[IMP]:mrp:removed tabs
...
bzr revid: apa@tinyerp.com-20120705064752-uzfgjsi0jvbh35vd
2012-07-05 12:17:52 +05:30
Amit Patel (OpenERP)
2649dd52c9
[IMP]:mrp:improved Manufacturing Order view with h1 and h2
...
bzr revid: apa@tinyerp.com-20120704085826-abq2adz03n0xt8to
2012-07-04 14:28:26 +05:30
Amit Patel (OpenERP)
3674c95e84
[MERGE]:merged with trunk
...
bzr revid: apa@tinyerp.com-20120704084602-7bdvtp45lkfanw70
2012-07-04 14:16:02 +05:30
Thibault Delavallée
27a1ac68d4
[REF] ThreadView widget renamed to mail_thread. Also added some footers where they were not used.
...
bzr revid: tde@openerp.com-20120703124111-smgj0kw3ct32552y
2012-07-03 14:41:11 +02:00
Amit Patel (OpenERP)
3772db6f92
[MERGE]:merged from trunk
...
bzr revid: apa@tinyerp.com-20120629125827-yq3amirp1zduezx1
2012-06-29 18:28:27 +05:30
Raphael Collet
1debe0efcd
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120628131210-hyx2t1lqbl5hwm9g
2012-06-28 15:12:10 +02:00
Amit Patel (OpenERP)
6bbb339b9f
[IMP]:improved view in new style
...
bzr revid: apa@tinyerp.com-20120627111252-j0dliz74sqlwg2v4
2012-06-27 16:42:52 +05:30
Raphael Collet
c48d9bd23c
[IMP] mrp: improve titles in form views of BoM and Manufacturing order
...
bzr revid: rco@openerp.com-20120627095718-tetbrm2s3dd6pimu
2012-06-27 11:57:18 +02:00
Raphael Collet
b1761e964b
[IMP] mrp: improve form view of manufacturing order
...
bzr revid: rco@openerp.com-20120627094006-i8oo3zqnefmwvizc
2012-06-27 11:40:06 +02:00
Raphael Collet
3dc9af4c1e
[IMP] mrp, procurement: clean up views
...
bzr revid: rco@openerp.com-20120627091941-j80e2cid54bpv4ym
2012-06-27 11:19:41 +02:00
Raphael Collet
51ea235710
[FIX] mrp: fix classes in form views
...
bzr revid: rco@openerp.com-20120627084004-1sppr5fzjg0mucgx
2012-06-27 10:40:04 +02:00
Raphael Collet
4990286de5
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120627083039-ndn1p9f18dz2hkcw
2012-06-27 10:30:39 +02:00
Amit Patel (OpenERP)
d47db9912c
[MERGE]
...
bzr revid: apa@tinyerp.com-20120627071657-fhoqu1tu3j8g1g5k
2012-06-27 12:46:57 +05:30
Kuldeep Joshi (OpenERP)
44f45e3922
[IMP] change menu name
...
bzr revid: kjo@tinyerp.com-20120625065627-09700e1rk8hapwah
2012-06-25 12:26:27 +05:30
Kuldeep Joshi (OpenERP)
edfd2c18f0
[IMP] remove string
...
bzr revid: kjo@tinyerp.com-20120625061950-nw23wvb4zcu86dzh
2012-06-25 11:49:50 +05:30
Kuldeep Joshi (OpenERP)
74b1e9d770
[IMP] set button on top
...
bzr revid: kjo@tinyerp.com-20120625055411-zod3eaopqihynuf1
2012-06-25 11:24:11 +05:30
Jigar Amin - OpenERP
43a50a651b
[MERGE] lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20120625041934-v1twcjzbjupl369n
2012-06-25 09:49:34 +05:30
Kuldeep Joshi (OpenERP)
36e94e982d
[IMP] bom view change
...
bzr revid: kjo@tinyerp.com-20120622134517-ewlgnn3w7veps9wi
2012-06-22 19:15:17 +05:30
Quentin (OpenERP)
4c104ca727
[IMP] search views: made some small usability changes
...
bzr revid: qdp-launchpad@openerp.com-20120622130506-pzz8wqo5p5y902qc
2012-06-22 15:05:06 +02:00
Kuldeep Joshi (OpenERP)
1a944c6c29
[IMP] workcenter and rounting view change
...
bzr revid: kjo@tinyerp.com-20120622123822-3o2d1npxrfy40xr1
2012-06-22 18:08:22 +05:30
Kuldeep Joshi (OpenERP)
de90ef25dc
[IMP]Manufacturing orders view change
...
bzr revid: kjo@tinyerp.com-20120622120353-poglhhjdz17vbegi
2012-06-22 17:33:53 +05:30
Purnendu Singh (OpenERP)
55633a22a2
[REF] search views: removed filterr_domain if only one element was inside
...
bzr revid: psi@tinyerp.com-20120622111251-nykd53nolythqhu2
2012-06-22 16:42:51 +05:30
Purnendu Singh (OpenERP)
1c35eb1049
[MERGE] Mearge with main addons
...
bzr revid: psi@tinyerp.com-20120622055230-trqmxu7r1qtxa0ut
2012-06-22 11:22:30 +05:30
Jigar Amin - OpenERP
d145817fb8
[MERGE] lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20120621043747-n4sjqa91q2xc3wl9
2012-06-21 10:07:47 +05:30
Randhir Mayatra (OpenERP)
e80980330b
[USA] replaced red button class oe_form_button_active_flow to oe_highlight
...
bzr revid: rma@tinyerp.com-20120620101205-uf0ibqbq4uzu17iq
2012-06-20 15:42:05 +05:30
Stephane Wirtel
f2fba32b56
[REF] Change the CSS classes
...
bzr revid: stw@openerp.com-20120619085618-agdxk4fdgy3of6gp
2012-06-19 10:56:18 +02:00
Jigar Amin - OpenERP
7fc1b0b25e
[MERGE] lp:openpbject-addons
...
bzr revid: jam@tinyerp.com-20120619061856-eok4a7xmyodeapku
2012-06-19 11:48:56 +05:30
Mayur Maheshwari (OpenERP)
f489ef4f3a
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120619055615-bz15l0m1cd5aee6s
2012-06-19 11:26:15 +05:30
Purnendu Singh (OpenERP)
2e3728db21
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120619050100-26hsypt5z491kbje
2012-06-19 10:31:00 +05:30
Stephane Wirtel
17f11dc7d9
[REF] Review the form views
...
bzr revid: stw@openerp.com-20120618160057-wzqaoepmqqzgj3tq
2012-06-18 18:00:57 +02:00
Purnendu Singh (OpenERP)
5ac3c108d5
[MERGE]mrp_*: search view update
...
bzr revid: psi@tinyerp.com-20120618123832-xxltu1jy7b4iqutc
2012-06-18 18:08:32 +05:30
Ajay Chauhan (OpenERP)
0d06cd0235
[IMP]mrp : improve search code in xml
...
bzr revid: cha@tinyerp.com-20120618091502-kblo7qm9y5nebjhp
2012-06-18 14:45:02 +05:30
Mayur Maheshwari (OpenERP)
318fc7a37f
[IMP]mrp: improve menutip
...
bzr revid: mma@tinyerp.com-20120615101207-yy6eco3oqgtl76m8
2012-06-15 15:42:07 +05:30
Mayur Maheshwari (OpenERP)
07021533c5
[IMP]mrp: fix the form tag issue
...
bzr revid: mma@tinyerp.com-20120615090522-8twzo6vov7ew3gfx
2012-06-15 14:35:22 +05:30
Mayur Maheshwari (OpenERP)
be7b44cbd1
[IMP]mrp: added a context for default search
...
bzr revid: mma@tinyerp.com-20120615071444-2uyv0zz17qtqd6nf
2012-06-15 12:44:44 +05:30
Ajay Chauhan (OpenERP)
3e3a234cf0
[IMP]mrp_* : improve search code in xml
...
bzr revid: cha@tinyerp.com-20120615054710-gsgycbzi3ie60481
2012-06-15 11:17:10 +05:30
Mayur Maheshwari (OpenERP)
77cedcc2b5
[IMP]mrp: improve view
...
bzr revid: mma@tinyerp.com-20120614111328-zrxqevkts0byblim
2012-06-14 16:43:28 +05:30
Mayur Maheshwari (OpenERP)
e0a0d760ac
[IMP]mrp: improve a typo and added a group
...
bzr revid: mma@tinyerp.com-20120614102258-kx1gf1k329fobhrz
2012-06-14 15:52:58 +05:30
ajay javiya (OpenERP)
414bf8db4b
[ADD] : Add color on button
...
bzr revid: aja@tinyerp.com-20120614095018-1lyb4q7imca8ngq4
2012-06-14 15:20:18 +05:30
Mayur Maheshwari (OpenERP)
6c833f8fc7
[IMP]mrp: improve a menutip
...
bzr revid: mma@tinyerp.com-20120614054650-l7wt69b9aikt5pdl
2012-06-14 11:16:50 +05:30
Mayur Maheshwari (OpenERP)
37de535a47
[IMP]mrp: improve a label
...
bzr revid: mma@tinyerp.com-20120613112607-axqq081te2y5o3o4
2012-06-13 16:56:07 +05:30
Nimesh (Open ERP)
352a61336d
[IMP] add sheet.
...
bzr revid: nco@tinyerp.com-20120613112412-epxfaecnbfevhofb
2012-06-13 16:54:12 +05:30
Mayur Maheshwari (OpenERP)
bf006496d3
[MERGE] merge with main addons
...
bzr revid: mma@tinyerp.com-20120611130407-b99sndu60jupcqw6
2012-06-11 18:34:07 +05:30
Mayur Maheshwari (OpenERP)
7c6ebb98f5
[FIX]stock: added a group , class on button, improve a menu tip,label name,added a tree view on one2many field
...
bzr revid: mma@tinyerp.com-20120611095914-631eo6yw8bz9aknx
2012-06-11 15:29:14 +05:30
Fabien Pinckaers
a8e1b5d3d2
fix
...
bzr revid: fp@tinyerp.com-20120609233239-tm5cz70fctemmar0
2012-06-10 01:32:39 +02:00
Fabien Pinckaers
90c391ec33
fix
...
bzr revid: fp@tinyerp.com-20120609231824-3k3xejhpbpknvaa1
2012-06-10 01:18:24 +02:00
Fabien Pinckaers
746610f234
[IMP] better form views
...
bzr revid: fp@tinyerp.com-20120609215628-0ro72kp0hzni67j9
2012-06-09 23:56:28 +02:00
Fabien Pinckaers
4914e39f59
[IMP] better form views, new guidelines
...
bzr revid: fp@tinyerp.com-20120609150855-8vhx441vhby4lbr4
2012-06-09 17:08:55 +02:00
Fabien Pinckaers
3c8643ce4c
[IMP] better form views, new guidelines
...
bzr revid: fp@tinyerp.com-20120609143904-ydwqfyb54atbcpvw
2012-06-09 16:39:04 +02:00
Fabien Pinckaers
b1ea5e4c97
[IMP] replace footer by divs for chatter
...
bzr revid: fp@tinyerp.com-20120713095341-6h0ganz4zmlwv9wg
2012-07-13 11:53:41 +02:00
Amit Patel (OpenERP)
b17672cd44
[IMP]:mrp
...
bzr revid: apa@tinyerp.com-20120605120235-6bjlk7mdrqtquovo
2012-06-05 17:32:35 +05:30
Fabien Pinckaers
48f8823bad
[IMP] replaced all oe_form_topbar with the new <header> style
...
bzr revid: fp@tinyerp.com-20120604121139-zqoqbou9v2fdue5h
2012-06-04 14:11:39 +02:00
Fabien Pinckaers
623fd428bd
[IMP] xml of topbars, removed oe_right, oe_clear
...
bzr revid: fp@tinyerp.com-20120604105056-xvos3jwt3i9wsqrb
2012-06-04 12:50:56 +02:00
Sbh (Openerp)
1bc1b8817e
[MERGE] Merge with lp:openobject-adddons
...
bzr revid: sbh@tinyerp.com-20120523045707-rxt3uirdycmb3bxj
2012-05-23 10:27:07 +05:30
Fabien Pinckaers
5c791531aa
[IMP] improved typos
...
bzr revid: fp@tinyerp.com-20120522161055-6013qr1s4p773hoj
2012-05-22 18:10:55 +02:00
Sbh (Openerp)
f4ef4460c2
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20120522103754-qvz1rqmzfpywc6yq
2012-05-22 16:07:54 +05:30
Fabien Pinckaers
b3fa4ccf5c
[IMP] removed icons from topbar
...
bzr revid: fp@tinyerp.com-20120522091445-mpiknieg2v8sd31f
2012-05-22 11:14:45 +02:00
Fabien Pinckaers
ee566d388c
[IMP] merged topbar status widgets
...
bzr revid: fp@tinyerp.com-20120522085037-oktkq3td2hg9lvzr
2012-05-22 10:50:37 +02:00
Amit Patel (OpenERP)
1aefff9733
[MERGE]:merged from trunk
...
bzr revid: apa@tinyerp.com-20120517101517-npk57s14kgxlk7in
2012-05-17 15:45:17 +05:30
Kuldeep Joshi (OpenERP)
e8c273ca3d
[IMP]mrp: remove sheet tag
...
bzr revid: kjo@tinyerp.com-20120516073310-kpcqjbc34wr6b3y2
2012-05-16 13:03:10 +05:30
Kuldeep Joshi (OpenERP)
8524829e6b
[IMP] set col for group
...
bzr revid: kjo@tinyerp.com-20120516071546-lop7d6nrsf7szo11
2012-05-16 12:45:46 +05:30
Kuldeep Joshi (OpenERP)
cba71891c7
[IMP] mrp: set openchatter outside the form view and arrange field
...
bzr revid: kjo@tinyerp.com-20120516065416-vmel0qk1zcse2vw4
2012-05-16 12:24:16 +05:30
Sbh (Openerp)
e51ed975f3
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20120516043048-pkd9klih8jdszhni
2012-05-16 10:00:48 +05:30
Raphael Collet
bcb9291df3
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120514150926-osvdmdyopi6ynn6o
2012-05-14 17:09:26 +02:00
Sbh (Openerp)
24e14346e2
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20120514124555-xw7sxqnk7w72m8q5
2012-05-14 18:15:55 +05:30
Sbh (Openerp)
d424067702
[MERGE] Merge procurment
...
bzr revid: sbh@tinyerp.com-20120514120531-pionchjinalrucfm
2012-05-14 17:35:31 +05:30
Sbh (Openerp)
3a5b1451b7
[MERGE] Merge lp:~openerp-dev/openobject-addons/trunk-social-mail-tpa
...
bzr revid: sbh@tinyerp.com-20120514112710-1xnsgtcqmdwhtqxv
2012-05-14 16:57:10 +05:30
Raphael Collet
43ed050319
[MERGE] trunk-product-view-tta (improve product kanban and form view)
...
bzr revid: rco@openerp.com-20120514083657-55agqnkd58p6oiy5
2012-05-14 10:36:57 +02:00
Raphael Collet
ece6843491
[IMP] mrp modules: fix English
...
bzr revid: rco@openerp.com-20120509134234-qpjy7wgyoumzos4l
2012-05-09 15:42:34 +02:00
Saurang Suthar (OpenERP)
a2a05cfc19
[IMP]:improved titles State by Status everywhere
...
bzr revid: ssu@tinyerp.com-20120504115748-2vd1dns7bxptg384
2012-05-04 17:27:48 +05:30
Mayur Maheshwari (OpenERP)
1de84a98bc
[IMP]procurement : Added state and buttons on top bar and sheet tag in inherited view
...
bzr revid: mma@tinyerp.com-20120504104317-xesuo9wje9eo6zoq
2012-05-04 16:13:17 +05:30
Saurang Suthar (OpenERP)
ff8d3e11d6
[IMP]:improved code for creation of BoM for one2many issue
...
bzr revid: ssu@tinyerp.com-20120502124848-usphl8qr4l2b57ge
2012-05-02 18:18:48 +05:30
Saurang Suthar (OpenERP)
d6ae0f8fc4
[IMP]:improved code for creating minimum stock rule and taking current product in BoM in product form view
...
bzr revid: ssu@tinyerp.com-20120502113432-1xgak350n58lbwyu
2012-05-02 17:04:32 +05:30
Turkesh Patel (Open ERP)
ce187540ef
[MRG] merge with main addons
...
bzr revid: tpa@tinyerp.com-20120430124803-w1mt7uybjqwwp9em
2012-04-30 18:18:03 +05:30
Saurang Suthar (OpenERP)
a60e41d975
[IMP]:seperator strings are added for BoM and Minimum Stock Rules
...
bzr revid: ssu@tinyerp.com-20120427121548-pi9af6cg2vmg4ie8
2012-04-27 17:45:48 +05:30
Saurang Suthar (OpenERP)
439ac26da6
[IMP]:resolve error at the time of creating new product by improving product form view for BoM and Minimum Stock Rules
...
bzr revid: ssu@tinyerp.com-20120427115547-qg0w7z632h3a8e0w
2012-04-27 17:25:47 +05:30
Saurang Suthar (OpenERP)
7f5fdbc8a5
[IMP]:BoM and minimum stock rules are visible directly in the product form without having to click on the relate icon
...
bzr revid: ssu@tinyerp.com-20120426131113-nhp6432tixh0e278
2012-04-26 18:41:13 +05:30
Turkesh Patel (Open ERP)
18a5714ab4
[IMP] improved view
...
bzr revid: tpa@tinyerp.com-20120426084400-k36hv8xbqunb5v73
2012-04-26 14:14:00 +05:30
Dharti Ratani (OpenERP)
76b7573716
[MERGE]merged with latest trunk
...
bzr revid: dhr@tinyerp.com-20120426052351-oq8ufb0gcijle39q
2012-04-26 10:53:51 +05:30
Dharti Ratani (OpenERP)
15dae73907
[IMP]improved product form
...
bzr revid: dhr@tinyerp.com-20120426051717-1qwywvi0r3f62l9r
2012-04-26 10:47:17 +05:30
Jagdish Panchal (Open ERP)
75c8ceb9b0
[MERGE] branch merged with lp:openobject-addons
...
bzr revid: jap@tinyerp.com-20120426044931-h8p2ynkxef02jp19
2012-04-26 10:19:31 +05:30
Raphael Collet
81094d3e96
[IMP] mrp, mrp_operations, mrp_repair: remove group_extended
...
bzr revid: rco@openerp.com-20120425140625-pofufyzwwvv60hsy
2012-04-25 16:06:25 +02:00
Jagdish Panchal (Open ERP)
427ea26334
[IMP] MRP: rename UOM to Unit of Measure everywhere
...
bzr revid: jap@tinyerp.com-20120425085415-vcgutq32ohkkjiu6
2012-04-25 14:24:15 +05:30
Jagdish Panchal (Open ERP)
18653db6f2
[IMP] mrp,mrp_repair,stock: Rename fields Production Lot >> Serial Number and also rename the fields in stock congi wizard
...
bzr revid: jap@tinyerp.com-20120424130805-dbfdz0f4j440vy2h
2012-04-24 18:38:05 +05:30
Turkesh Patel (Open ERP)
930144c80f
[fix] purchase,mrp: inherited view error
...
bzr revid: tpa@tinyerp.com-20120424130202-m99sbmem0z87r6df
2012-04-24 18:32:02 +05:30
Turkesh Patel (Open ERP)
4e1ee61eec
[IMP] rename field message_ids_social to message_ids.
...
bzr revid: tpa@tinyerp.com-20120420112605-cctm0yw34vedqco8
2012-04-20 16:56:05 +05:30
Turkesh Patel (Open ERP)
3ebc3652ff
[IMP] mrp:improved code for tree view
...
bzr revid: tpa@tinyerp.com-20120419101638-ltl5621fdkyyv8yr
2012-04-19 15:46:38 +05:30
Thibault Delavallée
09d751796b
[MERGE] Merged with main addons.
...
bzr revid: tde@openerp.com-20120405165529-11wrm91tu3xi23ll
2012-04-05 18:55:29 +02:00
Raphael Collet
416375ba2b
[IMP] product,mrp: move group_mrp_properties into module product, to add use on sale order lines
...
bzr revid: rco@openerp.com-20120404134731-3syvingajqrxgysg
2012-04-04 15:47:31 +02:00
Raphael Collet
ba9ae5c6e7
[FIX] mrp: menu Manufacturing > Master Data > Work Centers restricted to group 'Manage Routings and Work Orders'
...
bzr revid: rco@openerp.com-20120404100144-edi31w7s56rajhhj
2012-04-04 12:01:44 +02:00
Thibault Delavallée
16e50b1a43
[MERGE] Merged with bth MRP branch
...
bzr revid: tde@openerp.com-20120403104751-y1iep9psdtn8cphp
2012-04-03 12:47:51 +02:00
Raphael Collet
017c5f8290
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120403082756-egpot17iztniu8tr
2012-04-03 10:27:56 +02:00
Meera Trambadia (OpenERP)
0e8ccd774d
[MERGE] branch merged with openobject-addons
...
bzr revid: mtr@tinyerp.com-20120326114847-6yju1vy8h7a33iwv
2012-03-26 17:18:47 +05:30
Raphael Collet
77117e046d
[IMP] mrp: change xml id of usability groups
...
bzr revid: rco@openerp.com-20120322155244-4pbdhs0ltzf98ub1
2012-03-22 16:52:44 +01:00
Thibault Delavallée
9cff260d3d
[IMP] Code cleaning
...
bzr revid: tde@openerp.com-20120322090154-2qau8gkkp5zql8py
2012-03-22 10:01:54 +01:00
Jagdish Panchal (Open ERP)
f29fb08e43
[IMP] MRP: apply group_no_one on menus Working Time, Resource Leaves, Properties, Property Groups
...
bzr revid: jap@tinyerp.com-20120316095306-778zru49zhkkwpw7
2012-03-16 15:23:06 +05:30
Bhumi Thakkar (Open ERP)
11b087a0b6
[FIX] renamed methods' name and modified statements and removed need_action_user_id field from view.
...
bzr revid: bth@tinyerp.com-20120313114429-b1jyxk7i4v1e5n8t
2012-03-13 17:14:29 +05:30
Bhumi Thakkar (Open ERP)
7942090ef0
[IMP] remove need_action_user_id from message_append_note method when calling and overwrite get_needaction_user_id method.
...
bzr revid: bth@tinyerp.com-20120309122343-a1adl30bj595cbhn
2012-03-09 17:53:43 +05:30
Bhumi Thakkar (Open ERP)
d94bb35ff7
[FIX] UOM is added in change quantity notification in product and UI of threadview is modified.
...
bzr revid: bth@tinyerp.com-20120307130713-d9qp1ms3oajj40zk
2012-03-07 18:37:13 +05:30
Bhumi Thakkar (Open ERP)
d83bf22983
[IMP] notifications in mrp,bom,product.
...
bzr revid: bth@tinyerp.com-20120306133816-59cs058o3oq8arro
2012-03-06 19:08:16 +05:30
Turkesh Patel (Open ERP)
55c4d298ef
[ADD] added configuration view for mrp
...
bzr revid: tpa@tinyerp.com-20120305105243-owrr6ks1326t1hi2
2012-03-05 16:22:43 +05:30
Meera Trambadia (OpenERP)
1c7da7ea8b
[MERGE] branch merged with trunk-improve_default_filter_mrp-jap
...
bzr revid: mtr@tinyerp.com-20120301095045-y1dtrml6168o8dao
2012-03-01 15:20:45 +05:30
Meera Trambadia (OpenERP)
8769a5fea8
[IMP] mrp:- changed parent menu and seq for 'Routings' and 'Work Centers'
...
bzr revid: mtr@tinyerp.com-20120229055448-99q97gr3hwno381y
2012-02-29 11:24:48 +05:30
Meera Trambadia (OpenERP)
e740873697
[IMP] mrp:-renamed menu Manufacturing Orders => Orders Planning
...
bzr revid: mtr@tinyerp.com-20120227071813-p9ez8j1y4ajtxr6l
2012-02-27 12:48:13 +05:30
Jagdish Panchal (Open ERP)
a5d3bbdbaa
[IMP] remove the default filter on list view in mrp_* module
...
bzr revid: jap@tinyerp.com-20120227051516-7z4eqh76h2efhc0a
2012-02-27 10:45:16 +05:30
Quentin (OpenERP)
a747ff55dd
[MERGE] adding domain on field product_id of mrp.production form view
...
bzr revid: qdp-launchpad@openerp.com-20120216162909-00vi550vyrukx06b
2012-02-16 17:29:09 +01:00
niv-openerp
e32d0e3d04
[imp] refactored all gantt views
...
bzr revid: nicolas.vanhoren@openerp.com-20120127133355-kc2tmo26eoxij07b
2012-01-27 14:33:55 +01:00
Mayur Maheshwari (OpenERP)
3399221f62
[IMP]mrp: added a domian on product field
...
bzr revid: mma@tinyerp.com-20120112054438-e6w60ghk1i26l0ym
2012-01-12 11:14:38 +05:30
Fabien Pinckaers
c113b63b4e
[FIX] holidays, mpr bom open all selected
...
bzr revid: fp@tinyerp.com-20111230122811-kdv25gd2at2ps33r
2011-12-30 13:28:11 +01:00
Fabien Pinckaers
3868ac0d2e
typo
...
bzr revid: fp@tinyerp.com-20111219223209-g7ci0l0w0r5q4utt
2011-12-19 23:32:09 +01:00
Fabien Pinckaers
93586f4324
merge
...
lp bug: https://launchpad.net/bugs/902158 fixed
bzr revid: fp@tinyerp.com-20111219220644-7imt3in19h7tb9gw
2011-12-19 23:06:44 +01:00
Harry (OpenERP)
2f90d02a0d
[MERGE] merged with trunk-development-branch
...
bzr revid: hmo@tinyerp.com-20111216130346-p3til4dryu8gukw2
2011-12-16 18:33:46 +05:30
Amit (OpenERP)
8a4ffef0ef
[FIX]:mrp:fixed usability issue in BOM
...
bzr revid: apa@tinyerp.com-20111215061733-97bq8wtpye1ug5nj
2011-12-15 11:47:33 +05:30
Raphael Collet
e36dc8c5e3
[MERGE] lp:877999 (mrp: fix view_mode in action BOM structure)
...
bzr revid: rco@openerp.com-20111214103834-rq39elcdqpz6zr26
2011-12-14 11:38:34 +01:00
Kirti Savalia (OpenERP)
84a0b6f5d5
[FIX]:correct the help text
...
lp bug: https://launchpad.net/bugs/902158 fixed
bzr revid: ksa@tinyerp.com-20111212053835-04kouho224k9g3zc
2011-12-12 11:08:35 +05:30
Harry (OpenERP)
2e504a69e0
[MERGE] merged with trunk development branch: lp:~openobject-addons
...
bzr revid: hmo@tinyerp.com-20111206054932-kq9etzc5nibs0dc3
2011-12-06 11:19:32 +05:30
Yogesh (OpenERP)
64a08f7165
[FIX] mrp :- add view_mode in mrp.bom tree view.
...
bzr revid: ysa@tinyerp.com-20111129085326-05iks6b7lv7bkhgg
2011-11-29 14:23:26 +05:30
Vo Minh Thu
2e1023ddbe
[IMP] domain to context:
...
Use explicitely default_xxx in the context instead of
relying on the domain to fill form views.
bzr revid: vmt@openerp.com-20111124121433-z5du2yeu319ea1ax
2011-11-24 13:14:33 +01:00
Olivier Dony
b22fa55566
[IMP] all: remove references to `object` column of ir.values, now gone
...
This will get rid of a lot of warnings now that the server
warns about unknown fields
bzr revid: odo@openerp.com-20111116115810-9c5kp7lql0yyhs3n
2011-11-16 12:58:10 +01:00
Rucha (Open ERP)
f90e5ce97b
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20111114053819-xkztyd5wk6kr5sn6
2011-11-14 11:08:19 +05:30
Rucha (Open ERP)
68139dca87
[FIX]: mrp: Fixed problem of lp:734273 by passing context properly in onchange instead of getting user lang manually
...
bzr revid: rpa@tinyerp.com-20111102100621-cxlpkgfsnxbqdlhs
2011-11-02 15:36:21 +05:30
RavishchanraMurari (Open ERP)
e27810b809
add_user_id_in_mrp
...
bzr revid: rmu@tinyerp.com-20111012092209-vjxhv89ml34drugh
2011-10-12 14:52:09 +05:30
Fabien Pinckaers
c3a79fbc36
merge
...
bzr revid: fp@tinyerp.com-20110924091037-kpy965dboeutk5y4
2011-09-24 11:10:37 +02:00
Olivier Dony
253eaa462d
[FIX] fix useless and invalid casts in domain fields
...
The ORM will automatically append 00:00:00 to a date
literal that is being compared with a timestamp field
with operators '>' or '>=', and 23:59:59 if compared
with operators '<' or '<='.
So a trivial domain for 'Today' is:
[('tstamp_field','>=',current_date),('tstamp_field','<=',current_date)]
taking advantage of the current_date helper that
is defined as the current date in YYYY-MM-DD format.
bzr revid: odo@openerp.com-20110924005547-pvgblte6r14so7mw
2011-09-24 02:55:47 +02:00
Rucha (Open ERP)
0e861ae34a
[MERGE]: Merge with latest trunk-addons and resolved conflicts in bank statement as new state was added in statement
...
bzr revid: rpa@tinyerp.com-20110922061419-cvaza3f5050o0b85
2011-09-22 11:44:19 +05:30
Atik Agewan (OpenERP)
0e0438a779
[IMP] ALL:change in all statusbar_colors quotes
...
bzr revid: aag@tinyerp.com-20110921050948-m2iezimspmspsvjs
2011-09-21 10:39:48 +05:30
Fabien Pinckaers
05d6d35cc8
[Merge]
...
bzr revid: fp@tinyerp.com-20110917110317-34apz3spz1h9azjl
2011-09-17 13:03:17 +02:00
Atik Agewan (OpenERP)
882392394d
[IMP] ALL: Remove Space from attribute values
...
bzr revid: aag@tinyerp.com-20110915084914-kgbpw52ym5uz8ye0
2011-09-15 14:19:14 +05:30
Atik Agewan (OpenERP)
556233685f
[ADD] MRP,Project:Add widget=statusbar in state field.
...
bzr revid: aag@tinyerp.com-20110915054059-7iuj6qeg3nc4wm10
2011-09-15 11:10:59 +05:30
Xavier Morel
178fec5c64
[FIX] str 'in' str (singletons missing tuple-building comma), in @colors attributes. Replace by string equality
...
bzr revid: xmo@openerp.com-20110911135025-v9yct8pnjfj21tyj
2011-09-11 15:50:25 +02:00
Antony Lesuisse
98f7058af1
[MERGE] mrp renames and reorder menu
...
bzr revid: al@openerp.com-20110828015216-139k0tz93shisb0h
2011-08-28 03:52:16 +02:00
Tejas (OpenERP)
96364651ed
[Usability] renamed the label and changed the sequence of the menu
...
bzr revid: tta@openerp.com-20110817085712-7n64kag6hb6vtwhf
2011-08-17 14:27:12 +05:30
Amit Parmar (OpenERP)
d57f379dbc
[IMP] remerge add relate button on product form
...
bzr revid: aar@tinyerp.com-20110804132133-y10n60u932mr0eso
2011-08-04 18:51:33 +05:30
Amit Parmar (OpenERP)
5a1021b830
[IMP] remerge add_relate_button
...
bzr revid: aar@tinyerp.com-20110726072053-oznk99qpj41e5bq2
2011-07-26 12:50:53 +05:30
Amit Parmar (OpenERP)
212826dbf2
[IMP] remerge add_relate_button
...
bzr revid: aar@tinyerp.com-20110726062133-a1fbqo0ywivh0cra
2011-07-26 11:51:33 +05:30
Amit Parmar (OpenERP)
7be9b68c76
[IMP] adding relate button on the product form
...
bzr revid: aar@tinyerp.com-20110720132742-kkotpypy35kg2lf3
2011-07-20 18:57:42 +05:30
Raphael Collet
6cf0147f6f
[IMP] add and improve tooltips
...
bzr revid: rco@openerp.com-20110719090602-avsnx2s63pvggwx8
2011-07-19 11:06:02 +02:00
RavishchanraMurari (Open ERP)
1c9e8b20a7
merged from usability branch
...
bzr revid: rmu@tinyerp.com-20110708103703-shoax95slyy9s30j
2011-07-08 16:07:03 +05:30
RavishchanraMurari (Open ERP)
0046b4558e
added tools tips
...
bzr revid: rmu@tinyerp.com-20110708103047-eck3ijxd1mouvppy
2011-07-08 16:00:47 +05:30
Amit Bhavsar (Open ERP)
90734e477c
[usability],In routing form view change selection feild to search
...
bzr revid: amb@tinyerp.com-20110706073113-02leyku0z289ifqj
2011-07-06 13:01:13 +05:30
Xavier Morel
4e6a9ea55c
[REM] all @col and @colspan attributes on groups in search views: search views are not laid out by columns, therefore these attributes do not belong
...
bzr revid: xmo@openerp.com-20110315140859-uh9w3exdit84qz47
2011-03-15 15:08:59 +01:00
Quentin (OpenERP)
6ec75017ed
[MERGE] lp:720282
...
bzr revid: qdp-launchpad@openerp.com-20110311151819-11hyz2byqmee3w22
2011-03-11 16:18:19 +01:00
Quentin (OpenERP)
4341c795c4
[MERGE] merged with main addons branch
...
bzr revid: qdp-launchpad@openerp.com-20110309131425-bz2wsl8onhzyl2ww
2011-03-09 14:14:25 +01:00
ksa (Open ERP)
873d19a629
[FIX]: misleading terminology on workcenter
...
lp bug: https://launchpad.net/bugs/720282 fixed
bzr revid: ksa@tinyerp.co.in-20110218085856-0x2gqq3i8r2wb5t4
2011-02-18 14:28:56 +05:30
ksa (Open ERP)
b8c1d07c84
[FIX]:manufactorig : missing label on field of bill of meterials
...
lp bug: https://launchpad.net/bugs/720288 fixed
bzr revid: ksa@tinyerp.co.in-20110217071622-1y13vj3edn43wsc3
2011-02-17 12:46:22 +05:30
Thibault Francois
a001b29366
[MERGE] my-addons
...
bzr revid: tfr@openerp.com-20110214163231-41oa4q6mrczj0015
2011-02-14 17:32:31 +01:00
qdp-launchpad@tinyerp.com
25341b78cb
[MERGE] merged with main addons branch
...
bzr revid: qdp-launchpad@tinyerp.com-20110117080048-h0e64af48ru2bkvp
2011-01-17 09:00:48 +01:00
Thibault Francois
1451a89319
[FIX] buildbot fix mrp action_partial_move doesn't exist anymore replace by action_partial_move_server
...
bzr revid: tfr@openerp.com-20110114152016-fv7fha139ylqmb2q
2011-01-14 16:20:16 +01:00
qdp-launchpad@tinyerp.com
e6b1d532fd
[IMP] mrp: usability improvements
...
bzr revid: qdp-launchpad@tinyerp.com-20110112162629-wncrn33fporm75la
2011-01-12 17:26:29 +01:00
rha@tinyerp.com
8bf0e23a94
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
...
bzr revid: rha@tinyerp.com-20110111101501-aq97xcojue3coeje
2011-01-11 15:45:01 +05:30
rpa (Open ERP)
deda381068
[IMP]: mrp: Added reverted changes for production view
...
bzr revid: rpa@tinyerp.com-20110110125747-jixt2pdn6upk9dij
2011-01-10 18:27:47 +05:30
rha@tinyerp.com
e9f7a90ac8
[Fix]: production orders waiting raw materials can not be cancelled
...
lp bug: https://launchpad.net/bugs/498033 fixed
bzr revid: rha@tinyerp.com-20110107091158-1qrugqztsw5ulktr
2011-01-07 14:41:58 +05:30
qdp-launchpad@tinyerp.com
4a9f371c75
[MERGE] merged the dev2 branch
...
bzr revid: qdp-launchpad@tinyerp.com-20101230172302-fayn50b4fz7vfjln
2010-12-30 18:23:02 +01:00
Sbh (OpenERP)
d62ad4bc04
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20101230051319-1csd22jbcxfp50ew
2010-12-30 10:43:19 +05:30
Fabien Pinckaers
22e3f9388a
fix
...
bzr revid: fp@tinyerp.com-20101229170108-x74slosrspmyul4g
2010-12-29 18:01:08 +01:00
Fabien Pinckaers
0a7c9c6ee2
[FIX] complete rewrite for clean up of hr_holidays
...
bzr revid: fp@tinyerp.com-20101229124123-7tt4ttk3jmkispw7
2010-12-29 13:41:23 +01:00
Sbh (OpenERP)
6e725393de
[MERGE] Merge lp:~openerp-commiter/openobject-addons/trunk-addons-aag
...
bzr revid: sbh@tinyerp.com-20101229095203-pdddo70xzpv8s1r3
2010-12-29 15:22:03 +05:30
Sbh (OpenERP)
42001ee76f
[MERGE] merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20101229070055-l8rf6xlk6pjyrur0
bzr revid: sbh@tinyerp.com-20101229083843-83ypw4f0ecxfv68e
bzr revid: sbh@tinyerp.com-20101229091103-mkxpoao8otcyyux5
2010-12-29 14:41:03 +05:30
aag (OpenERP)
326a0c7d2d
[IMP] mrp: Manufacturing Orders Form View - Usability Issue
...
lp bug: https://launchpad.net/bugs/695008 fixed
bzr revid: aag@tinyerp.co.in-20101229084838-pw0oeb6orsncyrs3
2010-12-29 14:18:38 +05:30
aag (OpenERP)
5521ba1387
[IMP] mrp: Manufacturing Orders Usability Issue of compute button
...
lp bug: https://launchpad.net/bugs/695004 fixed
bzr revid: aag@tinyerp.co.in-20101229054437-gsis5dlfyqibjs3z
2010-12-29 11:14:37 +05:30
Fabien Pinckaers
910b8c4af8
[IMP] access rights
...
bzr revid: fp@tinyerp.com-20101228151738-mmm1gug4t2hesron
2010-12-28 16:17:38 +01:00
Fabien Pinckaers
07bfa5c23d
[IMP] access rights
...
bzr revid: fp@tinyerp.com-20101228145253-192pr7ifqlyt90jn
2010-12-28 15:52:53 +01:00
Sbh (OpenERP)
9f0e3f8481
[MERGE] merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20101227124321-1x0xs79sp555g33d
2010-12-27 18:13:21 +05:30
François Degrave
53ea5a328b
[IMP] security groups for HR + 'group by' in extended views in some views (stock moves, mrp, documents)
...
bzr revid: fde@openerp.com-20101227104651-23h1xm7hh2qnr7m7
2010-12-27 11:46:51 +01:00
qdp-launchpad@tinyerp.com
ff40556780
[MERGE] merged the evv branch related to help tooltips on menuitems
...
bzr revid: qdp-launchpad@tinyerp.com-20101223154141-wx1u87wzxs9znjsx
2010-12-23 16:41:41 +01:00
rpa (Open ERP)
c12c88eb01
[MREGE]: Merge with lp:~openerp-commiter/openobject-addons/dev-addons2-rha1
...
bzr revid: rpa@tinyerp.com-20101222123722-0fa3kerln033csfa
2010-12-22 18:07:22 +05:30
rpa (Open ERP)
6c514475ca
[MERGE]: Merged with lp:~openerp-dev/openobject-addons/ron-dev-addons2
...
bzr revid: rpa@tinyerp.com-20101222110542-j33o6xe24p4dy0tb
2010-12-22 16:35:42 +05:30
ron@tinyerp.com
0bc496ed1e
[MERGE]Merged with Trunk-dev-addons2
...
bzr revid: ron@tinyerp.com-20101222054827-4j3swsc75ryk54zt
2010-12-22 11:18:27 +05:30
ron@tinyerp.com
c4d5104dd6
[IMP]MRP:-Improvement Code BUG :-691012
...
bzr revid: ron@tinyerp.com-20101222045021-hmyte79qnqneo1xe
2010-12-22 10:20:21 +05:30
rha@tinyerp.com
5cb326ed81
[Fix]: Bug #692950 add a filter button Ready selected by default in Manufacturing order
...
bzr revid: rha@tinyerp.com-20101221130849-2ydpumhtp7wr5lcb
2010-12-21 18:38:49 +05:30
ron@tinyerp.com
9cb5968734
[IMP]IMPROVEMTNT in CODE MO consuming product not taking Exiting Lot
...
bzr revid: ron@tinyerp.com-20101221085210-a6rcsfsrubzdvqcm
2010-12-21 14:22:10 +05:30
ron@tinyerp.com
bcdfc08fb7
[FIX]mrp: in MO consuming product not taking Exiting Lot
...
lp bug: https://launchpad.net/bugs/691012 fixed
bzr revid: ron@tinyerp.com-20101221071238-3zyspxlqmow7nmh0
2010-12-21 12:42:38 +05:30
François Degrave
773cdea683
"[IMP] security groups on act_window in product and partner objects"
...
bzr revid: fde@openerp.com-20101220145607-vx2r937j9sj7e1zw
2010-12-20 15:56:07 +01:00
rpa (Open ERP)
4e307d022c
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: rpa@tinyerp.com-20101215042654-04ccazkz5v57ml3j
bzr revid: rpa@tinyerp.com-20101216043335-ji5h61dra451cml4
bzr revid: rpa@tinyerp.com-20101220082255-1g3ea50rkjlacwqw
2010-12-20 13:52:55 +05:30
rha@tinyerp.com
0b0a33c0d6
[Fix]: A Manufacturing/User and a Manufacturing/Manager have the same rights
...
lp bug: https://launchpad.net/bugs/690117 fixed
bzr revid: rha@tinyerp.com-20101215091925-80gdc90x940az7xr
2010-12-15 14:49:25 +05:30
qdp-launchpad@tinyerp.com
ab8c38b279
[IMP] access rights improvements + small usability fixes
...
bzr revid: qdp-launchpad@tinyerp.com-20101214160729-lc1q0oy76dygh5s2
2010-12-14 17:07:29 +01:00
Els Van Vossel
ab38e64d02
[IMP] changed menutips
...
bzr revid: openerp@evv-laptop-20101214062211-mlp6bzfhb0tw0fu6
2010-12-14 07:22:11 +01:00
rpa (Open ERP)
4f62b6c9b8
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: rpa@tinyerp.com-20101209042938-md7p7a3j5ntwt0ov
2010-12-09 09:59:38 +05:30
Xavier Morel
f21577dde9
[REM] all @default attributes: they should not be there and they aren't handled by the GTK client (as far as I know)
...
bzr revid: xmo@openerp.com-20101208102305-yd96zmg10exredgq
2010-12-08 11:23:05 +01:00
rpa (Open ERP)
45c4f72634
[MERGE]: Merge with lp:~openerp-commiter/openobject-addons/sus-dev-addons-manufacturing
...
bzr revid: rpa@tinyerp.com-20101207121110-kp9v4nls28k19q21
2010-12-07 17:41:10 +05:30
rpa (Open ERP)
b6e743433b
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/ksa-addons2
...
bzr revid: rpa@tinyerp.com-20101207104811-ccx204cbxp2p56kh
2010-12-07 16:18:11 +05:30
rpa (Open ERP)
f46c228003
[MERGE]: Merge with lp:~openerp-commiter/openobject-addons/trunk-addons-aag
...
bzr revid: rpa@tinyerp.com-20101206121220-hj7gsth8yo1adinx
2010-12-06 17:42:20 +05:30
aag (OpenERP)
c95a16f2e9
[IMP] MRP: mod2 pad Manufacturing
...
bzr revid: aag@tinyerp.co.in-20101203131148-9lez2d66agzj4c5v
2010-12-03 18:41:48 +05:30
qdp-launchpad@tinyerp.com
382779126a
[MERGE] merged the dev team2 branch
...
bzr revid: qdp-launchpad@tinyerp.com-20101126161359-s02ik0bmz3l8lt9u
2010-11-26 17:13:59 +01:00
Xavier Morel
eee9eb46b3
[ADD] mrp: web_icon for manufacturing application
...
bzr revid: xmo@openerp.com-20101126115657-58fy1dnvsofli3mh
2010-11-26 12:56:57 +01:00
sus
06abcc7f99
Change search view from draft to ready with domain ready to produce in mrp/mrp_view.xml
...
lp bug: https://launchpad.net/bugs/680918 fixed
bzr revid: tiny@tiny-desktop-20101125065648-ytmj8ps061h9vwxs
2010-11-25 12:26:48 +05:30