Commit Graph

196 Commits

Author SHA1 Message Date
Christophe Simonis 4b72678bc7 [MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
Thibault Delavallée 1b13217838 [MERGE] sales/crm: minor improvements in account_analytic_analysis, crm, event_sale, hr_timesheet_invoice, sale views
bzr revid: tde@openerp.com-20140205160347-nptajwoxfl5ylfa9
2014-02-05 17:03:47 +01:00
Denis Ledoux 5aedbce448 [FIX] account_analytic_analysis: currency were wrong when preparing recurring invoices
The id of the sale pricelist of the customer was set as currency_id, instead of using the id of the currency of the pricelist. (Obviously)
Furthermore, the currency of the contract pricelist takes the lead.
Then, if none of these two are set, we choose the currency of the company, finally.

bzr revid: dle@openerp.com-20140204115226-rowmbr5223fcu08k
2014-02-04 12:52:26 +01:00
Olivier Dony 89a6771f6a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9698, revision-id: odo@openerp.com-20131216142049-xh9gxy5cir3p2i09
bzr revid: dle@openerp.com-20131216111534-0w0jdod25ff3iapc
bzr revid: odo@openerp.com-20131216142246-unt6qqb23uq53we1
2013-12-16 15:22:46 +01:00
Denis Ledoux af22a1c5b7 [FIX] account_analytic_analysis: is_overdue_quantity was not updated when quantity max was changed
is_overdue_quantity is a stored function field which was updated only when analytic lines where updated. Or, when the quantity_max field is updated, this field should be recomputed and restored. This is now the case

bzr revid: dle@openerp.com-20131216111218-zcz8qwa7zn3iwvye
2013-12-16 12:12:18 +01:00
Atul Patel (OpenERP) 89c428bd84 [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20131029133906-xrxccq8zm285m2zw
2013-10-29 19:09:06 +05:30
Olivier Dony 5cba82e2c9 [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8788 dle@openerp.com-20131003094541-ro29hhkas03rdvw8
bzr revid: odo@openerp.com-20131003111222-upt1ytb92db50zay
2013-10-03 13:12:22 +02:00
Ravi Gohil (OpenERP) 87ca8ad41b [FIX] account_analytic_analysis: fix the traceback, AttributeError: 'long' object has no attribute 'account_ids' when automatic recurring invoice is enabled.(Maintenance Case : 597966)
bzr revid: rgo@tinyerp.com-20130924105728-gtmc1862gcazs7lb
2013-09-24 16:27:28 +05:30
Atul Patel (OpenERP) 4ccbbba7c8 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20130826045058-4ipsemxtca1rdagy
2013-08-26 10:20:58 +05:30
Darshan Kalola cc23db19a7 [IMP] improve contract usability
bzr revid: darshankalola@gmail.com-20130729054047-z73ocu5isfqc0b3v
2013-07-29 11:10:47 +05:30
Nimesh Contractor (OpenERP) 1d85d13a73 [IMP] when you uncheck the to_invoice at that time upper timesheet value is not uncheked.
bzr revid: nco@tinyerp.com-20130711060751-vllvxwpb0awptpom
2013-07-11 11:37:51 +05:30
Darshan Kalola (OpenERP Trainee) 13ac97438d [IMP]make ratio null and untick timesheet when untick invoice on timesheet option on contract
bzr revid: darshankalola@gmail.com-20130614134423-7itt49kbf09nq36t
2013-06-14 19:14:23 +05:30
Christophe Matthieu 8c6ff33bef [IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos)
bzr revid: chm@openerp.com-20130607102359-is19utzap127nwr4
2013-06-07 12:23:59 +02:00
Martin Trigaux 8f0b106e47 [MERGE] account_analytic_analysis: better tooltip on remaining time field
bzr revid: mat@openerp.com-20130530114426-u508zvb7zw5aj1fg
2013-05-30 13:44:26 +02:00
Amit Bhavsar (Open ERP) 24848a8dcc [MERGE] merge with latest trunk
bzr revid: bde@tinyerp.com-20130522095432-1sl1b6uu6ewod4md
bzr revid: amb@tinyerp.com-20130528091941-wak8fnembuvewwjf
2013-05-28 14:49:41 +05:30
bth-openerp 94d1af294c [FIX]revert code.
bzr revid: bth@tinyerp.com-20130517055655-9fscfd08aaom0wyt
2013-05-17 11:26:55 +05:30
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
ggh-openerp 3b73e2b2a4 [IMP]Removed space before Exclamation marks [!]
bzr revid: ggh@tinyerp.com-20130429071557-vnxo5nni03vc886j
2013-04-29 12:45:57 +05:30
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
bth-openerp 334faeb843 [REV] Revert code for wrong value in invoiced in fixed price.
bzr revid: bth@tinyerp.com-20130417050900-mri6vhcb1v9i5lya
2013-04-17 10:39:00 +05:30
bth-openerp 30b847fbf0 [REM] Remove unwanted changes.
bzr revid: bth@tinyerp.com-20130416072248-qtn1ajo89i4wt048
2013-04-16 12:52:48 +05:30
bth-openerp 8caa5bae8d [IMP] Improve tooltip on field.
bzr revid: bth@tinyerp.com-20130415072053-5zyrp09xf9bd2ivf
2013-04-15 12:50:53 +05:30
bth-openerp d6fcb3ec65 [IMP]FIX:Wrong value coming in invoiced on fixed price.
bzr revid: bth@tinyerp.com-20130412071937-b23oux3oabqgoywz
2013-04-12 12:49:37 +05:30
bth-openerp 79a335f2f4 [IMP] date start & end taken from template.
bzr revid: bth@tinyerp.com-20130411133351-z8zypiywjbgwt7by
2013-04-11 19:03:51 +05:30
bth-openerp ae4900a278 [IMP] Modify tooltip for remaining on timesheet.
bzr revid: bth@tinyerp.com-20130409104807-jme2059quueouns8
2013-04-09 16:18:07 +05:30
Quentin (OpenERP) 3bb51ac696 [MERGE] forward port of bugfixes made in 7.0, up to revision 8969.
bzr revid: qdp-launchpad@openerp.com-20130404095257-oek77sijuxjyi0aj
2013-04-04 11:52:57 +02:00
Josse Colpaert 23d2c6d634 [FIX] Remove also import and correct total invoiced on so by calculation of invoice lines
bzr revid: jco@openerp.com-20130327171243-zzagfabhf5i0bb90
2013-03-27 18:12:43 +01: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) 4fca70b0b2 [FIX] account_analytic_analysis: wrong computation of remaining to invoice field (should not take into consideration lines for which it exists a draft invoice)
bzr revid: qdp-launchpad@openerp.com-20130326170456-p4j54ar9272n05no
2013-03-26 18:04:56 +01:00
Olivier Dony 914a97f329 [FIX] account_analytic_analysis: remove duplicate method kept by mistake while porting 7.0 fixes to trunk in rev.8620
bzr revid: odo@openerp.com-20130315113120-xsmfoxw6a6kaylzm
2013-03-15 12:31:20 +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
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
sgo@tinyerp.com cb6b856d04 [MERGE]merge fka branch for changes in contract
bzr revid: sgo@tinyerp.com-20130307131039-u0d2wchfrwuhtky1
2013-03-07 18:40:39 +05:30
DBR (OpenERP) 7b2b623ff4 [IMP] Set False in analtic account for new analytic line
bzr revid: dbr@tinyerp.com-20130307085053-im3yk2akhg95ksyd
2013-03-07 14:20:53 +05:30
DBR (OpenERP) 148b43ca3f Minore changes
bzr revid: dbr@tinyerp.com-20130307074432-k1v9z8yvkmccydm2
2013-03-07 13:14:32 +05:30
DBR (OpenERP) c98d7dad22 [IMP]Remove write and use append
bzr revid: dbr@tinyerp.com-20130307062020-49zgr9rni4ovuf7p
2013-03-07 11:50:20 +05:30
DBR (OpenERP) 5303cef954 [IMP]account_analytic_analysis: Improve onchange template and set context in added code
bzr revid: dbr@tinyerp.com-20130307060259-zu4ufsgasgvxkq8w
2013-03-07 11:32:59 +05:30
DBR (OpenERP) b4e9d6679b [IMP]account_analytic_analysis: remove copy method and imp onchange_template
bzr revid: dbr@tinyerp.com-20130306134505-zoc23qcltknnakbp
2013-03-06 19:15:05 +05:30
Foram Katharotiya (OpenERP) bdbb287f71 [IMP] received email when renew contract
bzr revid: fka@tinyerp.com-20130306131836-d98z0o25sp21777e
2013-03-06 18:48:36 +05:30
DBR (OpenERP) 2677c1158d [IMP] Improve the indentation
bzr revid: dbr@tinyerp.com-20130306095300-10085nnd4xuxilsc
2013-03-06 15:23:00 +05:30
DBR (OpenERP) a94403f274 [IMP]Improve yml
bzr revid: dbr@tinyerp.com-20130305123016-kaj6aoebxpes5c0w
2013-03-05 18:00:16 +05:30
DBR (OpenERP) aef9a2686a [IMP]Add copy methos and account_id field for analytic_line
bzr revid: dbr@tinyerp.com-20130305114217-8ecl35x2fv07xvhu
2013-03-05 17:12:17 +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
DBR (OpenERP) dbb28ac108 [IMP] Remove Extra code
bzr revid: dbr@tinyerp.com-20130304113445-b7z7wm6g30ivzf42
2013-03-04 17:04:45 +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) 7903d8b0dc [IMP]account_analytic_analysis: set ids intes of id for write bcoz in project there is ids so fix the runbt traceback
bzr revid: dbr@tinyerp.com-20130304103055-qm3qr1nzuul3pd1b
2013-03-04 16:00:55 +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