[Dolibarr-git] [Dolibarr/dolibarr] 5ed798: Begin to wok on Vat expense report integration in ...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 5ed79800e0924dda12e5f2112c072a4e1b142c62
      
https://github.com/Dolibarr/dolibarr/commit/5ed79800e0924dda12e5f2112c072a4e1b142c62
  Author: aspangaro <address@hidden>
  Date:   2016-11-05 (Sat, 05 Nov 2016)

  Changed paths:
    M htdocs/compta/tva/index.php
    M htdocs/compta/tva/quadri_detail.php
    M htdocs/core/lib/tax.lib.php
    M htdocs/install/mysql/tables/llx_expensereport.sql

  Log Message:
  -----------
  Begin to wok on Vat expense report integration in reports


  Commit: 137561aec9c318481c5b92a635a74794243bb085
      
https://github.com/Dolibarr/dolibarr/commit/137561aec9c318481c5b92a635a74794243bb085
  Author: aspangaro <address@hidden>
  Date:   2016-11-12 (Sat, 12 Nov 2016)

  Changed paths:
    M ChangeLog
    M build/debian/README.howto
    M dev/skeletons/skeleton_list.php
    M htdocs/.gitignore
    M htdocs/accountancy/admin/account.php
    M htdocs/accountancy/admin/defaultaccounts.php
    M htdocs/accountancy/admin/importaccounts.php
    M htdocs/accountancy/admin/index.php
    M htdocs/accountancy/admin/productaccount.php
    M htdocs/accountancy/class/html.formventilation.class.php
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/expensereport/lines.php
    M htdocs/accountancy/expensereport/list.php
    M htdocs/accountancy/supplier/lines.php
    M htdocs/accountancy/supplier/list.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/list.php
    M htdocs/admin/agenda_other.php
    M htdocs/admin/confexped.php
    M htdocs/admin/expedition.php
    M htdocs/admin/supplier_order.php
    M htdocs/admin/system/database.php
    M htdocs/admin/system/dolibarr.php
    M htdocs/api/class/api.class.php
    M htdocs/api/index.php
    M htdocs/comm/action/card.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/class/cactioncomm.class.php
    M htdocs/comm/action/index.php
    M htdocs/comm/action/listactions.php
    M htdocs/comm/action/pertype.php
    M htdocs/comm/action/peruser.php
    M htdocs/comm/mailing/card.php
    M htdocs/comm/mailing/cibles.php
    M htdocs/comm/mailing/class/mailing.class.php
    M htdocs/comm/mailing/index.php
    M htdocs/comm/mailing/info.php
    M htdocs/comm/mailing/list.php
    M htdocs/comm/propal/card.php
    M htdocs/comm/propal/stats/index.php
    M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
    M htdocs/commande/card.php
    M htdocs/commande/class/api_orders.class.php
    M htdocs/commande/list.php
    M htdocs/commande/stats/index.php
    M htdocs/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/compta/bank/annuel.php
    M htdocs/compta/bank/bankentries.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/index.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/apercu.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/facture/stats/index.php
    M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
    M htdocs/compta/index.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/sociales/index.php
    M htdocs/conf/conf.php.example
    M htdocs/contact/class/contact.class.php
    M htdocs/contrat/card.php
    M htdocs/contrat/services.php
    M htdocs/contrat/tpl/linkedobjectblock.tpl.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/class/commonobject.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.formactions.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formpropal.class.php
    R htdocs/core/class/html.formsupplier_proposal.class.php
    M htdocs/core/class/smtps.class.php
    M htdocs/core/db/DoliDB.class.php
    M htdocs/core/db/mysqli.class.php
    M htdocs/core/filemanagerdol/connectors/php/config.php
    M htdocs/core/lib/agenda.lib.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/donation.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/price.lib.php
    M htdocs/core/lib/security2.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/eldy.lib.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/modAccounting.class.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
    M htdocs/core/tpl/admin_extrafields_edit.tpl.php
    M htdocs/core/tpl/contacts.tpl.php
    M htdocs/core/tpl/notes.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/don/document.php
    M htdocs/don/index.php
    A htdocs/don/note.php
    M htdocs/ecm/search.php
    M htdocs/expedition/shipment.php
    M htdocs/expedition/tpl/linkedobjectblock.tpl.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
    M htdocs/install/inc.php
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/install/mysql/migration/repair.sql
    A htdocs/install/mysql/tables/llx_links.key.sql
    M htdocs/install/mysql/tables/llx_mailing_cibles.sql
    M htdocs/langs/de_AT/agenda.lang
    M htdocs/langs/en_GB/admin.lang
    M htdocs/langs/en_GB/banks.lang
    M htdocs/langs/en_GB/main.lang
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/commercial.lang
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/members.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/en_US/supplier_proposal.lang
    M htdocs/langs/en_US/users.lang
    M htdocs/langs/es_CL/admin.lang
    M htdocs/langs/es_CL/other.lang
    M htdocs/langs/es_MX/accountancy.lang
    M htdocs/langs/es_MX/banks.lang
    M htdocs/langs/es_MX/install.lang
    M htdocs/langs/es_MX/main.lang
    M htdocs/langs/es_MX/other.lang
    M htdocs/langs/es_PE/accountancy.lang
    M htdocs/langs/fr_CA/admin.lang
    M htdocs/langs/fr_FR/accountancy.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/agenda.lang
    M htdocs/langs/fr_FR/banks.lang
    M htdocs/langs/fr_FR/bills.lang
    M htdocs/langs/fr_FR/companies.lang
    M htdocs/langs/fr_FR/compta.lang
    M htdocs/langs/fr_FR/ecm.lang
    M htdocs/langs/fr_FR/errors.lang
    M htdocs/langs/fr_FR/install.lang
    M htdocs/langs/fr_FR/loan.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/langs/fr_FR/members.lang
    M htdocs/langs/fr_FR/orders.lang
    M htdocs/langs/fr_FR/products.lang
    M htdocs/langs/fr_FR/sendings.lang
    M htdocs/langs/fr_FR/stocks.lang
    M htdocs/langs/fr_FR/supplier_proposal.lang
    M htdocs/langs/fr_FR/trips.lang
    M htdocs/langs/fr_FR/workflow.lang
    M htdocs/langs/nl_BE/accountancy.lang
    M htdocs/langs/pt_BR/accountancy.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_BR/agenda.lang
    M htdocs/langs/pt_BR/banks.lang
    M htdocs/langs/pt_BR/bills.lang
    M htdocs/langs/pt_BR/bookmarks.lang
    M htdocs/langs/pt_BR/boxes.lang
    M htdocs/langs/pt_BR/cashdesk.lang
    M htdocs/langs/pt_BR/categories.lang
    M htdocs/langs/pt_BR/commercial.lang
    M htdocs/langs/pt_BR/companies.lang
    M htdocs/langs/pt_BR/compta.lang
    M htdocs/langs/pt_BR/contracts.lang
    M htdocs/langs/pt_BR/cron.lang
    M htdocs/langs/pt_BR/deliveries.lang
    M htdocs/langs/pt_BR/dict.lang
    M htdocs/langs/pt_BR/donations.lang
    M htdocs/langs/pt_BR/ecm.lang
    M htdocs/langs/pt_BR/errors.lang
    M htdocs/langs/pt_BR/exports.lang
    M htdocs/langs/pt_BR/externalsite.lang
    M htdocs/langs/pt_BR/ftp.lang
    M htdocs/langs/pt_BR/help.lang
    M htdocs/langs/pt_BR/holiday.lang
    M htdocs/langs/pt_BR/hrm.lang
    M htdocs/langs/pt_BR/incoterm.lang
    M htdocs/langs/pt_BR/install.lang
    M htdocs/langs/pt_BR/interventions.lang
    M htdocs/langs/pt_BR/languages.lang
    M htdocs/langs/pt_BR/ldap.lang
    M htdocs/langs/pt_BR/link.lang
    M htdocs/langs/pt_BR/loan.lang
    M htdocs/langs/pt_BR/mailmanspip.lang
    M htdocs/langs/pt_BR/mails.lang
    M htdocs/langs/pt_BR/main.lang
    M htdocs/langs/pt_BR/margins.lang
    M htdocs/langs/pt_BR/members.lang
    M htdocs/langs/pt_BR/opensurvey.lang
    M htdocs/langs/pt_BR/orders.lang
    M htdocs/langs/pt_BR/other.lang
    M htdocs/langs/pt_BR/paybox.lang
    M htdocs/langs/pt_BR/paypal.lang
    M htdocs/langs/pt_BR/printing.lang
    M htdocs/langs/pt_BR/productbatch.lang
    M htdocs/langs/pt_BR/products.lang
    M htdocs/langs/pt_BR/projects.lang
    M htdocs/langs/pt_BR/propal.lang
    M htdocs/langs/pt_BR/receiptprinter.lang
    M htdocs/langs/pt_BR/resource.lang
    M htdocs/langs/pt_BR/salaries.lang
    M htdocs/langs/pt_BR/sendings.lang
    M htdocs/langs/pt_BR/sms.lang
    M htdocs/langs/pt_BR/stocks.lang
    M htdocs/langs/pt_BR/suppliers.lang
    M htdocs/langs/pt_BR/trips.lang
    M htdocs/langs/pt_BR/users.lang
    M htdocs/langs/pt_BR/website.lang
    M htdocs/langs/pt_BR/withdrawals.lang
    M htdocs/langs/ru_UA/banks.lang
    M htdocs/langs/ru_UA/install.lang
    M htdocs/langs/ru_UA/other.lang
    M htdocs/main.inc.php
    M htdocs/product/card.php
    M htdocs/product/class/product.class.php
    M htdocs/product/stock/tpl/stockcorrection.tpl.php
    M htdocs/product/stock/tpl/stocktransfer.tpl.php
    M htdocs/projet/card.php
    A htdocs/projet/class/api_projects.class.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/element.php
    M htdocs/projet/graph_opportunities.inc.php
    M htdocs/projet/index.php
    M htdocs/projet/info.php
    M htdocs/projet/list.php
    M htdocs/public/test/test_arrays.php
    M htdocs/public/test/test_forms.php
    M htdocs/societe/rib.php
    M htdocs/societe/soc.php
    M htdocs/supplier_proposal/card.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php
    M htdocs/supplier_proposal/list.php
    M htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
    M htdocs/support/inc.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/agenda_extsites.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php
    M htdocs/user/document.php
    M htdocs/user/perms.php
    M htdocs/viewimage.php
    M scripts/cron/cron_run_jobs.php

  Log Message:
  -----------
  Merge remote-tracking branch 'Upstream/develop' into 5.0-p35


  Commit: e13e66ce7ba79a35dd15908392b186fcc43884ea
      
