[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr/dolibarr] 5b1ae9: Added two new options when billing time spen
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr/dolibarr] 5b1ae9: Added two new options when billing time spent on a... |
|
Date: |
Wed, 15 Jan 2020 04:23:27 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 5b1ae96ce9878def8998eafe6a8c9a8c0c596605
https://github.com/Dolibarr/dolibarr/commit/5b1ae96ce9878def8998eafe6a8c9a8c0c596605
Author: Guillaume Matheron <address@hidden>
Date: 2019-12-29 (Sun, 29 Dec 2019)
Changed paths:
M htdocs/projet/tasks/time.php
Log Message:
-----------
Added two new options when billing time spent on a project :
- Create one invoice line per timespent entry
- Create one invoice line per task
Commit: 84d8ca4b332ecb30ab95a99e4432af1cbb0c6406
https://github.com/Dolibarr/dolibarr/commit/84d8ca4b332ecb30ab95a99e4432af1cbb0c6406
Author: Guillaume Matheron <address@hidden>
Date: 2019-12-29 (Sun, 29 Dec 2019)
Changed paths:
M htdocs/projet/tasks/time.php
Log Message:
-----------
Made spaces/tab usage more consistent
Commit: 458c1e2174c5a9af21e7830e625682656a020002
https://github.com/Dolibarr/dolibarr/commit/458c1e2174c5a9af21e7830e625682656a020002
Author: stickler-ci <address@hidden>
Date: 2019-12-29 (Sun, 29 Dec 2019)
Changed paths:
M htdocs/projet/tasks/time.php
Log Message:
-----------
Fixing style errors.
Commit: 93b894bf92851d7791dd5cda74d7380fa3b19baf
https://github.com/Dolibarr/dolibarr/commit/93b894bf92851d7791dd5cda74d7380fa3b19baf
Author: root <address@hidden>
Date: 2020-01-02 (Thu, 02 Jan 2020)
Changed paths:
M ChangeLog
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/adherents/admin/website.php
M htdocs/adherents/subscription.php
M htdocs/admin/modules.php
R htdocs/bom/admin/index.html
R htdocs/bom/admin/setup.php
M htdocs/cashdesk/tpl/validation2.tpl.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/compta/bank/transfer.php
M htdocs/compta/bank/various_payment/card.php
M htdocs/compta/bank/various_payment/document.php
M htdocs/compta/facture/card.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/discount.class.php
M htdocs/core/class/interfaces.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
M htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/facture/doc/pdf_sponge.modules.php
M htdocs/core/modules/modCashDesk.class.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/propale/doc/pdf_cyan.modules.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
M htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/install/upgrade2.php
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/cashdesk.lang
M htdocs/langs/en_US/ticket.lang
M htdocs/loan/class/loan.class.php
M htdocs/loan/list.php
M htdocs/loan/schedule.php
M htdocs/main.inc.php
M htdocs/product/ajax/products.php
M htdocs/product/class/product.class.php
M htdocs/public/payment/paymentok.php
M htdocs/public/ticket/create_ticket.php
M htdocs/takepos/admin/setup.php
M htdocs/takepos/ajax/ajax.php
M htdocs/takepos/invoice.php
M htdocs/takepos/takepos.php
M scripts/odt2pdf/odt2pdf.sh
Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop
Commit: 4f65f8d0950d07f3bc78e772526e55b8364878a5
https://github.com/Dolibarr/dolibarr/commit/4f65f8d0950d07f3bc78e772526e55b8364878a5
Author: Guillaume Matheron <address@hidden>
Date: 2020-01-02 (Thu, 02 Jan 2020)
Changed paths:
M htdocs/core/class/html.formmargin.class.php
Log Message:
-----------
Fixed bug (missing include) in formmargin.class.php, affecting display of
propal
Commit: e9e0aae1ce8634cf1b2769404734bde76d2669c1
https://github.com/Dolibarr/dolibarr/commit/e9e0aae1ce8634cf1b2769404734bde76d2669c1
Author: Guillaume Matheron <address@hidden>
Date: 2020-01-02 (Thu, 02 Jan 2020)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/projet/tasks/time.php
Log Message:
-----------
Added option to bill time spent on a task to an existing draft invoice (for
instance a recurrent bill)
Commit: 92f50f635702b83b93352cabf99b4197807222a9
https://github.com/Dolibarr/dolibarr/commit/92f50f635702b83b93352cabf99b4197807222a9
Author: stickler-ci <address@hidden>
Date: 2020-01-02 (Thu, 02 Jan 2020)
Changed paths:
M htdocs/projet/tasks/time.php
Log Message:
-----------
Fixing style errors.
Commit: 19e69dc8690caa0a507b8d861f3358fa1f2fe7a3
https://github.com/Dolibarr/dolibarr/commit/19e69dc8690caa0a507b8d861f3358fa1f2fe7a3
Author: Guillaume Matheron <address@hidden>
Date: 2020-01-02 (Thu, 02 Jan 2020)
Changed paths:
M htdocs/projet/tasks/time.php
Log Message:
-----------
Creating invoice from time spent now takes in to account the product duration
to compute the quantity to bill
Commit: 42ba6ab9ba004bbf4b207eb8b3013f39eb306715
https://github.com/Dolibarr/dolibarr/commit/42ba6ab9ba004bbf4b207eb8b3013f39eb306715
Author: Guillaume Matheron <address@hidden>
Date: 2020-01-02 (Thu, 02 Jan 2020)
Changed paths:
M htdocs/projet/tasks/time.php
Log Message:
-----------
Merge branch 'develop' of github.com:guillaumematheron/dolibarr into develop
Commit: 9efdec6c6e6a854cfb7545eea5dc57c8da2fdb7a
https://github.com/Dolibarr/dolibarr/commit/9efdec6c6e6a854cfb7545eea5dc57c8da2fdb7a
Author: Guillaume Matheron <address@hidden>
Date: 2020-01-02 (Thu, 02 Jan 2020)
Changed paths:
M htdocs/projet/tasks/time.php
Log Message:
-----------
Merge branch 'develop' of github.com:guillaumematheron/dolibarr into develop
Commit: 671daafb52855efe70dbe6a75deb4719939fcd8b
https://github.com/Dolibarr/dolibarr/commit/671daafb52855efe70dbe6a75deb4719939fcd8b
Author: Guillaume Matheron <address@hidden>
Date: 2020-01-02 (Thu, 02 Jan 2020)
Changed paths:
Log Message:
-----------
Merge branch 'develop' of github.com:guillaumematheron/dolibarr into develop
Commit: 2c68b08e4f1759705c51ba9c195cc3abd202c742
https://github.com/Dolibarr/dolibarr/commit/2c68b08e4f1759705c51ba9c195cc3abd202c742
Author: stickler-ci <address@hidden>
Date: 2020-01-02 (Thu, 02 Jan 2020)
Changed paths:
M htdocs/projet/tasks/time.php
Log Message:
-----------
Fixing style errors.
Commit: 044ebeb98eba7418fad59e0caa34d10cc6fed3b3
https://github.com/Dolibarr/dolibarr/commit/044ebeb98eba7418fad59e0caa34d10cc6fed3b3
Author: Guillaume Matheron <address@hidden>
Date: 2020-01-03 (Fri, 03 Jan 2020)
Changed paths:
M htdocs/societe/class/companypaymentmode.class.php
M htdocs/societe/paymentmodes.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop
Commit: f1c27b1dd7ae56ece3f47bbb471679106b8baed6
https://github.com/Dolibarr/dolibarr/commit/f1c27b1dd7ae56ece3f47bbb471679106b8baed6
Author: Guillaume Matheron <address@hidden>
Date: 2020-01-03 (Fri, 03 Jan 2020)
Changed paths:
M htdocs/societe/class/companypaymentmode.class.php
M htdocs/societe/paymentmodes.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop
Commit: 6aa09d82689bf182e0969ec8b0277ff6f0a720dc
https://github.com/Dolibarr/dolibarr/commit/6aa09d82689bf182e0969ec8b0277ff6f0a720dc
Author: Guillaume Matheron <address@hidden>
Date: 2020-01-03 (Fri, 03 Jan 2020)
Changed paths:
M htdocs/projet/tasks/time.php
Log Message:
-----------
Merge branch 'develop' of github.com:guillaumematheron/dolibarr into develop
Commit: 0e7f80724cf0482e9ec51a207d7ea751ce9cb1a9
https://github.com/Dolibarr/dolibarr/commit/0e7f80724cf0482e9ec51a207d7ea751ce9cb1a9
Author: Guillaume Matheron <address@hidden>
Date: 2020-01-03 (Fri, 03 Jan 2020)
Changed paths:
Log Message:
-----------
Merge branch 'develop' of github.com:guillaumematheron/dolibarr into develop
Commit: d13e1ddcdf7d2b89fdc372a149679913173367ba
https://github.com/Dolibarr/dolibarr/commit/d13e1ddcdf7d2b89fdc372a149679913173367ba
Author: Guillaume Matheron <address@hidden>
Date: 2020-01-03 (Fri, 03 Jan 2020)
Changed paths:
M htdocs/accountancy/class/accountancyexport.class.php
Log Message:
-----------
Add document date instead of creation date when exporting FEC file
Commit: 72b7e72f735aa6fdb048842f68c579f1b9d0402b
https://github.com/Dolibarr/dolibarr/commit/72b7e72f735aa6fdb048842f68c579f1b9d0402b
Author: Guillaume Matheron <address@hidden>
Date: 2020-01-03 (Fri, 03 Jan 2020)
Changed paths:
M htdocs/accountancy/class/accountancyexport.class.php
Log Message:
-----------
Dates YYMMDD dans l'export FEC
Commit: ffa88ad11f4f95a5b22aa06a357fe39e9cac5eb1
https://github.com/Dolibarr/dolibarr/commit/ffa88ad11f4f95a5b22aa06a357fe39e9cac5eb1
Author: Guillaume Matheron <address@hidden>
Date: 2020-01-05 (Sun, 05 Jan 2020)
Changed paths:
A .github/ISSUE_TEMPLATE/custom.md
M ChangeLog
M README-FR.md
M README.md
M htdocs/comm/action/list.php
M htdocs/compta/bank/releve.php
M htdocs/compta/facture/card.php
M htdocs/core/actions_addupdatedelete.inc.php
M htdocs/core/class/html.formmargin.class.php
M htdocs/fourn/class/api_supplier_invoices.class.php
M htdocs/install/mysql/data/llx_c_action_trigger.sql
M htdocs/install/mysql/migration/10.0.0-11.0.0.sql
M htdocs/install/mysql/tables/llx_product_price.sql
M htdocs/langs/en_US/agenda.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/mrp.lang
M htdocs/langs/en_US/other.lang
M htdocs/loan/card.php
M htdocs/mrp/class/mo.class.php
M htdocs/mrp/mo_card.php
M htdocs/mrp/mo_production.php
M htdocs/product/admin/product_tools.php
M htdocs/product/class/product.class.php
M htdocs/product/fournisseurs.php
M htdocs/product/reassort.php
M htdocs/projet/element.php
M htdocs/salaries/card.php
M htdocs/societe/class/companypaymentmode.class.php
M htdocs/societe/paymentmodes.php
M htdocs/takepos/takepos.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop
Commit: b7e4d4904fb302ca3080f26c1d2b2abe31b1c22c
https://github.com/Dolibarr/dolibarr/commit/b7e4d4904fb302ca3080f26c1d2b2abe31b1c22c
Author: Guillaume Matheron <address@hidden>
Date: 2020-01-13 (Mon, 13 Jan 2020)
Changed paths:
M htdocs/accountancy/class/accountancyexport.class.php
Log Message:
-----------
Revert "Add document date instead of creation date when exporting FEC file"
This reverts commit d13e1ddcdf7d2b89fdc372a149679913173367ba.
Commit: 43bf0a79e6952de54a3f71835507c16c753e2c75
https://github.com/Dolibarr/dolibarr/commit/43bf0a79e6952de54a3f71835507c16c753e2c75
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-15 (Wed, 15 Jan 2020)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formmargin.class.php
M htdocs/projet/tasks/time.php
Log Message:
-----------
Merge pull request #12770 from guillaumematheron/develop
NEW 2 new options when creating an invoice from time spent on a project : by
period or by task
Compare:
https://github.com/Dolibarr/dolibarr/compare/d771efe37c7d...43bf0a79e695
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr/dolibarr] 5b1ae9: Added two new options when billing time spent on a...,
Laurent Destailleur <=