Commit Graph

69969 Commits

Author SHA1 Message Date
Foram Katharotiya (OpenERP) 6d5cb91043 [MERGE] with 7.0
bzr revid: fka@tinyerp.com-20130515051235-i2opyehkanl77oud
bzr revid: fka@tinyerp.com-20130520051543-kd6e5rhqb3c2j2w2
bzr revid: fka@tinyerp.com-20130522062104-u9f3sec8wxivuouv
bzr revid: fka@tinyerp.com-20130531103058-mu8bja9j90m2newc
bzr revid: fka@tinyerp.com-20130604053616-dq91e11sgmbhqxjz
2013-06-04 11:06:16 +05:30
Olivier Dony 2c364097c7 [MERGE] l10n_ca: fix some tax definitions + updated fiscal position names, courtesy of Jonatan Cloutier (Savoir-Faire Linux)
bzr revid: odo@openerp.com-20130603161020-gljpqmv504pn2npv
2013-06-03 18:10:20 +02:00
Olivier Dony b942539e3d [MERGE] l10n_lu: update financial report labels to match latest eCDF values, courtesy of Stéphane Bidoul (Acsone)
bzr revid: odo@openerp.com-20130603155610-penultapioum2i8w
2013-06-03 17:56:10 +02:00
Quentin (OpenERP) 232e24b7a4 [FIX] trml2pdf: reportlab 2.4.4 doesn't support the previous syntax (sname in self.default_style)
bzr revid: qdp-launchpad@openerp.com-20130603093048-4iwgnb4hxhsxrazc
2013-06-03 11:30:48 +02:00
Launchpad Translations on behalf of openerp 9705c37dfa Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130601055923-2o80qu13ofm2jkfh
bzr revid: launchpad_translations_on_behalf_of_openerp-20130531070111-eqt2i0xb3xqrth7p
bzr revid: launchpad_translations_on_behalf_of_openerp-20130601055928-uap5zeq41e0317xt
2013-06-01 05:59:28 +00:00
Quentin (OpenERP) fe7866ccec [FIX] crm: after a merge of several leads/opportunities, delete the old records as the SUPERUSER to avoid security issues.
bzr revid: qdp-launchpad@openerp.com-20130531123414-ezx9ixg9ggame1g6
2013-05-31 14:34:14 +02:00
Quentin (OpenERP) 4eb57678cb [FIX] sale_margin: when sharing a SO with a customer, don't show the margin
bzr revid: qdp-launchpad@openerp.com-20130531122745-lkhi0nftibhu325j
2013-05-31 14:27:45 +02:00
Quentin (OpenERP) 5b83d03ac1 [FIX] account, usability: restrict the choice of the account to the ones with type 'other' for income and expense account of product and invoice line
bzr revid: qdp-launchpad@openerp.com-20130531121945-fjb9y6rj3k9qd4m9
2013-05-31 14:19:45 +02:00
Quentin (OpenERP) 031dbeb01a [FIX] hr: display the employee instead of the user in the calendar view
bzr revid: qdp-launchpad@openerp.com-20130531121351-iirl3ukuojphy21z
2013-05-31 14:13:51 +02:00
Dhruti Shastri (OpenERP) dfe1a7ca34 [hr_hlidays] : Calender view display False value if no user_id
bzr revid: dhs@tinyerp.com-20130531120453-56m4n4h4bxrca2x5
2013-05-31 17:34:53 +05:30
Pinakin Nayi (OpenERP) b430036c7f [FIX]crm : delete with super user to avoid access rules because if there is any user (not have delete access of lead) than also merge opportunity
bzr revid: pna@tinyerp.com-20130531114716-5as9flbu2506reh0
2013-05-31 17:17:16 +05:30
Quentin (OpenERP) 03d39c5429 [IMP/FIX] report, trml2pdf: added the support of registerFontFamily tag to allow the mapping of different fonts for bold, italic or boldItalic
bzr revid: qdp-launchpad@openerp.com-20130531114612-ofcn1swt5o5cc7oc
2013-05-31 13:46:12 +02:00
Dharti Ratani (Open ERP) 2d51566f66 [FIX]Hide the margin in SO if you see SO as a customer through portal, if 'Display margin on sale orders' is activated
bzr revid: dhr@tinyerp.com-20130531092311-rgtlbv55ai4223pk
2013-05-31 14:53:11 +05:30
Olivier Dony 4045f8c9a5 [MERGE] project: wrong FK used in implementation of project.search(), courtesy of Nicolas Bessi (Camptocamp)
lp bug: https://launchpad.net/bugs/1186146 fixed

bzr revid: odo@openerp.com-20130531091150-4cs6p4w3ced3dist
2013-05-31 11:11:50 +02:00
Quentin (OpenERP) 40ea4556de [FIX] base, res_company: typo in default paraStyle tagname
bzr revid: qdp-launchpad@openerp.com-20130531074745-ycfvlzrvlkrli33h
2013-05-31 09:47:45 +02:00
nicolas.bessi@camptocamp.com c3f7fbbf1f [FIX] project name search if aa id != project id
lp bug: https://launchpad.net/bugs/1186146 fixed

