odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
71,958 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

2895 Commits

Author SHA1 Message Date
Randhir Mayatra (OpenERP) e76ba4f0ee [IMP] improve the code 
bzr revid: rma@tinyerp.com-20121127102406-p6s01zzhpc01u5rp
 2012-11-27 15:54:06 +05:30
Randhir Mayatra (OpenERP) 03e20c4191 [IMP] improve the code 
bzr revid: rma@tinyerp.com-20121127092948-mcfepfa7ftitm0zy
 2012-11-27 14:59:48 +05:30
Randhir Mayatra (OpenERP) 38011c3b3f [IMP] make changes into manufacturing 
bzr revid: rma@tinyerp.com-20121127083127-pqobf6n7z0kfihgz
 2012-11-27 14:01:27 +05:30
Randhir Mayatra (OpenERP) 32380ffda2 [MERGE] merge with parent 
bzr revid: rma@tinyerp.com-20121127051949-58wtrp5p7b8idg54
bzr revid: rma@tinyerp.com-20121127073838-0oee2zpeqdlbz35x
 2012-11-27 13:08:38 +05:30
Launchpad Translations on behalf of openerp e6d033755f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20121127052458-7c24bjy09rqd8r8o
bzr revid: launchpad_translations_on_behalf_of_openerp-20121127054533-m8gqmer5k5jpcs65
 2012-11-27 05:45:33 +00:00
Randhir Mayatra (OpenERP) 15d87dde77 [IMP] make changes into mrp view 
bzr revid: rma@tinyerp.com-20121127044521-wpy4pmdmjlr6ezwc
 2012-11-27 10:15:21 +05:30
dhr a652624909 [IMP]Improved BOM form view and added default quantity for product in mrp byproduct 
bzr revid: dhr@tinyerp.com-20121126120042-g37rl8kfpz9jovsy
 2012-11-26 17:30:42 +05:30
Fabien Pinckaers bf74d74a00 [IMP] MRP quick create poducts from BoM 
bzr revid: fp@tinyerp.com-20121126084927-l90x0zhcuvhn7nsa
 2012-11-26 09:49:27 +01:00
Launchpad Translations on behalf of openerp 828cce9be0 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125063324-fjz8k77annh364u7
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126044235-u20vi1440dgppikf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125064209-s515ia18188hl147
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126045508-rm6d2mx71a0sjqh9
 2012-11-26 04:55:08 +00:00
Divyesh Makwana (Open ERP) 2068c1ae4b [Merge] Merge with main addons. 
bzr revid: mdi@tinyerp.com-20121126044759-dk67dwd1mkk2rfo1
 2012-11-26 10:17:59 +05:30
Launchpad Translations on behalf of openerp 117bf937b9 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124055830-p04ni2o2ogsch9zc
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124065500-zwtkurcb1ic9ktqb
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124070752-itto1xb6r6oao3z5
 2012-11-24 07:07:52 +00:00
Olivier Dony 771b216118 [I18N] Update translation templates in preparation for 7.0 release 
bzr revid: odo@openerp.com-20121124030804-9dvr1qwec830p8fc
 2012-11-24 04:08:04 +01:00
Divyesh Makwana (Open ERP) 8b161d799e [Merge] Merge with main addons. 
bzr revid: mdi@tinyerp.com-20121123044123-8k6xplyowc8t8p7k
 2012-11-23 10:11:23 +05:30
Arnaud Pineux 1d335a7cdb [IMP] Re-set the sequence number for main menus 
bzr revid: api@openerp.com-20121121162753-3mi0si4kf3rei42n
 2012-11-21 17:27:53 +01:00
Hardik f37e2b6b03 [IMP]Update access rights on MRP 
bzr revid: hsa@tinyerp.com-20121121120103-tlbn5lxfdl9vvclj
 2012-11-21 17:31:03 +05:30
Hardik 7b50b16c6d [IMP]Access rights on mrp user to confirm production 
bzr revid: hsa@tinyerp.com-20121121084950-u9mcxfi8pr2rbzyq
 2012-11-21 14:19:50 +05:30
Hardik 8bbc604a60 [IMP]Access Rights on MRP module 
bzr revid: hsa@tinyerp.com-20121119120810-afr8rswrqtllz1kr
 2012-11-19 17:38:10 +05:30
Fabien Pinckaers 2cfef36846 [MERGE] improved welcome messages and mail css 
bzr revid: fp@tinyerp.com-20121115100740-3pbot8zfu64s4ods
 2012-11-15 11:07:40 +01:00
Thibault Delavallée 64277d04c3 [IMP] Addons: messages when installing key apps is not of comment subtype, meaning they are effectively pushed. 
bzr revid: tde@openerp.com-20121114115504-tvh0j9ks0jde12ed
 2012-11-14 12:55:04 +01:00
Turkesh Patel (Open ERP) 0ecb804c14 [IMP] merge with lp:openobject-addons 
bzr revid: tpa@tinyerp.com-20121112094318-tcm54uj1lw7fnto8
 2012-11-12 15:13:18 +05:30
Fabien Pinckaers 5294614a92 [MERGE] company with & symbol do not print cost report 
bzr revid: fp@tinyerp.com-20121112084140-k5jynabatz0wsi0a
 2012-11-12 09:41:40 +01:00
vta vta@openerp.com c18686212a [FIX] Removed module_stock_planning from config. 
bzr revid: vta@openerp.com-20121109115720-dpwdqke5n1an857p
 2012-11-09 12:57:20 +01:00
Turkesh Patel (Open ERP) 710a1b447f [IMP] mrp: change status name to Awaiting Raw Materials from waiting goods. 
bzr revid: tpa@tinyerp.com-20121109065115-yv943wosxg89byxi
 2012-11-09 12:21:15 +05:30
Turkesh Patel (Open ERP) ffbf3ef66d [IMP] mrp:set default supply method manufacture for bill of material product. 
bzr revid: tpa@tinyerp.com-20121109064221-6ke8yqwgd7mmpxy4
 2012-11-09 12:12:21 +05:30
Launchpad Translations on behalf of openerp 0528e00788 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20121109043946-6epxgg88lp1lykye
 2012-11-09 04:39:46 +00:00
Launchpad Translations on behalf of openerp 1a8ef8657b Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20121108044758-ltq38lseznj56gu2
 2012-11-08 04:47:58 +00:00
Cedric Snauwaert c3aaf6439e [MERGE]merge with latest addons_trunk 
bzr revid: csn@openerp.com-20121105123913-cvrvkmgeoqtija71
 2012-11-05 13:39:13 +01:00
Launchpad Translations on behalf of openerp f3a92c9633 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20121103050437-hjtar0inhj4gqyfi
 2012-11-03 05:04:37 +00:00
Turkesh Patel (Open ERP) c79cd2dad0 [MRG] merge with lp:openobject-addons 
bzr revid: tpa@tinyerp.com-20121102123924-957vbi612ss1kdtu
 2012-11-02 18:09:24 +05:30
Fabien Pinckaers bb2e63e67f [MERGE] trunk 
bzr revid: fp@tinyerp.com-20121102095441-sl6jkdve08luoy33
 2012-11-02 10:54:41 +01:00
Fabien Pinckaers f48a3a681b [FIX] +others merge 
bzr revid: fp@tinyerp.com-20121102095359-r3jsyyhr29w3xkzv
 2012-11-02 10:53:59 +01:00
Fabien Pinckaers 533ba71c5f [FIX] repir 
bzr revid: fp@tinyerp.com-20121102090736-2d27xtxv05rav09u
 2012-11-02 10:07:36 +01:00
Fabien Pinckaers 7d68e7d6a9 [MERGE] bom removed name field 
bzr revid: fp@tinyerp.com-20121102084453-olkflm1a7mju0jji
 2012-11-02 09:44:53 +01:00
Launchpad Translations on behalf of openerp ddb59425d0 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20121102050954-ce3yauvzc6w6h2j3
 2012-11-02 05:09:54 +00:00
Mayur Maheshwari (OpenERP) 3acc7b4352 [FIX]mrp : fix the issue when company name with & then Product Cost Structure report not print 
bzr revid: mma@tinyerp.com-20121101072511-55g8ouxd8rz1mfw4
 2012-11-01 12:55:11 +05:30
Amit Patel bedd2a90a5 [MERGE]:trunk 
bzr revid: apa@tinyerp.com-20121101061419-jaiwrh10n2nj1f6t
 2012-11-01 11:44:19 +05:30
ajay javiya (OpenERP) 1ba3225b94 [IMP]: Improve remaining changes to refector from mrpsubproduct to mrpbyproduct 
bzr revid: aja@tinyerp.com-20121031070517-oql0a2ax490xr8ip
 2012-10-31 12:35:17 +05:30
Ajay Chauhan (OpenERP) 0c6e353402 [MERGE] merge with lp:openobject-addons 
bzr revid: cha@tinyerp.com-20121030073118-scr9xzzln22jben7
 2012-10-30 13:01:18 +05:30
Launchpad Translations on behalf of openerp 87d3caa50f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20121030053700-w841c92uvirpii9h
 2012-10-30 05:37:00 +00:00