https://github.com/Dolibarr/dolibarr/commit/e13e66ce7ba79a35dd15908392b186fcc43884ea
  Author: aspangaro <address@hidden>
  Date:   2016-11-12 (Sat, 12 Nov 2016)

  Changed paths:
    M htdocs/compta/tva/index.php
    M htdocs/core/lib/tax.lib.php

  Log Message:
  -----------
  Update works


  Commit: 1dcf02af3aea83ed16d2fcbddb3b831e47000de1
      
https://github.com/Dolibarr/dolibarr/commit/1dcf02af3aea83ed16d2fcbddb3b831e47000de1
  Author: aspangaro <address@hidden>
  Date:   2016-11-12 (Sat, 12 Nov 2016)

  Changed paths:
    M htdocs/compta/tva/index.php
    M htdocs/compta/tva/quadri_detail.php

  Log Message:
  -----------
  Correct some mistakes


  Commit: 8909b4111d206de9ca3023687646e7bdfc721fcd
      
https://github.com/Dolibarr/dolibarr/commit/8909b4111d206de9ca3023687646e7bdfc721fcd
  Author: aspangaro <address@hidden>
  Date:   2016-11-12 (Sat, 12 Nov 2016)

  Changed paths:
    M htdocs/compta/tva/quadri_detail.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/langs/en_US/trips.lang

  Log Message:
  -----------
  Add options on getNomUrl


  Commit: 7953ea8b4dd29db5ed5ccb93652f8324f6c5fb96
      
https://github.com/Dolibarr/dolibarr/commit/7953ea8b4dd29db5ed5ccb93652f8324f6c5fb96
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-11-12 (Sat, 12 Nov 2016)

  Changed paths:
    M htdocs/compta/tva/index.php
    M htdocs/compta/tva/quadri_detail.php
    M htdocs/core/lib/tax.lib.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/install/mysql/tables/llx_expensereport.sql
    M htdocs/langs/en_US/trips.lang

  Log Message:
  -----------
  Merge pull request #5979 from aspangaro/5.0-p35

Vat expense report integration in reports


Compare: 
https://github.com/Dolibarr/dolibarr/compare/057a2140748c...7953ea8b4dd2