Commit Graph
26956 Commits
Author SHA1 Message Date
Sbh (OpenERP) 2e445afbc0 [MERGE] MERGE bug fix lp:681463
bzr revid: sbh@tinyerp.com-20110117123225-zkcebluprlvnejik
2011-01-17 18:02:25 +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
Olivier Dony 2639d28bf0 [FIX] websrv_lib: missing import errno
bzr revid: odo@openerp.com-20110117121524-jswvwrmiqfs4d28t
2011-01-17 13:15:24 +01:00
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
jam-openerp 008fb8b7f2 [ADD] caldav : caldav synchronization wizard added new field to link online caldav documentation
bzr revid: jam@tinyerp.com-20110117114421-wkv8h9mldsg8f8a7
2011-01-17 17:14:21 +05:30
jam-openerp 390a32d7db [IMP/ADD] project_long_term : 1) Improved the Phase sheduling Wizard warning messages 2) Addedd waraning message for Task Scheduling wizard
bzr revid: jam@tinyerp.com-20110117113948-eoc37olm4iorqe02
2011-01-17 17:09:48 +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
P. Christeas 8e809ace7f Merge branch 'official-trunk' into deb-scripts
bzr revid: xrg@openerp.com-20110117111022-qmkv7jpo448iwvyh
2011-01-17 12:10:22 +01:00
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
Sbh (OpenERP) 3ccd839211 [Fix] outlook: improve installation documentation
bzr revid: sbh@tinyerp.com-20110117104305-awc87sdewgx4zd8t
2011-01-17 16:13:05 +05:30
Ujjvala Collins (OpenERP) ae410f8dd3 [FIX] crm: Added exrule field in the view for recurrency with exception rules.
lp bug: https://launchpad.net/bugs/530681 fixed

bzr revid: uco@tinyerp.com-20110117103828-31f8bdxb3n9rr81i
2011-01-17 16:08:28 +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
Stephane Wirtel bbd1cd025b [IMP] Add an external dependency for users_ldap
bzr revid: stephane@openerp.com-20110117102936-owbi526stgjd9ucc
2011-01-17 11:29:36 +01:00
Stephane Wirtel 34f1d34f77 [IMP] Add the missing certificates
bzr revid: stephane@openerp.com-20110117102616-xhdg1e24reijv88k
2011-01-17 11:26:16 +01:00
niv-openerp 74476a880a [IMP] Changed default values for journal items view mode.
bzr revid: nicolas.vanhoren@openerp.com-20110117114049-c99yxh045pm6bhg9
2011-01-17 12:40:49 +01:00
Yogesh (OpenERP) 0fdcdcaf6a [MERGE] res.request: request_get() should not count closed requests in current ones
lp bug: https://launchpad.net/bugs/698039 fixed

bzr revid: odo@openerp.com-20110117102702-xkk6dqvgcrhhwsci
2011-01-17 11:27:02 +01:00
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
Ujjvala Collins (OpenERP) 42c89ee0cb [FIX] project, analytic: Template project shouldn't pollute the analytic chart of account.
lp bug: https://launchpad.net/bugs/681463 fixed

bzr revid: uco@tinyerp.com-20110117102522-9xpds30ckjny7l9p
2011-01-17 15:55:22 +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
P. Christeas 3aed57ec23 Merge branch 'official-trunk' into deb-scripts
bzr revid: p_christ@hol.gr-20110117094021-rbjm55dip17tnuy4
2011-01-17 11:40:21 +02:00
mtr 00683a79af [IMP] hr_timesheet:again removed extra space
bzr revid: mtr@mtr-20110117093644-692ixf9oxk0jkn4i
2011-01-17 15:06:44 +05:30
Sbh (OpenERP) 2ddeba8dcc [Fix] Fix buildbot warning
bzr revid: sbh@tinyerp.com-20110117093623-7l7ozx1ti28cm7on
2011-01-17 15:06:23 +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
Sbh (OpenERP) 9f8af32072 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20110117084538-j1w6rj9k3zxls938
2011-01-17 14:15:38 +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
P. Christeas 795b2bdcae expression: fix function.search() when it does not restrict
Triggered by [Bug 702340]

When we try to search a composite expression like:
   [( 'ourfoo.subfoo', '=' , True) ]
.. where subfoo is a function field of the model ofourfoo field,
the framework will call subfoo.search([('subfoo','=',True)]).
The latter shall return a domain expression that will restrict
the search on 'ourfoo'.

When the returned expression is empty, meaning "match all", the algebra
on the parent expression would come up with an invalid  [..., '&', ( 1, '=', 1) ]
sequence.

bzr revid: p_christ@hol.gr-20110117084108-vt1qe72lhw8ldxqm
2011-01-17 10:41:08 +02:00
P. Christeas c180358e30 ir.model: fix loading of data, for inheriting models
Since a recent commit, non (long, int) values will propagate, so we'd
better not use inherit_id = browse_record(...) as a value in create()'s
dict.

Previously, it did work because we define __int__() so that:
    int(browse_record(...)) == browse_record(...).id

bzr revid: p_christ@hol.gr-20110117084054-8qv5uc4vt4w9aygv
2011-01-17 10:40:54 +02:00
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