Mayur Maheshwari (OpenERP) ec1b99dad9 [MERGE]: Merge with lp:openobject-addons 
bzr revid: mma@tinyerp.com-20121030045855-mmpkxjsz2sswzcd1
 2012-10-30 10:28:55 +05:30
Amit Patel 139bd09fd9 [MERGE]:trunk 
bzr revid: apa@tinyerp.com-20121030045711-c88fjivi8qwek8m8
 2012-10-30 10:27:11 +05:30
Mayur Maheshwari (OpenERP) b31df93d2b [IMP]mrp : improve code 
bzr revid: mma@tinyerp.com-20121029070717-84dp16ivxzuk3b4j
 2012-10-29 12:37:17 +05:30
Mayur Maheshwari (OpenERP) 5cd70ef9e8 [IMP]mrp : improve little bit code 
bzr revid: mma@tinyerp.com-20121029062442-imihipixq7g7llcb
 2012-10-29 11:54:42 +05:30
Mayur Maheshwari (OpenERP) cebac5ec17 [MERGE]: Merge with lp:openobject-addons 
bzr revid: mma@tinyerp.com-20121029053711-6dj6yentegfhwyb6
 2012-10-29 11:07:11 +05:30
Ajay Chauhan (OpenERP) 9eaf91da63 [MERGE] merge with lp:openobject-addons 
bzr revid: cha@tinyerp.com-20121029051051-t1v037ohd9hg24x7
 2012-10-29 10:40:51 +05:30
Amit Patel 32d361629a [MERGE]:trunk 
bzr revid: apa@tinyerp.com-20121029051034-xdqhz0ghy0r1f7vc
 2012-10-29 10:40:34 +05:30
Launchpad Translations on behalf of openerp 93be12ab1e Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20121026045553-t4k1bgsmirz090jr
bzr revid: launchpad_translations_on_behalf_of_openerp-20121026045641-3opz9ueu2crfb479
bzr revid: launchpad_translations_on_behalf_of_openerp-20121026051921-6vyyfhq3fpp22atu
 2012-10-26 05:19:21 +00:00
Hardik c09ed359f6 [IMP]Work Order tab is only display for mrp routing group 
bzr revid: hsa@tinyerp.com-20121025132942-s65ph30jg9y5sbeo
 2012-10-25 18:59:42 +05:30
Ajay Chauhan (OpenERP) b75dc1a733 [MERGE] merge with main addons 
bzr revid: cha@tinyerp.com-20121025102229-7bbzxygkwvcd969l
 2012-10-25 15:52:29 +05:30
Mayur Maheshwari (OpenERP) 8515164a97 [MERGE]: Merge with lp:openobject-addons 
bzr revid: mma@tinyerp.com-20121025101811-t70it53o5ia7u41s
 2012-10-25 15:48:11 +05:30
Fabien Pinckaers 375d261e08 [FIX] misc fixes & useability ps week 41 
bzr revid: fp@tinyerp.com-20121025083644-19mnzr6ktbpppgjg
 2012-10-25 10:36:44 +02:00
Amit Patel 3e4e8006de [MERGE]:trunk 
bzr revid: apa@tinyerp.com-20121025070133-x6g4can9le7p4d5z
 2012-10-25 12:31:33 +05:30
Fabien Pinckaers a334d1ebea [MERGE] typo 
bzr revid: fp@openerp.com-20121024201859-aljpjevofisrt9o3
 2012-10-24 22:18:59 +02:00
Fabien Pinckaers a7368145ca [MERGE] typo 
bzr revid: fp@openerp.com-20121024201424-98la8f2wkhfjrtae
 2012-10-24 22:14:24 +02:00
niv-openerp dd99dc7ed0 m 
bzr revid: nicolas.vanhoren@openerp.com-20121022161556-wb1l3kahb9lwrnv3
 2012-10-22 18:15:56 +02:00
Foram Katharotiya (OpenERP) 7b5a6055a0 [MERGE] merge with parent 
bzr revid: fka@tinyerp.com-20121022052857-1vsp4vtx2faqpsc8
bzr revid: fka@tinyerp.com-20121022072456-k8glxmgiviozrgpc
 2012-10-22 12:54:56 +05:30
Ajay Chauhan (OpenERP) f90a616aeb [MERGE] merge with lp:openobject-addons 
bzr revid: cha@tinyerp.com-20121022054123-n1is1o6a9egeeflp
 2012-10-22 11:11:23 +05:30
Divyesh Makwana (Open ERP) d3f99be6f7 [Merge] Merge with main addons. 
bzr revid: mdi@tinyerp.com-20121016043915-jj52ndvtvtry8wtn
bzr revid: mdi@tinyerp.com-20121017044114-rx20qcnmj0h2di9m
bzr revid: mdi@tinyerp.com-20121018040816-rldo7d3wvdarhrrn
bzr revid: mdi@tinyerp.com-20121019043918-ajzdhughbwm3j859
bzr revid: mdi@tinyerp.com-20121022041308-wczx6ppb8id1100g
 2012-10-22 09:43:08 +05:30
Fabien Pinckaers f542bc2111 [MERGE] fix access rights stock user 
bzr revid: fp@openerp.com-20121021202555-hxbi9u4vxudtaxjj
 2012-10-21 22:25:55 +02:00
Foram Katharotiya (OpenERP) aa7856b025 [IMP] remove date_planned_end function Field in mrp_production 
bzr revid: fka@tinyerp.com-20121019105210-fx477sy9ht4mlic1
 2012-10-19 16:22:10 +05:30
Foram Katharotiya (OpenERP) b24eb49293 [IMP] remove date_planned_date function Field in mrp_production 
bzr revid: fka@tinyerp.com-20121019102702-gcskff4ae16jrzqp
 2012-10-19 15:57:02 +05:30
Thibault Delavallée d3b2aff657 [MERGE] Merged with addons/trunk. 
bzr revid: tde@openerp.com-20121019074855-q13yu3kz0jqmr2hi
 2012-10-19 09:48:55 +02:00
ajay javiya (OpenERP) 86bbcadff6 [IMP]:Inherit warehouse user inherit from group employee 
bzr revid: aja@tinyerp.com-20121019071912-gt9k5v6vh64quz5t
 2012-10-19 12:49:12 +05:30
Launchpad Translations on behalf of openerp 5bfa3c5a7d Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20121019053933-51d6oob5aw0ujz40
 2012-10-19 05:39:33 +00:00
Mayur Maheshwari (OpenERP) 4f51b5074f [IMP]mrp : improve name serch code 
bzr revid: mma@tinyerp.com-20121017121804-fqperqam3p2sg9bs
 2012-10-17 17:48:04 +05:30
Foram Katharotiya (OpenERP) 1a627b275c [FIX] traceback of graph in mrp 
bzr revid: fka@tinyerp.com-20121017113434-lihuvchvs6621id6
 2012-10-17 17:04:34 +05:30
Mayur Maheshwari (OpenERP) 34e660c8e7 [IMP]mrp : improve litle bit code 
bzr revid: mma@tinyerp.com-20121017095202-eg3pedyqgjk0x22i
 2012-10-17 15:22:02 +05:30
Mayur Maheshwari (OpenERP) 71f65114cd [IMP]mrp : added a name_search method in mrp.bom object for serch via code and product name 
bzr revid: mma@tinyerp.com-20121017090536-6mejdgejv8dtmqeh
 2012-10-17 14:35:36 +05:30
Christophe Matthieu 23e20e95d4 [MERGE] from trunk 
bzr revid: chm@openerp.com-20121017073146-9m5s2hffeekmj068
 2012-10-17 09:31:46 +02:00
Mayur Maheshwari (OpenERP) f006171ab3 [IMP]mrp : improve bom structure report 
bzr revid: mma@tinyerp.com-20121017061659-bam8qklr8frdl8wo
 2012-10-17 11:46:59 +05:30
Ajay Chauhan (OpenERP) 9b977bc530 [IMP] mrp: added defaults for user_id for 'Manufactoring Order' 
bzr revid: cha@tinyerp.com-20121017060050-qovhujv4ysnhf04a
 2012-10-17 11:30:50 +05:30
Mayur Maheshwari (OpenERP) f78e5b1b1b [IMP]mrp : improve string and remove name field from mrp.bom object 
bzr revid: mma@tinyerp.com-20121016123741-g042zhrmmyfqb0sa
 2012-10-16 18:07:41 +05:30
Mayur Maheshwari (OpenERP) 8346293d72 [MERGE]: Merge with lp:openobject-addons 
bzr revid: mma@tinyerp.com-20121015090200-irfaskfn9i1p68j9
bzr revid: mma@tinyerp.com-20121016052513-vl56jxtp7xbpa2ry
 2012-10-16 10:55:13 +05:30
Divyesh Makwana (Open ERP) ad24f7026b [Merge] Merge with main addons. 
bzr revid: mdi@tinyerp.com-20121015053217-06u3fa6yyybpartw
 2012-10-15 11:02:17 +05:30
Ajay Chauhan (OpenERP) 8f9ddd1e7c [IMP] mrp,mrp_subproduct: made little change in warning message 
bzr revid: cha@tinyerp.com-20121015051941-6dqf8bqo87lews7m
 2012-10-15 10:49:41 +05:30
