[Dolibarr-git] [Dolibarr/dolibarr] cb189e: Add salary payment

[Juanjo Menent]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: cb189ed83e83723b44d1d836420be57b7614fc2e
      
https://github.com/Dolibarr/dolibarr/commit/cb189ed83e83723b44d1d836420be57b7614fc2e
  Author: aspangaro <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M htdocs/accountancy/journal/bankjournal.php

  Log Message:
  -----------
  Add salary payment


  Commit: e4f51d8f7a3a09ed534baf8871a794e5b3656c93
      
https://github.com/Dolibarr/dolibarr/commit/e4f51d8f7a3a09ed534baf8871a794e5b3656c93
  Author: aspangaro <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/accountancy/admin/productaccount.php
    M htdocs/accountancy/class/accountancysystem.class.php
    M htdocs/accountancy/class/accountingaccount.class.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/cashjournal.php
    M htdocs/admin/limits.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/agenda.lib.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/bank.lib.php
    M htdocs/core/lib/categories.lib.php
    M htdocs/core/lib/contact.lib.php
    M htdocs/core/lib/contract.lib.php
    M htdocs/core/lib/ecm.lib.php
    M htdocs/core/lib/emailing.lib.php
    M htdocs/core/lib/fichinter.lib.php
    M htdocs/core/lib/fiscalyear.lib.php
    M htdocs/core/lib/fourn.lib.php
    M htdocs/core/lib/order.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/prelevement.lib.php
    M htdocs/core/lib/product.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/propal.lib.php
    M htdocs/core/lib/sendings.lib.php
    M htdocs/core/lib/stock.lib.php
    M htdocs/core/lib/tax.lib.php
    M htdocs/core/lib/trip.lib.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/core/modules/propale/mod_propale_marbre.php
    M htdocs/core/modules/propale/mod_propale_saphir.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/product/fiche.php
    M htdocs/public/emailing/mailing-unsubscribe.php
    M htdocs/societe/ajax/company.php
    M htdocs/theme/amarok/style.css.php
    M htdocs/theme/auguria/style.css.php
    M htdocs/theme/bureau2crea/style.css.php
    M htdocs/theme/cameleo/style.css.php
    M htdocs/theme/eldy/style.css.php
    M scripts/accountancy/export-thirdpartyaccount.php

  Log Message:
  -----------
  Merge branch 'Upstream/develop'


  Commit: 9d08f4c5f5c769d86606d7b467c0433ad2c2ad51
      
https://github.com/Dolibarr/dolibarr/commit/9d08f4c5f5c769d86606d7b467c0433ad2c2ad51
  Author: aspangaro <address@hidden>
  Date:   2014-09-03 (Wed, 03 Sep 2014)

  Changed paths:
    M htdocs/accountancy/admin/account.php
    M htdocs/accountancy/admin/card.php
    M htdocs/accountancy/admin/export.php
    M htdocs/accountancy/admin/index.php
    M htdocs/accountancy/admin/journaux.php
    M htdocs/accountancy/class/accountingaccount.class.php
    M htdocs/core/menus/standard/eldy.lib.php

  Log Message:
  -----------
  Patch Accounting Expert module


  Commit: 4f41ee9f4c9c612e6541933f62a87a614128bd4d
      
https://github.com/Dolibarr/dolibarr/commit/4f41ee9f4c9c612e6541933f62a87a614128bd4d
  Author: aspangaro <address@hidden>
  Date:   2014-09-03 (Wed, 03 Sep 2014)

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

  Log Message:
  -----------
  typo


  Commit: 1389f7593380b146597481e36d536f8d99d6fb3b
      
https://github.com/Dolibarr/dolibarr/commit/1389f7593380b146597481e36d536f8d99d6fb3b
  Author: aspangaro <address@hidden>
  Date:   2014-09-03 (Wed, 03 Sep 2014)

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

  Log Message:
  -----------
  Don't show journals of module comptabilite when accounting expert module is 
enabled


  Commit: 354aee2457a1aab752ebb1c5557702ff1392ca3d
      