bzr revid: nicolas.bessi@camptocamp.com-20130531073631-dthwxiyp8mnmtkfr
2013-05-31 09:36:31 +02:00
Launchpad Translations on behalf of openerp ddc7e6c994 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130531070107-7d2k818beg8965ll
2013-05-31 07:01:07 +00:00
Launchpad Translations on behalf of openerp 3892f2012e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130531070010-d94zj275obvxgnow
2013-05-31 07:00:10 +00:00
Pinakin Nayi (OpenERP) de5b79545e [FIX]account : account invoice balance is double the total
bzr revid: pna@tinyerp.com-20130531062946-i0rhy98n8bjk9nh4
2013-05-31 11:59:46 +05:30
Olivier Dony 5b18695c45 [FIX] portal_hr_employee: force inherit_id to False to avoid errors during migrations
The view has been converted to a first-class view
but was an inherited view before, so existing
database will exhibit issues when updating unless
the inherit_id field is forced to NULL.

Also fixed a minor typo.

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

bzr revid: odo@openerp.com-20130530151255-6kx6l91mwwa4tfei
2013-05-30 17:12:55 +02:00
Josse Colpaert 619bbffa5f [IMP] Change src dest main currency when creating accounting entries for stock
bzr revid: jco@openerp.com-20130530150441-fgr5aoi89v4gvra1
2013-05-30 17:04:41 +02:00
Thibault Delavallée ac791818e0 [MERGE] [CHERRYPICK] Backport of revision 4879 of saas-1 branch.
[FIX] ir_attachment: in check, values could coutain a
False res_model; no need to check self.pool[False], obviously. We consider void attachments
as being accessible, because no related document exists.

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

bzr revid: tde@openerp.com-20130530142608-jgu1y7175q8hjkt5
2013-05-30 16:26:08 +02:00
Xavier Morel aaa0cc0b82 [FIX] triggering of dataset_changed events to correctly happen *after* the operation
also added it to DataSet#create calls where it seems to be missing

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

bzr revid: xmo@openerp.com-20130530131115-tzap50w2ydnqmxit
2013-05-30 15:11:15 +02:00
Xavier Morel 890ea99146 [IMP] allow export of selected records only
bzr revid: xmo@openerp.com-20130530100556-yidc2yyx8mm4au1q
2013-05-30 12:05:56 +02:00
Xavier Morel c0807b34b1 [IMP] export view: use events hash
bzr revid: xmo@openerp.com-20130530100420-8zsa03ssom8ox2g4
2013-05-30 12:04:20 +02:00
Xavier Morel 398f570e69 [IMP] code cleanup, better use of jquery
bzr revid: xmo@openerp.com-20130530095827-ondsza16ze29neel
2013-05-30 11:58:27 +02:00
Xavier Morel 03b80e154e [IMP] option to only export selected records
lp bug: https://launchpad.net/bugs/900385 fixed

bzr revid: xmo@openerp.com-20130530094525-1ub1yhdqsag6xxzq
2013-05-30 11:45:25 +02:00
Xavier Morel c063ef4109 [FIX] linting warnings in export
bzr revid: xmo@openerp.com-20130530090823-7l75tasejwt5ywb9
2013-05-30 11:08:23 +02:00
Mohammed Shekha 22ba680c7e [FIX]Refixed the issue of oe_sessions_effectiveusername storage in temp, used geteuid which returns effective user id.
bzr revid: msh@openerp.com-20130530090814-6uf0hs5j0223w985
2013-05-30 14:38:14 +05:30
Launchpad Translations on behalf of openerp b0ee73993c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130530065710-szrvqpddm40l9j7c
bzr revid: launchpad_translations_on_behalf_of_openerp-20130530065720-yji44thx1pwq2xe7
2013-05-30 06:57:20 +00:00
Martin Trigaux d626d3cb61 [MERGE] backport saas-1 rev 8728
[FIX] mail, project, project_issue, crm_lead: fixed 'XX Created' subtype not triggered because of condition
based on state=new and not state=draft.
For tasks, issues and leads, no generic 'Document created' message is posted anymore
because of the 'XX Created' message with subtype automatically logged.
Generic creation message is logged before automatic subscription to enable
message pushing to responsibles.

bzr revid: mat@openerp.com-20130529143022-wy76srwb2nwkspe3
2013-05-29 16:30:22 +02:00
Olivier Dony 760fea7831 [MERGE] base: remove remaining company assignments on currencies, courtesy of Stefan Rijnhart (Therp)
lp bug: https://launchpad.net/bugs/1111298 fixed

