Commit Graph
48479 Commits
Author SHA1 Message Date
Amit Patel (OpenERP) 6852bda625 [IMP]:account_voucher:solved inheritance problem
bzr revid: apa@tinyerp.com-20120606060247-29v18y29k91cr8ov
2012-06-06 11:32:47 +05:30
Amit Patel (OpenERP) 1818c749d4 [REM]:hr_evalution,hr_timesheet:removed commented code.
bzr revid: apa@tinyerp.com-20120606052348-w9szbg50gni8atz8
2012-06-06 10:53:48 +05:30
Amit Patel (OpenERP) 101c9bc148 typo
bzr revid: apa@tinyerp.com-20120606052108-sbbfjn9bhg0zfon9
2012-06-06 10:51:08 +05:30
Amit Patel (OpenERP) 5853e5543d [IMP]:hr_evaluation,hr_timesheet
bzr revid: apa@tinyerp.com-20120606051544-xrngnek1g4vimizv
2012-06-06 10:45:44 +05:30
Sanjay Gohel (Open ERP) c57707b20f [MERGE]merge with parent branch
bzr revid: sgo@tinyerp.com-20120606051336-d46zuf6ao8zzcbo8
2012-06-06 10:43:36 +05:30
Sanjay Gohel (Open ERP) bffea7767e [IMP]remove field which is no in use
bzr revid: sgo@tinyerp.com-20120606050946-8ao9tjzf0lfcqdxr
2012-06-06 10:39:46 +05:30
Fabien Pinckaers 1d1ce0d155 [IMP] form views
bzr revid: fp@tinyerp.com-20120605211711-sozrip6ebhekk952
2012-06-05 23:17:11 +02:00
Fabien Pinckaers 8f72522f76 [IMP] form view cleaning, removing some module: base_synchro, base_module_quality
bzr revid: fp@tinyerp.com-20120605210748-7qm4rxu1o013595e
2012-06-05 23:07:48 +02:00
Fabien Pinckaers ba6249cfd2 [IMP] cleaning form views
bzr revid: fp@tinyerp.com-20120605175630-v2mc9zu97myvgnh6
2012-06-05 19:56:30 +02:00
Fabien Pinckaers bf9448c7c8 [IMP] cleaning form views
bzr revid: fp@tinyerp.com-20120605175411-ddx99g5kj2dhzzmb
2012-06-05 19:54:11 +02:00
Fabien Pinckaers 141adaf84f [merge]
bzr revid: fp@tinyerp.com-20120605164422-uq33qejpdf9mx77o
2012-06-05 18:44:22 +02:00
Sanjay Gohel (Open ERP) 714ddfc279 [MERGE]merge with parent branch
bzr revid: sgo@tinyerp.com-20120605133220-rakt5glcgv0fc3wk
2012-06-05 19:02:20 +05:30
Amit Patel (OpenERP) 37ac236cc5 [IMP]:point_of_sale
bzr revid: apa@tinyerp.com-20120605132812-mblxngyk7qi6si3d
2012-06-05 18:58:12 +05:30
Amit Patel (OpenERP) 76bc2a11b2 [IMP]:idea
bzr revid: apa@tinyerp.com-20120605125318-8xsw6vvuinawo075
2012-06-05 18:23:18 +05:30
Sanjay Gohel (Open ERP) feb6043507 [IMP]idea stat view commented
bzr revid: sgo@tinyerp.com-20120605125219-70aydtigm37argrk
2012-06-05 18:22:19 +05:30
Amit Patel (OpenERP) f00358b871 [IMP]:account:small imp
bzr revid: apa@tinyerp.com-20120605124719-b42stb7s9fz0lbx5
2012-06-05 18:17:19 +05:30
Sanjay Gohel (Open ERP) 04b4f081ad [MERGE]merge with parent branch
bzr revid: sgo@tinyerp.com-20120605122005-w78q5mdzc32v65fa
bzr revid: sgo@tinyerp.com-20120605123627-j9611rpz26ubzheq
2012-06-05 18:06:27 +05:30
Amit Patel (OpenERP) f43fdd060b [IMP]:users_ldap
bzr revid: apa@tinyerp.com-20120605122912-2s7r7tk1xe0rs603
2012-06-05 17:59:12 +05:30
Amit Patel (OpenERP) f2477d9471 [MERGE]:lp:~openerp-dev/openobject-addons/trunk-form-fp-changes-sgo
bzr revid: apa@tinyerp.com-20120605121833-yixeouvnti1kv3f4
2012-06-05 17:48:33 +05:30
Amit Patel (OpenERP) 1e2ce5afdc [IMP]:report_webkit
bzr revid: apa@tinyerp.com-20120605121235-6xheefhrf01y279f
2012-06-05 17:42:35 +05:30
Fabien Pinckaers ee05d6050e [IMP] XML design
bzr revid: fp@tinyerp.com-20120605120334-3vbk4cu2xf8vmbrf
2012-06-05 14:03:34 +02:00
Amit Patel (OpenERP) b17672cd44 [IMP]:mrp
bzr revid: apa@tinyerp.com-20120605120235-6bjlk7mdrqtquovo
2012-06-05 17:32:35 +05:30
Amit Patel (OpenERP) 7c0cb3f365 [IMP]:account
bzr revid: apa@tinyerp.com-20120605115352-l8haagu60vyxp15s
2012-06-05 17:23:52 +05:30
Sanjay Gohel (Open ERP) dd95c3c28c [IMP]add condition on context if its none for account and project module
bzr revid: sgo@tinyerp.com-20120605115100-sk723sr60x7twb53
2012-06-05 17:21:00 +05:30
Sanjay Gohel (Open ERP) e07d4252eb [IMP]:add condition for context in report_webkit for fields view get
bzr revid: sgo@tinyerp.com-20120605113839-cum83coqtg6ji8jh
2012-06-05 17:08:39 +05:30
Amit Patel (OpenERP) a59e33fdd4 [MERGE]:merged sgo branch for added condition on stock.
bzr revid: apa@tinyerp.com-20120605112416-4nt300k8plqqlsa1
2012-06-05 16:54:16 +05:30
Sanjay Gohel (Open ERP) ca8767762d [MERGE]merge with parent
bzr revid: sgo@tinyerp.com-20120605112143-trwmhti9ubccpyn6
2012-06-05 16:51:43 +05:30
Amit Patel (OpenERP) 84b2bec521 [IMP]:set dict if context is None.
bzr revid: apa@tinyerp.com-20120605111946-c3wqtixpybqc9qks
2012-06-05 16:49:46 +05:30
Sanjay Gohel (Open ERP) 3508f75dba [IMP]:add condition for context in stock
bzr revid: sgo@tinyerp.com-20120605111229-utdr8bxhod22b8sh
2012-06-05 16:42:29 +05:30
Sanjay Gohel (Open ERP) 4d63b7a037 [MERGE]merge with parent branch
bzr revid: sgo@tinyerp.com-20120605085608-sw689no894qnnehz
bzr revid: sgo@tinyerp.com-20120605105313-ydfb58lnpt8zd33e
bzr revid: sgo@tinyerp.com-20120605110041-a82ski6fiqbfyplv
2012-06-05 16:30:41 +05:30
Amit Patel (OpenERP) de21ac07e3 [IMP]:resolved account/project module
bzr revid: apa@tinyerp.com-20120605105944-5fnf4y9b16au0a1y
2012-06-05 16:29:44 +05:30
Amit Patel (OpenERP) 771a592749 typo
bzr revid: apa@tinyerp.com-20120605105243-yzi0ex8lybbtwaor
2012-06-05 16:22:43 +05:30
Amit Patel (OpenERP) ffcd8f105e [IMP]:resolved account module
bzr revid: apa@tinyerp.com-20120605105033-ses82h9j15f94yht
2012-06-05 16:20:33 +05:30
Amit Patel (OpenERP) ccb8d479bb [IMP]:crm:removed unused fields from crm
bzr revid: apa@tinyerp.com-20120605103739-afic8hq7x1mmixd4
2012-06-05 16:07:39 +05:30
Amit Patel (OpenERP) 6eb9277f25 [IMP]:resolved project module.
bzr revid: apa@tinyerp.com-20120605102015-gzsm3ofkga2j9e8i
2012-06-05 15:50:15 +05:30
Amit Patel (OpenERP) a4f0970972 [IMP]:users:removed menu_tips field
bzr revid: apa@tinyerp.com-20120605085357-i5m58fkr0xq050or
2012-06-05 14:23:57 +05:30
Sanjay Gohel (Open ERP) 6497ad6bc1 [MERGE]merge with parent branch
bzr revid: sgo@tinyerp.com-20120605083702-w4mmubyxjd93oeqe
2012-06-05 14:07:02 +05:30
Fabien Pinckaers a73d7c066f [merge] fixes from apa
bzr revid: fp@tinyerp.com-20120605082202-96rxs6tm6f1h0yx4
2012-06-05 10:22:02 +02:00
Fabien Pinckaers d226ca4d35 [IMP] account views
bzr revid: fp@tinyerp.com-20120605081910-o4ehqzhvhs80zdl7
2012-06-05 10:19:10 +02:00
Amit Patel (OpenERP) 7d382f34d7 [IMP]:email_template:solved inheritance problem
bzr revid: apa@tinyerp.com-20120605073234-xtdjpdfwlcxpqk5v
2012-06-05 13:02:34 +05:30
Sanjay Gohel (Open ERP) 1d9c93f64b [MERGE]merge withh parent branch
bzr revid: sgo@tinyerp.com-20120605061819-1nlq0vtsc05v5om6
2012-06-05 11:48:19 +05:30
Amit Patel (OpenERP) f5ecf231d2 [IMP]:anonymization:checked if context == NONE then pass the dict.
bzr revid: apa@tinyerp.com-20120605061629-ulshs2cevdqm0hlf
2012-06-05 11:46:29 +05:30
Fabien Pinckaers b84c3a198d [IMP] new form views: products
bzr revid: fp@tinyerp.com-20120604214118-nsd41wojih2cmw97
2012-06-04 23:41:18 +02:00
Fabien Pinckaers 4f9dfbd40b [IMP] new form views
bzr revid: fp@tinyerp.com-20120604212913-v4ys62ho3od0i8h3
2012-06-04 23:29:13 +02:00
Fabien Pinckaers 6e38414fe9 [IMP] removing res.partner.event and som segmentation
bzr revid: fp@tinyerp.com-20120604171042-thc4lksih1c2ac8m
2012-06-04 19:10:42 +02:00
Fabien Meghazi 4971146eb4 [FCK] When you merge fp's commits, don't forget to use --author 'Fabien Pinckaers'
bzr revid: fme@openerp.com-20120604130415-a5ka5xy1opot52ff
2012-06-04 15:04:15 +02:00
Fabien Pinckaers deb9992ca8 [merge] placeholders in view
bzr revid: fp@tinyerp.com-20120604122255-nii4f2aoqbdr0dhj
2012-06-04 14:22:55 +02:00
Fabien Pinckaers ed072048a0 [merge] placeholders
bzr revid: fp@tinyerp.com-20120604122053-n2q2q545tbezcyip
2012-06-04 14:20:53 +02:00
Fabien Meghazi ec5fb5c606 [MERGE] Merged trunk-form-fme
bzr revid: fme@openerp.com-20120604121651-k56bbwqg78ekahx1
2012-06-04 14:16:51 +02:00
Amit Patel (OpenERP) e77bebd888 [MERGE]
bzr revid: apa@tinyerp.com-20120531112635-xn9x7o4y1j3hj3k4
bzr revid: apa@tinyerp.com-20120604121221-fvsc35dcksknc64n
2012-06-04 17:42:21 +05:30