dolibarr-git
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] ea1a81: FIX : Comptability when multi


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] ea1a81: FIX : Comptability when multiple account charts
Date: Fri, 11 Dec 2015 08:05:56 -0800

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ea1a81f5f4dc8b02d47a8d0bf67ce594f6a44724
      
https://github.com/Dolibarr/dolibarr/commit/ea1a81f5f4dc8b02d47a8d0bf67ce594f6a44724
  Author: Florian HENRY <address@hidden>
  Date:   2015-12-09 (Wed, 09 Dec 2015)

  Changed paths:
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/supplier/list.php

  Log Message:
  -----------
  FIX : Comptability when multiple account charts


  Commit: 96a95d6ae18f3afec8970429c01a5154e3b85001
      
https://github.com/Dolibarr/dolibarr/commit/96a95d6ae18f3afec8970429c01a5154e3b85001
  Author: Florian HENRY <address@hidden>
  Date:   2015-12-09 (Wed, 09 Dec 2015)

  Changed paths:
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/class/html.formventilation.class.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/core/lib/report.lib.php
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql

  Log Message:
  -----------
  Debug accountancy on 3.9


  Commit: b80518efb4b34721a35cce399b6afe33f18fb991
      
https://github.com/Dolibarr/dolibarr/commit/b80518efb4b34721a35cce399b6afe33f18fb991
  Author: Florian HENRY <address@hidden>
  Date:   2015-12-09 (Wed, 09 Dec 2015)

  Changed paths:
    M htdocs/accountancy/class/bookkeeping.class.php

  Log Message:
  -----------
  fix travis


  Commit: 71d0024b27c45f639d157d08012f449fcf9171b9
      
https://github.com/Dolibarr/dolibarr/commit/71d0024b27c45f639d157d08012f449fcf9171b9
  Author: Florian HENRY <address@hidden>
  Date:   2015-12-11 (Fri, 11 Dec 2015)

  Changed paths:
    M COPYRIGHT
    M composer.json
    M composer.lock
    M htdocs/admin/fichinter.php
    M htdocs/admin/livraison.php
    M htdocs/admin/supplier_proposal.php
    M htdocs/bookmarks/list.php
    M htdocs/comm/propal.php
    M htdocs/commande/card.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/exports/export.php
    M htdocs/externalsite/admin/externalsite.php
    M htdocs/fichinter/card.php
    M htdocs/fichinter/contact.php
    M htdocs/fourn/class/paiementfourn.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/contact.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/fourn/facture/card.php
    M htdocs/includes/mobiledetect/mobiledetectlib/.gitignore
    M htdocs/includes/mobiledetect/mobiledetectlib/.travis.yml
    M htdocs/includes/mobiledetect/mobiledetectlib/LICENSE.txt
    M htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json
    M htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php
    M htdocs/includes/mobiledetect/mobiledetectlib/README.md
    M htdocs/includes/mobiledetect/mobiledetectlib/composer.json
    R htdocs/includes/mobiledetect/mobiledetectlib/composer.lock
    M htdocs/includes/mobiledetect/mobiledetectlib/examples/demo.php
    A htdocs/includes/mobiledetect/mobiledetectlib/examples/test.php
    M htdocs/includes/mobiledetect/mobiledetectlib/export/exportToJSON.php
    M htdocs/includes/mobiledetect/mobiledetectlib/tests/BasicsTest.php
    M htdocs/includes/mobiledetect/mobiledetectlib/tests/UA_List.inc.php
    M htdocs/includes/mobiledetect/mobiledetectlib/tests/UserAgentTest.php
    R htdocs/includes/mobiledetect/mobiledetectlib/tests/VendorsTest.php
    A htdocs/includes/mobiledetect/mobiledetectlib/tests/VendorsTest_tmp.php
    M htdocs/includes/mobiledetect/mobiledetectlib/tests/phpunit.xml
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Acer.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Alcatel.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Allview.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Amazon.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Apple.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Archos.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Asus.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Blackberry.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Dell.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Google.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HP.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HTC.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Huawei.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/LG.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lava.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Leader.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lenovo.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Mi.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Microsoft.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Motorola.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Nokia.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Onda.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Others.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Prestigio.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Samsung.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Sony.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/SpecialCases.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Vodafone.php
    A 
htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/ZTE.php
    M htdocs/includes/mobiledetect/mobiledetectlib/tests/ualist.json
    M htdocs/includes/tecnickcom/tcpdf/CHANGELOG.TXT
    M htdocs/includes/tecnickcom/tcpdf/README.TXT
    M htdocs/includes/tecnickcom/tcpdf/composer.json
    M htdocs/includes/tecnickcom/tcpdf/include/barcodes/qrcode.php
    M htdocs/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php
    M htdocs/includes/tecnickcom/tcpdf/include/tcpdf_images.php
    M htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php
    M htdocs/includes/tecnickcom/tcpdf/tcpdf.php
    M htdocs/includes/tecnickcom/tcpdf/tcpdf_parser.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop


  Commit: 47fce16778d49a2d4a100649b8b6fb0f3b319e65
      
