[Dolibarr-git] [Dolibarr/dolibarr] b47252: Modifiy menu for accountancy module - New balance ...

[Laurent Destailleur]

  Branch: refs/heads/3.9
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b47252fcb6a206d3c73eec4127f05007dac71b76
      
https://github.com/Dolibarr/dolibarr/commit/b47252fcb6a206d3c73eec4127f05007dac71b76
  Author: aspangaro <address@hidden>
  Date:   2016-02-11 (Thu, 11 Feb 2016)

  Changed paths:
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/langs/en_US/accountancy.lang

  Log Message:
  -----------
  Modifiy menu for accountancy module - New balance feature


  Commit: 87fee74fb12a8f6db1ab3759b76a100ddc9558d4
      
https://github.com/Dolibarr/dolibarr/commit/87fee74fb12a8f6db1ab3759b76a100ddc9558d4
  Author: aspangaro <address@hidden>
  Date:   2016-02-11 (Thu, 11 Feb 2016)

  Changed paths:
    M htdocs/langs/en_US/accountancy.lang

  Log Message:
  -----------
  Modify menu for accountancy module - New balance feature


  Commit: f1a26cf54b3c88bde2738edc0d22ed649af5c101
      
https://github.com/Dolibarr/dolibarr/commit/f1a26cf54b3c88bde2738edc0d22ed649af5c101
  Author: aspangaro <address@hidden>
  Date:   2016-02-11 (Thu, 11 Feb 2016)

  Changed paths:
    M htdocs/langs/en_US/accountancy.lang

  Log Message:
  -----------
  Correct problem of merging for language file


  Commit: a8ead1d44ce4c4d88366e5d4e8a28e44dc8ba793
      
https://github.com/Dolibarr/dolibarr/commit/a8ead1d44ce4c4d88366e5d4e8a28e44dc8ba793
  Author: aspangaro <address@hidden>
  Date:   2016-02-15 (Mon, 15 Feb 2016)

  Changed paths:
    A htdocs/accountancy/bookkeeping/balance.php
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/adherents/list.php
    M htdocs/admin/confexped.php
    M htdocs/admin/delais.php
    M htdocs/admin/dict.php
    M htdocs/admin/oauth.php
    M htdocs/comm/mailing/card.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/remise.php
    M htdocs/compta/facture.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/commonobjectline.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/core/modules/modOauth.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/modules/oauth/google_oauthcallback.php
    M htdocs/core/modules/printing/printgcp.modules.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/exports/class/export.class.php
    M htdocs/imports/class/import.class.php
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/product/class/productcustomerprice.class.php
    M htdocs/product/price.php
    M htdocs/societe/price.php
    M scripts/emailings/mailing-send.php

  Log Message:
  -----------
  Merge remote-tracking branch 'Upstream/3.9' into 3.9-p11

Correct conflicts:
        htdocs/core/menus/standard/eldy.lib.php


  Commit: 816195cb438cd70bb44d0651ed5b7eccae4c5b88
      
https://github.com/Dolibarr/dolibarr/commit/816195cb438cd70bb44d0651ed5b7eccae4c5b88
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-02-15 (Mon, 15 Feb 2016)

  Changed paths:
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/langs/en_US/accountancy.lang

  Log Message:
  -----------
  Merge pull request #4600 from aspangaro/3.9-p11

Modifiy menu for accountancy module - New balance feature


Compare: 
https://github.com/Dolibarr/dolibarr/compare/353fa7c2fc44...816195cb438c