dolibarr-git
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] 143c01: Fix : Sql error on salaries i

From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 143c01: Fix : Sql error on salaries index for accountancy ...
Date: Thu, 18 May 2017 08:45:23 -0700 
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 143c019905e571321feb4fa7a385cc82aa9d6e85
      
https://github.com/Dolibarr/dolibarr/commit/143c019905e571321feb4fa7a385cc82aa9d6e85
  Author: Alexandre SPANGARO <address@hidden>
  Date:   2017-05-14 (Sun, 14 May 2017)

  Changed paths:
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/salaries/index.php
    M htdocs/core/class/html.formaccounting.class.php

  Log Message:
  -----------
  Fix : Sql error on salaries index for accountancy multijournal + debug


  Commit: cedf5fb0ed730965d7e88f50898d260f5b0f271f
      
https://github.com/Dolibarr/dolibarr/commit/cedf5fb0ed730965d7e88f50898d260f5b0f271f
  Author: Alexandre SPANGARO <address@hidden>
  Date:   2017-05-14 (Sun, 14 May 2017)

  Changed paths:
    M htdocs/core/modules/modStripe.class.php
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/install/mysql/tables/llx_bank_account.key.sql
    M htdocs/langs/en_US/paybox.lang
    M htdocs/langs/en_US/paypal.lang
    M htdocs/langs/en_US/stripe.lang
    M htdocs/paypal/admin/paypal.php
    M htdocs/public/paybox/paymentko.php
    M htdocs/public/paybox/paymentok.php
    M htdocs/public/payment/newpayment.php
    M htdocs/public/payment/paymentko.php
    M htdocs/public/payment/paymentok.php
    M htdocs/public/paypal/newpayment.php
    M htdocs/public/paypal/paymentko.php
    M htdocs/public/paypal/paymentok.php
    R htdocs/public/stripe/config.php
    M htdocs/public/stripe/index.php
    M htdocs/public/stripe/newpayment.php
    A htdocs/public/stripe/paymentko.php
    A htdocs/public/stripe/paymentok.php
    M htdocs/stripe/admin/stripe.php
    A htdocs/stripe/config.php
    M htdocs/stripe/lib/stripe.lib.php

  Log Message:
  -----------
  Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal


  Commit: 93554b7e30d4b6d4830292a054cdf7154885f132
      
https://github.com/Dolibarr/dolibarr/commit/93554b7e30d4b6d4830292a054cdf7154885f132
  Author: Alexandre SPANGARO <address@hidden>
  Date:   2017-05-14 (Sun, 14 May 2017)

  Changed paths:
    M htdocs/accountancy/admin/categories_list.php
    M htdocs/accountancy/admin/journals_list.php
    M htdocs/accountancy/admin/productaccount.php
    M htdocs/accountancy/bookkeeping/balance.php
    M htdocs/accountancy/bookkeeping/listbyaccount.php
    M htdocs/adherents/list.php
    M htdocs/adherents/subscription/list.php
    M htdocs/admin/dict.php
    M htdocs/admin/tools/listevents.php
    M htdocs/admin/translation.php
    M htdocs/comm/action/listactions.php
    M htdocs/comm/mailing/cibles.php
    M htdocs/comm/mailing/list.php
    M htdocs/comm/propal/list.php
    M htdocs/commande/list.php
    M htdocs/compta/bank/bankentries.php
    M htdocs/compta/bank/index.php
    M htdocs/compta/deplacement/list.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/paiement/cheque/list.php
    M htdocs/compta/paiement/list.php
    M htdocs/compta/prelevement/bons.php
    M htdocs/compta/prelevement/demandes.php
    M htdocs/compta/prelevement/list.php
    M htdocs/compta/salaries/index.php
    M htdocs/compta/sociales/index.php
    M htdocs/compta/tva/reglement.php
    M htdocs/contrat/list.php
    M htdocs/contrat/services.php
    M htdocs/core/lib/company.lib.php
    M htdocs/don/list.php
    M htdocs/expedition/list.php
    M htdocs/expensereport/list.php
    M htdocs/fichinter/list.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/facture/impayees.php
    M htdocs/fourn/facture/list.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/holiday/list.php
    M htdocs/opensurvey/list.php
    M htdocs/product/list.php
    M htdocs/product/price.php
    M htdocs/product/reassort.php
    M htdocs/product/reassortlot.php
    M htdocs/projet/list.php
    M htdocs/projet/tasks.php
    M htdocs/resource/list.php
    M htdocs/societe/consumption.php
    M htdocs/societe/list.php
    M htdocs/societe/price.php
    M htdocs/supplier_proposal/list.php

  Log Message:
  -----------
  Typo searchpicto


  Commit: 4dc7d5cd8d2ee6d1320ae634a77005a878b32a83
      