bzr revid: odo@openerp.com-20130529113450-fwqqfess9w07spk3
2013-05-29 13:34:50 +02:00
Martin Trigaux ab85cf0e86 [IMP] base_action_rule: add help message on trigger date field
bzr revid: mat@openerp.com-20130529104202-ofyadlqo6ax10axe
2013-05-29 12:42:02 +02:00
Stefan Rijnhart 6c2a6d2bc3 [FIX] Remove additional company assignments to currencies
lp bug: https://launchpad.net/bugs/1111298 fixed

bzr revid: stefan@therp.nl-20130529103503-bhhs25yxlo92xnig
2013-05-29 12:35:03 +02:00
Launchpad Translations on behalf of openerp 3dc8f09253 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130529075839-8iy52gg0xn0hwag2
2013-05-29 07:58:39 +00:00
Christophe Simonis b243c7dae5 [FIX] rml2pdf: correct filename for Sun-ExtA font
bzr revid: chs@openerp.com-20130528185031-azdnkayclc7l243x
2013-05-28 20:50:31 +02:00
Martin Trigaux 37111666cf [IMP] various change
account_payment: [FIX] Spelling error and missing call to _(), courtesy of Stefan Rijnhart (Therp)
account: [FIX] context is not propagated through account_period.name_search to account_period.search, courtesy of Guewen Baconnier (Camptocamp)
account_followup: [IMP] remove create and import button on 'do manual followup' view, courtesy of Csaba Toth

bzr revid: mat@openerp.com-20130528154100-o0csnsfumcep9r1c
2013-05-28 17:41:00 +02:00
Martin Trigaux e390d05862 [MERGE] [FIX] Spelling error and missing call to _(), courtesy of Stefan Rijnhart (Therp)
bzr revid: mat@openerp.com-20130528152722-lky2l3f6htfc0h35
2013-05-28 17:27:22 +02:00
Martin Trigaux 17a618eb89 [MERGE] [FIX] context is not propagated through account_period.name_search to account_period.search, courtesy of Guewen Baconnier (Camptocamp)
lp bug: https://launchpad.net/bugs/1177348 fixed

bzr revid: mat@openerp.com-20130528152327-zq382uvqn9h3ja83
2013-05-28 17:23:27 +02:00
Stefan Rijnhart 2ed4144abe [FIX] Actually import gettext function
bzr revid: stefan@therp.nl-20130528152303-20c281snp5o3bkfq
2013-05-28 17:23:03 +02:00
Martin Trigaux 90a9010f52 [MERGE] [FIX] 'Do manual Follow-ups' (menu) mistakenly enables create and import button
lp bug: https://launchpad.net/bugs/1156938 fixed

bzr revid: mat@openerp.com-20130528151301-ioede6k0mqsw3c61
2013-05-28 17:13:01 +02:00
Martin Trigaux 524f9da9b8 [MERGE] sync
bzr revid: mat@openerp.com-20130528151116-2p8kfbk1v76sooo1
2013-05-28 17:11:16 +02:00
Martin Trigaux 1c59463ddc [MERGE] various changes
account: use context in pos box actions, avoid traceback when cashout
account_followup: allow grouping by country
document_page: allow grouping by author

bzr revid: mat@openerp.com-20130528141917-0hdp1qkf6pn914x5
2013-05-28 16:19:17 +02:00
Martin Trigaux 2e245cac18 [MERGE] [FIX]:pages should be filtered using group by author in the knowledge menu
bzr revid: mat@openerp.com-20130528141116-ewfyg0ej42huhwl9
2013-05-28 16:11:16 +02:00
Martin Trigaux 71072f1a2c [MERGE] [FIX] account_followup: Fixed the issue of Group by of Country of Do Manual Follow-ups
bzr revid: mat@openerp.com-20130528135207-7w93gs1h41my1uwl
2013-05-28 15:52:07 +02:00
Martin Trigaux 56a3b528f5 [MERGE] [FIX]account:in cash register if we put or take money its generate traceback
bzr revid: mat@openerp.com-20130528133435-v4b99yxh3hi523he
2013-05-28 15:34:35 +02:00
Martin Trigaux 2fe9d85686 [MERGE] sync
bzr revid: mat@openerp.com-20130528131634-v0codb0fx6r7p3i0
2013-05-28 15:16:34 +02:00
Martin Trigaux 7f643d5540 [IMP] various changes
sale_stock: fix test to match new order
project: remove create button on view
procurement: allow grouping by reason
mrp: use property_ids for order line
account: allow grouping by template

bzr revid: mat@openerp.com-20130528131559-1u7t50sicpc3c6xe
2013-05-28 15:15:59 +02:00
Stefan Rijnhart 07cf4d5836 [FIX] Spelling error and missing call to _()
bzr revid: stefan@therp.nl-20130528130906-ciyf3thaw579pqvu
2013-05-28 15:09:06 +02:00
Martin Trigaux 2229e4d1d0 [FIX] correct test to match new ordering
bzr revid: mat@openerp.com-20130528130521-m09g4mhv3iyuefa2
2013-05-28 15:05:21 +02:00