Commit Graph

105 Commits

Author SHA1 Message Date
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
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
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
Sbh (Open ERP) 0fa923b8d8 [Fix] hr_timesheet_invoice:remove warning message for address field
bzr revid: kjo@tinyerp.com-20120321122537-l5zj0cr790xwjnm1
2012-03-21 17:55:37 +05:30
Bhumika (OpenERP) 7419c49725 [Fix] remove unused field referce
bzr revid: sbh@tinyerp.com-20120307104530-wjmgyaj4c9ocrd5i
2012-03-07 16:15:30 +05:30
Numerigraphe - Lionel Sausin 2d2a44dcf2 [FIX] unmutable default in the remaining modules
[REF] coding style consistency

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

bzr revid: ls@numerigraphe.fr-20120305184003-er00xtj9vtcw7gna
2012-03-05 19:40:03 +01:00
Fabien Pinckaers 36acb24ce4 [IMP] Contract management + fixes
bzr revid: fp@tinyerp.com-20111116145958-pzp36c49wh6028p9
2011-11-16 15:59:58 +01:00
Ferdinand b84248c04c [FIX] hr_timesheet_invoice : Added Configuration Error when no income account is set for service product
lp bug: https://launchpad.net/bugs/838887 fixed

bzr revid: bde@tinyerp.com-20110908092229-2fg0xixgpjgsdjwm
2011-09-08 14:52:29 +05:30
Olivier Dony 560915cb68 [MERGE] merged latest fixes from 6.0 up to r.4556
Rev 4556 = revision-id: jvo@tinyerp.com-20110502133745-s1zyed65h6ojwkvk.

bzr revid: odo@openerp.com-20110502184643-d3qzosqdurscd51i
2011-05-02 20:46:43 +02:00
Jay Vora (OpenERP) cacca76c57 [MERGE] Merged Anup's branch for the fix of invoice created for analyric lines(case 5267). This also covers the fix for the bug lp:728092. Pricelist calculation corrected
lp bug: https://launchpad.net/bugs/728092 fixed

bzr revid: jvo@tinyerp.com-20110421074529-7p3ts8v1w285jzmg
2011-04-21 13:15:29 +05:30
Anup (OpenERP) 58a9ccd223 [FIX] product,hr_timesheet_invoice : Invoicing analytic lines(timesheet lines) were calculating wrong prices for product (Support SaaS Case : 5267)
bzr revid: ach@tinyerp.com-20110419073135-az6tvqgfbepkr94c
2011-04-19 13:01:35 +05:30
pso (OpenERP) cf91e73c54 [FIX] hr_timesheet_invoice: Fixed bug of recreating invoice if invoice already exists
lp bug: https://launchpad.net/bugs/751269 fixed

bzr revid: pso@tinyerp.com-20110412092115-nz5zelrazbk3og7y
2011-04-12 14:51:15 +05:30
Quentin (OpenERP) 9b351c8d5d [FIX] hr_timesheet_invoice: fixed error when invoicing (due to previous merge on osv_memory)
bzr revid: qdp-launchpad@openerp.com-20110315145931-zlle0u5ybzzep434
2011-03-15 15:59:31 +01:00
Sbh (OpenERP) b8b2ac99da [Fix] fix buildbot Warnings
bzr revid: sbh@tinyerp.com-20101221084941-49jujlav0nw7e2eh
2010-12-21 14:19:41 +05:30
PSI(OpenERP) 6de75adc3e [FIX] hr_timesheet_invoice: Wrong date format in Invoice on analytic entries
lp bug: https://launchpad.net/bugs/587940 fixed

bzr revid: mra@mra-laptop-20101207111519-76v7ogqbr7k28w1u
2010-12-07 16:45:19 +05:30
vth cd8e9de724 [REF] hr_*
bzr revid: vth@tinyerp.com-20101027124959-phubwje70rmbec4p
2010-10-27 18:19:59 +05:30
Fabien Pinckaers b3a6611ee0 [IMP] better useability
bzr revid: fp@tinyerp.com-20101012215940-yvnh0sog8voxiz85
2010-10-12 23:59:40 +02:00
Fabien Pinckaers 67999a7e4e [IMP] billing project hours useable
bzr revid: fp@tinyerp.com-20101004232308-pvzlua2cyra2kvqp
2010-10-05 01:23:08 +02:00
RHA (Open ERP) d5ad0b8ff1 [CLEAN]: Removed commented codes, unnecessary spaces.
bzr revid: uco@tinyerp.com-20100819115157-sfsmbnjdgpp4wl12
2010-08-19 17:21:57 +05:30
PSI(Openerp) a0e9f8d2b7 [IMP] HR related modules yaml
bzr revid: mra@mra-laptop-20100730085935-7m1d0km3li9ehrva
2010-07-30 14:29:35 +05:30
PSI (OpenERP) 4b1348a989 [IMP] hr related modules improvements
bzr revid: mra@mra-laptop-20100727071145-4n3z9i1jj1zosp8z
2010-07-27 12:41:45 +05:30
Jay (Open ERP) f46f7a770b [FIX] Hr_timesheet_invoice : Corrected order or notes and uom i18n for invoice of analytic entries
bzr revid: jvo@tinyerp.com-20100701160516-0q042murztf74dwt
2010-07-01 21:35:16 +05:30
qdp-launchpad@tinyerp.com 8e199aadc8 [IMP] account, hr_attendance, hr_timesheet: typo, remove empty lines
[FIX] account_coda: remove wrong comment

bzr revid: qdp-launchpad@tinyerp.com-20100618135520-b1k3la6hsfxs7xuh
2010-06-18 15:55:20 +02:00