https://github.com/Dolibarr/dolibarr/commit/47fce16778d49a2d4a100649b8b6fb0f3b319e65
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-12-11 (Fri, 11 Dec 2015)

  Changed paths:
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/class/html.formventilation.class.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/supplier/list.php
    M htdocs/core/lib/report.lib.php
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql

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

Conflicts:
        htdocs/install/mysql/migration/3.8.0-3.9.0.sql


  Commit: f1374625f0e8862fcc11d74db65108756c190cd5
      
https://github.com/Dolibarr/dolibarr/commit/f1374625f0e8862fcc11d74db65108756c190cd5
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-12-11 (Fri, 11 Dec 2015)

  Changed paths:
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/class/html.formventilation.class.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/supplier/list.php
    M htdocs/core/lib/report.lib.php
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql

  Log Message:
  -----------
  git push origin developMerge branch 'FHenry-develop' into develop


  Commit: 1a58624775206e1a3d7f6e3f793a6400754c17f7
      
https://github.com/Dolibarr/dolibarr/commit/1a58624775206e1a3d7f6e3f793a6400754c17f7
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-12-11 (Fri, 11 Dec 2015)

  Changed paths:
    M htdocs/accountancy/admin/card.php
    M htdocs/accountancy/admin/fiscalyear_info.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/index.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/adherents/info_subscription.php
    M htdocs/admin/compta.php
    M htdocs/admin/confexped.php
    M htdocs/admin/external_rss.php
    M htdocs/admin/ldap.php
    M htdocs/admin/ldap_contacts.php
    M htdocs/admin/ldap_groups.php
    M htdocs/admin/ldap_users.php
    M htdocs/admin/menus/edit.php
    M htdocs/admin/perms.php
    M htdocs/admin/prelevement.php
    M htdocs/admin/proxy.php
    M htdocs/admin/supplier_proposal.php
    M htdocs/admin/system/os.php
    M htdocs/admin/taxes.php
    M htdocs/api/admin/explorer.php
    M htdocs/asterisk/wrapper.php
    M htdocs/bookmarks/admin/bookmark.php
    M htdocs/cashdesk/admin/cashdesk.php
    M htdocs/categories/admin/categorie.php
    M htdocs/comm/action/info.php
    M htdocs/comm/action/rapport/index.php
    M htdocs/comm/mailing/info.php
    M htdocs/comm/multiprix.php
    M htdocs/comm/prospect/recap-prospect.php
    M htdocs/comm/recap-client.php
    M htdocs/comm/remise.php
    M htdocs/comm/remx.php
    M htdocs/commande/info.php
    M htdocs/compta/bank/bilan.php
    M htdocs/compta/bank/budget.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/info.php
    M htdocs/compta/bank/search.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/bank/virement.php
    M htdocs/compta/clients.php
    M htdocs/compta/deplacement/info.php
    M htdocs/compta/facture/info.php
    M htdocs/compta/localtax/card.php
    M htdocs/compta/localtax/clients.php
    M htdocs/compta/localtax/index.php
    M htdocs/compta/localtax/quadri_detail.php
    M htdocs/compta/localtax/reglement.php
    M htdocs/compta/paiement/avalider.php
    M htdocs/compta/paiement/index.php
    M htdocs/compta/paiement/info.php
    M htdocs/compta/paiement_charge.php
    M htdocs/compta/prelevement/create.php
    M htdocs/compta/prelevement/demandes.php
    M htdocs/compta/prelevement/fiche-rejet.php
    M htdocs/compta/prelevement/fiche-stat.php
    M htdocs/compta/prelevement/list.php
    M htdocs/compta/prelevement/rejets.php
    M htdocs/compta/sociales/index.php
    M htdocs/compta/tva/card.php
    M htdocs/compta/tva/index.php
    M htdocs/compta/tva/quadri.php
    M htdocs/compta/tva/quadri_detail.php
    M htdocs/compta/tva/quarter_report.php
    M htdocs/compta/ventilation/card.php
    M htdocs/compta/ventilation/fournisseur/card.php
    M htdocs/compta/ventilation/fournisseur/list.php
    M htdocs/contrat/info.php
    M htdocs/cron/info.php
    M htdocs/exports/export.php
    M htdocs/fourn/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/contact.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/fourn/paiement/card.php
    M htdocs/ftp/index.php
    M htdocs/holiday/card.php
    M htdocs/hrm/establishment/card.php
    M htdocs/imports/import.php
    M htdocs/livraison/card.php
    M htdocs/loan/card.php
    M htdocs/loan/payment/card.php
    M htdocs/loan/payment/payment.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/8ac189a1c3e4...1a5862477520

reply via email to

[Prev in Thread] Current Thread [Next in Thread]