Commit Graph
26198 Commits
Author SHA1 Message Date
psi (Open ERP) b010dd77c8 [MERGE] merge with dev-addons3
bzr revid: psi@tinyerp.co.in-20110118055137-kdet67e8iy6k3o6g
2011-01-18 11:21:37 +05:30
Mustufa Rangwala 125cff6efb [MERGE] hr_attendance, holidays => use tools.ustr for ascii char in xsl reports
bzr revid: mra@mra-laptop-20110117124710-5n6wm3rnubtqnntw
2011-01-17 18:17:10 +05:30
ARA (OpenERP) d639116333 [MERGE] merge from dev3
bzr revid: ara@tinyerp.com-20110117124103-zmjdbyc4x05w8fw1
2011-01-17 18:11:03 +05:30
Mustufa Rangwala 2d369b9f4e [MERGE] performance issues - account, sale, hr_*, pos: https://bugs.launchpad.net/openobject-addons/+bug/693833
bzr revid: mra@mra-laptop-20110117123659-t3etytigbjtd88uq
2011-01-17 18:06:59 +05:30
ARA (OpenERP) 3ec0d38e20 [FIX]hr_timesheet: Problems printing atttendance by month and holiday summery reports
bzr revid: ara@tinyerp.com-20110117123644-dsywsjudkcfa798x
2011-01-17 18:06:44 +05:30
Mustufa Rangwala 29110b6487 [FIX] hr_expense: hr_expense not working when Employee is not assigned user_id
lp bug: https://launchpad.net/bugs/703902 fixed

bzr revid: mra@mra-laptop-20110117122113-blnbg42tr0oxh5ny
2011-01-17 17:51:13 +05:30
psi (Open ERP) 1bf802b5c4 [FIX] account, account_*, hr_*, point_of_sale, sale: performance issues - account_move_lines and others(Modification in last commit)
bzr revid: psi@tinyerp.co.in-20110117115717-79et9vg0idyc9k57
2011-01-17 17:27:17 +05:30
Mustufa Rangwala 218ed6b582 [MERGE] hr_expense: Invoice button not working
bzr revid: mra@mra-laptop-20110117113521-1tv9uuf8ofssiwwk
2011-01-17 17:05:21 +05:30
psi (Open ERP) ec8823d2d3 [FIX] account, account_*, hr_*, point_of_sale, sale: performance issues - account_move_lines and others
lp bug: https://launchpad.net/bugs/693833 fixed

bzr revid: psi@tinyerp.co.in-20110117112056-ryw0wyjltqzeuhzt
2011-01-17 16:50:56 +05:30
Mustufa Rangwala ae717cd9ac [MERGE] [6.0RC1][hr_timesheet] Problems printing timesheet reports
bzr revid: mra@mra-laptop-20110117111333-yieqqvd0ljh3c8mf
2011-01-17 16:43:33 +05:30
mtr f422e1be8a [FIX] hr: added domain on 'Home Address' of Employee
lp bug: https://launchpad.net/bugs/703836 fixed