Ajay Chauhan (OpenERP) 504a1d2fb9 [MERGE] merge with lp:openobject-addons 
bzr revid: cha@tinyerp.com-20121011052709-3fq17pzb8ut7l75d
bzr revid: cha@tinyerp.com-20121012051312-huk16gqwvuwxy98w
bzr revid: cha@tinyerp.com-20121015050320-tsawh79tfgpmhc1p
 2012-10-15 10:33:20 +05:30
Launchpad Translations on behalf of openerp 7f23ad5de5 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20121014043940-206nffs2h36wt170
 2012-10-14 04:39:40 +00:00
Fabien Pinckaers d2bd911c21 [MERGE] 
bzr revid: fp@tinyerp.com-20121013104324-t7p11vcb6u14z712
 2012-10-13 12:43:24 +02:00
Fabien Pinckaers 368bf1a0c2 [FIX] notes of products 
bzr revid: fp@tinyerp.com-20121013095508-c448sk16rdoc1kxf
 2012-10-13 11:55:08 +02:00
Launchpad Translations on behalf of openerp bcfee955da Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20121013043627-kst9vjslj6iqp6wq
bzr revid: launchpad_translations_on_behalf_of_openerp-20121013044941-k1vrd8hcxn5tqr0i
 2012-10-13 04:49:41 +00:00
Mayur Maheshwari (OpenERP) 0b87880029 [IMP]all: imporve string state to status 
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
 2012-10-12 17:12:58 +05:30
Divyesh Makwana (Open ERP) fb87569289 [Merge] Merge with main addons. 
bzr revid: mdi@tinyerp.com-20121011045301-ttt0tzlrk8ge06db
bzr revid: mdi@tinyerp.com-20121012052424-z2toltq0vw0pnyk9
 2012-10-12 10:54:24 +05:30
Christophe Matthieu 4a77345f63 [IMP] mail, following: access 
bzr revid: chm@openerp.com-20121011161614-k72bm2f6gw451u5g
 2012-10-11 18:16:14 +02:00
Christophe Matthieu 3a47e369e1 [MERGE] from trunk 
bzr revid: chm@openerp.com-20121011071602-u23xansbga1i41vs
 2012-10-11 09:16:02 +02:00
Fabien Pinckaers dd5f5eca9b [MERGE] 
bzr revid: fp@openerp.com-20121010203818-32otffomve5ifm16
 2012-10-10 22:38:18 +02:00
Fabien Pinckaers 7813f13442 [MERGE] 
bzr revid: fp@openerp.com-20121010190438-x2o6jhuoknexa67k
 2012-10-10 21:04:38 +02:00
Amit Patel 23f406063f [MERGE]:trunk 
bzr revid: apa@tinyerp.com-20121009090057-gtwa0gu95m5s1zcr
 2012-10-09 14:30:57 +05:30
Divyesh Makwana (Open ERP) 9c58413280 [IMP] mrp : In manufacturing orders, 'Consumed product' should have an 'S'. 
bzr revid: mdi@tinyerp.com-20121008104935-pdeix1mw0do90z19
 2012-10-08 16:19:35 +05:30
Mayur Maheshwari (OpenERP) 8926173f86 [MERGE]: Merge with lp:openobject-addons 
bzr revid: mma@tinyerp.com-20121008060135-v2kqft87wju94z7j
 2012-10-08 11:31:35 +05:30
Ajay Chauhan (OpenERP) 634cb59470 [MERGE] merge with lp:openobject-addons 
bzr revid: cha@tinyerp.com-20121004050131-emowa7pye2si6cja
bzr revid: cha@tinyerp.com-20121008050019-d1rkpmvni8nmzml6
 2012-10-08 10:30:19 +05:30
Fabien Pinckaers eb9a49718f [MERGE] procuremnt msgs improved 
bzr revid: fp@tinyerp.com-20121004133829-re00elfxxlq6oayq
 2012-10-04 15:38:29 +02:00
Quentin (OpenERP) 6d70bedd69 [MERGE] trunk 
bzr revid: qdp-launchpad@openerp.com-20121004084906-zhqfu2jz1o4hn0c1
 2012-10-04 10:49:06 +02:00
Khushboo Bhatt (Open ERP) dbb18562a5 [FIX]from product's view if we click on Bill of Materials view it opens bill of materials view which is showing BoM of this product as a component too 
bzr revid: kbh@tinyerp.com-20121004084253-hc1nibjcdkamocni
 2012-10-04 14:12:53 +05:30
Harry (OpenERP) dd44dab68c [FIX] small issues 
bzr revid: hmo@tinyerp.com-20121003113810-mnlg6rf50xi2ljnt
 2012-10-03 17:08:10 +05:30
Harry (OpenERP) 319ba65bb8 [MERGE] 
bzr revid: hmo@tinyerp.com-20121003105212-651698je5ye1zpuz
 2012-10-03 16:22:12 +05:30
Ajay Chauhan (OpenERP) bb4b253dfd [IMP] mrp: added onchange method for product_uom field 
bzr revid: cha@tinyerp.com-20121003103608-1uuh3t9mw7i2scif
 2012-10-03 16:06:08 +05:30
Randhir Mayatra (OpenERP) fbd443a66e [MERGE] merge with addons 
bzr revid: rma@tinyerp.com-20121003103503-5rdpwbp2cecfmna0
 2012-10-03 16:05:03 +05:30
Tejas Tank 9c2ca851e2 [IMP] procurement: Products reserverd from stock & added Manufucture Order in procurement. 
bzr revid: tta@openerp.com-20121003094341-suosaw2sum3grn7k
 2012-10-03 15:13:41 +05:30
Tejas Tank 0f534670ea [IMP] open chatter messages on the procurement. 
bzr revid: tta@openerp.com-20121003075730-hkwuqmpkriswphgh
 2012-10-03 13:27:30 +05:30
Randhir Mayatra (OpenERP) be0bf6e4e6 [IMP] make changes into product view 
bzr revid: rma@tinyerp.com-20121003052200-sauluqtzzgubn3x4
 2012-10-03 10:52:00 +05:30
Fabien Pinckaers c93d70e919 [MERGE] chm - improved subtype - fixes 
bzr revid: fp@openerp.com-20121002204023-8v3jf2n84xe2jol9
 2012-10-02 22:40:23 +02:00
Antonin Bourguignon 2b2288a3bd [FIX] a few problems introduced with the last merge 
bzr revid: abo@openerp.com-20121002111231-zo41jejkrm8afavu
 2012-10-02 13:12:31 +02:00
Antonin Bourguignon 1653332080 [MERGE] trunk 
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
 2012-10-02 12:29:15 +02:00
Randhir Mayatra (OpenERP) f669a37fc0 [IMP] make changes into product 
bzr revid: rma@tinyerp.com-20121001121630-cvtnnh6eh86nkj1a
 2012-10-01 17:46:30 +05:30
Randhir Mayatra (OpenERP) 9890c1da13 [MERGE] merge with parent branch 
bzr revid: rma@tinyerp.com-20121001085821-7c7g51mtgdp99qgl
 2012-10-01 14:28:21 +05:30
Randhir Mayatra (OpenERP) cd64e33d16 [IMP] make changes into product,procurement module 
bzr revid: rma@tinyerp.com-20121001085603-1s2kt6ufg8fcom8e
 2012-10-01 14:26:03 +05:30
Antony Lesuisse cb287a1964 [MERGE] trunk 
bzr revid: al@openerp.com-20120930141653-rm3miqkgxam9ko4i
 2012-09-30 16:16:53 +02:00
Antony Lesuisse 6dd16f2613 [MERGE] trunk 
bzr revid: al@openerp.com-20120930141638-bw50m7b5a8wnu2yh
 2012-09-30 16:16:38 +02:00
Fabien Pinckaers 8813523acb [MERGE] workcenter uom for analytic cost 
bzr revid: fp@tinyerp.com-20120930125757-gfgkrbvitaharv8l
 2012-09-30 14:57:57 +02:00
Fabien Pinckaers 1b868441cc [MERGE] better context for prod_lot_id 
bzr revid: fp@tinyerp.com-20120930110202-4t6pcdjhqhb89xrv
 2012-09-30 13:02:02 +02:00
Fabien Pinckaers cef74b0420 [MERGE] order of routing based on sequence 
bzr revid: fp@tinyerp.com-20120930103518-7r8cjxprx6ri2zqo
 2012-09-30 12:35:18 +02:00
Fabien Pinckaers b2f798a522 [IMP] performance improvement in MRP 
bzr revid: fp@tinyerp.com-20120929133917-x6dlgou1te98962z
 2012-09-29 15:39:17 +02:00
Fabien Pinckaers 8d1f52ffb7 [FIX] BoM Structure 
bzr revid: fp@tinyerp.com-20120929084332-drmkupa4b3udo908
 2012-09-29 10:43:32 +02:00
Antonin Bourguignon 8683ea9c6d [MERGE] trunk 
bzr revid: abo@openerp.com-20120928152152-p6s1dzq96g0sy2sf
 2012-09-28 17:21:52 +02:00
