[Dolibarr-git] [Dolibarr/dolibarr] f0a305: Fix: ER button set_paid & merge with old option se...

[Juanjo Menent]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f0a3057221c230a38172ab656fe826123f6cc871
      
https://github.com/Dolibarr/dolibarr/commit/f0a3057221c230a38172ab656fe826123f6cc871
  Author: aspangaro <address@hidden>
  Date:   2015-06-21 (Sun, 21 Jun 2015)

  Changed paths:
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php

  Log Message:
  -----------
  Fix: ER button set_paid & merge with old option setPaid


  Commit: e0ae7bd4300ea04051d3cce414848c1ac9c9fbe8
      
https://github.com/Dolibarr/dolibarr/commit/e0ae7bd4300ea04051d3cce414848c1ac9c9fbe8
  Author: aspangaro <address@hidden>
  Date:   2015-06-21 (Sun, 21 Jun 2015)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/prelevement/bons.php
    M htdocs/compta/prelevement/card.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/prelevement/create.php
    M htdocs/compta/prelevement/index.php
    R htdocs/compta/prelevement/lignes.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/prelevement.lib.php
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
    M htdocs/core/modules/modExpenseReport.class.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_expensereport_det.sql
    M htdocs/langs/en_US/withdrawals.lang
    M htdocs/langs/fr_FR/withdrawals.lang
    M htdocs/product/card.php
    M htdocs/societe/class/companybankaccount.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/rib.php

  Log Message:
  -----------
  Merge remote-tracking branch 'Upstream/develop' into develop-37


  Commit: 134cea194dc3a3e3ca79a80bb75d94b4cf20afb2
      
https://github.com/Dolibarr/dolibarr/commit/134cea194dc3a3e3ca79a80bb75d94b4cf20afb2
  Author: aspangaro <address@hidden>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php

  Log Message:
  -----------
  Debug


  Commit: fae0a99a97121504aaae57744f66c23293ecd286
      
https://github.com/Dolibarr/dolibarr/commit/fae0a99a97121504aaae57744f66c23293ecd286
  Author: aspangaro <address@hidden>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M dev/skeletons/skeleton_page.php
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/supplier/lines.php
    M htdocs/adherents/card.php
    M htdocs/adherents/list.php
    M htdocs/admin/ihm.php
    M htdocs/barcode/codeinit.php
    M htdocs/categories/index.php
    M htdocs/comm/list.php
    M htdocs/comm/prospect/list.php
    M htdocs/compta/prelevement/create.php
    M htdocs/core/boxes/modules_boxes.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/search_page.php
    M htdocs/cron/card.php
    M htdocs/cron/class/cronjob.class.php
    M htdocs/fourn/list.php
    M htdocs/holiday/card.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/langs/en_US/cron.lang
    M htdocs/langs/en_US/holiday.lang
    M htdocs/langs/en_US/members.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/main.inc.php
    M htdocs/projet/element.php
    M htdocs/projet/list.php
    M htdocs/public/cron/cron_run_jobs.php
    M htdocs/societe/canvas/actions_card_common.class.php
    M htdocs/societe/index.php
    A htdocs/societe/list.php
    M htdocs/societe/soc.php
    R htdocs/societe/societe.php
    M htdocs/support/default.css
    M htdocs/support/index.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

  Log Message:
  -----------
  Merge remote-tracking branch 'Upstream/develop' into develop-37


  Commit: 385857380bfeb3c10eb179c00bc0c403085ac87a
      
https://github.com/Dolibarr/dolibarr/commit/385857380bfeb3c10eb179c00bc0c403085ac87a
  Author: aspangaro <address@hidden>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/expensereport/export_csv.php
    M htdocs/expensereport/synchro_compta.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_expensereport.sql

  Log Message:
  -----------
  Remove old field


  Commit: 759aec392595b8153375a13bca28a16cdff547b9
      
https://github.com/Dolibarr/dolibarr/commit/759aec392595b8153375a13bca28a16cdff547b9
  Author: Juanjo Menent <address@hidden>
  Date:   2015-06-24 (Wed, 24 Jun 2015)

  Changed paths:
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/expensereport/export_csv.php
    M htdocs/expensereport/synchro_compta.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_expensereport.sql

  Log Message:
  -----------
  Merge pull request #3084 from aspangaro/develop-patch37

Fix: ER button set_paid & merge with old option setPaid


Compare: 
https://github.com/Dolibarr/dolibarr/compare/fc9d54fdaa9f...759aec392595