Commit Graph

172 Commits

Author SHA1 Message Date
Martin Trigaux 7d36f54288 [FIX] account_analytic_analysis: revert method signature change made at rev 9277
The additional parameters were made to avoid overwriting values when changing of template.
As we can not add parameters in only one module, we overwrite values only for not saved records.
This mitigates the overwrite while not changing the API.

bzr revid: mat@openerp.com-20140508083948-gkk7d1250a8znhlt
2014-05-08 10:39:48 +02:00
Christophe Simonis 7a7d7febf8 [MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
Denis Ledoux 6e04c0c5eb [FIX] account_analytic_analysis: prevent enable recurring invoices if not of type contract. Avoid cron to not continue if one of the contract failed to create its recurring invoices
bzr revid: dle@openerp.com-20140418132917-ztvzinwn3kt786m2
2014-04-18 15:29:17 +02:00
Denis Ledoux 2695cacea4 [FIX] account_analytic_analysis, analytic, hr_timesheet: do not override existing data of analytic account on template on_change
bzr revid: dle@openerp.com-20140401123657-ozh4ycx36jojpg51
2014-04-01 14:36:57 +02:00
Denis Ledoux cbba7eb4da [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9796 revid:launchpad_translations_on_behalf_of_openerp-20140128070310-721zmkmw0ocyz6im
bzr revid: dle@openerp.com-20140128100949-mfa2geyx6rklwtcg
2014-01-28 11:09:49 +01:00
Antony Lesuisse b7895c99d6 [FIX] contract search view typo
bzr revid: al@openerp.com-20140125000444-14nkccg6vyu5nmv5
2014-01-25 01:04:44 +01:00
Thibault Delavallée ed0a829cb3 [MERGE] [IMP] addons: improved name and tooltips of groupby date in various addons.
bzr revid: tde@openerp.com-20130904141053-yustqiuzynbettq8
2013-09-04 16:10:53 +02:00
Olivier Dony 9c08e12962 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9085
revision-id: odo@openerp.com-20130429105458-r89mnkx8okdxsdld

bzr revid: odo@openerp.com-20130429151410-54y94063gijyk16o
2013-04-29 17:14:10 +02:00
Quentin (OpenERP) 1e344dbc53 [FIX] account_analytic_analysis, hr_timesheet_invoice: partial replay of the fix made in revno 9056. The fix effect is the same, but more appropriate to a stable version (the wizard will be removed in v8 only)
bzr revid: qdp-launchpad@openerp.com-20130423151810-lcwo7abivbaoog0s
2013-04-23 17:18:10 +02:00
Quentin (OpenERP) e13dc082e5 [REV] revert revision 9056 that was deleting a whole wizard. The patch is good but not applicable as it in the v7
bzr revid: qdp-launchpad@openerp.com-20130423144948-unekni1ztjwv71fb
2013-04-23 16:49:48 +02:00
Quentin (OpenERP) d50b081191 [MERGE] account_analytic_analysis, hr_timsheet_invoice: fix made in the computation of the 'Invoiced Amount' computed field + removal of wizard to invoice timesheets that was giving wrong results, and which is now replaced by a simple redirection on the lines to invoice
bzr revid: qdp-launchpad@openerp.com-20130423105427-yrs3g9x6nigdl20j
2013-04-23 12:54:27 +02:00
Quentin (OpenERP) 33f27b362b [MERGE] forward port of addons v7 up to revision 9045
bzr revid: qdp-launchpad@openerp.com-20130422153449-c62emljfa4a49758
2013-04-22 17:34:49 +02:00
Olivier Dony feefb0ad36 [FIX] search views: use child_of operator for partner_id fields that can reference both companies and contacts
The goal is to match both the Company and its contacts
when searching for the Company

bzr revid: odo@openerp.com-20130420022642-6qe8pp4ifexjms65
2013-04-20 04:26:42 +02:00
Thibault Delavallée 040ceb0125 [IMP] crm, project: fixed css issues preventing alias to be displayed in readonly mode; improved form view of salesteams and project about aliases; improved sequence of menus to display salesteam as first menu entry.
bzr revid: tde@openerp.com-20130404115627-3vw1uv4xrmeu13k2
2013-04-04 13:56:27 +02:00
Josse Colpaert 8548a69f73 [FIX] Timesheets invoiced as expenses are and correction removed in invoiced calculation
bzr revid: jco@openerp.com-20130327103833-ekjzi3e0alkpod35
2013-03-27 11:38:33 +01:00
Quentin (OpenERP) 2b64c79c3d [MERGE] forward port of fixes made in v7 addons branch up to revision 8872
bzr revid: qdp-launchpad@openerp.com-20130318122717-qptmntn26bx4wn8r
2013-03-18 13:27:17 +01:00
Josse Colpaert 3b1b386561 [FIX] Remove sales filter in Time and Materials to Invoice
bzr revid: jco@openerp.com-20130314161327-xtq04qqi9w7ohgb3
2013-03-14 17:13:27 +01:00
Quentin (OpenERP) be05b374a1 [MERGE] forwardport of bugfixes made in v7 up to revision 8854.
bzr revid: qdp-launchpad@openerp.com-20130314112740-s01t51p4m7mxcumz
2013-03-14 12:27:40 +01:00
Quentin (OpenERP) 46ed704e83 [FIX] analytic_contract, usability: display the reinvoicing info group when charge_expense is True
bzr revid: qdp-launchpad@openerp.com-20130313155725-v79jfvl05ehbuhdh
2013-03-13 16:57:25 +01:00
Fabien Pinckaers c7d709e579 [FIX] misc fixes on contracts, timesheets
bzr revid: fp@openerp.com-20130312123321-mly0k9lrh3im78bg
2013-03-12 13:33:21 +01:00
Fabien Pinckaers e519da72a0 [MERGE] recurring invoices on contracts
bzr revid: fp@openerp.com-20130312154529-1bu8lwfobrvk7zqa
2013-03-12 16:45:29 +01:00
Fabien Pinckaers bed8a96291 [FIX] misc contracts fixes, timesheets
bzr revid: fp@openerp.com-20130312121218-vsvmaj12px4vqpvz
2013-03-12 13:12:18 +01:00
Foram Katharotiya (OpenERP) 30bde6fd18 [MERGE] with parent
bzr revid: fka@tinyerp.com-20130307111017-7uhh4ef7chk5f3jw
2013-03-07 16:40:17 +05:30
sgo@tinyerp.com d29957f302 [IMP]improve template type contract view
bzr revid: sgo@tinyerp.com-20130307094613-k36e87pz6v7m7ly2
2013-03-07 15:16:13 +05:30
DBR (OpenERP) 2677c1158d [IMP] Improve the indentation
bzr revid: dbr@tinyerp.com-20130306095300-10085nnd4xuxilsc
2013-03-06 15:23:00 +05:30
Foram Katharotiya (OpenERP) c5d928f30c [IMP] checked timesheet onchange of on timesheets
bzr revid: fka@tinyerp.com-20130305071704-7e43z4rps33ntouc
2013-03-05 12:47:04 +05:30
Foram Katharotiya (OpenERP) 548936166a [IMP] make required field customer
bzr revid: fka@tinyerp.com-20130304132345-go4efgxiex0slpkl
2013-03-04 18:53:45 +05:30
Foram Katharotiya (OpenERP) 81f0cd8783 [IMP] improve string in invoicing section
bzr revid: fka@tinyerp.com-20130304111733-wnpc98u7mn3im8j3
2013-03-04 16:47:33 +05:30
Foram Katharotiya (OpenERP) af5969508a [IMP] if directly create a so and invoice, from the SO it not display in contract
bzr revid: fka@tinyerp.com-20130304105918-vblu28tisjnbdt0h
2013-03-04 16:29:18 +05:30
DBR (OpenERP) 31893ec287 [IMP] Improve the code ans yml statements
bzr revid: dbr@tinyerp.com-20130304090508-1l93y5ozddarpqfv
2013-03-04 14:35:08 +05:30
Foram Katharotiya (OpenERP) 4f00199aaa [IMP] change string of date & put start date before end date in list view
bzr revid: fka@tinyerp.com-20130304083652-3coo0jeou5lde1z3
2013-03-04 14:06:52 +05:30
Foram Katharotiya (OpenERP) 9e037ba34f [IMP] in contract no order to invoice string shoud be seen until sale order is not confirmed
bzr revid: fka@tinyerp.com-20130304072341-uo0b9ibjp2sehyrd
2013-03-04 12:53:41 +05:30
DBR (OpenERP) 2d18a009f1 [IMP]Remove extra button and set grey color for a para.
bzr revid: dbr@tinyerp.com-20130227100115-panqiupw1j2yzvdy
2013-02-27 15:31:15 +05:30
DBR (OpenERP) d9d7c96218 [IMP]Improve code and remove extra views
bzr revid: dbr@tinyerp.com-20130226095232-yxjjlsqzj9bvdbg3
2013-02-26 15:22:32 +05:30
DBR (OpenERP) caf9999e37 [IMP]account_analytic_analysis: Improve on_change of product
bzr revid: dbr@tinyerp.com-20130226053542-g7yw7exjycvxxwni
2013-02-26 11:05:42 +05:30
DBR (OpenERP) 7c7bee5d39 [IMP]account_analytic_analysis: Improve code for normal orm
Remove posgress view

bzr revid: dbr@tinyerp.com-20130225133511-j43f4z5jl5hb8e2h
2013-02-25 19:05:11 +05:30
Jojo La Bricole a49b928657 [FIX] invoice, analytic search view fixes
bzr revid: al@openerp.com-20130222165730-uutgomtcgznarnay
2013-02-22 17:57:30 +01:00
DBR (OpenERP) 9d630ceda7 [IMP]account_analytic_account: Improve cron function temp via button and split query
bzr revid: dbr@tinyerp.com-20130222131401-ou4dktk5kiojnsw1
2013-02-22 18:44:01 +05:30
DBR (OpenERP) 1ac3f5df62 [IMP]account_analytic_analysis:
Improve code for tax calculation

bzr revid: dbr@tinyerp.com-20130222105927-4x4yhy5gs2k0edhk
2013-02-22 16:29:27 +05:30
DBR (OpenERP) 92fc06063c [Merge] lp:openobject-addons
bzr revid: dbr@tinyerp.com-20130222055629-7b4wjhef7l66l6ri
2013-02-22 11:26:29 +05:30
DBR (OpenERP) d4f73eb924 [IMP]account_analytic_analysis:
Improve the posgress view as per specification
Improve code for subtotal and line taxes

bzr revid: dbr@tinyerp.com-20130221134355-9lqe412182voa8b0
2013-02-21 19:13:55 +05:30
Antony Lesuisse 2a805abfbc [FIX] contract disable quickcreate, add group_by pricelist
bzr revid: al@openerp.com-20130221012920-o2034onrq76dje78
2013-02-21 02:29:20 +01:00
DBR (OpenERP) a9551459cd [IMP]account_analytic_analysis : Create new posgress view for o2m virtual invoice field
bzr revid: dbr@tinyerp.com-20130220132838-ddh64pa31wabtx61
2013-02-20 18:58:38 +05:30
DBR (OpenERP) 6d19450457 [IMP]account_analytic_analysis:
Add Recurrent virtual invoice functionality 
Try to set cron job but and test it's function with temp invoice btn

bzr revid: dbr@tinyerp.com-20130218125117-4sqbhxb1vro2nzhp
2013-02-18 18:21:17 +05:30
Antony Lesuisse b069932671 reorder and document contract views in one clear file.
bzr revid: al@openerp.com-20130214195645-oia0msv4fz1h14zx
2013-02-14 20:56:45 +01:00
Olivier Dony 9434537986 [FIX] contracts: use correct quantity field to avoid mismatching values
`quantity` is a recursive sum of quantities of all types, including child accounts,
while `hours_quantity` is the local sum of quantities in `general` analytic journals.
The latter is what corresponds to the `Units consumed` value for contracts, and what
is used to compute the `remaining_hours`, so we must used that.

bzr revid: odo@openerp.com-20130110171100-el2g1i3ou89p2yjc
2013-01-10 18:11:00 +01:00
Olivier Dony 49597f0e66 [MERGE] *: improved english wording, suggestions courtesy of OpenERP Community
bzr revid: odo@openerp.com-20121221164808-kdjrtcbgma4dr3on
2012-12-21 17:48:08 +01:00
Fabien Pinckaers 22454532d1 [IMP] very small fix in contracts, always show sale orders
bzr revid: fp@tinyerp.com-20121221164255-2mys887v0uee0f0z
2012-12-21 17:42:55 +01:00
Khushboo Bhatt (Open ERP) f233374657 [FIX]account_analytic_analysis:menu string changed
bzr revid: kbh@tinyerp.com-20121219063050-6418jrzcmh8vqe5x
2012-12-19 12:00:50 +05:30
Fabien Pinckaers 0a29f55843 [IMP] contracts
bzr revid: fp@tinyerp.com-20121210194250-ausp6zfxnu4ruq4q
2012-12-10 20:42:50 +01:00