Quentin (OpenERP) a6ef1d4a42 [IMP] mrp: cleaning of stock move name 
bzr revid: qdp-launchpad@openerp.com-20120928095035-w1g06od25auo52ev
 2012-09-28 11:50:35 +02:00
Fabien Pinckaers 6c88927a51 [MERGE] MRP Useability: menus 
bzr revid: fp@tinyerp.com-20120927172640-w8z1nipu7ijwb8k2
 2012-09-27 19:26:40 +02:00
Fabien Pinckaers e9f4840c93 [IMP] emoving bad code, no invitation system on events 
[IMP] no more certifiate, will be managed in apps.openerp.com directly

bzr revid: fp@tinyerp.com-20120926121627-60isym4hdjkaxe9p
 2012-09-26 14:16:27 +02:00
Hardik 7e3367ccc5 [IMP]MRP : Add context in product action 
bzr revid: hsa@tinyerp.com-20120925064030-ts2zed5vkznj9puj
 2012-09-25 12:10:30 +05:30
Antonin Bourguignon 1fbb4a5c16 [IMP] handling of '(copy)' l10n 
bzr revid: abo@openerp.com-20120924162645-z1h4l2mj6c8i6wr3
 2012-09-24 18:26:45 +02:00
Hardik fe3b453e98 [IMP]Add Products below BOM 
bzr revid: hsa@tinyerp.com-20120924133244-8czsc0bs1mtx0af3
 2012-09-24 19:02:44 +05:30
Christophe Matthieu f47111449c [IMP] mail_follower: unique field widget, sub-types on click 
bzr revid: chm@openerp.com-20120924095616-keuji387bvy6pmcs
 2012-09-24 11:56:16 +02:00
Christophe Matthieu fa63653de9 [MERGE] from trunk-mail-mail-rules-tde 
bzr revid: chm@openerp.com-20120921095037-czl4s3v0do11yhkq
 2012-09-21 11:50:37 +02:00
Hardik a01ef1b395 [IMP]Product id is updated 
bzr revid: hsa@tinyerp.com-20120921065147-sbvbrp7z5y7m2nyz
 2012-09-21 12:21:47 +05:30
Thibault Delavallée cb806332be [FIX] subtype_xml_id -> subtype in message_post. 
bzr revid: tde@openerp.com-20120920145405-vwi1kt1ttkd2w8sz
 2012-09-20 16:54:05 +02:00
Thibault Delavallée 1206b8f7a0 [IMP] Addons: added message_is_follower and message_subtype_data invisible fields to all views using Chatter and Followers widgets. 
bzr revid: tde@openerp.com-20120920115900-vvpfhjvw135vhf91
 2012-09-20 13:59:00 +02:00
Thibault Delavallée b9820db8f0 [CLEAN] hr_holidays, hr_recruitment, idea, mrp: cleaned subtypes. 
bzr revid: tde@openerp.com-20120919131240-7cc61fqg5eoom9zt
 2012-09-19 15:12:40 +02:00
Thibault Delavallée fa27dde6c9 [MERGE] Merged with addons/trunk. 
bzr revid: tde@openerp.com-20120919111000-w3xmyatd6new8ghm
 2012-09-19 13:10:00 +02:00
Hardik e971934854 [IMP]MRP : Add Product Menu and BOM field is required 
bzr revid: hsa@tinyerp.com-20120919105324-uqh8z188rtl34bva
 2012-09-19 16:23:24 +05:30
Thibault Delavallée 585ec570d2 [MERGE] Merged with addons/trunk. 
bzr revid: tde@openerp.com-20120918155905-rkdtkuu559ii0e6p
bzr revid: tde@openerp.com-20120919075051-zjxrbcbltrlp8h4k
 2012-09-19 09:50:51 +02:00
Fabien Pinckaers 4dad07b8bb [MERGE] stock improvements & fixes 
bzr revid: fp@tinyerp.com-20120918171020-u9yrlmxui2v9ow3a
 2012-09-18 19:10:20 +02:00
Amit Patel 7f9b4d6d8d [MERGE] 
bzr revid: apa@tinyerp.com-20120918050814-n0mlkmd9tazd7hso
 2012-09-18 10:38:14 +05:30
Thibault Delavallée 0ff327fa66 [MERGE] Merged with addons/trunk. 
bzr revid: tde@openerp.com-20120917160657-3zjj4evb1ezgo94a
 2012-09-17 18:06:57 +02:00
Thibault Delavallée abf16c58c6 [IMP] Addons: added invisible field for message_is_follower; note: reidented view; account_voucher: reidented one view. 
bzr revid: tde@openerp.com-20120917153533-u102ds3eo1xr1mnt
 2012-09-17 17:35:33 +02:00
Fabien Pinckaers abf3d2bd53 [IMP] product explanation about the business flow 
bzr revid: fp@tinyerp.com-20120917144740-2hsb04t8dpzxzuue
 2012-09-17 16:47:40 +02:00
Sanjay Gohel (Open ERP) e6cdcb6b51 [MERGE]merge with trunk addons 
bzr revid: sgo@tinyerp.com-20120917065740-w9a3xhe632368t2n
 2012-09-17 12:27:40 +05:30
Fabien Pinckaers b9fa71cc59 [MERGE] merge rpa's imprvoements of modules description 
bzr revid: fp@openerp.com-20120916212615-jfoghzsady0ektp1
 2012-09-16 23:26:15 +02:00
Fabien Pinckaers adee7dae15 [MERGE] product form view 
bzr revid: fp@openerp.com-20120916163441-xf3ipgkpiu3rmy31
 2012-09-16 18:34:41 +02:00
Fabien Pinckaers ab4b7da49f [IMP] cleaned ir.actions.todo to launch newly installed application 
bzr revid: fp@openerp.com-20120916114249-5px8shvbm3tzhidh
 2012-09-16 13:42:49 +02:00
Launchpad Translations on behalf of openerp 831cfe6d0e Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20120915045546-04wd8t9lh32zubmg
bzr revid: launchpad_translations_on_behalf_of_openerp-20120916043910-4mdhgae8w7eamg54
 2012-09-16 04:39:10 +00:00
Gilles Major 59c03591df [MERGE] improvements on module descriptions 
bzr revid: gim@openerp.com-20120914140950-drka4c0tnbnkw3fg
 2012-09-14 16:09:50 +02:00
Gilles Major 30839863e8 [IMP] improve module descriptions 
bzr revid: gim@openerp.com-20120914122827-dhao39ur269mmin8
 2012-09-14 14:28:27 +02:00
Amit Patel ca38083f17 [MERGE]:trunk 
bzr revid: apa@tinyerp.com-20120914100803-1h2h8golavg0wtw0
 2012-09-14 15:38:03 +05:30
Christophe Matthieu 46a60cdac7 [MERGE] from trunk-mail-concreting-tde, TODO fix bug 
bzr revid: chm@openerp.com-20121029090847-27h3tmyvsv9c8vej
 2012-10-29 10:08:47 +01:00
Frédéric van der Essen 7cdf99ade1 [IMP] mail: improved display of openchatter in form views 
bzr revid: fva@openerp.com-20121026095821-c3idarsd5yi9fzso
 2012-10-26 11:58:21 +02:00
Amit Patel 682a69ffcc [MERGE]:trunk 
bzr revid: apa@tinyerp.com-20120914050130-c9qugrxlnwude0s7
 2012-09-14 10:31:30 +05:30
Mayur Maheshwari (OpenERP) b90853eaf0 [IMP]account : improve string 
bzr revid: mma@tinyerp.com-20120913125154-75dc3d48yk1atujy
 2012-09-13 18:21:54 +05:30
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
Sanjay Gohel (Open ERP) fa5f1e174e [IMP]changed in mrp and mrp_operations for subtype 
bzr revid: sgo@tinyerp.com-20120913071430-o7bml82s6tgnwn4h
 2012-09-13 12:44:30 +05:30
Foram Katharotiya (OpenERP) 7a95639544 [IMP] improve code of supply_method in project_mrp 
bzr revid: fka@tinyerp.com-20120913055633-u2yybpkevxj48jvd
 2012-09-13 11:26:33 +05:30
Rucha (Open ERP) 10c5a5c02a [MERGE]: Merge with latest trunk-addons 
bzr revid: rpa@tinyerp.com-20120913053058-unlfdj92o69rnjam
 2012-09-13 11:00:58 +05:30
Mayur Maheshwari (OpenERP) c31c8a09c6 [MERGE]: Merge with lp:openobject-addons 
bzr revid: mma@tinyerp.com-20120913051706-1lm8s0xgl8qsseso
 2012-09-13 10:47:06 +05:30
Launchpad Translations on behalf of openerp 74df8d0147 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20120913043945-ngyp0f6ecuw641wx
 2012-09-13 04:39:45 +00:00
Raphael Collet 58510a62e4 [IMP] mrp: improve code in wizard change_production_qty 
bzr revid: rco@openerp.com-20120912141613-l7aqxgr1bpn0g82u
 2012-09-12 16:16:13 +02:00
Raphael Collet 26d162e80f [IMP] mrp: remove redundant domains in form view 
bzr revid: rco@openerp.com-20120912132733-eo0yfrn1v0dsxmhx
 2012-09-12 15:27:33 +02:00