https://github.com/Dolibarr/dolibarr/commit/4dc7d5cd8d2ee6d1320ae634a77005a878b32a83
  Author: Alexandre SPANGARO <address@hidden>
  Date:   2017-05-14 (Sun, 14 May 2017)

  Changed paths:
    M htdocs/compta/facture/card.php
    M htdocs/modulebuilder/skeletons/skeleton_list.php
    M htdocs/product/canvas/product/tpl/list.tpl.php
    M htdocs/product/canvas/service/tpl/list.tpl.php
    M htdocs/product/stock/list.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/productlot_list.php
    M htdocs/product/stock/replenish.php
    M htdocs/product/stock/replenishorders.php
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/perweek.php
    M htdocs/projet/tasks/list.php
    M htdocs/projet/tasks/time.php
    M htdocs/user/hierarchy.php
    M htdocs/user/index.php
    M htdocs/variants/combinations.php

  Log Message:
  -----------
  Fix : tooltip on bank in customer invoice card


  Commit: becd023032f78b43c2818339c90f8ccd469ebdba
      
https://github.com/Dolibarr/dolibarr/commit/becd023032f78b43c2818339c90f8ccd469ebdba
  Author: Alexandre SPANGARO <address@hidden>
  Date:   2017-05-15 (Mon, 15 May 2017)

  Changed paths:
    M htdocs/compta/facture/card.php
    M htdocs/fourn/facture/card.php

  Log Message:
  -----------
  Fix : tooltip on supplier invoice payment


  Commit: 7dbe3b1da97c1260f46fcdb3966af36857065493
      
https://github.com/Dolibarr/dolibarr/commit/7dbe3b1da97c1260f46fcdb3966af36857065493
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-05-18 (Thu, 18 May 2017)

  Changed paths:
    M htdocs/accountancy/admin/categories_list.php
    M htdocs/accountancy/admin/journals_list.php
    M htdocs/accountancy/admin/productaccount.php
    M htdocs/accountancy/bookkeeping/balance.php
    M htdocs/accountancy/bookkeeping/listbyaccount.php
    M htdocs/adherents/list.php
    M htdocs/adherents/subscription/list.php
    M htdocs/admin/dict.php
    M htdocs/admin/tools/listevents.php
    M htdocs/admin/translation.php
    M htdocs/comm/action/listactions.php
    M htdocs/comm/mailing/cibles.php
    M htdocs/comm/mailing/list.php
    M htdocs/comm/propal/list.php
    M htdocs/commande/list.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/deplacement/list.php
    M htdocs/compta/facture/card.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/paiement/cheque/list.php
    M htdocs/compta/paiement/list.php
    M htdocs/compta/prelevement/bons.php
    M htdocs/compta/prelevement/demandes.php
    M htdocs/compta/prelevement/list.php
    M htdocs/compta/salaries/index.php
    M htdocs/compta/sociales/index.php
    M htdocs/compta/tva/reglement.php
    M htdocs/contrat/list.php
    M htdocs/contrat/services.php
    M htdocs/core/class/html.formaccounting.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/don/list.php
    M htdocs/expedition/list.php
    M htdocs/expensereport/list.php
    M htdocs/fichinter/list.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/impayees.php
    M htdocs/fourn/facture/list.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/holiday/list.php
    M htdocs/modulebuilder/skeletons/skeleton_list.php
    M htdocs/opensurvey/list.php
    M htdocs/product/canvas/product/tpl/list.tpl.php
    M htdocs/product/canvas/service/tpl/list.tpl.php
    M htdocs/product/list.php
    M htdocs/product/price.php
    M htdocs/product/reassort.php
    M htdocs/product/reassortlot.php
    M htdocs/product/stock/list.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/productlot_list.php
    M htdocs/product/stock/replenish.php
    M htdocs/product/stock/replenishorders.php
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/perweek.php
    M htdocs/projet/list.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/list.php
    M htdocs/projet/tasks/time.php
    M htdocs/resource/list.php
    M htdocs/societe/consumption.php
    M htdocs/societe/list.php
    M htdocs/societe/price.php
    M htdocs/supplier_proposal/list.php
    M htdocs/user/hierarchy.php
    M htdocs/user/index.php
    M htdocs/variants/combinations.php

  Log Message:
  -----------
  Merge pull request #6843 from aspangaro/6.0-multijournal

Fix : Sql error on salaries index for accountancy multijournal + debug


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5a79d11389e1...7dbe3b1da97c
reply via email to
[Prev in Thread] Current Thread [Next in Thread]