odoo/odoo.git
13 years ago[FIX]: Remove print statement and Fix Import user problem.
Atul Patel (OpenERP) [Mon, 14 Mar 2011 05:50:40 +0000 (11:20 +0530)]
[FIX]: Remove print statement and Fix Import user problem.

bzr revid: atp@tinyerp.com-20110314055040-m7rlh5fv6k6huk3d

13 years ago[MERGE]
Atul Patel (OpenERP) [Mon, 14 Mar 2011 04:43:01 +0000 (10:13 +0530)]
[MERGE]

bzr revid: atp@tinyerp.com-20110314044301-4jm3cdk15hds8rkz

13 years ago[IMP]
Thibault Francois [Thu, 10 Mar 2011 15:55:04 +0000 (16:55 +0100)]
[IMP]

bzr revid: tfr@openerp.com-20110310155504-so6i5w9m9fzlevwe

13 years ago[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm
Atul Patel (OpenERP) [Thu, 10 Mar 2011 12:12:07 +0000 (17:42 +0530)]
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm

bzr revid: atp@tinyerp.com-20110310121207-p2w1y0xipemiokqz

13 years ago[MERGE] merge with lp:openobject-addons
Bhumika (OpenERP) [Mon, 14 Mar 2011 04:38:16 +0000 (10:08 +0530)]
[MERGE] merge with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20110310054707-6s394ib20ru3d3ll
bzr revid: sbh@tinyerp.com-20110314043816-jpa3z2npzjeelxj2

13 years agoLaunchpad automatic translations update.
Launchpad Translations on behalf of openerp [Mon, 14 Mar 2011 04:46:24 +0000 (04:46 +0000)]
Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110312050230-04oy1jc0vy0oc6b6
bzr revid: launchpad_translations_on_behalf_of_openerp-20110313045022-bn9v2s1j02fdt51o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110314044624-p765rl8121i95w5o

13 years ago[MERGE] merged the dev branch containing the HR improvements
Quentin (OpenERP) [Fri, 11 Mar 2011 17:29:52 +0000 (18:29 +0100)]
[MERGE] merged the dev branch containing the HR improvements

bzr revid: qdp-launchpad@openerp.com-20110311172952-jqlv6z6kf9x64fr8

13 years ago[FIX] hr_timesheet_sheet: removed readonly on attendances
Quentin (OpenERP) [Fri, 11 Mar 2011 17:25:13 +0000 (18:25 +0100)]
[FIX] hr_timesheet_sheet: removed readonly on attendances

bzr revid: qdp-launchpad@openerp.com-20110311172513-7b3cpor9feipqfvf

13 years ago[FIX] hr_recruitment: decrease no_of_recruitment if employee is hired
Quentin (OpenERP) [Fri, 11 Mar 2011 17:20:00 +0000 (18:20 +0100)]
[FIX] hr_recruitment: decrease no_of_recruitment if employee is hired

bzr revid: qdp-launchpad@openerp.com-20110311172000-2f2ljdljf6y0tqjv

13 years ago[FIX] Removed deprecated license files (was GPL v3, we are using AGPL v3).
Julien Thewys [Fri, 11 Mar 2011 17:18:16 +0000 (18:18 +0100)]
[FIX] Removed deprecated license files (was GPL v3, we are using AGPL v3).

bzr revid: jth@openerp.com-20110311171816-5zoozckwq3efv7ed

13 years ago[MERGE] lp:729651
Quentin (OpenERP) [Fri, 11 Mar 2011 16:04:25 +0000 (17:04 +0100)]
[MERGE] lp:729651

bzr revid: qdp-launchpad@openerp.com-20110311160425-g3hp0y1589og7lc6

13 years ago[MERGE] lp:731795
Quentin (OpenERP) [Fri, 11 Mar 2011 15:58:13 +0000 (16:58 +0100)]
[MERGE] lp:731795

bzr revid: qdp-launchpad@openerp.com-20110311155813-4523ulj2av7l7shd

13 years ago[MERGE] lp:731332
Quentin (OpenERP) [Fri, 11 Mar 2011 15:49:09 +0000 (16:49 +0100)]
[MERGE] lp:731332

bzr revid: qdp-launchpad@openerp.com-20110311154909-jzqf7l3f4qsezsja

13 years ago[MERGE] lp:731787
Quentin (OpenERP) [Fri, 11 Mar 2011 15:46:47 +0000 (16:46 +0100)]
[MERGE] lp:731787

bzr revid: qdp-launchpad@openerp.com-20110311154647-rg9vhygirxzhq61u

13 years ago[MERGE] lp:729539
Quentin (OpenERP) [Fri, 11 Mar 2011 15:43:35 +0000 (16:43 +0100)]
[MERGE] lp:729539

bzr revid: qdp-launchpad@openerp.com-20110311154335-omz3sjw6supwr2hc

13 years ago[MERGE] lp:728384
Quentin (OpenERP) [Fri, 11 Mar 2011 15:40:27 +0000 (16:40 +0100)]
[MERGE] lp:728384

bzr revid: qdp-launchpad@openerp.com-20110311154027-ttt0dxt3hx000kkd

13 years ago[MERGE] lp:712555
Quentin (OpenERP) [Fri, 11 Mar 2011 15:20:11 +0000 (16:20 +0100)]
[MERGE] lp:712555

bzr revid: qdp-launchpad@openerp.com-20110311152011-l4exyyynypxqv08r

13 years ago[MERGE] lp:720282
Quentin (OpenERP) [Fri, 11 Mar 2011 15:18:19 +0000 (16:18 +0100)]
[MERGE] lp:720282

bzr revid: qdp-launchpad@openerp.com-20110311151819-11hyz2byqmee3w22

13 years ago[MERGE] lp:724073
Quentin (OpenERP) [Fri, 11 Mar 2011 15:11:23 +0000 (16:11 +0100)]
[MERGE] lp:724073

bzr revid: qdp-launchpad@openerp.com-20110311151123-66ps2vpxxh07xqqc

13 years ago[MERGE] lp:724059
Quentin (OpenERP) [Fri, 11 Mar 2011 15:09:26 +0000 (16:09 +0100)]
[MERGE] lp:724059

bzr revid: qdp-launchpad@openerp.com-20110311150926-t7yoq5d0f9rpccdx

13 years ago[IMP] hr: improved recruitement
Quentin (OpenERP) [Fri, 11 Mar 2011 13:41:36 +0000 (14:41 +0100)]
[IMP] hr: improved recruitement

bzr revid: qdp-launchpad@openerp.com-20110311134136-jal186xbwpjf4hba

13 years agoaddons js loading
Antony Lesuisse [Fri, 11 Mar 2011 13:26:22 +0000 (14:26 +0100)]
addons js loading

bzr revid: al@openerp.com-20110311132622-otrxhghgox9jqax6

13 years ago[IMP] hr,hr_timesheet:add one func _no_of_expected_employees ans change string analyt...
aag (OpenERP) [Fri, 11 Mar 2011 12:23:45 +0000 (17:53 +0530)]
[IMP] hr,hr_timesheet:add one func _no_of_expected_employees ans change string analytic account

bzr revid: aag@tinyerp.co.in-20110311122345-g1ufdl0i4ogzwbe2

13 years ago[FIX] hr_holidays: type of holidays
Quentin (OpenERP) [Fri, 11 Mar 2011 11:50:24 +0000 (12:50 +0100)]
[FIX] hr_holidays: type of holidays

bzr revid: qdp-launchpad@openerp.com-20110311115024-5sx7xt40tpla9c6x

13 years ago[IMP] hr,hr_holidays: remove extended view on employee category (was conflicting...
Quentin (OpenERP) [Fri, 11 Mar 2011 11:32:04 +0000 (12:32 +0100)]
[IMP] hr,hr_holidays: remove extended view on employee category (was conflicting with hr/manager group)

bzr revid: qdp-launchpad@openerp.com-20110311113204-kxmskgilat5vlk3f

13 years ago[IMP]: hr: Added on change department in employee form to set manager
Rucha (Open ERP) [Fri, 11 Mar 2011 10:54:49 +0000 (16:24 +0530)]
[IMP]: hr: Added on change department in employee form to set manager

bzr revid: rpa@tinyerp.com-20110311105449-0h02fpefhrk6kqhu

13 years ago[IMP]: hr_holidays: Made demo of leave allocation request as validated to avoid warni...
Rucha (Open ERP) [Fri, 11 Mar 2011 10:31:09 +0000 (16:01 +0530)]
[IMP]: hr_holidays: Made demo of leave allocation request as validated to avoid warning when confirming a leave request for another demo

bzr revid: rpa@tinyerp.com-20110311103109-lgqt6vp1wz94c0sh

13 years ago[IMP]: Rename "Confirm" to "Submit to Manager"
Rucha (Open ERP) [Fri, 11 Mar 2011 10:10:16 +0000 (15:40 +0530)]
[IMP]: Rename "Confirm" to "Submit to Manager"

bzr revid: rpa@tinyerp.com-20110311101016-gzi2lkvfj5029n8x

13 years ago[IMP]: hr_recruitment: Improvement in wizard to hire applicant
Rucha (Open ERP) [Fri, 11 Mar 2011 10:07:52 +0000 (15:37 +0530)]
[IMP]: hr_recruitment: Improvement in wizard to hire applicant
* Put appripriate function names
* Improved view

bzr revid: rpa@tinyerp.com-20110311100752-ltcri0xmbn89ic30

13 years ago[MERGE]: Merge with trunk addons
Rucha (Open ERP) [Fri, 11 Mar 2011 08:44:52 +0000 (14:14 +0530)]
[MERGE]: Merge with trunk addons

bzr revid: rpa@tinyerp.com-20110311084452-hlkwjehf0tzkbdoh

13 years agoLaunchpad automatic translations update.
Launchpad Translations on behalf of openerp [Fri, 11 Mar 2011 04:49:49 +0000 (04:49 +0000)]
Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110310044459-bl4c8to5a8lkqoie
bzr revid: launchpad_translations_on_behalf_of_openerp-20110311044533-vzu3t2xfqo9rpcie
bzr revid: launchpad_translations_on_behalf_of_openerp-20110311044949-0wrkjd4vljipalzz

13 years ago[MERGE] merged the rpa branch for fixing stock_no_autopicking yaml test
Quentin (OpenERP) [Thu, 10 Mar 2011 15:31:46 +0000 (16:31 +0100)]
[MERGE] merged the rpa branch for fixing stock_no_autopicking yaml test

bzr revid: qdp-launchpad@openerp.com-20110310153146-isgxco4z6klc632s

13 years ago[FIX]: Fixed buildbot warning
Rucha (Open ERP) [Thu, 10 Mar 2011 13:42:22 +0000 (19:12 +0530)]
[FIX]: Fixed buildbot warning

bzr revid: rpa@tinyerp.com-20110310134222-cc71256pfg6u1srf

13 years ago[IMP]: hr_holidays: Added one data for comnepsatory days
Rucha (Open ERP) [Thu, 10 Mar 2011 13:38:52 +0000 (19:08 +0530)]
[IMP]: hr_holidays: Added one data for comnepsatory days

bzr revid: rpa@tinyerp.com-20110310133852-84hxcgx9ldh70ajk

13 years ago[MERGE] lp:728378
Quentin (OpenERP) [Thu, 10 Mar 2011 13:34:49 +0000 (14:34 +0100)]
[MERGE] lp:728378

bzr revid: qdp-launchpad@openerp.com-20110310133449-7plbyz4dipbdb033

13 years ago[IMP]: hr_holidays: Holidays => Leaves
Rucha (Open ERP) [Thu, 10 Mar 2011 13:29:00 +0000 (18:59 +0530)]
[IMP]: hr_holidays: Holidays => Leaves

bzr revid: rpa@tinyerp.com-20110310132900-gl2i53oa7mgcq1sz

13 years ago[IMP]: hr_holidays: Leave Type => Allocation Type
Rucha (Open ERP) [Thu, 10 Mar 2011 13:25:40 +0000 (18:55 +0530)]
[IMP]: hr_holidays: Leave Type => Allocation Type

bzr revid: rpa@tinyerp.com-20110310132540-3pns1pqcfiltkytp

13 years ago[MERGE] lp:727900
Quentin (OpenERP) [Thu, 10 Mar 2011 13:22:15 +0000 (14:22 +0100)]
[MERGE] lp:727900

bzr revid: qdp-launchpad@openerp.com-20110310132215-vvrm02jam6d3x850

13 years ago[IMP]: hr: All users must have "Employees" in their shortcuts
Rucha (Open ERP) [Thu, 10 Mar 2011 13:18:27 +0000 (18:48 +0530)]
[IMP]: hr: All users must have "Employees" in their shortcuts

bzr revid: rpa@tinyerp.com-20110310131827-xbm0r2edcivfhr61

13 years ago[MERGE] lp:727711
Quentin (OpenERP) [Thu, 10 Mar 2011 13:18:08 +0000 (14:18 +0100)]
[MERGE] lp:727711

bzr revid: qdp-launchpad@openerp.com-20110310131808-erh4wpeohk472b4y

13 years agoskeleton missing parts
Antony Lesuisse [Thu, 10 Mar 2011 13:17:24 +0000 (14:17 +0100)]
skeleton missing parts

bzr revid: al@openerp.com-20110310131724-x1yvnpvvld27qrn0

13 years ago[MERGE] lp:727242
Quentin (OpenERP) [Thu, 10 Mar 2011 13:13:11 +0000 (14:13 +0100)]
[MERGE] lp:727242

bzr revid: qdp-launchpad@openerp.com-20110310131311-3a01z2cgbsws2vvu

13 years ago[MERGE] lp:727083
Quentin (OpenERP) [Thu, 10 Mar 2011 13:12:36 +0000 (14:12 +0100)]
[MERGE] lp:727083

bzr revid: qdp-launchpad@openerp.com-20110310131236-z0uh2pwawe9zi71j

13 years ago[IMP]: hr: Manager should not be a related to department anymore. Converted to many2o...
Rucha (Open ERP) [Thu, 10 Mar 2011 13:10:57 +0000 (18:40 +0530)]
[IMP]: hr: Manager should not be a related to department anymore. Converted to many2one field

bzr revid: rpa@tinyerp.com-20110310131057-jrh5wegf3mclyk18

13 years ago[IMP]: hr: "Employee Hierarchy" > "Subordonate Hierarchy"
Rucha (Open ERP) [Thu, 10 Mar 2011 13:07:04 +0000 (18:37 +0530)]
[IMP]: hr: "Employee Hierarchy" > "Subordonate Hierarchy"

bzr revid: rpa@tinyerp.com-20110310130704-i1tb4qzjyinngq1t

13 years ago[IMP]: hr, hr_holidays: Minor improvements
Rucha (Open ERP) [Thu, 10 Mar 2011 13:04:54 +0000 (18:34 +0530)]
[IMP]: hr, hr_holidays: Minor improvements

bzr revid: rpa@tinyerp.com-20110310130454-495pmz0tnkp6w0tr

13 years agoskeleton split openerp.base
Antony Lesuisse [Thu, 10 Mar 2011 12:54:15 +0000 (13:54 +0100)]
skeleton split openerp.base

bzr revid: al@openerp.com-20110310125415-xgp35keh863mehtp

13 years ago[FIX]: hr_recruitment: Fixed yml
Rucha (Open ERP) [Thu, 10 Mar 2011 12:53:14 +0000 (18:23 +0530)]
[FIX]: hr_recruitment: Fixed yml

bzr revid: rpa@tinyerp.com-20110310125314-yqy68nmpp1rlbcbi

13 years ago[MERGE] lp:718741
Quentin (OpenERP) [Thu, 10 Mar 2011 12:49:14 +0000 (13:49 +0100)]
[MERGE] lp:718741

bzr revid: qdp-launchpad@openerp.com-20110310124914-ueig5xmxmwkq4r8m

13 years ago[MERGE] merged the branch of rpa fixing the error on mrp yaml test
Quentin (OpenERP) [Thu, 10 Mar 2011 12:38:51 +0000 (13:38 +0100)]
[MERGE] merged the branch of rpa fixing the error on mrp yaml test

bzr revid: qdp-launchpad@openerp.com-20110310123851-3g81uv03mv6x6ecu

13 years agoskeleton part1
Antony Lesuisse [Thu, 10 Mar 2011 11:51:23 +0000 (12:51 +0100)]
skeleton part1

bzr revid: al@openerp.com-20110310115123-5a4i2wg3lw33kqv5

13 years ago[FIX]: mrp: Fix buildbot warnings
Rucha (Open ERP) [Thu, 10 Mar 2011 11:34:02 +0000 (17:04 +0530)]
[FIX]: mrp: Fix buildbot warnings

bzr revid: rpa@tinyerp.com-20110310113402-k4wudv6txb69h6vh

13 years ago[MERGE] bug fix 730632
Thibault Francois [Thu, 10 Mar 2011 10:39:51 +0000 (11:39 +0100)]
[MERGE] bug fix 730632

bzr revid: tfr@openerp.com-20110310103951-dapqhvwa3enikc7d

13 years ago[FIX] Account: [6.0] analytic account - parent_id domain missing
Ferdinand @ Camptocamp [Thu, 10 Mar 2011 10:16:50 +0000 (15:46 +0530)]
[FIX] Account: [6.0] analytic account - parent_id domain missing

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

bzr revid: ara@tinyerp.com-20110310101650-p2q400ypd2vbjsp8

13 years ago[FIX]: correct buildbots warning for sugarcrm.
Atul Patel (OpenERP) [Thu, 10 Mar 2011 09:55:37 +0000 (15:25 +0530)]
[FIX]: correct buildbots warning for sugarcrm.

bzr revid: atp@tinyerp.com-20110310095537-t19fd2qzszxfxirv

13 years ago[FIX] hr_holidays: Can not refuse leave if its category is by employee category
ARA (OpenERP) [Thu, 10 Mar 2011 09:54:32 +0000 (15:24 +0530)]
[FIX] hr_holidays: Can not refuse leave if its category is by employee category

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

bzr revid: ara@tinyerp.com-20110310095432-s4q9ijdf21gp77sg

13 years ago[IMP] replace \W's for word boundaries by \b (actually about word boundaries), replac...
Xavier Morel [Thu, 10 Mar 2011 09:10:10 +0000 (10:10 +0100)]
[IMP] replace \W's for word boundaries by \b (actually about word boundaries), replace String.match to literal regexes by RegExp.test (if result is used in test only) or RegExp.exec

bzr revid: xmo@openerp.com-20110310091010-5odm0fp0383yev3t

13 years ago[Merge] : Merge with lp:openobject-addons
Rifakat Haradwala (Open ERP) [Thu, 10 Mar 2011 08:41:20 +0000 (14:11 +0530)]
[Merge] : Merge with lp:openobject-addons

bzr revid: rha@tinyerp.com-20110310084120-y1kpcq0suqh7r20l

13 years ago[MERGED]Merged with lp:openobject-addons
ron@tinyerp.com [Thu, 10 Mar 2011 07:24:46 +0000 (12:54 +0530)]
[MERGED]Merged with lp:openobject-addons

bzr revid: ron@tinyerp.com-20110310072446-hszx8wbrul3xgwkf

13 years ago[REF]Account:Missing company rules
ron@tinyerp.com [Thu, 10 Mar 2011 07:04:12 +0000 (12:34 +0530)]
[REF]Account:Missing company rules

bzr revid: ron@tinyerp.com-20110310070412-joyjs060iwf0ctms

13 years ago[ADD]: Import sugarcrm leads data into crm lead and import stage for lead and opportu...
Atul Patel (OpenERP) [Thu, 10 Mar 2011 06:51:22 +0000 (12:21 +0530)]
[ADD]: Import sugarcrm leads data into crm lead and import stage for lead and opportunity.

bzr revid: atp@tinyerp.com-20110310065122-l3ks5n5u2st8nwc7

13 years ago[Fix] account_payment: changes in record rules
Rifakat Haradwala (Open ERP) [Thu, 10 Mar 2011 06:50:07 +0000 (12:20 +0530)]
[Fix] account_payment: changes in record rules

bzr revid: rha@tinyerp.com-20110310065007-vj16d1i4lb2dl8c2

13 years ago[FIX] hr: [6.0.1] HR-category: many2many link defined incorrectly
ARA (OpenERP) [Thu, 10 Mar 2011 06:07:26 +0000 (11:37 +0530)]
[FIX] hr: [6.0.1] HR-category: many2many link defined incorrectly

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

bzr revid: ara@tinyerp.com-20110310060726-ol6ie4jrouzviinj

13 years ago[MERGE]
Ujjvala Collins (OpenERP) [Thu, 10 Mar 2011 05:46:29 +0000 (11:16 +0530)]
[MERGE]

bzr revid: uco@tinyerp.com-20110310054629-szq66pkzv8p0uwm0

13 years ago[FIX] Point_of_sale: resubmit above merge proposal
ARA (OpenERP) [Thu, 10 Mar 2011 05:31:13 +0000 (11:01 +0530)]
[FIX] Point_of_sale: resubmit above merge proposal

bzr revid: ara@tinyerp.com-20110310053113-c3ae7c9we0k4mnrl

13 years ago[IMP]: Import data for opportunity and correct some problem for dependency.
Atul Patel (OpenERP) [Thu, 10 Mar 2011 05:19:58 +0000 (10:49 +0530)]
[IMP]: Import data for opportunity and correct some problem for dependency.

bzr revid: atp@tinyerp.com-20110310051958-u30t8o233aq3euet

13 years ago[FIX] Point_of_sale: [trunk] POS: creating invoice for partner with empty address
ARA (OpenERP) [Thu, 10 Mar 2011 05:12:38 +0000 (10:42 +0530)]
[FIX] Point_of_sale: [trunk] POS: creating invoice for partner with empty address

bzr revid: ara@tinyerp.com-20110310051238-cc8uki8qo47045n4

13 years agoLaunchpad automatic translations update.
Launchpad Translations on behalf of openerp [Thu, 10 Mar 2011 04:46:36 +0000 (04:46 +0000)]
Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110310044636-k42hq7vfv8qd11o5

13 years ago[MERGE] lp:731035
Quentin (OpenERP) [Wed, 9 Mar 2011 18:41:27 +0000 (19:41 +0100)]
[MERGE] lp:731035

bzr revid: qdp-launchpad@openerp.com-20110309184127-hac60f3vqynk0rkh

13 years ago[IMP] improvements to qweb
Xavier Morel [Wed, 9 Mar 2011 17:02:54 +0000 (18:02 +0100)]
[IMP] improvements to qweb

bzr revid: xmo@openerp.com-20110309170254-ucze2gs4yhh14y8v

13 years ago[MERGE] lp:726444
Quentin (OpenERP) [Wed, 9 Mar 2011 16:52:46 +0000 (17:52 +0100)]
[MERGE] lp:726444

bzr revid: qdp-launchpad@openerp.com-20110309165246-b1gws90c0ewv3h3w

13 years ago[MERGE] lp:726816
Quentin (OpenERP) [Wed, 9 Mar 2011 16:44:18 +0000 (17:44 +0100)]
[MERGE] lp:726816

bzr revid: qdp-launchpad@openerp.com-20110309164418-jvtr58an3yej7yhm

13 years ago[MERGE] lp:726551
Quentin (OpenERP) [Wed, 9 Mar 2011 16:37:56 +0000 (17:37 +0100)]
[MERGE] lp:726551

bzr revid: qdp-launchpad@openerp.com-20110309163756-2jd6j11qhz6zjgit

13 years ago[MERGE] lp:722673
Quentin (OpenERP) [Wed, 9 Mar 2011 16:33:22 +0000 (17:33 +0100)]
[MERGE] lp:722673

bzr revid: qdp-launchpad@openerp.com-20110309163322-zvcz3q64hsr3x031

13 years ago[MERGE] merged fix of lp bug 715477
Quentin (OpenERP) [Wed, 9 Mar 2011 16:12:49 +0000 (17:12 +0100)]
[MERGE] merged fix of lp bug 715477

bzr revid: qdp-launchpad@openerp.com-20110309161249-klox9o64rmhhzg5x

13 years ago[MERGE] merged fix of lp bug 724891
Quentin (OpenERP) [Wed, 9 Mar 2011 16:07:39 +0000 (17:07 +0100)]
[MERGE] merged fix of lp bug 724891

bzr revid: qdp-launchpad@openerp.com-20110309160739-vlt5tmua4sspw2a0

13 years ago[MERGE] merged fix of bug 727162
Quentin (OpenERP) [Wed, 9 Mar 2011 16:05:32 +0000 (17:05 +0100)]
[MERGE] merged fix of bug 727162

bzr revid: qdp-launchpad@openerp.com-20110309160532-5elwfovvttom3i7w

13 years ago[MERGE] merged fix of bug 721595
Quentin (OpenERP) [Wed, 9 Mar 2011 16:01:29 +0000 (17:01 +0100)]
[MERGE] merged fix of bug 721595

bzr revid: qdp-launchpad@openerp.com-20110309160129-306vxpqxitjzt2hd

13 years agoDisplay header's user info when logged in. Should do real on_logged_in and on_logged_out
Fabien Meghazi [Wed, 9 Mar 2011 15:59:44 +0000 (16:59 +0100)]
Display header's user info when logged in. Should do real on_logged_in and on_logged_out

bzr revid: fme@openerp.com-20110309155944-4027u8f3er4o1y6w

13 years ago[MERGE] merged dev2 branch
Quentin (OpenERP) [Wed, 9 Mar 2011 15:55:27 +0000 (16:55 +0100)]
[MERGE] merged dev2 branch

bzr revid: qdp-launchpad@openerp.com-20110309155527-l9d77rtquhtto7ts

13 years agoAdded header right corner
Fabien Meghazi [Wed, 9 Mar 2011 15:03:38 +0000 (16:03 +0100)]
Added header right corner

bzr revid: fme@openerp.com-20110309150338-manveau1sy99fotm

13 years agoAdded header images (should talk about a clean way to store images)
Fabien Meghazi [Wed, 9 Mar 2011 14:59:45 +0000 (15:59 +0100)]
Added header images (should talk about a clean way to store images)

bzr revid: fme@openerp.com-20110309145945-jf3e3zodlexlxu15

13 years ago[REVERT] reverted bugfix lp 708434, should be discussed and developped in a distinct...
Quentin (OpenERP) [Wed, 9 Mar 2011 14:59:00 +0000 (15:59 +0100)]
[REVERT] reverted bugfix lp 708434, should be discussed and developped in a distinct branch

bzr revid: qdp-launchpad@openerp.com-20110309145900-29ynvnyv7neh9bcn

13 years ago[REF] product/pricelist.py: small code refactoring
Quentin (OpenERP) [Wed, 9 Mar 2011 14:52:01 +0000 (15:52 +0100)]
[REF] product/pricelist.py: small code refactoring

bzr revid: qdp-launchpad@openerp.com-20110309145201-srzm1vhmega7sh3f

13 years ago[ADD]: ADD Dependency table and import dependency before Import table for sugarcrm.
Atul Patel (OpenERP) [Wed, 9 Mar 2011 14:08:32 +0000 (19:38 +0530)]
[ADD]: ADD Dependency table and import dependency before Import table for sugarcrm.

bzr revid: atp@tinyerp.com-20110309140832-kadne2p106oiox8f

13 years ago[FIX] Point_of_sale: [trunk] POS: creating invoice for partner with empty address
ARA (OpenERP) [Wed, 9 Mar 2011 13:43:55 +0000 (19:13 +0530)]
[FIX] Point_of_sale: [trunk] POS: creating invoice for partner with empty address

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

bzr revid: ara@tinyerp.com-20110309134355-p62rr19fyewvq2p1

13 years ago[MERGE] merged with main addons branch
Quentin (OpenERP) [Wed, 9 Mar 2011 13:14:25 +0000 (14:14 +0100)]
[MERGE] merged with main addons branch

bzr revid: qdp-launchpad@openerp.com-20110309131425-bz2wsl8onhzyl2ww

13 years ago[MERGE] default value in act_window
Thibault Francois [Wed, 9 Mar 2011 13:03:45 +0000 (14:03 +0100)]
[MERGE] default value in act_window

bzr revid: tfr@openerp.com-20110309130345-uraw50vl1xlzqy6t

13 years ago[FIX] mail_gateway: Fixed unique file name error while sending mail.
Ujjvala Collins (OpenERP) [Wed, 9 Mar 2011 12:30:33 +0000 (18:00 +0530)]
[FIX] mail_gateway: Fixed unique file name error while sending mail.

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

bzr revid: uco@tinyerp.com-20110309123033-lwpzrncs7qge8jag

13 years ago[FIX]stock:split production lot take only Int value
ron@tinyerp.com [Wed, 9 Mar 2011 12:24:21 +0000 (17:54 +0530)]
[FIX]stock:split production lot take only Int value

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

bzr revid: ron@tinyerp.com-20110309122421-3a5dwc52gzoiqbr8

13 years ago[IMP] try adding some doc to qweb foreach
Xavier Morel [Wed, 9 Mar 2011 11:57:46 +0000 (12:57 +0100)]
[IMP] try adding some doc to qweb foreach

bzr revid: xmo@openerp.com-20110309115746-4hkmq0oziwoi4jfs

13 years ago[MERGE] bug fix lp:725081
Thibault Francois [Wed, 9 Mar 2011 11:32:05 +0000 (12:32 +0100)]
[MERGE] bug fix lp:725081

bzr revid: tfr@openerp.com-20110309113205-n2sf2ioe8gowg6ll

13 years ago[MERGE] 725736
Thibault Francois [Wed, 9 Mar 2011 11:25:50 +0000 (12:25 +0100)]
[MERGE] 725736

bzr revid: tfr@openerp.com-20110309112550-zzm2n7khyt8d9lnj

13 years ago[MERGE] bug fix lp:720247
Thibault Francois [Wed, 9 Mar 2011 11:19:13 +0000 (12:19 +0100)]
[MERGE] bug fix lp:720247

bzr revid: tfr@openerp.com-20110309111913-y14gkw6et9mf5946

13 years ago[IMP] muck around with vars and returns to simplify flows in qweb, extract xhr genera...
Xavier Morel [Wed, 9 Mar 2011 11:13:07 +0000 (12:13 +0100)]
[IMP] muck around with vars and returns to simplify flows in qweb, extract xhr generation in its own function

bzr revid: xmo@openerp.com-20110309111307-rpaueaqjdzg1dkgj

13 years ago[FIX] l10n_lu: added import with_statement.
Vo Minh Thu [Wed, 9 Mar 2011 11:08:20 +0000 (12:08 +0100)]
[FIX] l10n_lu: added import with_statement.

bzr revid: vmt@openerp.com-20110309110820-jax81r3qsori93sl

13 years ago[IMP] use switch/case in QWeb.trim, remove default case (as it's already handled...
Xavier Morel [Wed, 9 Mar 2011 10:48:00 +0000 (11:48 +0100)]
[IMP] use switch/case in QWeb.trim, remove default case (as it's already handled by conditional at function top)

bzr revid: xmo@openerp.com-20110309104800-tdbzuqtg9lpardhr

13 years ago[REM] broken QWeb.dump() and QWeb.debug() functions ('s' unknown and undeclared in...
Xavier Morel [Wed, 9 Mar 2011 10:43:58 +0000 (11:43 +0100)]
[REM] broken QWeb.dump() and QWeb.debug() functions ('s' unknown and undeclared in dump), broken qweb demo HTML file

bzr revid: xmo@openerp.com-20110309104358-ndorl9ijp1perixs

13 years ago[FIX] deduplicate local variable declaration
Xavier Morel [Wed, 9 Mar 2011 10:40:58 +0000 (11:40 +0100)]
[FIX] deduplicate local variable declaration

bzr revid: xmo@openerp.com-20110309104058-oicx8oz67wq0cdq4

13 years ago[IMP] quiet down pycharm's type-inference/verif again
Xavier Morel [Wed, 9 Mar 2011 10:40:08 +0000 (11:40 +0100)]
[IMP] quiet down pycharm's type-inference/verif again

bzr revid: xmo@openerp.com-20110309104008-9g3efgflpz4j8am8