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
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
7bf78a7097
[FIX] Clean up: wipe of timeinvoicecreateviewfinal wizard
...
bzr revid: jco@openerp.com-20130327133645-ax49xrxvt5svh4b1
2013-03-27 14:36:45 +01:00
Quentin (OpenERP)
748ebf0ab0
[MERGE] analytic_contract_hr_expense: functional field computation fixed + added some helping info in hr_timesheet_invoice in the reinvoicing wizard
...
bzr revid: qdp-launchpad@openerp.com-20130319125028-59jnnfc7tiixag4b
2013-03-19 13:50:28 +01:00
Josse Colpaert
fffc371f96
[FIX] Fix wrong amounts in contract form and add grey text message in Create Invoice wizard
...
bzr revid: jco@openerp.com-20130318153049-myvqzvv1c2zqgna8
2013-03-18 16:30:49 +01:00
Cecile Tonglet
15fe515601
[MERGE] From trunk
...
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
Arnaud Pineux
2fb7baa325
[IMP] demo for french users
...
bzr revid: api@openerp.com-20121211140346-bhh8o1rf5h57epcz
2012-12-11 15:03:46 +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
Quentin (OpenERP)
a51dc81513
[REF] account, hr_timesheet_invoice: code refactoring
...
bzr revid: qdp-launchpad@openerp.com-20121126141137-18h8t0vusnhe4e0l
2012-11-26 15:11:37 +01:00
Fabien Pinckaers
d9936eda84
[IMP] some timesheet invoices fixes (not all)
...
bzr revid: fp@tinyerp.com-20121126075403-z4dq5h9ytptrf6sh
2012-11-26 08:54:03 +01:00
Nimesh (Open ERP)
11bf67d192
[IMP] improve waring and remove unused lines.
...
bzr revid: nco@tinyerp.com-20121121062529-lt0yf4imqajvel47
2012-11-21 11:55:29 +05:30
Nimesh (Open ERP)
542b048b3f
[IMP] group the lines for similar produt/ratio by changeing query.
...
bzr revid: nco@tinyerp.com-20121121054647-2k7hvqyz0s4ah45h
2012-11-21 11:16:47 +05:30
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)
63f4f786a2
[IMP] merge the timesheet line for the same product.
...
bzr revid: nco@tinyerp.com-20121112135043-qrqbcf0m731rw7nx
2012-11-12 19:20:43 +05:30
Stéphane Bidoul
c186d01d8e
[FIX] invoice tasks work: default to account tax when product has no tax
...
lp bug: https://launchpad.net/bugs/1048305 fixed
bzr revid: stephane.bidoul@acsone.eu-20121030112632-7cbfv7xgzqnua6i5
2012-10-30 12:26:32 +01:00
Fabien Pinckaers
4f0c5bf19c
[IMP] contract useability and invoicing
...
bzr revid: fp@openerp.com-20121028151537-98wz6qiosmumbqvg
2012-10-28 16:15:37 +01:00
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
Antonin Bourguignon
2b2288a3bd
[FIX] a few problems introduced with the last merge
...
bzr revid: abo@openerp.com-20121002111231-zo41jejkrm8afavu
2012-10-02 13:12:31 +02:00
Antonin Bourguignon
1653332080
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
2012-10-02 12:29:15 +02:00
Fabien Pinckaers
0bebad7133
[MERGE] fix right company on multi-company timesheeets
...
bzr revid: fp@tinyerp.com-20120929132907-a618eqxz97jgnzoy
2012-09-29 15:29:07 +02:00
Stéphane Bidoul
38dfccaaa0
hr_timesheet_invoice: in invoice task work, use the account default tax if the product has no taxes defined
...
lp bug: https://launchpad.net/bugs/1048305 fixed
bzr revid: stephane.bidoul@acsone.eu-20120909165919-xgxu45ugq3944gvu
2012-09-09 18:59:19 +02:00
Stéphane Bidoul
4deb1f84e7
hr_timesheet_invoice, bill task work: use the analytic account company for the generated invoice_cost_create
...
This makes life much easiers for people generating billings for several companies.
lp bug: https://launchpad.net/bugs/1047826 fixed
bzr revid: stephane.bidoul@acsone.eu-20120909152438-qax5pv4ij76asmbv
2012-09-09 17:24:38 +02:00
Vo Minh Thu
9822629548
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Twinkle Christian (OpenERP)
721adad01e
[IMP]Remove type field from the whole hr module
...
bzr revid: tch@tinyerp.com-20120808124839-ecd1uic8mscg3s7f
2012-08-08 18:18:39 +05:30
Antonin Bourguignon
59aa37f0e4
[IMP] all the warning messages now start with 'Warning\!' (not 'Warning' or 'Warning \!')
...
bzr revid: abo@openerp.com-20120807113414-7mryqyt3jnq8shsa
2012-08-07 13:34:14 +02:00
Antonin Bourguignon
8a64e7580a
[IMP] all the error messages now start with 'Error\!' (not 'Error' or 'Error \!')
...
bzr revid: abo@openerp.com-20120807113137-44vehm0mthqawlo3
2012-08-07 13:31:37 +02:00
Antonin Bourguignon
b0e8ae4c7d
[IMP] error messages
...
fix errors ending with an exclamation point; use a point instead
remove uniques (or almost) error messages titles, like 'Encoding Error' (1 occurrence in addons), 'Integrity Error' (1 occurrence in addons), 'Report Name' (1 occurrence in addons), 'Value Error' (1 occurrence in addons), 'Wrong Period Code' (1 occurrence in addons); replace these with 'Error'
add newline character after some messages titles, when necessary
fix 'UserError': should be 'User Error'
remove spaces before exclamation marks
add capital letters to messages titles words (e.g.: 'Invalid action' becomes 'Invalid Action')
bzr revid: abo@openerp.com-20120807110616-u3nlnybtgaebro18
2012-08-07 13:06:16 +02:00
Antonin Bourguignon
fe5956057a
[FIX] spelling: 'insufficient data' instead of 'data insufficient'
...
bzr revid: abo@openerp.com-20120807102326-sro2nxr4zn95zhs1
2012-08-07 12:23:26 +02:00
pso (OpenERP)
773c2d5c63
[MERGE] Merge with main branch
...
bzr revid: pso@tinyerp.com-20120801064711-y90iik5ialfdnfft
2012-08-01 12:17:11 +05:30
Quentin (OpenERP)
9dab28d36e
[FIX] hr_timesheet_invoice: name_get() only support to receive a list of ids as parameter
...
bzr revid: qdp-launchpad@openerp.com-20120726123158-08ajmydd95ixpp2d
2012-07-26 14:31:58 +02:00
Quentin (OpenERP)
130de4f1a3
[FIX] hr_timesheet_invoice: error in sql query introduced in previous commit
...
bzr revid: qdp-launchpad@openerp.com-20120726115927-6qys36d1eecqfmuj
2012-07-26 13:59:27 +02:00
Quentin (OpenERP)
6c1bc3975e
[FIX] hr_timesheet_invoice: when reinvoicing costs, force the product should set the product on analytic lines without any + code refactoring and better warning message
...
lp bug: https://launchpad.net/bugs/976223 fixed
bzr revid: qdp-launchpad@openerp.com-20120726113530-rx713dc6sxy1cu2b
2012-07-26 13:35:30 +02:00
pso (OpenERP)
e5da0e191b
[MERGE] Merged with main branch
...
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
2012-07-25 18:23:32 +05:30
Saurang Suthar(OpenERP)
25d650e96e
[IMP] Improved warning messages for hr* modules
...
bzr revid: pso@tinyerp.com-20120725121354-hypwxo74c43jm5gp
2012-07-25 17:43:54 +05:30
pso (OpenERP)
fc26f3975d
[IMP] Improved warning messages/exceptions of hr modules
...
bzr revid: pso@tinyerp.com-20120716091918-hua9cjnv21nqa2yl
2012-07-16 14:49:18 +05:30
Purnendu Singh (OpenERP)
e5ae685374
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120713130824-r6p6d28u1h3c7nol
bzr revid: psi@tinyerp.com-20120716052129-2lj20gqc7zuyet1s
2012-07-16 10:51:29 +05:30
Fabien Pinckaers
16cce23c1a
[IMP] invoice layout + merge note&name
...
bzr revid: fp@openerp.com-20120714203623-9n1iap9hplafnjp9
2012-07-14 22:36:23 +02:00
Pinakin Nayi (OpenERP)
881148d4b1
[IMP]hr-warning-message
...
bzr revid: pna@tinyerp.com-20120713121613-poze6x6838cr9xpe
2012-07-13 17:46:13 +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
Pinakin Nayi (OpenERP)
27226c12b2
[IMP]hr-warning-message
...
bzr revid: pna@tinyerp.com-20120713070425-b3envibswfdt6umq
2012-07-13 12:34:25 +05:30
Fabien Pinckaers
64a9321d56
[IMP] footer on forms
...
bzr revid: fp@tinyerp.com-20120710164011-unqi1okf2uu8yhts
2012-07-10 18:40:11 +02:00
Quentin (OpenERP)
66922c7199
[IMP] code review
...
bzr revid: qdp-launchpad@openerp.com-20120703155843-awb230fppn22wbs1
2012-07-03 17:58:43 +02:00
Kuldeep Joshi (OpenERP)
8f7be97676
[IMP] set button class
...
bzr revid: kjo@tinyerp.com-20120702110747-s3f0iv72d6iv3wzj
2012-07-02 16:37:47 +05:30
Kuldeep Joshi (OpenERP)
8ad41e791d
[IMP] change menu sequence
...
bzr revid: kjo@tinyerp.com-20120702103111-blnzv4b6jb6xola0
2012-07-02 16:01:11 +05:30
Kuldeep Joshi (OpenERP)
36b05a7194
[MERGE] lp:openobject-addons
...
bzr revid: kjo@tinyerp.com-20120702091329-mur9imoo2v6tb4hc
2012-07-02 14:43:29 +05:30
Quentin (OpenERP)
6fe94bd4bc
[MERGE] merged with maint runk
...
bzr revid: qdp-launchpad@openerp.com-20120629123618-z1bv3dqdfqy23hno
2012-06-29 14:36:18 +02:00
Kuldeep Joshi (OpenERP)
8407f04694
[IMP] Reporting menu change
...
bzr revid: kjo@tinyerp.com-20120629104326-1x1ojw0xfegodhm4
2012-06-29 16:13:26 +05:30
Raphael Collet
76f17eb480
[IMP] in form views, remove useless colspans on buttons in headers
...
bzr revid: rco@openerp.com-20120629084603-yz0hdnvtjy1fplp1
2012-06-29 10:46:03 +02:00
Raphael Collet
5133bee1d5
[FIX] in form views, replace class 'oe_highlight_on_dirty' by 'oe_highlight'
...
bzr revid: rco@openerp.com-20120629083024-rqhtbf9melkygg0m
2012-06-29 10:30:24 +02:00