[Dolibarr-git] [Dolibarr/dolibarr] 95a515: NEW : Consumption view on thirdparty total line an...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 95a5152746c97da8784b0875edbbc04e08fd97d4
      
https://github.com/Dolibarr/dolibarr/commit/95a5152746c97da8784b0875edbbc04e08fd97d4
  Author: florian HENRY <address@hidden>
  Date:   2016-10-21 (Fri, 21 Oct 2016)

  Changed paths:
    M htdocs/societe/consumption.php

  Log Message:
  -----------
  NEW : Consumption view on thirdparty total line and total HT by element


  Commit: 4c4e404dae0fb4e81deb2b43a419e5890cf7fc9a
      
https://github.com/Dolibarr/dolibarr/commit/4c4e404dae0fb4e81deb2b43a419e5890cf7fc9a
  Author: florian HENRY <address@hidden>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

  Changed paths:
    M htdocs/societe/consumption.php

  Log Message:
  -----------
  Add unit PRice


  Commit: 5dcf3033ec9d5b5563db317b646c200676fd42b5
      
https://github.com/Dolibarr/dolibarr/commit/5dcf3033ec9d5b5563db317b646c200676fd42b5
  Author: florian HENRY <address@hidden>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

  Changed paths:
    M build/debian/README.howto
    M build/debian/control
    M build/debian/copyright
    M build/debian/dolibarr.postinst
    M build/debian/install.forced.php.install
    M build/debian/rules
    M dev/skeletons/skeleton_list.php
    M htdocs/accountancy/admin/productaccount.php
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/index.php
    M htdocs/accountancy/supplier/lines.php
    M htdocs/accountancy/supplier/list.php
    M htdocs/adherents/card.php
    M htdocs/adherents/class/adherent_type.class.php
    M htdocs/admin/dict.php
    M htdocs/admin/menus/edit.php
    A htdocs/admin/resource.php
    A htdocs/admin/resource_extrafields.php
    M htdocs/api/admin/index.php
    M htdocs/comm/propal/card.php
    M htdocs/commande/card.php
    M htdocs/commande/list.php
    R htdocs/compta/bank/account.php
    M htdocs/compta/bank/annuel.php
    A htdocs/compta/bank/bankentries.php
    M htdocs/compta/bank/budget.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/document.php
    M htdocs/compta/bank/graph.php
    M htdocs/compta/bank/index.php
    M htdocs/compta/bank/ligne.php
    R htdocs/compta/bank/rappro.php
    M htdocs/compta/bank/releve.php
    R htdocs/compta/bank/search.php
    A htdocs/compta/bank/transfer.php
    M htdocs/compta/bank/treso.php
    R htdocs/compta/bank/virement.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/paiement.php
    M htdocs/compta/paiement/cheque/list.php
    M htdocs/core/actions_linkedfiles.inc.php
    M htdocs/core/actions_sendmails.inc.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/bank.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/resource.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/modResource.class.php
    M htdocs/ecm/index.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/install/mysql/tables/llx_entrepot.sql
    A htdocs/install/mysql/tables/llx_resource_extrafields.key.sql
    A htdocs/install/mysql/tables/llx_resource_extrafields.sql
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/banks.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/install.lang
    M htdocs/langs/en_US/loan.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/members.lang
    M htdocs/langs/en_US/multicurrency.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/product/class/html.formproduct.class.php
    M htdocs/product/stock/card.php
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/projet/card.php
    M htdocs/resource/add.php
    M htdocs/resource/card.php
    M htdocs/resource/class/dolresource.class.php
    M htdocs/resource/list.php
    M htdocs/societe/class/societe.class.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/card.php
    M test/phpunit/CMailFileTest.php

  Log Message:
  -----------
  Merge branch 'develop' into dev_consomption_thirdparty_withmorefigures


  Commit: 201e084186d3def9ce0329e5073b2676b8282c15
      
https://github.com/Dolibarr/dolibarr/commit/201e084186d3def9ce0329e5073b2676b8282c15
  Author: florian HENRY <address@hidden>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

  Changed paths:
    M htdocs/societe/consumption.php

  Log Message:
  -----------
  style


  Commit: 237d04e3c05c81e8820aa5e58ed67648846df759
      
https://github.com/Dolibarr/dolibarr/commit/237d04e3c05c81e8820aa5e58ed67648846df759
  Author: florian HENRY <address@hidden>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M htdocs/admin/ihm.php
    M htdocs/comm/action/card.php
    M htdocs/comm/card.php
    M htdocs/comm/propal/card.php
    M htdocs/commande/card.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/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/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/exports/export.php
    M htdocs/fichinter/card.php
    M htdocs/fourn/card.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/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/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.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/task.class.php
    M htdocs/projet/document.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/soc.php
    M htdocs/supplier_proposal/card.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/info.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_consomption_thirdparty_withmorefigures


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

  Changed paths:
    M ChangeLog
    M build/debian/copyright
    M dev/skeletons/skeleton_api_class.class.php
    M dev/skeletons/skeleton_class.class.php
    M htdocs/adherents/card.php
    M htdocs/adherents/class/api_members.class.php
    M htdocs/adherents/class/api_subscriptions.class.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/categories/class/api_deprecated_category.class.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/class/api_agendaevents.class.php
    M htdocs/comm/propal/class/api_proposals.class.php
    M htdocs/comm/propal/class/propal.class.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/core/class/doleditor.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/utils.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/menus/standard/eldy_menu.php
    M htdocs/core/modules/export/export_excel.modules.php
    M htdocs/core/modules/export/export_excel2007.modules.php
    M htdocs/core/modules/export/modules_export.php
    M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
    M htdocs/don/list.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expensereport/class/api_expensereports.class.php
    M htdocs/fichinter/card.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/includes/tcpdi/tcpdi_parser.php
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/install/mysql/tables/llx_bank_account.sql
    M htdocs/install/step1.php
    M htdocs/langs/en_US/agenda.lang
    M htdocs/loan/class/loan.class.php
    M htdocs/main.inc.php
    M htdocs/product/card.php
    M htdocs/product/class/api_products.class.php
    M htdocs/product/stats/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/info.php
    M htdocs/projet/tasks/task.php
    M htdocs/societe/class/api_contacts.class.php
    M htdocs/societe/class/api_deprecated_contact.class.php
    M htdocs/societe/class/api_thirdparties.class.php
    M htdocs/societe/class/societe.class.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_deprecated_user.class.php
    M htdocs/user/class/api_users.class.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_consomption_thirdparty_withmorefigures


  Commit: 68d70e9ebadca4f7a8d733a86de98d7347a49e7f
      
https://github.com/Dolibarr/dolibarr/commit/68d70e9ebadca4f7a8d733a86de98d7347a49e7f
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-10-26 (Wed, 26 Oct 2016)

  Changed paths:
    M htdocs/societe/consumption.php

  Log Message:
  -----------
  Merge pull request #5904 from 
atm-florian/dev_consomption_thirdparty_withmorefigures

NEW : Consumption view on thirdparty add total line and total HT by element


Compare: 
https://github.com/Dolibarr/dolibarr/compare/bf0345da42bd...68d70e9ebadc