Raphael Collet 9ca9d887b2 [FIX] mrp: revert changes of access rights of group mrp/user 
bzr revid: rco@openerp.com-20120912115105-vqz8mpnfurq04sa3
 2012-09-12 13:51:05 +02:00
Raphael Collet 349abc53c1 [IMP] mrp: make more fields readonly on mrp production 
bzr revid: rco@openerp.com-20120912113046-44ahrld0blg5lqkv
 2012-09-12 13:30:46 +02:00
Sanjay Gohel (Open ERP) a807b57f4e [MERGE]merge with trunk addons 
bzr revid: apa@tinyerp.com-20120911054811-24s3e1perqf7x1wo
bzr revid: apa@tinyerp.com-20120911084547-trlru6t8r1dv1yhd
bzr revid: apa@tinyerp.com-20120912050215-glxhb94pu2aed5fz
bzr revid: apa@tinyerp.com-20120913050959-re58fqvnaqrhgzg0
bzr revid: sgo@tinyerp.com-20120914053201-khnzm9ei7rpjcp7u
 2012-09-14 11:02:01 +05:30
Mayur Maheshwari (OpenERP) 10fca1992b [MERGE]: Merge with lp:openobject-addons 
bzr revid: mma@tinyerp.com-20120912100259-k81vv67yg6ydqnwu
 2012-09-12 15:32:59 +05:30
Raphael Collet 8d7cb73938 [FIX] mrp: revert unexpected change in list color 
bzr revid: rco@openerp.com-20120912093454-q3g4v3avft0chnnb
 2012-09-12 11:34:54 +02:00
Raphael Collet 564fd29656 [IMP] mrp: make some fields on mrp.production readonly except in draft state 
bzr revid: rco@openerp.com-20120912092826-qfnhzzj5jgte474j
 2012-09-12 11:28:26 +02:00
Rucha (Open ERP) e8b39e8754 [IMP]: mrp: Improved module description for mrp 
bzr revid: rpa@tinyerp.com-20120912090904-mqu3ac5maza6qulo
 2012-09-12 14:39:04 +05:30
Mayur Maheshwari (OpenERP) d4f450a9a3 [IMP]all : Improve settings wizard with capital letters at the start of each sentence 
bzr revid: mma@tinyerp.com-20120912071413-2ik1suywyrb2qtuv
 2012-09-12 12:44:13 +05:30
Raphael Collet 72f39b0638 [IMP] mrp: change deprecated '<>' operator to '!=' 
bzr revid: rco@openerp.com-20120911145112-4ansycxt1o15b8fd
 2012-09-11 16:51:12 +02:00
Jigar Amin - OpenERP 2305856f1f [FIX] Update the group of the stock locations on field prodlot 
bzr revid: jam@tinyerp.com-20120910111359-2odv1fq5bj6wpr46
 2012-09-10 16:43:59 +05:30
Jigar Amin - OpenERP 57ff1302c6 [FIX] removed not needed states condition 
bzr revid: jam@tinyerp.com-20120910095104-sb0uco3gwzcr1vo3
 2012-09-10 15:21:04 +05:30
Jigar Amin - OpenERP af555bdd84 Merge lp:~openerp-dev/openobject-addons/trunk-addons7-update-aja 
bzr revid: jam@tinyerp.com-20120910074258-mg2tcxqdmclldo8o
 2012-09-10 13:12:58 +05:30
ajay javiya (OpenERP) b9c3b1efea [IMP]: Improve fields readonly-ness in mrp 
bzr revid: aja@tinyerp.com-20120910061409-g3ue25pqomfech3m
 2012-09-10 11:44:09 +05:30
ajay javiya (OpenERP) c8440c5094 [IMP]: Improve readonly-ness of field 
bzr revid: aja@tinyerp.com-20120910052121-73o2wk7v8yb0ydzd
 2012-09-10 10:51:21 +05:30
ajay javiya (OpenERP) e8d432a9ae [MERGE]:Merge with main branch 
bzr revid: aja@tinyerp.com-20120910045847-f4fylwf3i4fshv6m
 2012-09-10 10:28:47 +05:30
Jigar Amin - OpenERP 08a5a24194 Merge lp:openobject-addons 
bzr revid: jam@tinyerp.com-20120910041726-jmjdogjyn0dcv1ts
 2012-09-10 09:47:26 +05:30
Amit Patel (OpenERP) 28c02858aa [MERGE]:trunk 
bzr revid: apa@tinyerp.com-20120907051238-z0a84gfgpvq1hn1h
 2012-09-07 10:42:38 +05:30
Fabien Pinckaers e084498b7d [IMP] removing some board stuff 
bzr revid: fp@tinyerp.com-20120906152303-v6svwvqms858xm9t
 2012-09-06 17:23:03 +02:00
ajay javiya (OpenERP) 1a3b92d722 [IMP] :Update button hide in ready state 
bzr revid: aja@tinyerp.com-20120906084125-eehug1snoy1q4rus
 2012-09-06 14:11:25 +05:30
ajay javiya (OpenERP) 9e6408533d [ADD]:Add group on serial number 
bzr revid: aja@tinyerp.com-20120906073354-ve2u2hg0wt32y1z5
 2012-09-06 13:03:54 +05:30
ajay javiya (OpenERP) 3b0d997774 [IMP]:Improve view and change label 
bzr revid: aja@tinyerp.com-20120906065835-lmh0dscu20t2tptt
 2012-09-06 12:28:35 +05:30
Jigar Amin - OpenERP b15e92d5c9 [REF] Refectored the MRP BoM Form View 
bzr revid: jam@tinyerp.com-20120904131421-4bjwfxr40hnzl8lu
 2012-09-04 18:44:21 +05:30
Jigar Amin - OpenERP bc8b0d88d3 Merge lp:openobject-addons 
bzr revid: jam@tinyerp.com-20120904123028-qskoxfxm1708rivr
 2012-09-04 18:00:28 +05:30
ajay javiya (OpenERP) f9c81acefd [IMP]: Improve form view 
bzr revid: aja@tinyerp.com-20120904112250-2lmwv8xi6uwt086j
 2012-09-04 16:52:50 +05:30
Amit Patel (OpenERP) 0a5ebb52e1 [MERGE]:trunk-mail-cleaning-fp 
bzr revid: apa@tinyerp.com-20120904104409-w9zl98qjpem10pan
 2012-09-04 16:14:09 +05:30
ajay javiya (OpenERP) a75af642a3 [IMP]: Improve view of bom 
bzr revid: aja@tinyerp.com-20120904101452-ayj02ve12h21j1jq
 2012-09-04 15:44:52 +05:30
ajay javiya (OpenERP) 4cbc33adba [IMP]: Improve bom form view 
bzr revid: aja@tinyerp.com-20120904093529-d7up3kgrny9httql
 2012-09-04 15:05:29 +05:30
Thibault Delavallée 48c081f271 [MERGE] Merged with addons/trunk. 
bzr revid: tde@openerp.com-20120904075142-4xnbxyf52ph0jezj
 2012-09-04 09:51:42 +02:00
ajay javiya (OpenERP) 5458b03a19 [ADD]:Make fields readonly in ready state 
bzr revid: aja@tinyerp.com-20120903124359-i42vphfldpol232b
 2012-09-03 18:13:59 +05:30
Jigar Amin - OpenERP c56d60b9ab [FIX] Added the prodcue conetxt supply method 
bzr revid: jam@tinyerp.com-20120903113343-bygyynpssnvvub4n
 2012-09-03 17:03:43 +05:30
Jigar Amin - OpenERP 83a0226428 Merge lp:~openerp-dev/openobject-addons/trunk-addons7-change-qty-aja 
bzr revid: jam@tinyerp.com-20120903111420-g8wggfb5vlp3syb5
 2012-09-03 16:44:20 +05:30
ajay javiya (OpenERP) 54a5626b65 [MERGE]:Merge with parent branch 
bzr revid: aja@tinyerp.com-20120903105951-iqko94mxy02y41v5
 2012-09-03 16:29:51 +05:30
Jigar Amin - OpenERP 83e6fc07b1 Merge lp:~openerp-dev/openobject-addons/trunk-addons7-products-to-consume-aja 
bzr revid: jam@tinyerp.com-20120903105053-0uiz6c6v9ucddurn
 2012-09-03 16:20:53 +05:30
Jigar Amin - OpenERP ad35125d29 Merge lp:~openerp-dev/openobject-addons/trunk-addons7-change-location-tch 
bzr revid: jam@tinyerp.com-20120903103451-xxs6ep37ryhs6eb5
 2012-09-03 16:04:51 +05:30
ajay javiya (OpenERP) 1e19e30dc8 [IMP]:Update Quantity 
bzr revid: aja@tinyerp.com-20120903102830-66t92ajzbghiib7e
 2012-09-03 15:58:30 +05:30
Jigar Amin - OpenERP 6bce067472 Merge lp:~openerp-dev/openobject-addons/trunk-addons7-bom-field-on-top-tch 
bzr revid: jam@tinyerp.com-20120903102639-876nx24p0kr4ku5r
 2012-09-03 15:56:39 +05:30
