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

[Dolibarr-git] [Dolibarr/dolibarr] fdac53: Update objectline_create.tpl.

From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] fdac53: Update objectline_create.tpl.php
Date: Thu, 27 Nov 2014 17:22:50 -0800 
  Branch: refs/heads/3.7
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: fdac53bfca37b034a8decfb4f0e568cbc93a5b27
      
https://github.com/Dolibarr/dolibarr/commit/fdac53bfca37b034a8decfb4f0e568cbc93a5b27
  Author: BENKE Charles <address@hidden>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M htdocs/core/tpl/objectline_create.tpl.php

  Log Message:
  -----------
  Update objectline_create.tpl.php

add label tags for product mode type


  Commit: 7a272afd120029ba06d00ff6d56d7a8e129cbb8f
      
https://github.com/Dolibarr/dolibarr/commit/7a272afd120029ba06d00ff6d56d7a8e129cbb8f
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-11-23 (Sun, 23 Nov 2014)

  Changed paths:
    M ChangeLog
    M htdocs/fichinter/fiche.php

  Log Message:
  -----------
  Fixed [ bug #1595 ] Selected boolean extrafield in intervention creation 
page, does not save state


  Commit: dcfaeb6606657471e63100a50694fb08c1e3eac1
      
https://github.com/Dolibarr/dolibarr/commit/dcfaeb6606657471e63100a50694fb08c1e3eac1
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-11-23 (Sun, 23 Nov 2014)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/paypal/lib/paypal.lib.php
    M htdocs/product/class/product.class.php
    M htdocs/user/fiche.php

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


  Commit: 375d9aa33650f6c396ee1ae0166f33535bda12bf
      
https://github.com/Dolibarr/dolibarr/commit/375d9aa33650f6c396ee1ae0166f33535bda12bf
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-23 (Sun, 23 Nov 2014)

  Changed paths:
    M ChangeLog
    M htdocs/fichinter/fiche.php

  Log Message:
  -----------
  Merge pull request #2077 from marcosgdf/3.6

Fixed [ bug #1595 ] Selected boolean extrafield in intervention creation page, 
does not save state


  Commit: 1dbb19e8ef4a9b6ee76241eb61238253496e337c
      
https://github.com/Dolibarr/dolibarr/commit/1dbb19e8ef4a9b6ee76241eb61238253496e337c
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-24 (Mon, 24 Nov 2014)

  Changed paths:
    M htdocs/core/tpl/objectline_create.tpl.php

  Log Message:
  -----------
  Merge pull request #2058 from defrance69/patch-30

Update objectline_create.tpl.php


  Commit: 18406fc550d68bb5e851e242b6f928327bbe1a20
      
https://github.com/Dolibarr/dolibarr/commit/18406fc550d68bb5e851e242b6f928327bbe1a20
  Author: Francis Appels <address@hidden>
  Date:   2014-11-25 (Tue, 25 Nov 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

  Log Message:
  -----------
  Fix: Show sender Country on PDF docs

Show sender Country on PDF docs when sender Country != receiver Country


  Commit: b1a4b8e7d0aa8ff376e5dbfcf89260eb6e189d62
      
https://github.com/Dolibarr/dolibarr/commit/b1a4b8e7d0aa8ff376e5dbfcf89260eb6e189d62
  Author: Francis Appels <address@hidden>
  Date:   2014-11-25 (Tue, 25 Nov 2014)

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

  Log Message:
  -----------
  Fix: [ bug #1624 ] POS set buy price for margin

Use lowest buying price for margin when selling with POS or external
module. A POS user does not worry about suppliers.


  Commit: 4be9730518471568abb529ae9a4ef653d95a81ec
      
https://github.com/Dolibarr/dolibarr/commit/4be9730518471568abb529ae9a4ef653d95a81ec
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-28 (Fri, 28 Nov 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

  Log Message:
  -----------
  Merge pull request #2099 from fappels/3.6

Fix: Show sender Country on PDF docs


  Commit: df9a6dae6c438bffba4726802b579743910a014b
      
https://github.com/Dolibarr/dolibarr/commit/df9a6dae6c438bffba4726802b579743910a014b
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-28 (Fri, 28 Nov 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

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

Conflicts:
        htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
        htdocs/core/tpl/objectline_create.tpl.php
        htdocs/fichinter/fiche.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/9ba5e9434d4a...df9a6dae6c43
reply via email to
[Prev in Thread] Current Thread [Next in Thread]