Commit Graph

133 Commits

Author SHA1 Message Date
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
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
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) 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
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
al@openerp.com a899c8087b [FIX] account_analytic_analysis contract remind send a link
bzr revid: al@openerp.com-20130218174548-ct6wwed6plcvdilo
2013-02-18 18:45:48 +01:00
Antony Lesuisse e6d719cf3a [FIX] account_analytic_analysis only remind contracts
bzr revid: al@openerp.com-20130218161222-f7jmrek9udvwapml
2013-02-18 17:12:22 +01:00
Antony Lesuisse b1eba6c1ef Fix contract expiration reminder:
- fix domains and check for 3 different type of expiration
- use an email template instead of an hardcoded string

bzr revid: al@openerp.com-20130214235330-bmgjq962vn76q39x
2013-02-15 00:53:30 +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
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Quentin (OpenERP) 6f256d41db [FIX] account_analytic_contract, analytic_contract_hr_expense, hr_timesheet_invoice: fixed the computation of *to_invoice fields
bzr revid: qdp-launchpad@openerp.com-20121127120737-5xeed6lobynqf10l
2012-11-27 13:07:37 +01:00
Nimesh (Open ERP) 8a59fa0199 [IMP] correct the total for contract and fix problem of number of qty in for the same product.
bzr revid: nco@tinyerp.com-20121120115127-4zb0hpcqpzvqffc2
2012-11-20 17:21:27 +05:30
Nimesh (Open ERP) 65cd11f10d [FIX] fix the worng invoice amount.
bzr revid: nco@tinyerp.com-20121116132055-sfyjk47onvxl8wle
2012-11-16 18:50:55 +05:30
Fabien Pinckaers eff45f038d [IMP] invoice on timesheet using user price
bzr revid: fp@openerp.com-20121028121730-1sbhsoyxa220oktn
2012-10-28 13:17:30 +01:00
Jiten (OpenERP) 186681dad5 [IMP] Improved code in account_analytic_analysis py file to remove warning on server log.
bzr revid: jra@tinyerp.com-20120831102457-fmnon768mj73vyl0
2012-08-31 15:54:57 +05:30
Fabien Pinckaers 254489e168 [IMP] analytic contracts
bzr revid: fp@tinyerp.com-20120829190831-f6n1ruzsca2bo8xc
2012-08-29 21:08:31 +02:00
Bhumi Thakkar (Open ERP) 85eee1fad0 [FIX] Replace '=' with 'in'.
bzr revid: bth@tinyerp.com-20120827091656-emz7wpwsyyto3n12
2012-08-27 14:46:56 +05:30
Quentin (OpenERP) f699262170 [MERGE] perf improvements of analytic account analysis. Courtesy of Ronald Portier (Therp)
bzr revid: qdp-launchpad@openerp.com-20120726101423-3b4wfq0xuv02kuqf
2012-07-26 12:14:23 +02:00
Divyesh Makwana (Open ERP) b8221e8f7d [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120726042316-1lricsztfdwmx500
2012-07-26 09:53:16 +05:30
Divyesh Makwana (Open ERP) 69d9a3d4e2 [IMP] analytic, account_analytic_account : The field 'template_id' need to moved from 'account_analytic_analysis' module to 'analytic' so we can override 'on_change_template' from respective module(project, project_issue and hr_timesheet).
bzr revid: mdi@tinyerp.com-20120723120531-38reqpofvzh69bo7
2012-07-23 17:35:31 +05:30
Rajesh Prajapati (OpenERP) 71122ae47a [IMP]tooltip : I have changed the tooltip of fields as suggested
bzr revid: rpr@tinyerp.com-20120713101751-zokuph2bcpcmlfc5
2012-07-13 15:47:51 +05:30
Sanjay Gohel (Open ERP) fe938a4558 [IMP]add tooltip on type and add date,date_Start in on change template
bzr revid: sgo@tinyerp.com-20120626094843-ubz386g7f42jc2d2
2012-06-26 15:18:43 +05:30
Ronald Portier 2c115e6856 [FIX] Problem with runaway cpu and/or postgres crash on analytic account analysis.
lp bug: https://launchpad.net/bugs/1015995 fixed

bzr revid: ronald@therp.nl-20120622141932-f6rywvd1nawn186w
2012-06-22 16:19:32 +02:00
Sanjay Gohel (Open ERP) 95cd61d1f5 [IMP]improve view of contract and open chatter notification added when state changed
bzr revid: sgo@tinyerp.com-20120622091008-uy805uph0hz4vk0h
2012-06-22 14:40:08 +05:30
Quentin (OpenERP) 015f03776e [IMP] contract management: improved usability, mostly in account.analytic.account form view
bzr revid: qdp-launchpad@openerp.com-20120619122128-axj9zn61ahalgg98
2012-06-19 14:21:28 +02:00
Quentin (OpenERP) b9744fc4d9 [FIX] contract management: shortcut buttons on contract form view
bzr revid: qdp-launchpad@openerp.com-20120618155447-26rt90uvml410rwu
2012-06-18 17:54:47 +02:00
Quentin (OpenERP) 0182e3b17b [FIX] analytic_contract_hr_expense: fixed amounts in billing table + view inheritancy
bzr revid: qdp-launchpad@openerp.com-20120618145720-s1bcig0x52vj1t2w
2012-06-18 16:57:20 +02:00
Quentin (OpenERP) 7d7ba1515b [FIX] account_analytic_analysis: fixed amounts in billing table + [FIX] hr_timesheet_invoice: fixed filter 'to_invoice'
bzr revid: qdp-launchpad@openerp.com-20120618131022-a0sacqmlftg5wm22
2012-06-18 15:10:22 +02:00
Amit Patel (OpenERP) b9cbfb9a98 [IMP]:improved sale to invoice
bzr revid: apa@tinyerp.com-20120615133639-aarxp5rn5ovirjug
2012-06-15 19:06:39 +05:30
Quentin (OpenERP) 33f33dc9ad [FIX] account_analytic_account: onchange_template() fixed
bzr revid: qdp-launchpad@openerp.com-20120614142247-zhv1qoo6mw9bgcgi
2012-06-14 16:22:47 +02:00
Quentin (OpenERP) 80be8440fa [IMP] account_analytic_analysis, analytic_contract_hr_expense: remaining to invoice is max(old_remaining, current not invoice)
bzr revid: qdp-launchpad@openerp.com-20120614133728-7qbwcpdr811oaj7q
2012-06-14 15:37:28 +02:00
Quentin (OpenERP) 0fd300caf4 [IMP] account_analytic_analysis: the 'remaining hours to invoice' is different than the 'remaining hours to work'
bzr revid: qdp-launchpad@openerp.com-20120613090525-o5r4b84dfz5r2h6e
2012-06-13 11:05:25 +02:00
Amit Patel (OpenERP) 6cb8615965 [IMP]:improved code
bzr revid: apa@tinyerp.com-20120608072512-0r1at3uxjetwecga
2012-06-08 12:55:12 +05:30
Amit Patel (OpenERP) 38a2bd8cc1 [IMP]:improved report and fixed total_est
bzr revid: apa@tinyerp.com-20120608064819-p4yy10y6s5n0jtqo
2012-06-08 12:18:19 +05:30
Quentin (OpenERP) 32ea43d5d2 [IMP] analytic_contract_hr_expense: replay of previous commit (removed during merge for an easy solving)
bzr revid: qdp-launchpad@openerp.com-20120607124520-s8irgxvg4s2qni03
2012-06-07 14:45:20 +02:00
Quentin (OpenERP) c23de40df6 [ADD] analytic_contract_hr_expense: split of features of account_analytic_analysis and creation of a new module to contain all the stuff related to hr_expense (in order to keep clean dependancies)
bzr revid: qdp-launchpad@openerp.com-20120607123641-kjzynx1wwi4282lu
2012-06-07 14:36:41 +02:00
Amit Patel (OpenERP) e29261ec3b [MERGE/IMP]:lp:~openerp-dev/openobject-addons/trunk-contract-apa-improvements-dbr
bzr revid: apa@tinyerp.com-20120607114402-dzv6t6q8nn2muyv1
2012-06-07 17:14:02 +05:30
DBR (OpenERP) 6885badab4 [IMP]analytic: all invoicing data is getting filled from template.
bzr revid: dbr@tinyerp.com-20120607092218-yt3xyy3gel66z4sj
2012-06-07 14:52:18 +05:30
DBR (OpenERP) 2c3e08224e [IMP]account_analytic_analysis: Set Template of Contract instead of Template Of Contract
bzr revid: dbr@tinyerp.com-20120607054818-6v2ci3izb0wpi8y8
2012-06-07 11:18:18 +05:30
Sanjay Gohel (Open ERP) 26a574f796 [IMP]change report and made changes in timesheet which is not shown contract record and attrs on the field
bzr revid: sgo@tinyerp.com-20120604071856-xibj1lz9rjclyzmq
2012-06-04 12:48:56 +05:30
Amit Patel (OpenERP) 8921d70675 [IMP]:improved code
bzr revid: apa@tinyerp.com-20120601104343-nf2yy1ke9is2wkzn
2012-06-01 16:13:43 +05:30
Sanjay Gohel (Open ERP) 2da36cab75 [IMP]create function for open hr_expense for current analytic_id in hr_expense line and improve code
bzr revid: sgo@tinyerp.com-20120531072758-fhaake1kjj13iiwi
2012-05-31 12:57:58 +05:30
Sanjay Gohel (Open ERP) 11bf57f1bf [IMP]add expense line and add depend expense of hr in contract for calculation
bzr revid: sgo@tinyerp.com-20120530125641-w27mjp97b981yrpd
2012-05-30 18:26:41 +05:30
Sanjay Gohel (Open ERP) e886a135ed [IMP/MERGE]improve code and merge with latest parent branch
bzr revid: sgo@tinyerp.com-20120529104150-a7q7s1v48949cupe
bzr revid: sgo@tinyerp.com-20120529112009-lh2kom166hwkl12w
2012-05-29 16:50:09 +05:30
Amit Patel (OpenERP) cbb75342c0 [IMP]:improved view and code.
bzr revid: apa@tinyerp.com-20120529104451-24axuiq8m5s43tcj
2012-05-29 16:14:51 +05:30
Sanjay Gohel (Open ERP) 3bdb46d113 [IMP]remaining added and view improvement
bzr revid: sgo@tinyerp.com-20120529103949-wm8ln19qzwjar9yn
2012-05-29 16:09:49 +05:30
Sanjay Gohel (Open ERP) d29971eb7e [IMP]create view for contract lines and add field which needed
bzr revid: sgo@tinyerp.com-20120529065713-bokhp0ng21muadvo
2012-05-29 12:27:13 +05:30
Sanjay Gohel (Open ERP) 22dce01949 [IMP]add sequence file and sequence for analytic account and changes in form view extend type field and made changes in project of account for view an hr_timsheet_invoice and made on change for partner and template ids
bzr revid: sgo@tinyerp.com-20120528091910-jw8804dxj4hlbjaa
2012-05-28 14:49:10 +05:30
Quentin (OpenERP) 217c180fa2 [FIX+REF] account_analytic_analysis: fixed the dependancies and a bug related to wrong computation of is_overdue_quantity that was also counting the sales/purchases made instead of only considering the timesheet entries. Refactoring: 200 lines removed, as they were useless since commit 6305 (removal of consolidation on all fields), and as they were filthy and error prone since they were written -_-
bzr revid: qdp-launchpad@openerp.com-20120120110650-zho7p4mem5vqebse
2012-01-20 12:06:50 +01:00