Twinkle Christian (OpenERP) 3c39e72644 [IMP]In products to consume put serial number instead of source location 
bzr revid: tch@tinyerp.com-20120903093919-6tzhsadj3gnxjfgb
 2012-09-03 15:09:19 +05:30
Thibault Delavallée 6fa349a4eb [MERGE] Merged with addons/trunk. 
bzr revid: tde@openerp.com-20120903091818-0qnjl3e5tss54bbj
 2012-09-03 11:18:18 +02:00
Twinkle Christian (OpenERP) 89f828c54f [IMp]replace bom field from bottom to top 
bzr revid: tch@tinyerp.com-20120903091443-8nzjqxdo0xit6zc9
 2012-09-03 14:44:43 +05:30
Twinkle Christian (OpenERP) b822837fdd [IMp]replace bom field from bottom to top 
bzr revid: tch@tinyerp.com-20120903090851-1frhj6ylp8kg2k71
 2012-09-03 14:38:51 +05:30
Twinkle Christian (OpenERP) ded432e76f [IMp]replace bom field from bottom to top 
bzr revid: tch@tinyerp.com-20120903085728-qkbrtwchcu4ik7dx
 2012-09-03 14:27:28 +05:30
Twinkle Christian (OpenERP) e3f16f1f20 [IMp]replace bom field from bottom to top 
bzr revid: tch@tinyerp.com-20120903085350-g7oboh830z35lna6
 2012-09-03 14:23:50 +05:30
Twinkle Christian (OpenERP) a0e39d8231 [IMp]replace bom field from bottom to top 
bzr revid: tch@tinyerp.com-20120903085229-pm9tgtox0owpvgw7
 2012-09-03 14:22:29 +05:30
Twinkle Christian (OpenERP) f1928910f8 [IMp]replace bom field from bottom to top 
bzr revid: tch@tinyerp.com-20120903070715-lw6sjtk9xfk6y8aa
 2012-09-03 12:37:15 +05:30
ajay javiya (OpenERP) 1fb01f9600 [ADD]:Add group on button in mrp 
bzr revid: aja@tinyerp.com-20120903061805-b0l4gjyb8id0f1iw
 2012-09-03 11:48:05 +05:30
Jigar Amin - OpenERP b25129239a Merge lp:~openerp-dev/openobject-addons/trunk-addons7-readonly-mo-tch 
bzr revid: jam@tinyerp.com-20120903053502-tmyxe6bpnw7m8k5v
 2012-09-03 11:05:02 +05:30
Mayur Maheshwari (OpenERP) d10ddc0d15 [MERGE]: Merge with lp:openobject-addons 
bzr revid: mma@tinyerp.com-20120903053432-9um4h75wjy29k1n5
 2012-09-03 11:04:32 +05:30
Jigar Amin - OpenERP 9fb0a6d190 Merge lp:openobject-addons 
bzr revid: jam@tinyerp.com-20120903050501-0j9qk8rxs6gat7gr
 2012-09-03 10:35:01 +05:30
Fabien Pinckaers d0db8f930d imp 
bzr revid: fp@openerp.com-20120902131619-to09idu73evgf2re
 2012-09-02 15:16:19 +02:00
Fabien Pinckaers 4d2d2ee443 [IMP] useability form views reviewed: product, mrp 
bzr revid: fp@openerp.com-20120902131413-6sba369b26rbxvfd
 2012-09-02 15:14:13 +02:00
Twinkle Christian (OpenERP) 0e39d9e4c4 [IMP]made readonly field in when Mo is in in_production state 
bzr revid: tch@tinyerp.com-20120831131723-5xyb49kwho3m60u3
 2012-08-31 18:47:23 +05:30
Foram Katharotiya (OpenERP) e44d125479 [IMP] Add data of subtype in mrp, mrp_repair & mrp_operations 
bzr revid: fka@tinyerp.com-20120831131712-dz5b5isq797v5xfc
 2012-08-31 18:47:12 +05:30
Jigar Amin - OpenERP cf5005cecd [IMP] A manufaturing/user should not see purchase dashboard (menu) (only the purchase user can sse that menu) 
A manufaturing/user should be able to create a consume move line and produce whole mo
Mmerge lp:~openerp-dev/openobject-addons/trunk-addons7-access-right-tch

bzr revid: jam@tinyerp.com-20120831111613-csmo1im7ck5p3e2e
 2012-08-31 16:46:13 +05:30
Twinkle Christian (OpenERP) 9db6b11fb9 [IMP]purchse user can see that menu 
bzr revid: tch@tinyerp.com-20120831103615-w14f7ltu59bs7odl
 2012-08-31 16:06:15 +05:30
Amit Patel (OpenERP) 8ef441badb [MERGE]:merged with trunk 
bzr revid: apa@tinyerp.com-20120831102930-a53w7rvmibe3mqkm
 2012-08-31 15:59:30 +05:30
Twinkle Christian (OpenERP) be60e6ae63 [IMP]MRP user can produce whole mo 
bzr revid: tch@tinyerp.com-20120831101616-67vjdp0juzv1o8yt
 2012-08-31 15:46:16 +05:30
Fabien Pinckaers 39ed85c18d fix 
bzr revid: fp@tinyerp.com-20120831083909-suttma1sjdz7uu0m
 2012-08-31 10:39:09 +02:00
Fabien Pinckaers 40339ae025 [IMP] boms on products 
bzr revid: fp@tinyerp.com-20120831075505-n3478j5h7jqsu72j
 2012-08-31 09:55:05 +02:00
Thibault Delavallée c14a11482c [MERGE] Merged with addons/trunk. 
bzr revid: tde@openerp.com-20120831074032-3b41p3qnuknfv461
 2012-08-31 09:40:32 +02:00
Twinkle Christian (OpenERP) d4f40dd3e4 [IMP]purchse user can see that menu 
bzr revid: tch@tinyerp.com-20120831063137-nzc9rd3bn92esygs
 2012-08-31 12:01:37 +05:30
Mayur Maheshwari (OpenERP) 971ae44dfc [MERGE]: Merge with lp:openobject-addons 
bzr revid: mma@tinyerp.com-20120831062749-89g3ytkd83rdoac3
 2012-08-31 11:57:49 +05:30
Mayur Maheshwari (OpenERP) 0dd1516ce2 [IMP]stock :set a appropriate access rights and groups for manager and user 
bzr revid: mma@tinyerp.com-20120831062201-tyw9qvrf23eh8i3y
 2012-08-31 11:52:01 +05:30
Jigar Amin - OpenERP b110e26c9a [IMP] removed the Revision MOdel and Revision field from BoM and Added Chatter in place. 
Merge lp:~openerp-dev/openobject-addons/trunk-addons7-bom-aja

bzr revid: jam@tinyerp.com-20120831060553-99v9c62qk7kcyd09
 2012-08-31 11:35:53 +05:30
ajay javiya (OpenERP) 46c507a73e [REM]:Remove revision_ids 
bzr revid: aja@tinyerp.com-20120831050755-13uwoi89l1gchh0q
 2012-08-31 10:37:55 +05:30
ajay javiya (OpenERP) 4431d24355 [REM]Remove mrp_bom_revision 
bzr revid: aja@tinyerp.com-20120831050028-aoprwoo3bq8x0f75
 2012-08-31 10:30:28 +05:30
Olivier Dony 1dce0b1dc4 [FIX] all mail dependencies: replace message_post call by normal record + review misc wording 
bzr revid: odo@openerp.com-20120830141852-ku8nql1sfkko8669
 2012-08-30 16:18:52 +02:00
Jigar Amin - OpenERP 64921f7e62 [IMP] Default Supply Method shoud be on m2p product_id on MO 
Merged lp:~openerp-dev/openobject-addons/trunk-addons7-supplymethod-aja

bzr revid: jam@tinyerp.com-20120830131820-l0ygwj9sjd6snmvf
 2012-08-30 18:48:20 +05:30
Jigar Amin - OpenERP 140cab422e [IMP] Imporved the Configuration wizard message 
bzr revid: jam@tinyerp.com-20120830130615-l4wrqbj6sugefyvv
 2012-08-30 18:36:15 +05:30
ajay javiya (OpenERP) 3f2ced5a06 [IMP]mrp:change default supply method 
bzr revid: aja@tinyerp.com-20120830130359-bslgfmtvoqcl12hf
 2012-08-30 18:33:59 +05:30
Twinkle Christian (OpenERP) 3a9b697e9c [IMP]In stage object replace state to status 
bzr revid: tch@tinyerp.com-20120830130119-o1ofjtiwuhlmbu2x
 2012-08-30 18:31:19 +05:30
ajay javiya (OpenERP) 2063604ca8 [IMP]mrp:Improve ir.acrion.todo to jump mrp 
bzr revid: aja@tinyerp.com-20120830124355-5230z42d8f0up3sp
 2012-08-30 18:13:55 +05:30
Rajesh Prajapati (OpenERP) a2038dfe6d [FIX] mrp: issue of Bill of Materials Structure in more 
lp bug: https://launchpad.net/bugs/1041182 fixed

