[Dolibarr-git] [Dolibarr/dolibarr] 6b0b97: FIX : Keep supplier proposal

dolibarr-git

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

[Dolibarr-git] [Dolibarr/dolibarr] 6b0b97: FIX : Keep supplier proposal

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] 6b0b97: FIX : Keep supplier proposal price for supplier or...
Date:	Wed, 30 May 2018 03:13:52 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 6b0b975ffda214f73c65a5679c2730025e2400b5
      
https://github.com/Dolibarr/dolibarr/commit/6b0b975ffda214f73c65a5679c2730025e2400b5
  Author: ATM-Nicolas <address@hidden>
  Date:   2018-05-29 (Tue, 29 May 2018)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  FIX : Keep supplier proposal price for supplier order


  Commit: b65b545e0f498c5bd46d1c3c098ba6ff30410ed4
      
https://github.com/Dolibarr/dolibarr/commit/b65b545e0f498c5bd46d1c3c098ba6ff30410ed4
  Author: florian HENRY <address@hidden>
  Date:   2018-05-29 (Tue, 29 May 2018)

  Changed paths:
    M htdocs/compta/recap-compta.php
    M htdocs/fourn/recap-fourn.php

  Log Message:
  -----------
  add hook on balence pages


  Commit: 48a315f6cdc3f9a08530e10a3dc0dbd4d15d9e73
      
https://github.com/Dolibarr/dolibarr/commit/48a315f6cdc3f9a08530e10a3dc0dbd4d15d9e73
  Author: ATM-Nicolas <address@hidden>
  Date:   2018-05-30 (Wed, 30 May 2018)

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

  Log Message:
  -----------
  FIX : Bad substitution key used for default send proposal email


  Commit: e57ceab5de4fad7a54c6f8b613cf0dfdd2ce8857
      
https://github.com/Dolibarr/dolibarr/commit/e57ceab5de4fad7a54c6f8b613cf0dfdd2ce8857
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  Update fournisseur.commande.class.php


  Commit: aa59c380ad4cb6fdb3ff059b7df40e5964a33fc7
      
https://github.com/Dolibarr/dolibarr/commit/aa59c380ad4cb6fdb3ff059b7df40e5964a33fc7
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  Merge pull request #8886 from ATM-Nicolas/fix_supplier_order

FIX : Keep supplier proposal price for supplier order


  Commit: 7590df85e664c775c734d9ca64f14ffdf3dce5ac
      
https://github.com/Dolibarr/dolibarr/commit/7590df85e664c775c734d9ca64f14ffdf3dce5ac
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M htdocs/compta/recap-compta.php
    M htdocs/fourn/recap-fourn.php

  Log Message:
  -----------
  Merge pull request #8887 from atm-florian/6.0

add hook on balence pages


  Commit: 28646a6b5030e39dcd781ae73947b7daa74f5f26
      
https://github.com/Dolibarr/dolibarr/commit/28646a6b5030e39dcd781ae73947b7daa74f5f26
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-05-30 (Wed, 30 May 2018)

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

  Log Message:
  -----------
  Merge pull request #8892 from ATM-Nicolas/fix_bad_email_substitution_key

FIX : Bad substitution key used for default send proposal email


  Commit: 02da9b69921ac37aeab5cb06f8432e8f5e507af6
      
https://github.com/Dolibarr/dolibarr/commit/02da9b69921ac37aeab5cb06f8432e8f5e507af6
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  FIX #8893 to get formatted price as substitution vars


  Commit: 2df2071bae0c79e7947650c85046c8f47ebe6a45
      
https://github.com/Dolibarr/dolibarr/commit/2df2071bae0c79e7947650c85046c8f47ebe6a45
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-05-30 (Wed, 30 May 2018)

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

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


  Commit: 37331691201dadffd040fc8ac2a59f3310db48ee
      
https://github.com/Dolibarr/dolibarr/commit/37331691201dadffd040fc8ac2a59f3310db48ee
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M htdocs/compta/recap-compta.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/recap-fourn.php

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

Conflicts:
        htdocs/compta/recap-compta.php
        htdocs/fourn/class/fournisseur.commande.class.php


  Commit: 60321aabd89e38b77cfbf68cc4793b2970d5cb4d
      
https://github.com/Dolibarr/dolibarr/commit/60321aabd89e38b77cfbf68cc4793b2970d5cb4d
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  Fix regression


  Commit: 0412264418e06dab0475044df0a88c8fbd6b2945
      
https://github.com/Dolibarr/dolibarr/commit/0412264418e06dab0475044df0a88c8fbd6b2945
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

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

Conflicts:
        htdocs/fourn/class/fournisseur.commande.class.php


  Commit: de59892438cb1ad380a4ea2b03debc4f4bf61325
      
https://github.com/Dolibarr/dolibarr/commit/de59892438cb1ad380a4ea2b03debc4f4bf61325
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M htdocs/compta/recap-compta.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/recap-fourn.php
    M htdocs/langs/en_US/other.lang

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

Conflicts:
        htdocs/core/lib/functions.lib.php
        htdocs/fourn/class/fournisseur.commande.class.php


  Commit: d8d4d15b4b8bd03804faed61fbc0f0878dbde029
      
https://github.com/Dolibarr/dolibarr/commit/d8d4d15b4b8bd03804faed61fbc0f0878dbde029
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M .travis.yml
    M dev/setup/codesniffer/ruleset.xml
    M htdocs/accountancy/bookkeeping/balancebymonth.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/card.php
    M htdocs/compta/facture/class/api_invoices.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/core/modules/modApi.class.php
    M htdocs/core/modules/modAsset.class.php
    M htdocs/core/modules/modBanque.class.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modCommande.class.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/core/modules/modExpenseReport.class.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/core/modules/modFicheinter.class.php
    M htdocs/core/modules/modFournisseur.class.php
    M htdocs/core/modules/modGravatar.class.php
    M htdocs/core/modules/modHoliday.class.php
    M htdocs/core/modules/modMultiCurrency.class.php
    M htdocs/core/modules/modPaybox.class.php
    M htdocs/core/modules/modPaypal.class.php
    M htdocs/core/modules/modProduct.class.php
    M htdocs/core/modules/modPropale.class.php
    M htdocs/core/modules/modService.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/modules/modStock.class.php
    M htdocs/core/modules/modUser.class.php
    M htdocs/core/modules/printing/printgcp.modules.php
    M htdocs/cron/list.php
    M htdocs/fourn/facture/card.php
    M 
htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
    M htdocs/opensurvey/wizard/index.php
    M htdocs/supplier_proposal/card.php
    M test/phpunit/FactureTest.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c1f5c6becfaf...d8d4d15b4b8b
      **NOTE:** This service been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

[Prev in Thread]

Current Thread

[Next in Thread]

[Dolibarr-git] [Dolibarr/dolibarr] 6b0b97: FIX : Keep supplier proposal price for supplier or..., Laurent Destailleur, 2018/05/30
- [Dolibarr-git] [Dolibarr/dolibarr] 6b0b97: FIX : Keep supplier proposal price for supplier or..., Laurent Destailleur, 2018/05/30
- [Dolibarr-git] [Dolibarr/dolibarr] 6b0b97: FIX : Keep supplier proposal price for supplier or..., Laurent Destailleur <=

Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] 60321a: Fix regression
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] 050337: Avoid error on screen
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] 6b0b97: FIX : Keep supplier proposal price for supplier or...
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] b65b54: add hook on balence pages
Index(es):
- Date
- Thread