bzr revid: mtr@mtr-20110117110645-d8n0jg3gp45wle9v
2011-01-17 16:36:45 +05:30
mtr 2ae8271dd9 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: mtr@mtr-20110117110039-zxypi7plebs2scx3
2011-01-17 16:30:39 +05:30
Mustufa Rangwala e1438f29fa [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110117103716-flhzdron1kf6n3rf
2011-01-17 16:07:16 +05:30
Mustufa Rangwala 2f09faba42 [MERGE] an employee shouldn't be able to see expenses and holidays of others employee
bzr revid: mra@mra-laptop-20110117102556-evp00eqczxuy5l5z
2011-01-17 15:55:56 +05:30
qdp-launchpad@tinyerp.com 23606385d4 [MERGE] merged the dev2 branch
bzr revid: qdp-launchpad@tinyerp.com-20110117101958-mb28vtb0qckoayn3
2011-01-17 11:19:58 +01:00
Mustufa Rangwala 269b43ca72 [MERGE] Installing account_analytic_analysis you have a maximu of 2147 analytic accounts
bzr revid: mra@mra-laptop-20110117101145-fm4aijukjjn502gs
2011-01-17 15:41:45 +05:30
Olivier Dony 5b2e2371ca [FIX] res.partner: reverted incorrect patch for Addresses action, until a proper fix is done
Reverted revision: 3152.1.1  fde@openerp.com-20101222154236-vpuqk0ou0svugwkg

lp bug: https://launchpad.net/bugs/703226 fixed

bzr revid: odo@openerp.com-20110117100448-eba1mhz3gt45mu69
2011-01-17 11:04:48 +01:00
qdp-launchpad@tinyerp.com f28ed00264 [REF] mrp_repair, stock: small code refactoring
bzr revid: qdp-launchpad@tinyerp.com-20110117100122-gson7kged6atppnb
2011-01-17 11:01:22 +01:00
qdp-launchpad@tinyerp.com f2784aecc5 [FIX] stock: removed required=True on prodlot field of update stock wizard, in its definition in the .py file
bzr revid: qdp-launchpad@tinyerp.com-20110117095836-518n6w73qodqrl8o
2011-01-17 10:58:36 +01:00
P. Christeas 814c4af299 [FIX] osv: _constraints can be inherited by redefining a constraint with the same name
Indeed, when we define an expression like

class bar(osv.osv):
  _inherit = 'bar.bar'

  def _check_foo(self, cr, uid, ids, context):
      return True

  _constraints = [ (_check_foo, "Foo failed!", ['foo']) ]

... it means that _check_foo will be passed as an *object* to the model's
structure of _constraints. Therefore, it would be unequal and just append
the list of any existing constraints. So, an older (_check_foo, , ['foo'])
would always remain active using the previous code. This has to do with
the _check_foo being an unbound (ie. not inheritable) function.

Now, we check the /string name/ of the function, too. We say that if the
inherited class's constraint function has the same name "_check_foo", the
old ones shall be replaced.

Note: this MAY introduce unpredictable results, if several modules try
to override the same inherited constraint. There is no guaranteed order
of inheritance. Please avoid using this feature unless necessary.

lp bug: https://launchpad.net/bugs/700451 fixed

bzr revid: odo@openerp.com-20110117094750-4lyzx165f1z1zgl4
2011-01-17 10:47:50 +01:00
mtr bfea6901f1 [IMP] hr_timesheet:added space(Enter)
bzr revid: mtr@mtr-20110117094353-1eaz08p2ckgmjquo
2011-01-17 15:13:53 +05:30
mtr 00683a79af [IMP] hr_timesheet:again removed extra space
bzr revid: mtr@mtr-20110117093644-692ixf9oxk0jkn4i
2011-01-17 15:06:44 +05:30
mtr 60acda9965 [IMP] hr_timesheet: removed the extra space
bzr revid: mtr@mtr-20110117092604-sy4hkiugo3prx3pe
2011-01-17 14:56:04 +05:30
ARA (OpenERP) db2b558de3 [MERGE] merge from dev3
bzr revid: ara@tinyerp.com-20110117091244-zcbgnnujzh0a992c
2011-01-17 14:42:44 +05:30
ARA (OpenERP) 2ee52c73f3 [FIX]hr_timesheet: Problems printing timesheet reports
lp bug: https://launchpad.net/bugs/695960 fixed

bzr revid: ara@tinyerp.com-20110117090955-ofb3iiabb99e3zqt
2011-01-17 14:39:55 +05:30
psi (Open ERP) de9b76381c [FIX] account_analytic_analysis: Installing account_analytic_analysis you have a maximu of 2147 analytic accounts
lp bug: https://launchpad.net/bugs/699809 fixed

bzr revid: psi@tinyerp.co.in-20110117085902-olq2k7950948uetd
2011-01-17 14:29:02 +05:30
Mustufa Rangwala 82f3e85103 [MERGE] merge frm trunk addons
bzr revid: mra@mra-laptop-20110117085525-fyp0stkl1g8gi6kx
2011-01-17 14:25:25 +05:30
Mustufa Rangwala 9fe22ea6ba [FIX] Account: Cannot add an analytic account in a bank statement, Domain added on cash statement for analytic_id field (searching for parent.company's analytic account now and type!=view)
lp bug: https://launchpad.net/bugs/701105 fixed

bzr revid: mra@mra-laptop-20110117085007-n3k115qodk3n6ra4
2011-01-17 14:20:07 +05:30
mtr 028530f9eb [FIX] hr_attendance,hr_expense,hr_holidays: added 'ir.rule' for group 'Employee'
lp bug: https://launchpad.net/bugs/702805 fixed

bzr revid: mtr@mtr-20110117084537-jrsy3wg68io8z8e8
2011-01-17 14:15:37 +05:30
psi (Open ERP) fe62b0d406 [MERGE] merge with dev-addons3
bzr revid: psi@tinyerp.co.in-20110117083523-iqogm76b7l7bvc0q
2011-01-17 14:05:23 +05:30
ARA (OpenERP) e0c3983eb6 [MERGE] merge from dev3
bzr revid: ara@tinyerp.com-20110117083319-zw22v2bvypl3z8bf
2011-01-17 14:03:19 +05:30
Fabien Pinckaers 7c95acb04c [FIX] lp 701017
bzr revid: fp@tinyerp.com-20110117083122-aed5jqigyt1vq677
2011-01-17 09:31:22 +01:00
Fabien Pinckaers 4594829c20 [FIX] improvement in POS lp 702115
bzr revid: fp@tinyerp.com-20110117082847-n9evkxy2h8ceawiy
2011-01-17 09:28:47 +01:00
Fabien Pinckaers 9d9719a667 [FIX] lp 696779
bzr revid: fp@tinyerp.com-20110117081542-qdk42pa95vctkqd0
2011-01-17 09:15:42 +01:00
Fabien Pinckaers a51ab82160 [fIX] lp 701480
bzr revid: fp@tinyerp.com-20110117080556-3i3d4z4gdktpmvpd
2011-01-17 09:05:56 +01:00
qdp-launchpad@tinyerp.com 25341b78cb [MERGE] merged with main addons branch
bzr revid: qdp-launchpad@tinyerp.com-20110117080048-h0e64af48ru2bkvp
2011-01-17 09:00:48 +01:00
Fabien Pinckaers 147c88053f [IMP] add two incoterms from Alexis Delattre
bzr revid: fp@tinyerp.com-20110117075857-gaulvotztcdbz753
2011-01-17 08:58:57 +01:00
Fabien Pinckaers 77ca6ae2b0 [IMP] Add incoterm menu
bzr revid: fp@tinyerp.com-20110117075559-ivjti3ke5wcx1on8
2011-01-17 08:55:59 +01:00
Fabien Pinckaers a25ec4025b [FIX] lp 701067 from Xavier Alt
bzr revid: fp@tinyerp.com-20110117074534-hwg1hwb0znv0dkaj
2011-01-17 08:45:34 +01:00
Fabien Pinckaers b43cde3fc6 fix
bzr revid: fp@tinyerp.com-20110117074114-48gyv2q01kx7for5
2011-01-17 08:41:14 +01:00
Fabien Pinckaers 948e9172ce [FIX] lp 703088
bzr revid: fp@tinyerp.com-20110117073511-94kur7vzlhyfq9zt
2011-01-17 08:35:11 +01:00
Fabien Pinckaers 4e0bc0926d [FIX] lp 703649
bzr revid: fp@tinyerp.com-20110117072932-4y3jmdgo2s9ushj6
2011-01-17 08:29:32 +01:00
Mustufa Rangwala dcc21af8d2 [MERGE] Account: account_analytic_plan break the creation of inovice from analytic lines
bzr revid: mra@mra-laptop-20110117055637-q6rgiptw70h9169q
2011-01-17 11:26:37 +05:30
Mustufa Rangwala 68f406f77b [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110117053424-jijqj9nt2qupmczn
2011-01-17 11:04:24 +05:30
psi (Open ERP) 6cc21d77fa [FIX] account: account_analytic_plan break the creation of inovice from analytic lines
lp bug: https://launchpad.net/bugs/701895 fixed

bzr revid: psi@tinyerp.co.in-20110117051525-3lwmprov1zamc2vp
2011-01-17 10:45:25 +05:30
mtr d24d1f6a45 [IMP] hr_timesheet: uncommit the changes made for Bug #695960
bzr revid: mtr@mtr-20110117051337-9ge2j1n6waoodvqm
2011-01-17 10:43:37 +05:30
psi (Open ERP) 424f217e3f [MERGE] merge with dev-addons3
bzr revid: psi@tinyerp.co.in-20110117045827-ezzbwitavjcp8nxi
2011-01-17 10:28:27 +05:30
ARA (OpenERP) 3e173b77d3 [MERGE] merge from dev3
bzr revid: ara@tinyerp.com-20110117045712-gvfkg9x3daot0bjq
2011-01-17 10:27:12 +05:30
Launchpad Translations on behalf of openerp acc5c03dfb Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110116050632-y2dx1hzogk9swvth
bzr revid: launchpad_translations_on_behalf_of_openerp-20110116050251-14qxhugog9k60l75
bzr revid: launchpad_translations_on_behalf_of_openerp-20110117044929-4xn1kiab1qw5cire
2011-01-17 04:49:29 +00:00
Thibault Francois 385768ebe6 [FIX] Email Template : Send email correct field bcc, email_to
bzr revid: tfr@openerp.com-20110115220846-2swiafidl7a9bbu4
2011-01-15 23:08:46 +01:00