bzr revid: rpr@tinyerp.com-20120830094446-tna47o40g2so49zr
 2012-08-30 15:14:46 +05:30
Fabien Pinckaers 3b693e5ce2 [IMP] useability mrp 
bzr revid: fp@tinyerp.com-20120830092321-0sp1e61sosrwtiu7
 2012-08-30 11:23:21 +02:00
Thibault Delavallée 8b910c1f1d [MERGE] Merged with addons/trunk. 
bzr revid: tde@openerp.com-20120829074244-x6u8dnw4owiw93pv
 2012-08-29 09:42:44 +02:00
Dharti Ratani (OpenERP) 3733972565 [MERGE]merged with trunk 
bzr revid: dhr@tinyerp.com-20120828092928-da2a6k1f2e7g9i42
 2012-08-28 14:59:28 +05:30
Launchpad Translations on behalf of openerp 4e31d1be93 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828064335-bftlutj6aiymztbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828072410-7ndsu3tnyrjhtuor
 2012-08-28 07:24:10 +00:00
Ferdinand @ Camptocamp cf8c1611d5 [FIX] allows to add lots to planned quantity 
lp bug: https://launchpad.net/bugs/1009245 fixed

bzr revid: rmu@tinyerp.com-20120827114123-dpxrkfgeh28b1x3t
 2012-08-27 17:11:23 +05:30
Thibault Delavallée 4b0d1be1c0 [MERGE] Merged with addons/trunk. 
bzr revid: tde@openerp.com-20120827083705-p2edynkzch7hszrd
 2012-08-27 10:37:05 +02:00
Ravish Murari (OpenERP) 286bed2682 [merge] with latest addons 
bzr revid: rmu@tinyerp.com-20120824101100-5opxku51rtk2z8h3
 2012-08-24 15:41:00 +05:30
Dharti Ratani (OpenERP) 00139302a7 [MERGE]merged with trunk 
bzr revid: dhr@tinyerp.com-20120823072017-c48q59mif39j55wm
 2012-08-23 12:50:17 +05:30
Fabien Pinckaers b531d9cff1 [IMP] needaction after mail.thread 
bzr revid: fp@tinyerp.com-20120822153145-g7xopqq7oje7y60c
 2012-08-22 17:31:45 +02:00
Saurang Suthar(OpenERP) 095843797c [IMP] Improved _openerp__.py of all modules by replacing demo_xml with demo, init_xml and update_xml with data and adding noupdate 
bzr revid: pso@tinyerp.com-20120822130232-un52dks3sclyx8m5
 2012-08-22 18:32:32 +05:30
Dharti Ratani (OpenERP) 4655aebff8 [IMP]Fixed for procurement and locations tab come from module stock 
bzr revid: dhr@tinyerp.com-20120821113814-v2ymtmi80kukrzch
 2012-08-21 17:08:14 +05:30
Dharti Ratani (OpenERP) 6f28fde4ae [IMP]Renamed EAN13,supply method visible only when mrp is installed and suppliers tab comes when purchase is installed 
bzr revid: dhr@tinyerp.com-20120821063718-uobafa8ij65an5b0
 2012-08-21 12:07:18 +05:30
Hardik 8f9f860323 [IMP]Update __openerp__.py for all modules 
bzr revid: hsa@tinyerp.com-20120820125644-px287o03bxrx8h3o
 2012-08-20 18:26:44 +05:30
Fabien Pinckaers a3f8bc2dc5 [IMP] FIX in MRP demo data + mail stuff 
bzr revid: fp@tinyerp.com-20120817133449-y50n3iyh49f6w8j1
 2012-08-17 15:34:49 +02:00
Fabien Pinckaers 6ac583c0f7 [IMP] mail cleaning 
bzr revid: fp@tinyerp.com-20120817111936-2d33nlqlbvkjb374
 2012-08-17 13:19:36 +02:00
Hardik b040d2706d [IMP]update __openerp__.py in all modules 
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
 2012-08-17 16:45:40 +05:30
Fabien Pinckaers 66ece041f0 [IMP] append note 
bzr revid: fp@tinyerp.com-20120817102650-1sglq1y2dbb3xqju
 2012-08-17 12:26:50 +02:00
Fabien Pinckaers b62858e83e [IMP] Merging different ways of posting a message: 
message_append_note
  message_append_dict
  message_append
  --> merged all to message_post

bzr revid: fp@tinyerp.com-20120817100302-bqsqv23ogrchslew
 2012-08-17 12:03:02 +02:00
Fabien Pinckaers c7c1cb1037 [IMP] renaming message_state to message_unread 
bzr revid: fp@tinyerp.com-20120816092616-jnoj0d18rw1ifqth
 2012-08-16 11:26:16 +02:00
Fabien Pinckaers a2b7f82a81 [IMP] no auto_follow, we will use auto-compose instead on some actions 
bzr revid: fp@tinyerp.com-20120816090243-nzu6ounygswiceqi
 2012-08-16 11:02:43 +02:00
Fabien Pinckaers e5b76be9b8 [IMP] merge trunk 
bzr revid: fp@tinyerp.com-20120816072402-7w1avco6ryt12x10
 2012-08-16 09:24:02 +02:00
Antony Lesuisse da8045d784 add message_followers_ids 
bzr revid: al@openerp.com-20120815223038-ppuq03m5wj97u6rj
 2012-08-16 00:30:38 +02:00
Thibault Delavallée 92c70aa6ea [IMP] Addons: propagated new automatic subscription mechanism. 
bzr revid: tde@openerp.com-20120815205143-twthjirie2b5kr7n
 2012-08-15 22:51:43 +02:00
Thibault Delavallée 61274acd89 [MERGE] Merged with addons/trunk. 
bzr revid: tde@openerp.com-20120815195652-839w3fyumomq0ubf
 2012-08-15 21:56:52 +02:00
Fabien Pinckaers d820e866ee [MERGE] trunk 
bzr revid: fp@openerp.com-20120815185713-82zylb0yqqgs008y
 2012-08-15 20:57:13 +02:00
Fabien Pinckaers eb0669850d [IMP] removed needaction_pending, some cleaning in messages mail 
bzr revid: fp@openerp.com-20120815133643-loyzmyp6azs5lr47
 2012-08-15 15:36:43 +02:00
Thibault Delavallée a6482fe07c [WIP] Followers rewrite: in create/write, the purpose is to add the field in the values to write, and to simplify automatic subscription. WIP, lack of time to finish. Will be continued. 
bzr revid: tde@openerp.com-20120814170612-ax8xhcmmttrcphnl
 2012-08-14 19:06:12 +02:00
Quentin (OpenERP) 1232812cc6 [MERGE] merged branch that corrects the decimal precision on fields. Courtesy of Akretion 
bzr revid: qdp-launchpad@openerp.com-20120814141040-oaf7d56thhi2s9rm
 2012-08-14 16:10:40 +02:00
Vo Minh Thu 9822629548 [MERGE] merged trunk. 
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
 2012-08-13 18:06:57 +02:00
Rucha (Open ERP) dd7a2972d8 [MERGE]: Merge with latest trunk-addons 
bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5
 2012-08-13 10:44:11 +05:30
Rucha (Open ERP) ecfe4cbba1 [FIX]: mrp,sale: Fixed field name for image 
bzr revid: rpa@tinyerp.com-20120809102841-sbz3bu28hbqkl8dc
 2012-08-09 15:58:41 +05:30
Twinkle Christian (OpenERP) fc1b1749a8 [IMP]Remove type field from the modules 
bzr revid: tch@tinyerp.com-20120809060516-zgx3gdyv6wdshfyw
 2012-08-09 11:35:16 +05:30
Launchpad Translations on behalf of openerp e970ecd62c Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20120809050051-p6f437n80grsr5vz
 2012-08-09 05:00:51 +00:00
Olivier Dony 3fd9a77c83 [REVERT] Cancel PO Template changes from rev.2702 - to be fully re-generated before next release 
We'll also attempt to replace the master strings in the
translated .po files before replacing the master strings,
to avoid losing translations just because of mere typo fixes.

bzr revid: odo@openerp.com-20120808144613-wtz50tcz5n7kvcza
 2012-08-08 16:46:13 +02:00
Stephane Wirtel 4ae8ce4516 [MERGE] 
bzr revid: stw@openerp.com-20120808140846-ay7qn0bymtdbwj9q
 2012-08-08 16:08:46 +02:00
Stephane Wirtel 6fffe4ba64 [REF] bom: Redefine the form view of the boms in the form view of the product object 
bzr revid: stw@openerp.com-20120808134944-oc45kzo4q5ktbmxy
 2012-08-08 15:49:44 +02:00
Rucha (Open ERP) d597437dd7 [MERGE]: Merge with latest trunk-addons 
bzr revid: rpa@tinyerp.com-20120808063503-ymsvwnerxakqbcbx
 2012-08-08 12:05:03 +05:30
Antonin Bourguignon a97687a420 [MERGE] latest trunk 
also replace the error message title 'Operation Not Permitted' by 'Invalid Action'

bzr revid: abo@openerp.com-20120807120451-zdrrecilfh82obhl
 2012-08-07 14:04:51 +02:00