https://github.com/Dolibarr/dolibarr/commit/354aee2457a1aab752ebb1c5557702ff1392ca3d
  Author: aspangaro <address@hidden>
  Date:   2014-09-03 (Wed, 03 Sep 2014)

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

  Log Message:
  -----------
  Modify eldy menu


  Commit: de63388d33ad65f60a730c3c231028def06f6bca
      
https://github.com/Dolibarr/dolibarr/commit/de63388d33ad65f60a730c3c231028def06f6bca
  Author: aspangaro <address@hidden>
  Date:   2014-09-03 (Wed, 03 Sep 2014)

  Changed paths:
    M htdocs/accountancy/admin/export.php
    M htdocs/accountancy/admin/importaccounts.php
    M htdocs/accountancy/admin/journaux.php
    M htdocs/accountancy/bookkeeping/balancebymonth.php
    M htdocs/accountancy/bookkeeping/card.php
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/bookkeeping/listbyyear.php
    M htdocs/accountancy/customer/card.php
    M htdocs/accountancy/customer/index.php
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/cashjournal.php
    M htdocs/accountancy/journal/index.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/accountancy/supplier/card.php
    M htdocs/accountancy/supplier/index.php
    M htdocs/accountancy/supplier/lines.php
    M htdocs/accountancy/supplier/list.php

  Log Message:
  -----------
  Directory of file


  Commit: 102e85e1e7a685b6e3ae3c6639ffee2f8e64f1f0
      
https://github.com/Dolibarr/dolibarr/commit/102e85e1e7a685b6e3ae3c6639ffee2f8e64f1f0
  Author: aspangaro <address@hidden>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M ChangeLog
    M dev/skeletons/build_class_from_table.php
    R htdocs/accountancy/class/accountancyaccount.class.php
    M htdocs/accountancy/class/accountingaccount.class.php
    M htdocs/compta/bank/index.php
    M htdocs/core/ajax/ajaxdirpreview.php
    M htdocs/core/ajax/ajaxdirtree.php
    M htdocs/core/class/commonobjectline.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/fichinter.lib.php
    M htdocs/ecm/class/ecmdirectory.class.php
    M htdocs/ecm/tpl/enablefiletreeajax.tpl.php
    M htdocs/societe/consumption.php

  Log Message:
  -----------
  Merge branch 'Upstream/develop'


  Commit: ec47bc05b543381c485aa33b6e92353795561877
      
https://github.com/Dolibarr/dolibarr/commit/ec47bc05b543381c485aa33b6e92353795561877
  Author: aspangaro <address@hidden>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M htdocs/admin/index.php

  Log Message:
  -----------
  Missing key language


  Commit: 5b348979274e0bfc468e925fdd9b21644af20528
      
https://github.com/Dolibarr/dolibarr/commit/5b348979274e0bfc468e925fdd9b21644af20528
  Author: Juanjo Menent <address@hidden>
  Date:   2014-09-05 (Fri, 05 Sep 2014)

  Changed paths:
    M htdocs/accountancy/admin/account.php
    M htdocs/accountancy/admin/card.php
    M htdocs/accountancy/admin/export.php
    M htdocs/accountancy/admin/importaccounts.php
    M htdocs/accountancy/admin/index.php
    M htdocs/accountancy/admin/journaux.php
    M htdocs/accountancy/bookkeeping/balancebymonth.php
    M htdocs/accountancy/bookkeeping/card.php
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/bookkeeping/listbyyear.php
    M htdocs/accountancy/class/accountingaccount.class.php
    M htdocs/accountancy/customer/card.php
    M htdocs/accountancy/customer/index.php
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/cashjournal.php
    M htdocs/accountancy/journal/index.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/accountancy/supplier/card.php
    M htdocs/accountancy/supplier/index.php
    M htdocs/accountancy/supplier/lines.php
    M htdocs/accountancy/supplier/list.php
    M htdocs/admin/index.php
    M htdocs/core/menus/standard/eldy.lib.php

  Log Message:
  -----------
  Merge pull request #1864 from aspangaro/develop-accounting

Patch Accounting Expert module


Compare: 
https://github.com/Dolibarr/dolibarr/compare/60c633fd8b1d...5b348979274e