Commit Graph
70704 Commits
Author SHA1 Message Date
Frédéric van der Essen 6d9cf3fe2d [IMP] point_of_sale: no scrollbar in fullscreen mode
bzr revid: fva@openerp.com-20120716094637-n2mdh94pb147ggc0
2012-07-16 11:46:37 +02:00
Purnendu Singh (OpenERP) 2e2f7188d3 [MERGE, IMP] improve and merge cha branch to update desc formatting
bzr revid: psi@tinyerp.com-20120716094548-xx1ip3eljal3ffvl
2012-07-16 15:15:48 +05:30
Divyesh Makwana (Open ERP) 4bd4bd4b43 [IMP] hr_expense : Improved the tooltip.
bzr revid: mdi@tinyerp.com-20120716093859-nazz1z16342py7ta
2012-07-16 15:08:59 +05:30
pso (OpenERP) 2b6b52c6dc [IMP] Improved warning messages/exceptions of edi, fetchmail and event modules
bzr revid: pso@tinyerp.com-20120716093404-48rgy5699t3sy3co
2012-07-16 15:04:04 +05:30
niv-openerp b735f2545a merge tunk
bzr revid: nicolas.vanhoren@openerp.com-20120716093335-6t5yu6hnmvdymmq5
2012-07-16 11:33:35 +02:00
pso (OpenERP) 8a1c029e1c [IMP] Improved warning messages/exceptions of project modules
bzr revid: pso@tinyerp.com-20120716093128-5m3683kojty2hs0n
2012-07-16 15:01:28 +05:30
niv-openerp 08d2eb4828 Trying to delete web_livechat to solve conflicts
bzr revid: nicolas.vanhoren@openerp.com-20120716092929-y605mvjl2mggxlt6
2012-07-16 11:29:29 +02:00
Meera Trambadia (OpenERP) ccc985059a [MERGE] branch merged with trunk-payroll-india-mra
bzr revid: mtr@tinyerp.com-20120716092750-0deyjpp1xcly08h2
2012-07-16 14:57:50 +05:30
pso (OpenERP) 72fd6f460e [IMP] Improved warning messages/exceptions of base modules
bzr revid: pso@tinyerp.com-20120716092455-wfkj9pgm8k64dl2l
2012-07-16 14:54:55 +05:30
pso (OpenERP) 524e378d34 [IMP] Improved warning messages/exceptions of crm modules
bzr revid: pso@tinyerp.com-20120716092231-q8xt8fr4yy6sx2wf
2012-07-16 14:52:31 +05:30
Antonin Bourguignon 7c8fa25785 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120713100147-xgtikeq5dgxsx475
bzr revid: abo@openerp.com-20120713143010-kn46sk76lv3t59cb
bzr revid: abo@openerp.com-20120716092228-fe1kgyyj1k3t5ffg
2012-07-16 11:22:28 +02:00
pso (OpenERP) fc26f3975d [IMP] Improved warning messages/exceptions of hr modules
bzr revid: pso@tinyerp.com-20120716091918-hua9cjnv21nqa2yl
2012-07-16 14:49:18 +05:30
Mayur Maheshwari (OpenERP) 976593a400 [IMP]analytic_contract_project: improve create method in analytic to fix the issue of making a sale order to task of service product
bzr revid: mma@tinyerp.com-20120716091903-rwhx3w7te9rdvrfv
2012-07-16 14:49:03 +05:30
Rucha (Open ERP) 64137a63cf [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120716090657-r7mlld3rsufel2ge
2012-07-16 14:36:57 +05:30
Rucha (Open ERP) b92608c7fa [MERGE]: Merge with latest trunk-server
bzr revid: rpa@tinyerp.com-20120713132820-w50lxpo12iimem2f
bzr revid: rpa@tinyerp.com-20120716090547-hu9sfr5msvhhm8fy
2012-07-16 14:35:47 +05:30
Ankita Patel (OpenERP) 499b09e466 [IMP]l10n_in_hr_payroll,hr_payroll: remove unnecessary change
bzr revid: pat@tinyerp.com-20120716090515-n4e55i7ip5w2vvg4
2012-07-16 14:35:15 +05:30
Sanjay Gohel (Open ERP) 811efa7ab2 [IMP]improve xml architecture
bzr revid: sgo@tinyerp.com-20120716085608-elwahvnphgl8j9jn
2012-07-16 14:26:08 +05:30
Kuldeep Joshi (OpenERP) a8db458c54 [IMP]mrp: assign group
bzr revid: kjo@tinyerp.com-20120716085557-yipr924zh1bfpems
2012-07-16 14:25:57 +05:30
Meera Trambadia (OpenERP) feacc599ec [IMP] l10n_in_hr_payroll: improved string of a note field
bzr revid: mtr@tinyerp.com-20120716085430-ko319y2c4ou56dpe
2012-07-16 14:24:30 +05:30
Fabien Pinckaers 0614df719c merge_trunk
bzr revid: fp@tinyerp.com-20120716085334-57zztd74wsr8wzgf
2012-07-16 10:53:34 +02:00
Fabien Pinckaers 364de3ad21 merge
bzr revid: fp@tinyerp.com-20120716085132-wudvp93z4lzm2a4v
2012-07-16 10:51:32 +02:00
Kuldeep Joshi (OpenERP) efe9365e44 [IMP]mrp: remove unused code
bzr revid: kjo@tinyerp.com-20120716084932-9k6epzcpjjf0ukev
2012-07-16 14:19:32 +05:30
Divyesh Makwana (Open ERP) 7c6c75aff5 [IMP] hr_expense : Improved the module description.
bzr revid: mdi@tinyerp.com-20120716084739-scv93c6fwesm7tpi
2012-07-16 14:17:39 +05:30
Sanjay Gohel (Open ERP) f172824ed4 [IMP]improve view
bzr revid: sgo@tinyerp.com-20120716083520-a0cv3yfd0uxqg0s3
2012-07-16 14:05:20 +05:30
Thibault Delavallée 6c967e69a7 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120716083213-36vl49dem980amto
2012-07-16 10:32:13 +02:00
Thibault Delavallée 98f172c523 [IMP] mail: composition form: removed default body_html;
bzr revid: tde@openerp.com-20120716082951-gpn3x9vr514j0a3r
2012-07-16 10:29:51 +02:00
Xavier ALT d0125d893d [MERGE] OPW 51167: report: fix header pageCount always zero + add automatic per-story pageCount (v6.0 forward-port)
bzr revid: xal@openerp.com-20120716075217-kpwcotmrhpl4pj60
2012-07-16 09:52:17 +02:00
Kuldeep Joshi (OpenERP) 13e691d4da [IMP]mrp: set groups
bzr revid: kjo@tinyerp.com-20120716074559-5ert6z9zlz3b7j1p
2012-07-16 13:15:59 +05:30
Jiten (OpenERP) a14e505845 [MERGE] Merged from trunk.
bzr revid: jra@tinyerp.com-20120716073108-7zlweyipa1u4l1oh
2012-07-16 13:01:08 +05:30
Kuldeep Joshi (OpenERP) 7bbf025434 [IMP]mrp_operation: remove tab
bzr revid: kjo@tinyerp.com-20120716073005-bfh6wepqjxfsp7ml
2012-07-16 13:00:05 +05:30
Harry (OpenERP) eeb53ea575 [MERGE] upstream
bzr revid: hmo@tinyerp.com-20120716072742-jzalogwmc2va2cbn
2012-07-16 12:57:42 +05:30
Jiten (OpenERP) 5bba0c8e6b [ADD] Add css and sass file for bounce animation effect.
bzr revid: jra@tinyerp.com-20120716072644-ls2q54fr5o8fjyd7
2012-07-16 12:56:44 +05:30
Kuldeep Joshi (OpenERP) 55709d16ad [IMP]mrp_operation: set tab
bzr revid: kjo@tinyerp.com-20120716072559-arupshu08x0qg2b9
2012-07-16 12:55:59 +05:30
DBR (OpenERP) c96f2f4dda [IMP]stock_plannig: Remove sheet
bzr revid: dbr@tinyerp.com-20120716072226-albme40xuxinzmhn
2012-07-16 12:52:26 +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
Atul Patel (OpenERP) b3ea75636d [FIX]: Fix general issue.
Unknown field state in domain [["state","in",["done"]]] for period form
"Could not get field with name payment_rate_currency_id
"Could not get field with name algorithm

bzr revid: atp@tinyerp.com-20120716071455-r30romahsfg1zvxr
2012-07-16 12:44:55 +05:30
Divyesh Makwana (Open ERP) 18913e1b4d [IMP] hr_expense : Improved the code.
bzr revid: mdi@tinyerp.com-20120716071150-cj8hu9wxtul9mmbz
2012-07-16 12:41:50 +05:30
DBR (OpenERP) d0f22185a2 [IMP] Little view IMp
bzr revid: dbr@tinyerp.com-20120716070811-wcd4napbeba0gwv1
2012-07-16 12:38:11 +05:30
Jiten (OpenERP) 66d1d0e334 [IMP] Improved code.
bzr revid: jra@tinyerp.com-20120716070523-iim1n7ghl1a0tg6o
2012-07-16 12:35:23 +05:30
Divyesh Makwana (Open ERP) 361291706e [IMP] hr_expense : Improved the view.
bzr revid: mdi@tinyerp.com-20120716065809-xazcx753xqzum18c
2012-07-16 12:28:09 +05:30
Sanjay Gohel (Open ERP) 9b5414b8b7 [MERGE]merge with trunk server
bzr revid: sgo@tinyerp.com-20120716065750-8b6vxpitjxeflx7d
2012-07-16 12:27:50 +05:30
Sanjay Gohel (Open ERP) b81c51c73c [MERGE]merge with trunk addons
bzr revid: sgo@tinyerp.com-20120716065703-gcmugagvaaq1xl4c
2012-07-16 12:27:03 +05:30
Xavier Morel ef603ac337 [IMP] replace manual try:finally:close patterns with 'with closing' ones
bzr revid: xmo@openerp.com-20120716065640-qb69ojaljd5z6c39
2012-07-16 08:56:40 +02:00
Divyesh Makwana (Open ERP) 2368d235bf [IMP] hr_expense : Improved the code.
bzr revid: mdi@tinyerp.com-20120716065052-6pmwb3j1firawhdl
2012-07-16 12:20:52 +05:30
Xavier Morel 835cb5bcfa [FIX] concurrency issue when installing base_crypt from web client
Basically (and apparently), as base_crypt performs its conversion of
passwords to encrypted passwords a new request arrives and tries to
check its login, blowing up during the update.

* For the conversion, lock the whole table before updating the
  passwords, as we need to touch every record anyway we can just put a
  big exclusive lock on res_users

* Ideally we'd be able to just lock the relevant row of res_users in
  check/_login, but for some reason I don't quite get this does not
  work and still yields

    > TransactionRollbackError: could not serialize access due to concurrent update

  except on the SELECT FOR UPDATE query instead of the UPDATE one. The
  docs don't seem to help, and replacing the FOR UPDATE row-level lock
  by a table lock works even though they appear pretty much at the
  same point. Me no get.

bzr revid: xmo@openerp.com-20120716064903-403pth90kupgfdv3
2012-07-16 08:49:03 +02:00
Mayur Maheshwari (OpenERP) 58ffb0e3f8 [IMP]project_mrp: removed the issue of specific UOM from sale order to task flow
bzr revid: mma@tinyerp.com-20120716064657-7jvtzranbb677bnh
2012-07-16 12:16:57 +05:30
Mustufa Rangwala (OpenERP) 58ed2b3d3f [FIX] l10n_in: Fixes for child tax
bzr revid: mra@tinyerp.com-20120716064435-n60u5aszetiwa1ui
2012-07-16 12:14:35 +05:30
Digvijay Singh aad3669928 [MERGE] branch merged with trunk-payroll-india-mra
bzr revid: dsi@tinyerp.com-20120716064339-cpl2uf48nc49yj6m
2012-07-16 12:13:39 +05:30
DBR (OpenERP) 1f28307c83 [IMP]stock: Improve view for button setting
bzr revid: dbr@tinyerp.com-20120716063302-9m418ukyom2h6h75
2012-07-16 12:03:02 +05:30
Atul Patel (OpenERP) a74fbb4de7 [REM]: Remove tips and separator from report popup wizard
bzr revid: atp@tinyerp.com-20120716063121-tq9f8b4ntmncxxgc
2012-07-16 12:01:21 +05:30