Antonin Bourguignon b0e8ae4c7d [IMP] error messages 
fix errors ending with an exclamation point; use a point instead
remove uniques (or almost) error messages titles, like 'Encoding Error' (1 occurrence in addons), 'Integrity Error' (1 occurrence in addons), 'Report Name' (1 occurrence in addons), 'Value Error' (1 occurrence in addons), 'Wrong Period Code' (1 occurrence in addons); replace these with 'Error'
add newline character after some messages titles, when necessary
fix 'UserError': should be 'User Error'
remove spaces before exclamation marks
add capital letters to messages titles words (e.g.: 'Invalid action' becomes 'Invalid Action')

bzr revid: abo@openerp.com-20120807110616-u3nlnybtgaebro18
 2012-08-07 13:06:16 +02:00
Jigar Amin - OpenERP 935e31b328 merge lp:openobject-addons 
bzr revid: jam@tinyerp.com-20120807105628-j3py2jnd1fnbnzza
 2012-08-07 16:26:28 +05:30
Twinkle Christian (OpenERP) e63254835c [IMP]improved ciews 
bzr revid: tch@tinyerp.com-20120807073359-p6flrh7wr98t2pue
 2012-08-07 13:03:59 +05:30
Launchpad Translations on behalf of openerp 3cfd65b43d Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
 2012-08-07 05:39:28 +00:00
Antonin Bourguignon a52eeef519 [IMP] rephrase some error and warning messages in document, edi, google_base_account, mrp and mrp_repair 
remove exclamation marks at the end of messages
remove unjustified capital letters

bzr revid: abo@openerp.com-20120806170841-cx9vuend1vglmsqk
 2012-08-06 19:08:41 +02:00
pso (OpenERP) 389f8d6803 [MERGE] Merge with main branch 
bzr revid: pso@tinyerp.com-20120806094234-1b145yrjixy5yrsg
 2012-08-06 15:12:34 +05:30
Rucha (Open ERP) b7daa1fb31 [MERGE]: Merge with latest trunk-addons 
bzr revid: rpa@tinyerp.com-20120803045532-wsgei101ogh0o44d
bzr revid: rpa@tinyerp.com-20120806050952-xecwmyhg4p2fs4id
 2012-08-06 10:39:52 +05:30
Fabien Pinckaers 0869066f99 [IMP] improved modules message at installation --> to be reviewed later 
bzr revid: fp@openerp.com-20120805201322-y8ghspcb69wmb3ut
 2012-08-05 22:13:22 +02:00
Fabien Pinckaers 7904580e60 [IMwP] open the right menu according to the installed application 
bzr revid: fp@openerp.com-20120804215327-651jy6mn1w15x430
 2012-08-04 23:53:27 +02:00
Fabien Pinckaers ea52cfae17 [IMP] introducing new file type: html 
bzr revid: fp@openerp.com-20120804143556-457q040g6q30x3fu
 2012-08-04 16:35:56 +02:00
Fabien Pinckaers b363b1f622 fix 
bzr revid: fp@openerp.com-20120804135631-9qqfgcz9513qsyzp
 2012-08-04 15:56:31 +02:00
Fabien Pinckaers 4e69bdd6fc [IMP] improved menu tips - 10 firsts clicks 
bzr revid: fp@openerp.com-20120804132136-2b18cfkwv0njsglj
 2012-08-04 15:21:36 +02:00
Antonin Bourguignon b12e606e18 [MERGE] latest trunk 
bzr revid: abo@openerp.com-20120803160951-4n7ckom9hyhgeio2
 2012-08-03 18:09:51 +02:00
Antonin Bourguignon a8447abc9b [IMP] add proper XML headers to config views 
bzr revid: abo@openerp.com-20120803131542-j37qwqb2wc7913k9
 2012-08-03 15:15:42 +02:00
Antonin Bourguignon ec5f2fe5d3 [FIX] several typos 
rephrase some labels
fix capital letters
add missing spaces (mainly before parentheses)

bzr revid: abo@openerp.com-20120801154701-9jvsd9iyihx5phyn
 2012-08-01 17:47:01 +02:00
Rucha (Open ERP) 01bea180bb [MERGE]: Merge with latest trunk-addons 
bzr revid: rpa@tinyerp.com-20120801064738-vcjdjnt3s57i2hgc
 2012-08-01 12:17:38 +05:30
pso (OpenERP) 773c2d5c63 [MERGE] Merge with main branch 
bzr revid: pso@tinyerp.com-20120801064711-y90iik5ialfdnfft
 2012-08-01 12:17:11 +05:30
Randhir Mayatra (OpenERP) 7ab619d0b6 [MERGE]merge with parent branch 
bzr revid: rma@tinyerp.com-20120801055828-jmwl64y48nssb3v6
 2012-08-01 11:28:28 +05:30
Amit Patel (OpenERP) c5eae6dec7 [MERGE]:merged with trunk 
bzr revid: apa@tinyerp.com-20120801054207-8cfqqna4wauzarkb
 2012-08-01 11:12:07 +05:30
Quentin (OpenERP) e1b50e304d [MEGUEZ] merged the clean search view branch 
bzr revid: qdp-launchpad@openerp.com-20120731150358-jqd3eoz06imzlx01
 2012-07-31 17:03:58 +02:00
Randhir Mayatra (OpenERP) 442b5fce17 [IMP] improve the mrp wizard 
bzr revid: rma@tinyerp.com-20120731125101-wbdspvdq5hu3lgt3
 2012-07-31 18:21:01 +05:30
Twinkle Christian (OpenERP) cb1c6c08af [IMP]Improve search view in all modules 
bzr revid: tch@tinyerp.com-20120731112804-a0akxtqr1z0uew6w
 2012-07-31 16:58:04 +05:30
Randhir Mayatra (OpenERP) 9733defd19 [IMP] make changes in mrp wizard 
bzr revid: rma@tinyerp.com-20120731085056-pim4040x57o8qb3a
 2012-07-31 14:20:56 +05:30
Randhir Mayatra (OpenERP) 0fbd251623 [MARGE] improvement in human manufacturing wizard 
bzr revid: rma@tinyerp.com-20120731061630-is2qedleoox8t3b7
 2012-07-31 11:46:30 +05:30
Sanjay Gohel (Open ERP) 9c63ddb992 [MERGE]merge with trunk 
bzr revid: sgo@tinyerp.com-20120731054300-j6ax39hs18svscgz
 2012-07-31 11:13:00 +05:30
Stephane Wirtel 1fc30258ff [FIX] mrp: add the stock.group_locations group 
bzr revid: stw@openerp.com-20120730142943-1ruwsyaf5pvehbzm
 2012-07-30 16:29:43 +02:00
Fabien Pinckaers d14c62fbe8 [IMP] copywriting summary of modules 
bzr revid: fp@openerp.com-20120730132840-bchv2hmp40uqkwvb
 2012-07-30 15:28:40 +02:00
vta vta@openerp.com 264d2c3365 [MERGE] Trunk. 
bzr revid: vta@openerp.com-20120730123628-49rirhupbwqfzr0r
 2012-07-30 14:36:28 +02:00
Randhir Mayatra (OpenERP) 39090544af [IMP] improvement in manufacturing wizard 
bzr revid: rma@tinyerp.com-20120730110418-ht0w5403tq5kw9lw
 2012-07-30 16:34:18 +05:30
pso (OpenERP) 6b3593ee76 [MERGE] Merge with main branch 
bzr revid: pso@tinyerp.com-20120730095125-4s8q9hyx56x9248w
 2012-07-30 15:21:25 +05:30
pso (OpenERP) 739a05c00a [IMP] mrp: Removed comment from __openerp__.py 
bzr revid: pso@tinyerp.com-20120730065132-x50rhei1ya36y3u5
 2012-07-30 12:21:32 +05:30
Rucha (Open ERP) 9be1dc63e5 [MERGE]: Merge with latest trunk-addons 
bzr revid: rpa@tinyerp.com-20120730052105-tjzeohx0hyi43qi4
 2012-07-30 10:51:05 +05:30
Launchpad Translations on behalf of openerp 0c581831b8 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20120728045741-hrbggtt37yutrbpx
bzr revid: launchpad_translations_on_behalf_of_openerp-20120729043802-x7m56po0nxue0jb0
 2012-07-29 04:38:02 +00:00
Quentin (OpenERP) 234abbc5d6 [IMP] demo data of product categories 
bzr revid: qdp-launchpad@openerp.com-20120727154329-2dj5piwce9o5b7ra
 2012-07-27 17:43:29 +02:00
Quentin (OpenERP) 922f565eb7 [FIX] mrp: fix of the fix made 2 commits ago about the domain products in mrp orders. 
lp bug: https://launchpad.net/bugs/936865 fixed

bzr revid: qdp-launchpad@openerp.com-20120727122440-sju60sv1dqsr1tlm
 2012-07-27 14:24:40 +02:00
Rucha (Open ERP) db8991e3c7 [IMP]: product: Improved product categories structure and related changes 
bzr revid: rpa@tinyerp.com-20120727112025-2t75kivor8pcm2b8
 2012-07-27 16:50:25 +05:30