Commit Graph
70704 Commits
Author SHA1 Message Date
Fabien Pinckaers e30fed20b8 merge_trunk
bzr revid: fp@tinyerp.com-20120822133742-yx81c62bux28wruy
2012-08-22 15:37:42 +02:00
Stephane Wirtel a598e04752 [MERGE] purchase: a purchase user can create a quotation and confirm it
bzr revid: stw@openerp.com-20120822133729-8her237u00inknsl
2012-08-22 15:37:29 +02:00
Fabien Pinckaers 4fdb70d12a fix
bzr revid: fp@tinyerp.com-20120822133723-k5r76cty7dej5kjh
2012-08-22 15:37:23 +02:00
Fabien Pinckaers 3c8c168f85 merge_trunk
bzr revid: fp@tinyerp.com-20120822133509-v4irlqdjjba0wxxn
2012-08-22 15:35:09 +02:00
Dharti Ratani (OpenERP) 1dd5177e11 [IMP]
bzr revid: dhr@tinyerp.com-20120822133428-24wti3kz7lh469jh
2012-08-22 19:04:28 +05:30
Fabien Pinckaers 0f63b4a1fb [IMP] need action
bzr revid: fp@tinyerp.com-20120822133406-9ayg228mxfeg16dg
2012-08-22 15:34:06 +02:00
Paramjit Singh Sahota 5ca03ad337 [MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-account_voucher-bth
bzr revid: psa@tinyerp.com-20120822133243-rmhabdoh8ts3zjs9
2012-08-22 19:02:43 +05:30
Pinakin Nai(OpenERP) 17768541a0 [IMP] Added new stlye to avoid overriding of text in header section
bzr revid: pso@tinyerp.com-20120822133035-totgh1ez1omty11r
2012-08-22 19:00:35 +05:30
Olivier Dony 786419565a [FIX] mail: make basic mail tests pass again, remove useless/dead test code
bzr revid: odo@openerp.com-20120822133028-hms3xfhibhn1j38l
2012-08-22 15:30:28 +02:00
Vidhin Mehta (OpenERP) a69baa4d9c [IMP]header as input box.
bzr revid: vme@tinyerp.com-20120822132805-nmesgyvh29m5gnr9
2012-08-22 18:58:05 +05:30
Christophe Simonis e4eee36c8d [FIX] remove empty modules
bzr revid: chs@openerp.com-20120822132341-s2t6euk09e9v85i0
2012-08-22 15:23:41 +02:00
Khushboo Bhatt (Open ERP) 8ad4dd41c8 [IMP]l10n_in_hr_payroll:note added
bzr revid: kbh@tinyerp.com-20120822132229-abjrha00701xbyd3
2012-08-22 18:52:29 +05:30
Amit Patel (OpenERP) ce05a00c9e [MERGE]:merged with trunk
bzr revid: apa@tinyerp.com-20120822132228-3697zhp1w8auk1k9
2012-08-22 18:52:28 +05:30
Dharti Ratani (OpenERP) 75befda5e8 [IMP]Tax related fixes in account_invoice,delivery sale and stock ,purchase requistion
bzr revid: dhr@tinyerp.com-20120822131816-g4o83w2ot084wyeo
2012-08-22 18:48:16 +05:30
Bhumi Thakkar (Open ERP) 189a5ef346 [IMP] report_type function field is be stored in table.
bzr revid: bth@tinyerp.com-20120822131549-hkmnezfia8g03zm3
2012-08-22 18:45:49 +05:30
Khushboo Bhatt (Open ERP) 55ec89f7ee [IMP]l10n_in_hr_payroll:added rule for labour walfare fund.
bzr revid: kbh@tinyerp.com-20120822130945-xvwjnpf86eba0j1b
2012-08-22 18:39:45 +05:30
Stephane Wirtel 9e62274c58 [MERGE] base_calendar: remove the state and status on the top of a meeting
bzr revid: stw@openerp.com-20120822130700-10s6lk9f91o92dmx
2012-08-22 15:07:00 +02:00
pso (OpenERP) 15ba3f9dcc [MERGE] Merged PNA's branch to improve web module description
bzr revid: pso@tinyerp.com-20120822130336-8g6itlmuq97wuvjw
2012-08-22 18:33:36 +05:30
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
Khushboo Bhatt (Open ERP) 13485fd6b0 [IMP]l10n_in_hr_payroll:HRA rule improved,removed field.
bzr revid: kbh@tinyerp.com-20120822125933-bsiky3e4ttawry7a
2012-08-22 18:29:33 +05:30
Jigar Amin - OpenERP ef1864ec10 merge lp:openobject-addons
bzr revid: jam@tinyerp.com-20120822125826-fb2m9wqmbctfn4ow
2012-08-22 18:28:26 +05:30
RGA(OpenERP) b4a38f16ac [FIX] last_reconciliation_date should write on reconcilation and change according to get correct partner based on last reconciliation date
bzr revid: rgaopenerp-20120822125616-bxkrh4le71yg2dod
2012-08-22 18:26:16 +05:30
Paramjit Singh Sahota 53c4221204 [MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-sale-procurement-bth
bzr revid: psa@tinyerp.com-20120822125139-22f944nhqavgohd6
2012-08-22 18:21:39 +05:30
Olivier Dony a001d89243 [FIX] mail: more typos
bzr revid: odo@openerp.com-20120822124943-2ixd2vbbug38tfb2
2012-08-22 14:49:43 +02:00
Dharti Ratani (OpenERP) b4ed7eb4ea [IMP]Adding taxes to product category
bzr revid: dhr@tinyerp.com-20120822124710-loo8pjj33g1dgzp5
2012-08-22 18:17:10 +05:30
Paramjit Singh Sahota fcb21423b3 [MERGE] MERGED lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-hr_applicant-bth
bzr revid: psa@tinyerp.com-20120822124650-bv0k8mv8k35fg09d
2012-08-22 18:16:50 +05:30
Olivier Dony b873d36b90 [FIX] mail: more typos
bzr revid: odo@openerp.com-20120822124307-qnwx6nk66msz01jx
2012-08-22 14:43:07 +02:00
Olivier Dony 8b78127210 [FIX] mail: typo
bzr revid: odo@openerp.com-20120822123858-e3alagahniwbdpgz
2012-08-22 14:38:58 +02:00
Paramjit Singh Sahota ec283ff4ac [IMP] Given the access rights for the account.journal.cashbox.line in ACCOUNT.
bzr revid: psa@tinyerp.com-20120822123348-2gghmwi0k78oopkr
2012-08-22 18:03:48 +05:30
Khushboo Bhatt (Open ERP) f958f6f064 [IMP/ADD]l10n_in_hr_payroll:improved salary rules and added inputs of salary rules
bzr revid: kbh@tinyerp.com-20120822123223-zlx1lhd06lnluqnz
2012-08-22 18:02:23 +05:30
Jigar Amin - OpenERP 0fc5b454ab merge lp:openobject-server
bzr revid: jam@tinyerp.com-20120822123011-zy2dt7ihl3ragdci
2012-08-22 18:00:11 +05:30
Christophe Simonis d9a869c925 [FIX] remove loggging for test "test_out_of_range" of "test_impex" module
bzr revid: chs@openerp.com-20120822122123-h3zmh55aw7zwtep4
2012-08-22 14:21:23 +02:00
Christophe Simonis 4eafc023b3 [IMP] tools.misc.mute_logger can now be used as decorator
bzr revid: chs@openerp.com-20120822122013-9uxjwr9oqohseton
2012-08-22 14:20:13 +02:00
Dharti Ratani (OpenERP) abf966ceb5 [IMP]Adding an option in purchase wizard to hide costing method
bzr revid: dhr@tinyerp.com-20120822121515-1r7e8ufv6ojm5cdm
2012-08-22 17:45:15 +05:30
Vijaykumar Baladaniya bbaea3e020 [IMP] Improve footer problame.
bzr revid: vba@tinyerp.com-20120822121231-90qvm19zg6h9mwyk
2012-08-22 17:42:31 +05:30
Antonin Bourguignon f7a5eb5d6c [MERGE] latest trunk
bzr revid: abo@openerp.com-20120821172259-su6vqvxecwb5zra2
bzr revid: abo@openerp.com-20120822121220-yl5e9lhd7v4ap75a
2012-08-22 14:12:20 +02:00
Turkesh Patel (Open ERP) b791fc2743 [MRG] merge with main branch.
bzr revid: tpa@tinyerp.com-20120822120213-sbfqq119bo4rwqaw
2012-08-22 17:32:13 +05:30
Turkesh Patel (Open ERP) 568288c3e1 [MRG] merge with main branch.
bzr revid: tpa@tinyerp.com-20120822115641-3l3yla4kji6xaxm6
2012-08-22 17:26:41 +05:30
Pinakin Nayi (OpenERP) 91c6b897e9 [Imp]web description in rst format
bzr revid: pna@tinyerp.com-20120822113949-pc593w8qwiqh89w2
2012-08-22 17:09:49 +05:30
Olivier Dony 406e58399f [FIX] mail: unify message_post calls, fix typos, various lint cleanup
bzr revid: odo@openerp.com-20120822113439-aoy7v4njs6o34tu5
2012-08-22 13:34:39 +02:00
Amit Patel (OpenERP) 0e116ffb56 [IMP]:delivery:indentation
bzr revid: apa@tinyerp.com-20120822113336-d9wl1lhdi25n7jvg
2012-08-22 17:03:36 +05:30
Bhumi Thakkar (Open ERP) 9eac8aadaf [IMP] Remove property_ids:value from _prepare_order_line_procurement function which is unused and also created field.
bzr revid: bth@tinyerp.com-20120822113034-p7rth1ps829bt0qd
2012-08-22 17:00:34 +05:30
Khushboo Bhatt (Open ERP) 83ec6f517b [IMP/REM]l10n_in_hr_payroll:removed gratuity rules and all calculations for that rule,improved performance,bonus and supplementary rules
bzr revid: kbh@tinyerp.com-20120822112153-l3zlveq0afuu40mx
2012-08-22 16:51:53 +05:30
Bhumi Thakkar (Open ERP) edb6e7e0d3 [IMP] Replace field name type with message_type.
bzr revid: bth@tinyerp.com-20120822112137-u6i2dujnpisk7t1p
2012-08-22 16:51:37 +05:30
Bhumi Thakkar (Open ERP) a8fd3cccd2 [MERGE] merge branch lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-mail-bth
bzr revid: bth@tinyerp.com-20120822112047-hh8ogkbak69k2rsg
2012-08-22 16:50:47 +05:30
Amit Patel (OpenERP) 10c19dc350 [IMP]:delivery:assigned no one group to weight net
bzr revid: apa@tinyerp.com-20120822111644-tcsdsfv53z02lnyp
2012-08-22 16:46:44 +05:30
Thibault Delavallée 9871b2dd37 [FIX] Fixed last commit, about removing check_read/write/unlink/create: those methods were used, propagated the changes :) .
bzr revid: tde@openerp.com-20120822111613-305j77rs4fphkjts
2012-08-22 13:16:13 +02:00
Christophe Simonis 89f1693653 [IMP] remove unwanted log in test
bzr revid: chs@openerp.com-20120822110604-il0sxlvf592wasur
2012-08-22 13:06:04 +02:00
Thibault Delavallée 49596ebe91 [IMP] mail_thread: message_is_follower field is now calculated with other functional fields (message_summary and message_read). Cleaned message_subscribe and message_unsubscribe. Added deletion of followers when unlinking a record. Propagated change in mail_group view.
bzr revid: tde@openerp.com-20120822110313-is3p1h4s2e8c4hbm
2012-08-22 13:03:13 +02:00
Thibault Delavallée 40949f8052 [FIX] mail.js: fixed a wrong var name.
bzr revid: tde@openerp.com-20120822110057-1dqo701k2lmpmoxo
2012-08-22 13:00:57 +02:00