pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,181 Commits 1 Branch 0 Tags
e1438f29fa44ca816d41b515d9d00461850708df
Commit Graph
26181 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Thibault Francois 9d9d4d838c [MERGE] lp:~stephane-openerp/openobject-addons/reopen_project_issue_by_email : reopen project_issuer when a new mail is sent 
bzr revid: tfr@openerp.com-20110115212704-h5hvcmvj03ngmgo9
 2011-01-15 22:27:04 +01:00
Fabien Pinckaers 8bc146d459 fix_logging 
bzr revid: fp@tinyerp.com-20110115170802-n8o5kmx9vblfn0jw
 2011-01-15 18:08:02 +01:00
Fabien Pinckaers 322976309e [IMP] logging for set null failed 
bzr revid: fp@tinyerp.com-20110115170410-s0z661hshxjzj6b7
 2011-01-15 18:04:10 +01:00
Fabien Pinckaers f01e3326ba fix 
bzr revid: fp@tinyerp.com-20110115132456-hk9vf0sfyrly0xox
 2011-01-15 14:24:56 +01:00
Launchpad Translations on behalf of openerp 0c96f19b44 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110115055903-i9kqtkstdk8j0hnz
 2011-01-15 05:59:03 +00:00
Olivier Dony c2af4fde4f [FIX] ir.ui.view_sc: shortcuts are now translated, and using the name_get() of the linked resource 
lp bug: https://launchpad.net/bugs/699858 fixed

bzr revid: odo@openerp.com-20110115045058-d7iqs6himuf2kyps
 2011-01-15 05:50:58 +01:00
Olivier Dony 697eea26e4 [FIX] orm.read_group: prepend fields with table names to avoid collisions in SQL queries 
lp bug: https://launchpad.net/bugs/703105 fixed

bzr revid: odo@openerp.com-20110115013109-q1ekx17docisqhd0
 2011-01-15 02:31:09 +01:00
Olivier Dony 570d35e824 [FIX] fields.property: restore compatibility with non-m2o properties 
Was broken by revision 3029.2.20  ysa@tinyerp.com-20101231061314-jhjc6c2uyeqko19x, fixing bug 692891

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

bzr revid: odo@openerp.com-20110114230524-zkkvgi6ch7gk3d4m
 2011-01-15 00:05:24 +01:00
Olivier Dony 04d2a25816 [FIX] base: currency updates: names for SEK,NOK,DKK; symbol for RON; dropped obsolete EKK 
lp bug: https://launchpad.net/bugs/702475 fixed

bzr revid: odo@openerp.com-20110114215051-cbpd7wfbj1uiqpxx
 2011-01-14 22:50:51 +01:00
Olivier Dony 0efe4d882b [FIX] orm.write(): avoid name collision of "ids" variable, causing side-effects + some doc 
lp bug: https://launchpad.net/bugs/702744 fixed

bzr revid: odo@openerp.com-20110114211642-muwdr966zn84p4ma
 2011-01-14 22:16:42 +01:00
Fabien Pinckaers fd9c04edcd fix 
bzr revid: fp@tinyerp.com-20110114190038-0h62306fd35pe0sp
 2011-01-14 20:00:38 +01:00
Fabien Pinckaers cbca1196b4 [FIX] changed a warning to a debug 
bzr revid: fp@tinyerp.com-20110114183657-3mdz433zn2wlx2s8
 2011-01-14 19:36:57 +01:00
qdp-launchpad@tinyerp.com b8ca64c69d [IMP] account: reordered the columns of account.journal.view 
bzr revid: qdp-launchpad@tinyerp.com-20110114154405-ugtbrf0nhnnpr9ua
 2011-01-14 16:44:05 +01:00
Fabien Pinckaers cd534cb224 fix 
bzr revid: fp@tinyerp.com-20110114152947-ta7t20oze0jsneju
 2011-01-14 16:29:47 +01:00
Thibault Francois 1451a89319 [FIX] buildbot fix mrp action_partial_move doesn't exist anymore replace by action_partial_move_server 
bzr revid: tfr@openerp.com-20110114152016-fv7fha139ylqmb2q
 2011-01-14 16:20:16 +01:00
Antony Lesuisse 45f1b5ac6c [FIX] account_account allow write if company_id has the same value 
lp bug: https://launchpad.net/bugs/702329 fixed

bzr revid: al@openerp.com-20110114150106-i533hpid59k0rxl3
 2011-01-14 16:01:06 +01:00