mtr
d8b86dfe05
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
...
bzr revid: mtr@mtr-20110207063406-jiz37qc3zyft724i
2011-02-07 12:04:06 +05:30
Mustufa Rangwala
1c5f40245f
[MERGE] merge from trunk addons
...
bzr revid: mra@mra-laptop-20110207043856-nkvb1isiakcp09yz
bzr revid: mra@mra-laptop-20110207063511-ogtsui2uhqz66knt
2011-02-07 12:05:11 +05:30
mtr
ded6ee0b08
[FIX] hr_attendance:improved 'Weekly Attendance' report, prints 'h' for hours i.e.'7h06'
...
bzr revid: mtr@mtr-20110207062920-3mudqqxvxr80d4ip
2011-02-07 11:59:20 +05:30
89933f4c30
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110205045946-ngssapvavvzymfc4
bzr revid: launchpad_translations_on_behalf_of_openerp-20110206045319-cjbcpcr7k0jw8v8f
bzr revid: launchpad_translations_on_behalf_of_openerp-20110205050201-5kxv4wvlb171y4ec
bzr revid: launchpad_translations_on_behalf_of_openerp-20110206045419-syxas10vfjwq4nw9
bzr revid: launchpad_translations_on_behalf_of_openerp-20110207052017-1qsba36kfnjc0zkj
2011-02-07 05:20:17 +00:00
Olivier Dony
87a1392f99
[IMP] osv: added test for parent_store computations + fix for another edge case
...
The yaml test create a tree structure and modifies it by copying nodes
around and then moving them, checking that the child_of operator keeps
working afterwards. This test caught another edge case, as a follow-up
to the case of bug 708603
lp bug: https://launchpad.net/bugs/708603 fixed
bzr revid: odo@openerp.com-20110205004316-zaw9qqfke1bcw0s7
2011-02-05 01:43:16 +01:00
Mustufa Rangwala
8f43d299d0
[FIX] POS: Lots in POS => Add product lot on pos order line for validate pos order for product which has tracking outgoing set to true
...
lp bug: https://launchpad.net/bugs/710561 fixed
bzr revid: mra@mra-laptop-20110204113247-732fgockzszz7n6k
2011-02-04 17:02:47 +05:30
Mustufa Rangwala
51e3c0dff5
[MERGE] Account: accounting: improve the generation of journals and periods => backlog 991 id
...
bzr revid: mra@mra-laptop-20110204102049-2d80e0kr6vhk00el
2011-02-04 15:50:49 +05:30
mtr
01a08c7a52
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
...
bzr revid: mtr@mtr-20110204085111-0f0tlr3id2zsfu4b
2011-02-04 14:21:11 +05:30
mtr
90fe3e95fe
[FIX] hr_attendance:'Attendance by month' and 'Weekly Attendance' report now prints minutes also
...
lp bug: https://launchpad.net/bugs/711533 fixed
bzr revid: mtr@mtr-20110204084725-y2kjj4arrnv62zds
2011-02-04 14:17:25 +05:30
psi (Open ERP)
4c9e34cbd3
[MERGE] merge with dev-addons3
...
bzr revid: psi@tinyerp.co.in-20110203103228-0ii7bxdk2bgtydxr
bzr revid: psi@tinyerp.co.in-20110204050801-t6w0b0s0xae7wkx7
2011-02-04 10:38:01 +05:30
Mustufa Rangwala
545bf5805b
[MERGE] merge from trunk addons
...
bzr revid: mra@mra-laptop-20110204044842-i79i51jfk3ti97b6
2011-02-04 10:18:42 +05:30
Olivier Dony
1eca241d52
[MERGE] merged latest fixes from 6.0, up to rev 3334
...
bzr revid: odo@openerp.com-20110203230023-o2a0b5tovewu0ft2
2011-02-04 00:00:23 +01:00
Olivier Dony
22a2fc6aa6
[FIX] orm.write: avoid miscalculation of parent_left/right when moving multiple records under same parent
...
This issue caused the parent_left and parent_right values to be correct
only for the first record being update as part of a batch update on several
children from the same parent. An example of the consequences is the linked
bug 708503.
lp bug: https://launchpad.net/bugs/708603 fixed
bzr revid: odo@openerp.com-20110203225102-a7v8bv90l2ph5ujh
2011-02-03 23:51:02 +01:00
Olivier Dony
4900c41842
[REVERT] account: reverted incorrect fix for bug 708603, this is in fact a server error
...
Commit reverted was merged in rev 3164.118.782 mra@mra-laptop-20110131082002-xzx4v2adzdvv8nmg
lp bug: https://launchpad.net/bugs/708603 fixed
bzr revid: odo@openerp.com-20110203222026-ln6hmyivaj9bo11g
2011-02-03 23:20:26 +01:00
Mustufa Rangwala
eff87b20ec
[FIX] pos: [wizard: pos_payment] When you create invoices with different currencies set, the price is well mapped, but with the wrong currency
...
lp bug: https://launchpad.net/bugs/710462 fixed
bzr revid: mra@mra-laptop-20110203105528-0pe8uzhg0brgib58
2011-02-03 16:25:28 +05:30
mtr
fd9ad72a06
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
...
bzr revid: mtr@mtr-20110203102356-cejx2a2ltw9rgthc
2011-02-03 15:53:56 +05:30
mtr
94c626ed9a
[FIX] hr_attendance:Attendance by month report now prints minutes also
...
lp bug: https://launchpad.net/bugs/711533 fixed
bzr revid: mtr@mtr-20110203101717-2hr3a3q83fto442h
2011-02-03 15:47:17 +05:30
psi (Open ERP)
43b097f7dd
[ADD, IMP] account: changes in my last commite as per merge suggetion(New Opening and Miscellaneous journal)
...
bzr revid: psi@tinyerp.co.in-20110203101630-rvzgahp15111jf8s
2011-02-03 15:46:30 +05:30
Mustufa Rangwala
8c316dca64
[FIX] Account: Add company on period and fiscalyear tree view with multicompany group
...
lp bug: https://launchpad.net/bugs/711998 fixed
bzr revid: mra@mra-laptop-20110203092255-qpprxha1wur2br98
2011-02-03 14:52:55 +05:30
Jay Vora (OpenERP)
df6f269daa
[FIX] setup.py : typo corrected
...
lp bug: https://launchpad.net/bugs/710813 fixed
bzr revid: jvo@tinyerp.com-20110203074415-35mt5cl2bk5szzr4
2011-02-03 13:14:15 +05:30
Jay Vora (OpenERP)
153238a666
[FIX] setup.py : typo corrected
...
lp bug: https://launchpad.net/bugs/710813 fixed
bzr revid: jvo@tinyerp.com-20110203072943-vfath4rqrxhqwvdi
2011-02-03 12:59:43 +05:30
1474483553
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110203061642-vso4sr14t1g3p5sa
bzr revid: launchpad_translations_on_behalf_of_openerp-20110203061718-vr6gj90b3pov038j
2011-02-03 06:17:18 +00:00
Mustufa Rangwala
de953d274d
[MERGE] merge from trunk addons
...
bzr revid: mra@mra-laptop-20110203053708-qhkyf1vhdcuja6pb
2011-02-03 11:07:08 +05:30
Mustufa Rangwala
5e988a7057
[FIX] account_analytic_analysis: last_invoice_date field does not include manual invoices => changed the help string
...
lp bug: https://launchpad.net/bugs/711737 fixed
bzr revid: mra@mra-laptop-20110203052827-pcd1qdpdwoipuiep
2011-02-03 10:58:27 +05:30
bbfa775055
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110202044205-3ws4pqp0lavgg5c5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110203044526-s8t9nmtqd7do7yy4
2011-02-03 04:45:26 +00:00
38daed5a03
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110203044306-8k55djcscwbpuis6
2011-02-03 04:43:06 +00:00
Jay Vora (OpenERP)
e8a052cbf2
[FIX] Document_ftp : Correction on ftp_browse wizard for URL (Ref : Maintenance case 3889)
...
bzr revid: jvo@tinyerp.com-20110202145507-vqaoq77rjip164ga
2011-02-02 20:25:07 +05:30
Thibault Francois
59b7e608f0
[FIX] base_calendar : timezone False sent to server for write
...
bzr revid: tfr@openerp.com-20110202143557-9cefs1eyu2yekh04
2011-02-02 15:35:57 +01:00
Mustufa Rangwala
31552ce80d
[REF] account
...
bzr revid: mra@mra-laptop-20110202115439-e98y2mjze50g5luw
2011-02-02 17:24:39 +05:30
Mustufa Rangwala
fe01aaef74
[REF] account
...
bzr revid: mra@mra-laptop-20110202114728-3ifqa2gfy6ubka9g
2011-02-02 17:17:28 +05:30
Mustufa Rangwala
23961d330b
[MERGE] l10n_cr: property corrected
...
bzr revid: mra@mra-laptop-20110202112218-8sxqun1rtru4t5rb
2011-02-02 16:52:18 +05:30
mtr
36c8648d41
[IMP] hr_attendance:removed print statement
...
bzr revid: mtr@mtr-20110202104049-4g37pfocg7b4wwl8
2011-02-02 16:10:49 +05:30
mtr
c4a9cf71c1
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
...
bzr revid: mtr@mtr-20110202102244-b0zhudmg1uk14z8o
2011-02-02 15:52:44 +05:30
mtr
2caa4c37b3
[IMP] l10n_lu,l10n_cr: correct property account in account.chart.template
...
bzr revid: mtr@mtr-20110202095446-170cxzgzkm6eijqp
2011-02-02 15:24:46 +05:30
Mustufa Rangwala
e0b487ad77
[REVERT] l10n_gr: revert changes for property
...
bzr revid: mra@mra-laptop-20110202072334-givoepuyttwnk5tp
2011-02-02 12:53:34 +05:30
Mustufa Rangwala
563f6fef2b
[MERGE] l10n_de,l10n_ec,l10n_gr: correct property account in account.chart.template
...
bzr revid: mra@mra-laptop-20110202063400-53me0nhdwcvz23zg
2011-02-02 12:04:00 +05:30
Mustufa Rangwala
72304a37fa
[MERGE] merge from trunk addons
...
bzr revid: mra@mra-laptop-20110202061849-21bt0q7brtd6i19u
2011-02-02 11:48:49 +05:30
de2e08f4aa
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110202054408-8b2iwfb5fgdibeom
2011-02-02 05:44:08 +00:00
mtr
8af73b2885
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
...
bzr revid: mtr@mtr-20110202052531-jzi9gqaa7uf3xhbw
2011-02-02 10:55:31 +05:30
mtr
e2afe7b13a
[IMP] l10n_de,l10n_ec,l10n_gr: correct property account in account.chart.template
...
bzr revid: mtr@mtr-20110202052009-3b1xknulownwwild
2011-02-02 10:50:09 +05:30
Olivier Dony
d4c473f502
[REVERT] fields: revert previous fix, until tests and addons are checked for compatibility
...
bzr revid: odo@openerp.com-20110201210140-gmr25730fiuvq7e5
2011-02-01 22:01:40 +01:00
Thibault Francois
daa1b72973
[FIX] widget selection replace by m2o because the domain is dynamic
...
bzr revid: tfr@openerp.com-20110201160622-gc75h8fwp0c4vz7o
2011-02-01 17:06:22 +01:00
de6c15049e
[MERGE] merged dev2 branch
...
bzr revid: qdp-launchpad@tinyerp.com-20110201155635-1kfct183b9btdlnj
2011-02-01 16:56:35 +01:00
40e7342e28
[MERGE] merged the dev3 branch
...
bzr revid: qdp-launchpad@tinyerp.com-20110201155023-bhmz3wby39n868eq
2011-02-01 16:50:23 +01:00
Olivier Dony
1da43ed8ba
[MERGE] merged latest bugfixes from 6.0 into trunk (up to rev 4375)
...
bzr revid: odo@openerp.com-20110201142528-5w9ns20flxmetf3i
2011-02-01 15:25:28 +01:00
Olivier Dony
145c74b270
[REVERT] fields: revert previous fix, until tests and addons are checked for compatibility
...
bzr revid: odo@openerp.com-20110201130721-q368qznven3vbmty
2011-02-01 14:07:21 +01:00
Mustufa Rangwala
9259b22c59
[MERGE] project_planning: corrected value of 'date_to' field in the demo data
...
bzr revid: mra@mra-laptop-20110201125856-2xto32mgkwtptv13
2011-02-01 18:28:56 +05:30
Mustufa Rangwala
cda4bc7204
[REVERT] Analytic: changes reverted for rev 4927 (act window on analytic form)
...
bzr revid: mra@mra-laptop-20110201125345-t9jxwatp239l0w5w
2011-02-01 18:23:45 +05:30
mtr
d4214987f8
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
...
bzr revid: mtr@mtr-20110201124651-lrhtpwo9jpgo7zd2
2011-02-01 18:16:51 +05:30
Mustufa Rangwala
19cf9e1054
[IMP] hr_holidays: case_id on holidays object type changed from char to m2o (crm.meeting)
...
bzr revid: mra@mra-laptop-20110201124038-fwehl3uq7qo3tp6v
2011-02-01 18:10:38 +05:30
mtr