[Dolibarr-git] [Dolibarr/dolibarr] dc727e: Accountancy - Add binding and journal for expense ...

[Juanjo Menent]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: dc727ebb3c12f09f5f698ba46b7e2beea027f1ef
      
https://github.com/Dolibarr/dolibarr/commit/dc727ebb3c12f09f5f698ba46b7e2beea027f1ef
  Author: aspangaro <address@hidden>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

  Changed paths:
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/eldy.lib.php

  Log Message:
  -----------
  Accountancy - Add binding and journal for expense reports


  Commit: 6314df035a07dd8bc24da94c6cd56c6037ff0763
      
https://github.com/Dolibarr/dolibarr/commit/6314df035a07dd8bc24da94c6cd56c6037ff0763
  Author: aspangaro <address@hidden>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

  Changed paths:
    A htdocs/accountancy/expensereport/card.php
    A htdocs/accountancy/expensereport/index.html
    A htdocs/accountancy/expensereport/index.php
    A htdocs/accountancy/expensereport/lines.php
    A htdocs/accountancy/expensereport/list.php
    A htdocs/accountancy/journal/expensereportsjournal.php

  Log Message:
  -----------
  Work on expense report accountancy integration


  Commit: 6e7f104c5ff851abf8b1c586121ddba886d597a8
      
https://github.com/Dolibarr/dolibarr/commit/6e7f104c5ff851abf8b1c586121ddba886d597a8
  Author: aspangaro <address@hidden>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M htdocs/accountancy/expensereport/index.php
    M htdocs/accountancy/journal/expensereportsjournal.php
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/install/mysql/tables/llx_expensereport_det.sql
    M htdocs/langs/en_US/accountancy.lang

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


  Commit: 883446c5bb674c8c7b7c2a28ba5362f7a322d320
      
https://github.com/Dolibarr/dolibarr/commit/883446c5bb674c8c7b7c2a28ba5362f7a322d320
  Author: aspangaro <address@hidden>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M dev/skeletons/skeleton_api_class.class.php
    M dev/skeletons/skeleton_class.class.php
    M htdocs/adherents/class/api_members.class.php
    M htdocs/adherents/class/api_subscriptions.class.php
    M htdocs/admin/ihm.php
    M htdocs/api/admin/index.php
    M htdocs/api/class/api.class.php
    M htdocs/api/class/api_dictionnarycountries.class.php
    M htdocs/api/class/api_dictionnarytowns.class.php
    M htdocs/categories/class/api_categories.class.php
    M htdocs/comm/action/card.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/class/api_agendaevents.class.php
    M htdocs/comm/card.php
    M htdocs/comm/propal/card.php
    M htdocs/comm/propal/class/api_proposals.class.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/card.php
    M htdocs/commande/class/api_orders.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/class/api_bankaccounts.class.php
    M htdocs/compta/facture/class/api_invoices.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/paiement/cheque/card.php
    M htdocs/contact/card.php
    M htdocs/contact/document.php
    M htdocs/contrat/card.php
    M htdocs/core/class/doleditor.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/sendings.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/menus/standard/eldy_menu.php
    M htdocs/don/card.php
    M htdocs/expedition/card.php
    M htdocs/expedition/contact.php
    M htdocs/expedition/note.php
    M htdocs/expedition/stats/index.php
    M htdocs/expensereport/class/api_expensereports.class.php
    M htdocs/exports/export.php
    M htdocs/fichinter/card.php
    M htdocs/fourn/card.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/list.php
    M htdocs/ftp/admin/ftpclient.php
    M htdocs/ftp/index.php
    M htdocs/install/mysql/data/llx_const.sql
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/install/mysql/tables/llx_bank_account.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/supplier_proposal.lang
    M htdocs/langs/en_US/withdrawals.lang
    M htdocs/livraison/card.php
    M htdocs/main.inc.php
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/product/card.php
    M htdocs/product/class/api_products.class.php
    M htdocs/product/class/html.formproduct.class.php
    M htdocs/product/composition/card.php
    M htdocs/product/stats/card.php
    M htdocs/product/stock/card.php
    M htdocs/product/stock/info.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/replenish.php
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/document.php
    M htdocs/projet/info.php
    M htdocs/projet/tasks/task.php
    M htdocs/projet/tasks/time.php
    M htdocs/societe/canvas/company/tpl/card_view.tpl.php
    M htdocs/societe/canvas/individual/tpl/card_view.tpl.php
    M htdocs/societe/class/api_contacts.class.php
    M htdocs/societe/class/api_thirdparties.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php
    M htdocs/supplier_proposal/card.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/class/api_users.class.php
    M htdocs/user/info.php

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

Conflicts:
        htdocs/core/menus/standard/eldy.lib.php


  Commit: 8800bf8b25ee7b36162b78838ce066ab020c3539
      
https://github.com/Dolibarr/dolibarr/commit/8800bf8b25ee7b36162b78838ce066ab020c3539
  Author: aspangaro <address@hidden>
  Date:   2016-10-26 (Wed, 26 Oct 2016)

  Changed paths:
    M htdocs/accountancy/expensereport/card.php
    M htdocs/accountancy/expensereport/lines.php
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/trips.lang

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


  Commit: 029fa1ed8ace4bad26edbc27e27982fc2d47e4fc
      
https://github.com/Dolibarr/dolibarr/commit/029fa1ed8ace4bad26edbc27e27982fc2d47e4fc
  Author: aspangaro <address@hidden>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M htdocs/accountancy/expensereport/index.php
    M htdocs/accountancy/expensereport/lines.php
    M htdocs/accountancy/expensereport/list.php
    M htdocs/accountancy/journal/expensereportsjournal.php
    M htdocs/langs/en_US/accountancy.lang

  Log Message:
  -----------
  Finishing works


  Commit: a59cf0e13be73f025e4ff7cafe52961115712840
      
https://github.com/Dolibarr/dolibarr/commit/a59cf0e13be73f025e4ff7cafe52961115712840
  Author: Juanjo Menent <address@hidden>
  Date:   2016-10-28 (Fri, 28 Oct 2016)

  Changed paths:
    A htdocs/accountancy/expensereport/card.php
    A htdocs/accountancy/expensereport/index.html
    A htdocs/accountancy/expensereport/index.php
    A htdocs/accountancy/expensereport/lines.php
    A htdocs/accountancy/expensereport/list.php
    A htdocs/accountancy/journal/expensereportsjournal.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/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/install/mysql/tables/llx_expensereport_det.sql
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/trips.lang

  Log Message:
  -----------
  Merge pull request #5935 from aspangaro/5.0-p32

Accountancy - Add binding and journal for expense reports


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e1ee9f866110...a59cf0e13be7