[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 07d646: Trips & expenses move into hr
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 07d646: Trips & expenses move into hrm area |
|
Date: |
Sat, 12 Apr 2014 17:12:41 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 07d6464720e99e25b2f7433fe4a285d3f3a4e202
https://github.com/Dolibarr/dolibarr/commit/07d6464720e99e25b2f7433fe4a285d3f3a4e202
Author: aspangaro <address@hidden>
Date: 2014-03-20 (Thu, 20 Mar 2014)
Changed paths:
M htdocs/compta/index.php
Log Message:
-----------
Trips & expenses move into hrm area
Commit: 7e1035171cf679031cf1fa701a34ee67581a61e0
https://github.com/Dolibarr/dolibarr/commit/7e1035171cf679031cf1fa701a34ee67581a61e0
Author: aspangaro <address@hidden>
Date: 2014-03-22 (Sat, 22 Mar 2014)
Changed paths:
M ChangeLog
M build/debian/changelog
M build/perl/virtualmin/dolibarr.pl
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
M dev/initdata/mysqldump_dolibarr_3.5.0.sql
M dev/initdata/mysqldump_dolibarr_3.6.0.sql
M htdocs/admin/system/dolibarr.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/lib/date.lib.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_proforma.modules.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/project/pdf/pdf_baleine.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/core/tpl/document_actions_pre_headers.tpl.php
M htdocs/fourn/commande/fiche.php
M htdocs/holiday/fiche.php
M htdocs/imports/import.php
M htdocs/install/check.php
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/languages.lang
M htdocs/langs/en_US/margins.lang
A htdocs/langs/es_CL/admin.lang
A htdocs/langs/es_CL/agenda.lang
A htdocs/langs/es_CL/bills.lang
A htdocs/langs/es_CL/boxes.lang
A htdocs/langs/es_CL/commercial.lang
A htdocs/langs/es_CL/companies.lang
A htdocs/langs/es_CL/compta.lang
A htdocs/langs/es_CL/ecm.lang
A htdocs/langs/es_CL/install.lang
A htdocs/langs/es_CL/main.lang
A htdocs/langs/es_CL/members.lang
A htdocs/langs/es_CL/orders.lang
A htdocs/langs/es_CL/other.lang
A htdocs/langs/es_CL/products.lang
A htdocs/langs/es_CL/projects.lang
A htdocs/langs/es_CL/propal.lang
A htdocs/langs/es_CL/workflow.lang
M htdocs/margin/agentMargins.php
M htdocs/margin/lib/margins.lib.php
M htdocs/projet/document.php
M htdocs/projet/tasks/document.php
M test/phpunit/DateLibTest.php
M test/phpunit/Example_import_company_1.csv
M test/phpunit/FilesLibTest.php
M test/phpunit/FunctionsLibTest.php
M test/phpunit/ImportTest.php
Log Message:
-----------
Merge branch 'upstream/develop'
Commit: 81c9446d116ba9e5dce90abdccb20a30ab68eb54
https://github.com/Dolibarr/dolibarr/commit/81c9446d116ba9e5dce90abdccb20a30ab68eb54
Author: aspangaro <address@hidden>
Date: 2014-03-23 (Sun, 23 Mar 2014)
Changed paths:
M ChangeLog
M htdocs/admin/agenda_extsites.php
M htdocs/fourn/commande/liste.php
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/es_ES/categories.lang
M htdocs/langs/es_ES/companies.lang
M htdocs/langs/es_ES/compta.lang
M htdocs/langs/es_ES/deliveries.lang
M htdocs/langs/es_ES/exports.lang
M htdocs/langs/es_ES/mails.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/es_ES/opensurvey.lang
M htdocs/langs/es_ES/other.lang
M htdocs/langs/es_ES/products.lang
M htdocs/langs/es_ES/projects.lang
M htdocs/langs/es_ES/salaries.lang
Log Message:
-----------
Merge branch 'upstream/develop'
Commit: bc48ddd3fcba428f3b7f5495ae8a381514fe600d
https://github.com/Dolibarr/dolibarr/commit/bc48ddd3fcba428f3b7f5495ae8a381514fe600d
Author: aspangaro <address@hidden>
Date: 2014-03-23 (Sun, 23 Mar 2014)
Changed paths:
M htdocs/compta/paiement_charge.php
Log Message:
-----------
Présentation
Commit: e0dc01fe8565e84a6df2a35db8b606917f09a1b7
https://github.com/Dolibarr/dolibarr/commit/e0dc01fe8565e84a6df2a35db8b606917f09a1b7
Author: aspangaro <address@hidden>
Date: 2014-03-28 (Fri, 28 Mar 2014)
Changed paths:
M htdocs/compta/charges/index.php
M htdocs/compta/deplacement/stats/index.php
M htdocs/compta/facture.php
M htdocs/compta/paiement_charge.php
M htdocs/compta/payment_sc/fiche.php
M htdocs/compta/salaries/class/paymentsalary.class.php
M htdocs/compta/salaries/fiche.php
M htdocs/compta/salaries/index.php
M htdocs/compta/sociales/charges.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/sociales/document.php
M htdocs/compta/sociales/index.php
M htdocs/core/boxes/box_ficheinter.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/modules/modOpenSurvey.class.php
M htdocs/expedition/class/expeditionbatch.class.php
M htdocs/expedition/fiche.php
M htdocs/expedition/note.php
M htdocs/fourn/facture/fiche.php
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
M htdocs/install/mysql/tables/llx_payment_salary.sql
M htdocs/install/mysql/tables/llx_stock_mouvement.sql
M htdocs/install/mysql/tables/llx_tva.sql
M htdocs/langs/fr_BE/main.lang
M htdocs/opensurvey/card.php
M htdocs/product/fiche.php
M htdocs/product/stock/mouvement.php
M htdocs/projet/tasks.php
M htdocs/projet/tasks/task.php
Log Message:
-----------
Merge branch 'upstream/develop'
Commit: 52cd8792b780438c2833ee22dae207235abb63de
https://github.com/Dolibarr/dolibarr/commit/52cd8792b780438c2833ee22dae207235abb63de
Author: aspangaro <address@hidden>
Date: 2014-03-29 (Sat, 29 Mar 2014)
Changed paths:
M ChangeLog
M htdocs/compta/localtax/clients.php
M htdocs/compta/localtax/index.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
M htdocs/compta/tva/clients.php
M htdocs/compta/tva/index.php
M htdocs/compta/tva/quadri_detail.php
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
Log Message:
-----------
Merge branch 'upstream/develop'
Commit: 6e0788c8c1ed12ee99ffb9771899995914e03eea
https://github.com/Dolibarr/dolibarr/commit/6e0788c8c1ed12ee99ffb9771899995914e03eea
Author: aspangaro <address@hidden>
Date: 2014-03-30 (Sun, 30 Mar 2014)
Changed paths:
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge branch 'upstream/develop'
Commit: bae2fe0921507390812a80c34f6777e3a5f54532
https://github.com/Dolibarr/dolibarr/commit/bae2fe0921507390812a80c34f6777e3a5f54532
Author: aspangaro <address@hidden>
Date: 2014-04-12 (Sat, 12 Apr 2014)
Changed paths:
M ChangeLog
M build/debian/README.howto
M build/debian/install.forced.php.install
M build/makepack-dolibarr.pl
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
A dev/deduplicatefilelinesrecursively.sh
A dev/detectduplicatelangkey.sh
M dev/initdata/mysqldump_dolibarr_3.5.0.sql
M dev/initdata/savedemo.sh
M dev/skeletons/modMyModule.class.php
M dev/translation/README
M dev/translation/txpull.sh
M dev/translation/txpush.sh
M htdocs/adherents/admin/adherent_extrafields.php
M htdocs/adherents/admin/adherent_type_extrafields.php
M htdocs/adherents/card_subscriptions.php
M htdocs/adherents/liste.php
M htdocs/admin/company.php
M htdocs/admin/fckeditor.php
M htdocs/admin/prelevement.php
M htdocs/admin/tools/dolibarr_export.php
M htdocs/admin/tools/export.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/action/fiche.php
M htdocs/comm/action/index.php
M htdocs/comm/fiche.php
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/list.php
M htdocs/commande/fiche.php
M htdocs/compta/bank/account.php
M htdocs/compta/bank/bankid_fr.php
M htdocs/compta/bank/fiche.php
M htdocs/compta/bank/graph.php
M htdocs/compta/bank/treso.php
M htdocs/compta/dons/index.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/hrm.php
M htdocs/compta/paiement.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/tva/quadri_detail.php
M htdocs/conf/conf.php.example
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/doleditor.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formorder.class.php
M htdocs/core/class/html.formpropal.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/lib/treeview.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
M htdocs/core/modules/modProjet.class.php
M htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
M htdocs/core/modules/project/task/modules_task.php
M htdocs/core/modules/project/task/pdf/doc_generic_task_odt.modules.php
M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
M
htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
M htdocs/cron/card.php
M htdocs/expedition/fiche.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/fourn/commande/fiche.php
M htdocs/fourn/commande/liste.php
R htdocs/install/doctemplates/projects/template_task_summary.odt
M htdocs/install/mysql/data/llx_c_action_trigger.sql
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
M htdocs/install/pgsql/functions/functions.sql
M htdocs/langs/ar_SA/admin.lang
M htdocs/langs/ar_SA/agenda.lang
M htdocs/langs/ar_SA/bills.lang
M htdocs/langs/ar_SA/errors.lang
M htdocs/langs/ar_SA/languages.lang
M htdocs/langs/ar_SA/main.lang
M htdocs/langs/ar_SA/margins.lang
M htdocs/langs/ar_SA/other.lang
M htdocs/langs/ar_SA/paypal.lang
M htdocs/langs/ar_SA/salaries.lang
M htdocs/langs/ar_SA/withdrawals.lang
M htdocs/langs/bg_BG/admin.lang
M htdocs/langs/bg_BG/agenda.lang
M htdocs/langs/bg_BG/bills.lang
M htdocs/langs/bg_BG/errors.lang
M htdocs/langs/bg_BG/languages.lang
M htdocs/langs/bg_BG/main.lang
M htdocs/langs/bg_BG/margins.lang
M htdocs/langs/bg_BG/other.lang
M htdocs/langs/bg_BG/paypal.lang
M htdocs/langs/bg_BG/salaries.lang
M htdocs/langs/bg_BG/withdrawals.lang
M htdocs/langs/bs_BA/admin.lang
M htdocs/langs/bs_BA/agenda.lang
M htdocs/langs/bs_BA/bills.lang
M htdocs/langs/bs_BA/errors.lang
M htdocs/langs/bs_BA/languages.lang
M htdocs/langs/bs_BA/main.lang
M htdocs/langs/bs_BA/margins.lang
M htdocs/langs/bs_BA/other.lang
M htdocs/langs/bs_BA/paypal.lang
M htdocs/langs/bs_BA/salaries.lang
M htdocs/langs/bs_BA/withdrawals.lang
M htdocs/langs/ca_ES/admin.lang
M htdocs/langs/ca_ES/agenda.lang
M htdocs/langs/ca_ES/bills.lang
M htdocs/langs/ca_ES/errors.lang
M htdocs/langs/ca_ES/languages.lang
M htdocs/langs/ca_ES/main.lang
M htdocs/langs/ca_ES/margins.lang
M htdocs/langs/ca_ES/other.lang
M htdocs/langs/ca_ES/paypal.lang
M htdocs/langs/ca_ES/salaries.lang
M htdocs/langs/ca_ES/withdrawals.lang
M htdocs/langs/cs_CZ/admin.lang
M htdocs/langs/cs_CZ/agenda.lang
M htdocs/langs/cs_CZ/bills.lang
M htdocs/langs/cs_CZ/errors.lang
M htdocs/langs/cs_CZ/languages.lang
M htdocs/langs/cs_CZ/main.lang
M htdocs/langs/cs_CZ/margins.lang
M htdocs/langs/cs_CZ/other.lang
M htdocs/langs/cs_CZ/paypal.lang
M htdocs/langs/cs_CZ/salaries.lang
M htdocs/langs/cs_CZ/withdrawals.lang
M htdocs/langs/da_DK/admin.lang
M htdocs/langs/da_DK/agenda.lang
M htdocs/langs/da_DK/bills.lang
M htdocs/langs/da_DK/errors.lang
M htdocs/langs/da_DK/languages.lang
M htdocs/langs/da_DK/main.lang
M htdocs/langs/da_DK/margins.lang
M htdocs/langs/da_DK/other.lang
M htdocs/langs/da_DK/paypal.lang
M htdocs/langs/da_DK/salaries.lang
M htdocs/langs/da_DK/withdrawals.lang
M htdocs/langs/de_DE/admin.lang
M htdocs/langs/de_DE/agenda.lang
M htdocs/langs/de_DE/bills.lang
M htdocs/langs/de_DE/categories.lang
M htdocs/langs/de_DE/companies.lang
M htdocs/langs/de_DE/compta.lang
M htdocs/langs/de_DE/cron.lang
M htdocs/langs/de_DE/deliveries.lang
M htdocs/langs/de_DE/errors.lang
M htdocs/langs/de_DE/exports.lang
M htdocs/langs/de_DE/languages.lang
M htdocs/langs/de_DE/mails.lang
M htdocs/langs/de_DE/main.lang
M htdocs/langs/de_DE/margins.lang
M htdocs/langs/de_DE/opensurvey.lang
M htdocs/langs/de_DE/other.lang
M htdocs/langs/de_DE/paypal.lang
M htdocs/langs/de_DE/products.lang
M htdocs/langs/de_DE/projects.lang
M htdocs/langs/de_DE/salaries.lang
M htdocs/langs/de_DE/stocks.lang
M htdocs/langs/de_DE/withdrawals.lang
M htdocs/langs/el_GR/admin.lang
M htdocs/langs/el_GR/agenda.lang
M htdocs/langs/el_GR/bills.lang
M htdocs/langs/el_GR/companies.lang
M htdocs/langs/el_GR/errors.lang
M htdocs/langs/el_GR/languages.lang
M htdocs/langs/el_GR/main.lang
M htdocs/langs/el_GR/margins.lang
M htdocs/langs/el_GR/opensurvey.lang
M htdocs/langs/el_GR/other.lang
M htdocs/langs/el_GR/paypal.lang
M htdocs/langs/el_GR/propal.lang
M htdocs/langs/el_GR/salaries.lang
M htdocs/langs/el_GR/withdrawals.lang
M htdocs/langs/en_AU/main.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/cashdesk.lang
M htdocs/langs/en_US/companies.lang
M htdocs/langs/en_US/contracts.lang
M htdocs/langs/en_US/cron.lang
M htdocs/langs/en_US/deliveries.lang
M htdocs/langs/en_US/dict.lang
M htdocs/langs/en_US/donations.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/externalsite.lang
M htdocs/langs/en_US/help.lang
M htdocs/langs/en_US/holiday.lang
M htdocs/langs/en_US/install.lang
M htdocs/langs/en_US/interventions.lang
M htdocs/langs/en_US/languages.lang
M htdocs/langs/en_US/ldap.lang
M htdocs/langs/en_US/mailmanspip.lang
M htdocs/langs/en_US/mails.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/margins.lang
M htdocs/langs/en_US/members.lang
M htdocs/langs/en_US/opensurvey.lang
M htdocs/langs/en_US/orders.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/paypal.lang
M htdocs/langs/en_US/products.lang
M htdocs/langs/en_US/sendings.lang
M htdocs/langs/en_US/stocks.lang
M htdocs/langs/en_US/suppliers.lang
M htdocs/langs/en_US/trips.lang
M htdocs/langs/en_US/users.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/agenda.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/es_ES/errors.lang
M htdocs/langs/es_ES/languages.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/es_ES/margins.lang
M htdocs/langs/es_ES/other.lang
M htdocs/langs/es_ES/paypal.lang
M htdocs/langs/es_ES/salaries.lang
M htdocs/langs/es_ES/withdrawals.lang
M htdocs/langs/et_EE/admin.lang
Log Message:
-----------
Merge branch 'upstream/develop'
Commit: 79d8ce9d1ded4bdd69cb3ae444ee56e63e273512
https://github.com/Dolibarr/dolibarr/commit/79d8ce9d1ded4bdd69cb3ae444ee56e63e273512
Author: aspangaro <address@hidden>
Date: 2014-04-12 (Sat, 12 Apr 2014)
Changed paths:
M htdocs/core/lib/bank.lib.php
Log Message:
-----------
Add tabs in bank card
Commit: 9fb029890c56794f5ccbba3975e657470c329414
https://github.com/Dolibarr/dolibarr/commit/9fb029890c56794f5ccbba3975e657470c329414
Author: Laurent Destailleur <address@hidden>
Date: 2014-04-13 (Sun, 13 Apr 2014)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Doxygen
Commit: 38a05965944d81dc6d2a027e31f226b0d25e09b4
https://github.com/Dolibarr/dolibarr/commit/38a05965944d81dc6d2a027e31f226b0d25e09b4
Author: Laurent Destailleur <address@hidden>
Date: 2014-04-13 (Sun, 13 Apr 2014)
Changed paths:
M htdocs/compta/index.php
M htdocs/compta/paiement_charge.php
M htdocs/core/lib/bank.lib.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/aspangaro/dolibarr into
aspangaro-develop
Conflicts:
htdocs/core/lib/bank.lib.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/87f7771af2e3...38a05965944d
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 07d646: Trips & expenses move into hrm area,
Laurent Destailleur <=