dolibarr-git
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] dd1c5c: Fix: Missing commit

From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] dd1c5c: Fix: Missing commit
Date: Sun, 29 Jun 2014 15:00:50 -0700 
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: dd1c5ce3d833fb86222a450000bb64daad7175d7
      
https://github.com/Dolibarr/dolibarr/commit/dd1c5ce3d833fb86222a450000bb64daad7175d7
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-28 (Sat, 28 Jun 2014)

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

  Log Message:
  -----------
  Fix: Missing commit


  Commit: d61e5bae932633ab891e3c228bdf1c3fa6c935a2
      
https://github.com/Dolibarr/dolibarr/commit/d61e5bae932633ab891e3c228bdf1c3fa6c935a2
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-06-28 (Sat, 28 Jun 2014)

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

  Log Message:
  -----------
  Fix : Invoice PDF was not showing ref when created from a shipment. Now shows 
refs and dates of shipment and oreder related


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

  Changed paths:
    M ChangeLog
    M htdocs/adherents/card_subscriptions.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/paiement/class/paiement.class.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/holiday/month_report.php
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_BR/agenda.lang
    M htdocs/langs/pt_BR/banks.lang
    M htdocs/langs/pt_BR/bills.lang
    M htdocs/langs/pt_BR/bookmarks.lang
    M htdocs/langs/pt_BR/boxes.lang
    M htdocs/langs/pt_BR/cashdesk.lang
    M htdocs/langs/pt_BR/categories.lang
    M htdocs/langs/pt_BR/commercial.lang
    M htdocs/langs/pt_BR/companies.lang
    M htdocs/langs/pt_BR/compta.lang
    M htdocs/langs/pt_BR/contracts.lang
    M htdocs/langs/pt_BR/errors.lang
    M htdocs/langs/pt_BR/exports.lang
    M htdocs/langs/pt_BR/help.lang
    M htdocs/langs/pt_BR/holiday.lang
    M htdocs/langs/pt_BR/install.lang
    M htdocs/langs/pt_BR/languages.lang
    M htdocs/langs/pt_BR/mails.lang
    M htdocs/langs/pt_BR/main.lang
    M htdocs/langs/pt_BR/margins.lang
    M htdocs/langs/pt_BR/members.lang
    M htdocs/langs/pt_BR/opensurvey.lang
    M htdocs/langs/pt_BR/orders.lang
    M htdocs/langs/pt_BR/other.lang
    M htdocs/langs/pt_BR/paypal.lang
    M htdocs/langs/pt_BR/products.lang
    M htdocs/langs/pt_BR/projects.lang
    M htdocs/langs/pt_BR/shop.lang
    M htdocs/langs/pt_BR/stocks.lang
    M htdocs/langs/pt_BR/users.lang
    M htdocs/langs/pt_BR/withdrawals.lang
    M htdocs/product/class/product.class.php
    M htdocs/product/stock/lib/replenishment.lib.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/element.php
    M htdocs/societe/consumption.php

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


  Commit: 25f2fec4739c30b89ec3b0c670893da227baafd1
      
https://github.com/Dolibarr/dolibarr/commit/25f2fec4739c30b89ec3b0c670893da227baafd1
  Author: aspangaro <address@hidden>
  Date:   2014-06-29 (Sun, 29 Jun 2014)

  Changed paths:
    M htdocs/install/mysql/data/llx_accounting.sql
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql

  Log Message:
  -----------
  Fix :: acount_parent must be an int - Final step


  Commit: 198a8d40f7f95cd6b15d283170d6398d7b2883ba
      
https://github.com/Dolibarr/dolibarr/commit/198a8d40f7f95cd6b15d283170d6398d7b2883ba
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-29 (Sun, 29 Jun 2014)

  Changed paths:
    M htdocs/compta/facture/fiche-rec.php

  Log Message:
  -----------
  Fix: Missing translation


  Commit: 185728023443a0ace18b58ec16184a0a9dac38db
      
https://github.com/Dolibarr/dolibarr/commit/185728023443a0ace18b58ec16184a0a9dac38db
  Author: Florian HENRY <address@hidden>
  Date:   2014-06-29 (Sun, 29 Jun 2014)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Fix [ bug #1516 ] PRODUIT_CUSTOMER_PRICES don't take default price if
not defined for customer


  Commit: e8bb5d5cc0f3f5f5d45ab5ccdb90f5c02586281e
      
https://github.com/Dolibarr/dolibarr/commit/e8bb5d5cc0f3f5f5d45ab5ccdb90f5c02586281e
  Author: Florian HENRY <address@hidden>
  Date:   2014-06-29 (Sun, 29 Jun 2014)

  Changed paths:
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Syntax


  Commit: a24aedac004327168ab98fa5fc28c7cb731a5a5c
      
https://github.com/Dolibarr/dolibarr/commit/a24aedac004327168ab98fa5fc28c7cb731a5a5c
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-29 (Sun, 29 Jun 2014)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Merge pull request #1695 from FHenry/3.6

 Fix [ bug #1516 ]


  Commit: 6fc3111216ea19c115aa4cbd254629775bfef761
      
https://github.com/Dolibarr/dolibarr/commit/6fc3111216ea19c115aa4cbd254629775bfef761
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-29 (Sun, 29 Jun 2014)

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

  Log Message:
  -----------
  Merge pull request #1691 from atm-maxime/3.6

Fix : Invoice PDF was not showing ref when created from a shipment. Now ...


  Commit: 02f4016b7b59c406396d54a02bef8ea4e8f50504
      
https://github.com/Dolibarr/dolibarr/commit/02f4016b7b59c406396d54a02bef8ea4e8f50504
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-29 (Sun, 29 Jun 2014)

  Changed paths:
    M htdocs/install/mysql/data/llx_accounting.sql
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql

  Log Message:
  -----------
  Merge pull request #1693 from aspangaro/3.6

Fix :: acount_parent must be an int - Final step


  Commit: 14de1d66c052d21d24cfab8240d2b9707f247e9f
      
https://github.com/Dolibarr/dolibarr/commit/14de1d66c052d21d24cfab8240d2b9707f247e9f
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-29 (Sun, 29 Jun 2014)

  Changed paths:
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.6

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


  Commit: 25ce734638f13079fcf19a15dc79e2e49fa7a921
      
https://github.com/Dolibarr/dolibarr/commit/25ce734638f13079fcf19a15dc79e2e49fa7a921
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-30 (Mon, 30 Jun 2014)

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.6' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/ebc6bede13a8...25ce734638f1
reply via email to
[Prev in Thread] Current Thread [Next in Thread]