Commit Graph
70704 Commits
Author SHA1 Message Date
Jigar Amin - OpenERP 767e2c464c [MERGE] lp:openobject-server
bzr revid: jam@tinyerp.com-20120716062551-kihy1qhx1oshbx9l
2012-07-16 11:55:51 +05:30
Jigar Amin - OpenERP 68998d4c82 [MERGE] openerp-web
bzr revid: jam@tinyerp.com-20120716062416-xa18xmtkj5mgj2ag
2012-07-16 11:54:16 +05:30
Jigar Amin - OpenERP d23af2550d [MERGE] Call the translation services, check the requested translation if not translation then laod it from internal file resource will support when web running in non embedded mode
bzr revid: jam@tinyerp.com-20120716062251-ub62cqfwl2n15zh4
2012-07-16 11:52:51 +05:30
Divyesh Makwana (Open ERP) d73663c123 [IMP] hr_expense : Improved the hr expense report.
bzr revid: mdi@tinyerp.com-20120716062150-rrbwm51f34iei8xy
2012-07-16 11:51:50 +05:30
Rucha (Open ERP) dc7052c2f0 [FIX]: stock_planning: Fixed references in yml as per new demo improvements
bzr revid: rpa@tinyerp.com-20120716061605-h8kk7zxvr0d9zno3
2012-07-16 11:46:05 +05:30
Rucha (Open ERP) 0fbc2290f2 [FIX]: event_sale: Fixed wrong reference in event_sale yml
bzr revid: rpa@tinyerp.com-20120716061447-qu8h7uwtgra9i1xh
2012-07-16 11:44:47 +05:30
ajay javiya (OpenERP) fb97ac88ca [MERGE]:Branch trunk-base-gengo-res-tch
bzr revid: aja@tinyerp.com-20120716061306-az2qabiako2izoc4
2012-07-16 11:43:06 +05:30
Atul Patel (OpenERP) 7173035138 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120716060846-f6zpe2a5qlnji3zb
2012-07-16 11:38:46 +05:30
Mustufa Rangwala (OpenERP) edda972621 [IMP] l10n_in: typo
bzr revid: mra@tinyerp.com-20120716060812-dv6o6l2i3rw0vrmw
2012-07-16 11:38:12 +05:30
Xavier Morel e7f4ebc000 [IMP] move conversion of existing passwords to base_crypt's res.users.init
bzr revid: xmo@openerp.com-20120716060524-bxxhu2hrowba2e0y
2012-07-16 08:05:24 +02:00
Turkesh Patel (Open ERP) 58e20e9c8f [IMP] improved code to load data from po.
bzr revid: tpa@tinyerp.com-20120716060056-3az6awpd6gw39hii
2012-07-16 11:30:56 +05:30
Ankita Patel (OpenERP) ed4ca43c69 [IMP]hr_payroll: resolve conflicts
bzr revid: pat@tinyerp.com-20120716055914-ps31ejm29hlez34y
2012-07-16 11:29:14 +05:30
Mustufa Rangwala (OpenERP) ea99630732 [IMP] l10n_in: typo
bzr revid: mra@tinyerp.com-20120716055220-m732ts6l1549mr5g
2012-07-16 11:22:20 +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
Harry (OpenERP) 2c6c733b5f [MERGE] upstream
bzr revid: hmo@tinyerp.com-20120716054710-awgpnr6hdqy2altj
2012-07-16 11:17:10 +05:30
Launchpad Translations on behalf of openerp 0584322cfa Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120714064317-3wqq86mu3mqua1th
bzr revid: launchpad_translations_on_behalf_of_openerp-20120715053349-hycxfuf1iohx6mnx
bzr revid: launchpad_translations_on_behalf_of_openerp-20120716053227-4rhuwp0j8i0tcin1
bzr revid: launchpad_translations_on_behalf_of_openerp-20120714064347-93t1d4yvw7tv8w93
bzr revid: launchpad_translations_on_behalf_of_openerp-20120715053413-5ahkl0wjqqc6kf5i
bzr revid: launchpad_translations_on_behalf_of_openerp-20120716053308-oz0flgzfu5qhslyj
2012-07-16 05:33:08 +00:00
Purnendu Singh (OpenERP) e5ae685374 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120713130824-r6p6d28u1h3c7nol
bzr revid: psi@tinyerp.com-20120716052129-2lj20gqc7zuyet1s
2012-07-16 10:51:29 +05:30
Divyesh Makwana (Open ERP) ab7c3e17d2 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120713042628-l6uhli0s63fnahmh
bzr revid: mdi@tinyerp.com-20120716051625-1frry2b32tcocmcv
2012-07-16 10:46:25 +05:30
ksa (OpenERP) 27fbca1d69 [IMP]:change the variable name
bzr revid: ksa@tinyerp.com-20120716050151-xsxish71ok4pjqf3
2012-07-16 10:31:51 +05:30
Divyesh Makwana (Open ERP) f6cac6306e [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120712044418-j5zu9mxl2kpp06yh
bzr revid: mdi@tinyerp.com-20120713043746-mn9xmq90w0lbpoc5
bzr revid: mdi@tinyerp.com-20120716050127-ns69nn4wzygruke0
2012-07-16 10:31:27 +05:30
DBR (OpenERP) 87a63b3bdb [IMP]delivery,procurement,stock: Remove <sheet> tag
bzr revid: dbr@tinyerp.com-20120716045452-g3j929rtqcen87qq
2012-07-16 10:24:52 +05:30
Divyesh Makwana (Open ERP) 2acc1481a6 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120712044249-z0xy8j6ueloi2bqs
bzr revid: mdi@tinyerp.com-20120713043610-i5370isy4gb0jevv
bzr revid: mdi@tinyerp.com-20120716044613-pstjqy53b8v5kwf1
2012-07-16 10:16:13 +05:30
Divyesh Makwana (Open ERP) 248f7ade33 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120712044109-ffyj5eavkrtze574
bzr revid: mdi@tinyerp.com-20120713042730-web0bk83baozc0og
bzr revid: mdi@tinyerp.com-20120716044240-1boga05nifw4gfe9
2012-07-16 10:12:40 +05:30
Mustufa Rangwala (OpenERP) 1e1644010b [MERGE] Merge from main addons
bzr revid: mra@tinyerp.com-20120716044220-a6m4h1mom0kgnri4
2012-07-16 10:12:20 +05:30
Mustufa Rangwala (OpenERP) 7a16a95691 [MERGE] Merge from main addons
bzr revid: mra@tinyerp.com-20120716043712-vyb21fl5fb7tkdn0
2012-07-16 10:07:12 +05:30
Divyesh Makwana (Open ERP) 0443db5f9d [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120712043845-ing7eipsv3z20ps5
bzr revid: mdi@tinyerp.com-20120713044825-1wwxd80yp7cv2325
bzr revid: mdi@tinyerp.com-20120716043444-cfqjeo5rmnrj295x
2012-07-16 10:04:44 +05:30
Fabien Pinckaers 21832994f9 [IMP] css
bzr revid: fp@openerp.com-20120715123009-evvlbucsex188s7b
2012-07-15 14:30:09 +02:00
Fabien Pinckaers 6d65d1ce78 [IMP] kanban views for cstomers and suppliers in accounting
bzr revid: fp@openerp.com-20120715114112-04d62y2ykx54g0az
2012-07-15 13:41:12 +02:00
Mohammed Shekha 4d26d84178 [FIX]Refixed the issue.
bzr revid: msh@openerp.com-20120715092512-11o2lapgvwasmkm8
2012-07-15 14:55:12 +05:30
Mohammed Shekha b99233803b [FIX]Refixed the issue.
bzr revid: msh@openerp.com-20120715090738-guws32l0f71u214n
2012-07-15 14:37:38 +05:30
Mohammed Shekha a74f5ce2dc [FIX]Refixed the issue of kanban view, do_show_more button, the id was not pushed in dataset, used _.contains.
bzr revid: msh@openerp.com-20120715081719-srdb1xo48ywn9y4h
2012-07-15 13:47:19 +05:30
Launchpad Translations on behalf of openerp 6dac47419f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120715051341-64aocmtnt57g4enz
2012-07-15 05:13:41 +00:00
Fabien Pinckaers 48ac5f9f5c [IMP] customer payment
bzr revid: fp@openerp.com-20120714234429-zvuyng3xcv0iyghc
2012-07-15 01:44:29 +02:00
Fabien Pinckaers ea994558f1 [IMP] sales receipt form viewé
bzr revid: fp@openerp.com-20120714233525-0g8x3bl76kfloqfk
2012-07-15 01:35:25 +02:00
Fabien Pinckaers d455e31398 [IMP] form view supplier invoice
bzr revid: fp@openerp.com-20120714231843-pdgqdms3cjqtmg6f
2012-07-15 01:18:43 +02:00
Fabien Pinckaers 5256356f46 [FIX] note on invoices
bzr revid: fp@openerp.com-20120714221200-zdwhp48812cixfei
2012-07-15 00:12:00 +02:00
Fabien Pinckaers 3a1485c395 [FIX] edit without note
bzr revid: fp@openerp.com-20120714220123-a6m22nj0lz92cg8y
2012-07-15 00:01:23 +02:00
Fabien Pinckaers 04d0b232ea [IMP] merge note and name for PO, SO, Invoice Lines
bzr revid: fp@openerp.com-20120714211827-fe8e1mbz4cu37ayc
2012-07-14 23:18:27 +02:00
Fabien Pinckaers 6eaa79227e [IMP] merge note&name on purchase lines
bzr revid: fp@openerp.com-20120714205150-c5qjjjyuovbyxac5
2012-07-14 22:51:50 +02:00
Fabien Pinckaers 16cce23c1a [IMP] invoice layout + merge note&name
bzr revid: fp@openerp.com-20120714203623-9n1iap9hplafnjp9
2012-07-14 22:36:23 +02:00
Fabien Pinckaers f10881855c merge
bzr revid: fp@openerp.com-20120714200207-gwcq5xi2q5yzknu6
2012-07-14 22:02:07 +02:00
Fabien Pinckaers 856ee39450 fix
bzr revid: fp@openerp.com-20120714200142-n8tkm5zyltgxbm25
2012-07-14 22:01:42 +02:00
Fabien Pinckaers eb5246f1d7 form
bzr revid: fp@openerp.com-20120714200105-cr5psndz9duu2qfn
2012-07-14 22:01:05 +02:00
Fabien Pinckaers b84f5ef399 [IMP] better addons
bzr revid: fp@openerp.com-20120714195757-zqk43d7zhupitlsk
2012-07-14 21:57:57 +02:00
Atul Patel (OpenERP) e7fe5125d1 [FIX]: Add four tab and remove Accounting Name.
bzr revid: atp@tinyerp.com-20120714181525-mrvr9clpzoze09sl
2012-07-14 23:45:25 +05:30
Fabien Pinckaers 01790d1181 imp
bzr revid: fp@openerp.com-20120714171022-grn0n9wtbpjvcpm3
2012-07-14 19:10:22 +02:00
Fabien Pinckaers d23be9467c trunk
bzr revid: fp@openerp.com-20120713225718-21ke0ro01pzjtp06
bzr revid: fp@openerp.com-20120714170703-0nms2vjgyxy5sgdt
2012-07-14 19:07:03 +02:00
Fabien Pinckaers 55ecea546b [IMP] layout
bzr revid: fp@openerp.com-20120714165856-wqv4ldiu3y8ovln4
2012-07-14 18:58:56 +02:00
Fabien Pinckaers 5a8d2480e4 [FIX] meetings change
bzr revid: fp@openerp.com-20120714162203-fnnsbo7hpnduo29g
2012-07-14 18:22:03 +02:00
Fabien Pinckaers 1d94bd4907 [IMP] partner kanban, holidays, meeting
bzr revid: fp@openerp.com-20120714160403-if88yyfrqn07xp3t
2012-07-14 18:04:03 +02:00