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

[Dolibarr-git] [Dolibarr/dolibarr] e7cfb7: [ bug #1432 ] Trigger SHIPPIN

From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] e7cfb7: [ bug #1432 ] Trigger SHIPPING_CREATE ignores inte...
Date: Fri, 20 Jun 2014 06:26:26 -0700 
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: e7cfb719b994c1daf5400c3361790d4d7d4f0d76
      
https://github.com/Dolibarr/dolibarr/commit/e7cfb719b994c1daf5400c3361790d4d7d4f0d76
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/expedition/class/expedition.class.php

  Log Message:
  -----------
  [ bug #1432 ] Trigger SHIPPING_CREATE ignores interception on error


  Commit: 0c1ba58a00f96d952214cc37b048d0954c25f3b3
      
https://github.com/Dolibarr/dolibarr/commit/0c1ba58a00f96d952214cc37b048d0954c25f3b3
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/commande/class/commande.class.php

  Log Message:
  -----------
  Fix: [ bug #1449 ] Trigger ORDER_CREATE ignores interception on error


  Commit: 900b182f3c01218dc963b9b95bd55affffea1d78
      
https://github.com/Dolibarr/dolibarr/commit/900b182f3c01218dc963b9b95bd55affffea1d78
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Updated changelog


  Commit: 6e0ecc4f780ce79066b31a9510730debaf6b2d9b
      
https://github.com/Dolibarr/dolibarr/commit/6e0ecc4f780ce79066b31a9510730debaf6b2d9b
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

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

  Log Message:
  -----------
  Fixed LINEORDER_DELETE interception


  Commit: 95a58ebef8a248102d9870942b25d632fb6d9aa9
      
https://github.com/Dolibarr/dolibarr/commit/95a58ebef8a248102d9870942b25d632fb6d9aa9
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

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

  Log Message:
  -----------
  Fixed LINEORDER_UPDATE interception


  Commit: 7ebd23153249183159b6b343b25042f002bb5cf5
      
https://github.com/Dolibarr/dolibarr/commit/7ebd23153249183159b6b343b25042f002bb5cf5
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

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

  Log Message:
  -----------
  Fixed LINEORDER_INSERT interception


  Commit: 08588e208086d6a46cdafe9094b3a5e80632d576
      
https://github.com/Dolibarr/dolibarr/commit/08588e208086d6a46cdafe9094b3a5e80632d576
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

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

  Log Message:
  -----------
  Fixed ORDER_REOPEN trigger error message


  Commit: 86719bc82a7b212e4a4d24f2e540af20c0270383
      
https://github.com/Dolibarr/dolibarr/commit/86719bc82a7b212e4a4d24f2e540af20c0270383
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

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

  Log Message:
  -----------
  Fixed ORDER_CANCEL trigger error message


  Commit: 16b1b0f22753d4d844eb30cd30545f4f3477a0dd
      
https://github.com/Dolibarr/dolibarr/commit/16b1b0f22753d4d844eb30cd30545f4f3477a0dd
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

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

  Log Message:
  -----------
  Fixed ORDER_CLASSIFY_BILLED trigger error message


  Commit: f3807c754cf3784b8f6a2fc9e7da6f2075d70969
      
https://github.com/Dolibarr/dolibarr/commit/f3807c754cf3784b8f6a2fc9e7da6f2075d70969
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

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

  Log Message:
  -----------
  Fixed ORDER_DELETE trigger error message


  Commit: 5a3fc00b4c28e96d0e57f637a73ff013e16f9324
      
https://github.com/Dolibarr/dolibarr/commit/5a3fc00b4c28e96d0e57f637a73ff013e16f9324
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/fiche.php

  Log Message:
  -----------
  Fix: [ bug #1450 ] Several Customer order's triggers do not report the error 
from the trigger handler


  Commit: b9801a8b3cbf1304a00ab371f95168d2d56b5ba5
      
https://github.com/Dolibarr/dolibarr/commit/b9801a8b3cbf1304a00ab371f95168d2d56b5ba5
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Missing changelog


  Commit: 0ef89e40608943b9986a2422728c25d342714680
      
https://github.com/Dolibarr/dolibarr/commit/0ef89e40608943b9986a2422728c25d342714680
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M htdocs/commande/fiche.php

  Log Message:
  -----------
  Corrected ORDER_CLONE trigger error message


  Commit: 7cb5cc550fae6d353c5f135cb08a2e5b1cb2bf6c
      
https://github.com/Dolibarr/dolibarr/commit/7cb5cc550fae6d353c5f135cb08a2e5b1cb2bf6c
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Didn't mean to change this entry of the changelog


  Commit: ff37adf6f1e8468f7c32bc4631571f3c342ac3f2
      
https://github.com/Dolibarr/dolibarr/commit/ff37adf6f1e8468f7c32bc4631571f3c342ac3f2
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

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

  Log Message:
  -----------
  Fix: [ bug #1451 ] Interrupted order clone through trigger, loads nonexistent 
order


  Commit: 2fed26d68b40d006f1549fe1fe0454477dca3fbe
      
https://github.com/Dolibarr/dolibarr/commit/2fed26d68b40d006f1549fe1fe0454477dca3fbe
  Author: Fab <address@hidden>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  html fix : missing </tr>.


  Commit: 40742e84a9ef9702be1f9da246217ba45f48c0ee
      
https://github.com/Dolibarr/dolibarr/commit/40742e84a9ef9702be1f9da246217ba45f48c0ee
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/facture/list.php

  Log Message:
  -----------
  Fix: Bad balance of colspan.
Fix: Filter on status was not visible when selected from url.
Fix: Filtering on status was last when asking to sort.


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

  Changed paths:
    M htdocs/projet/fiche.php

  Log Message:
  -----------
  Fix: socid was not caught.
Fix: numbering modules was not correctly scanned.


  Commit: 80facefa23205b5c617293f74af7219562dca95c
      
https://github.com/Dolibarr/dolibarr/commit/80facefa23205b5c617293f74af7219562dca95c
  Author: Florian HENRY <address@hidden>
  Date:   2014-06-12 (Thu, 12 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

  Log Message:
  -----------
  Fix [ bug #1454 ] Mention de bas de page erroné


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

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/admin.lib.php

  Log Message:
  -----------
  Do not display dictionnay for non activated module


  Commit: 1ba02185e5b47d223242509e2979cb7a08806c75
      
https://github.com/Dolibarr/dolibarr/commit/1ba02185e5b47d223242509e2979cb7a08806c75
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-12 (Thu, 12 Jun 2014)

  Changed paths:
    M htdocs/comm/propal.php

  Log Message:
  -----------
  Fix: Error nor reported


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

  Changed paths:
    M htdocs/core/class/html.formprojet.class.php

  Log Message:
  -----------
  Fix: When project was disabled, label was not visible


  Commit: 40a5d20cc885ea47fc62bfd940d8e91e56e18f03
      
https://github.com/Dolibarr/dolibarr/commit/40a5d20cc885ea47fc62bfd940d8e91e56e18f03
  Author: Florian HENRY <address@hidden>
  Date:   2014-06-12 (Thu, 12 Jun 2014)

  Changed paths:
    M htdocs/core/modules/modProduct.class.php

  Log Message:
  -----------
  Do not reset index on product import !!!


  Commit: 1a9e53e21f3d804647ca50d11e60eee7143992d0
      
https://github.com/Dolibarr/dolibarr/commit/1a9e53e21f3d804647ca50d11e60eee7143992d0
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-12 (Thu, 12 Jun 2014)

  Changed paths:
    M htdocs/projet/class/task.class.php

  Log Message:
  -----------
  Fxi: Correct property name


  Commit: d508c076e8e5292b04ab8b1445d6c3ad11ba4bf2
      
https://github.com/Dolibarr/dolibarr/commit/d508c076e8e5292b04ab8b1445d6c3ad11ba4bf2
  Author: philippe <address@hidden>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M htdocs/fourn/paiement/fiche.php

  Log Message:
  -----------
  Fix : num paiement was not displayed


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

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/projet/class/task.class.php

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


  Commit: 0916d2cf3b1307db8d8e7612ae96f2e5ce71f67b
      
https://github.com/Dolibarr/dolibarr/commit/0916d2cf3b1307db8d8e7612ae96f2e5ce71f67b
  Author: Florian HENRY <address@hidden>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/projet/element.php

  Log Message:
  -----------
  Fix link element from project "associates object" pages
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50687-objet-associes-au-projet


  Commit: 42e6727e5ddd75ba1261c81901a63794dc2526ed
      
https://github.com/Dolibarr/dolibarr/commit/42e6727e5ddd75ba1261c81901a63794dc2526ed
  Author: Florian HENRY <address@hidden>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M htdocs/core/class/html.formprojet.class.php

  Log Message:
  -----------
  Better error return


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

  Changed paths:
    M ChangeLog
    M htdocs/expedition/class/expedition.class.php

  Log Message:
  -----------
  Merge branch 'bug-1432' of github.com:marcosgdf/dolibarr into
marcosgdf-bug-1432

Conflicts:
        ChangeLog


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

  Changed paths:
    M ChangeLog
    M htdocs/expedition/class/expedition.class.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1432' into 3.5


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

  Changed paths:
    M ChangeLog
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/fiche.php

  Log Message:
  -----------
  Fixes for bug 1449, 1450 and 1451 #1654


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

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


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

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'bug-1451' of github.com:marcosgdf/dolibarr into 3.5

Conflicts:
        ChangeLog


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

  Changed paths:
    M ChangeLog
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  Merge pull request #1656 from netfab/3.5

html fix : missing </tr>.


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

  Changed paths:
    M ChangeLog
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/modules/modProduct.class.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge branch '3.5' of github.com:FHenry/dolibarr into 3.5

Conflicts:
        ChangeLog


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

  Changed paths:
    M htdocs/fourn/paiement/fiche.php

  Log Message:
  -----------
  Merge pull request #1662 from grandoc/3.5

Fix : num paiement was not displayed


  Commit: 0f77fbaea2099af02d8fa04673b8ca5ece6daf3c
      
https://github.com/Dolibarr/dolibarr/commit/0f77fbaea2099af02d8fa04673b8ca5ece6daf3c
  Author: Florian HENRY <address@hidden>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/js/lib_head.js
    M htdocs/core/lib/ajax.lib.php

  Log Message:
  -----------
  Fix [ bug #1349 ] AJAX contact selector does not work fine in Project
card


  Commit: 03156b58e3242e329ca795d316fc9d6a12f5d056
      
https://github.com/Dolibarr/dolibarr/commit/03156b58e3242e329ca795d316fc9d6a12f5d056
  Author: Florian HENRY <address@hidden>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  [ bug #1452 ] variable used but not defined


  Commit: 7f92031583e16509e7e097be96de5b2fbb544359
      
https://github.com/Dolibarr/dolibarr/commit/7f92031583e16509e7e097be96de5b2fbb544359
  Author: Florian HENRY <address@hidden>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Changelog


  Commit: 0645189432634fead60e2ccc64c0cee6dfaead76
      
https://github.com/Dolibarr/dolibarr/commit/0645189432634fead60e2ccc64c0cee6dfaead76
  Author: Florian HENRY <address@hidden>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

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

  Log Message:
  -----------
  If multiprice level is used the VAT on addline is not correct


  Commit: 5b5473bc7c09fa98d55321944cd5db6cc21137c2
      
https://github.com/Dolibarr/dolibarr/commit/5b5473bc7c09fa98d55321944cd5db6cc21137c2
  Author: Francis Appels <address@hidden>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/admin/expedition.php

  Log Message:
  -----------
  Fix: [ bug #1509 ] Expedition admin submit error

Expedition admin free text & watermark submit error


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

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/compta/facture.php
    M htdocs/expedition/fiche.php
    M htdocs/fichinter/fiche.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object (3.5 fix)


  Commit: 40f5911f52cfe2d92ccc524c3950d45a1e322f70
      
https://github.com/Dolibarr/dolibarr/commit/40f5911f52cfe2d92ccc524c3950d45a1e322f70
  Author: Florian HENRY <address@hidden>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/commande/fiche.php

  Log Message:
  -----------
  Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a
product (on supplier order part)


  Commit: 46e54ac64e13e9096bffd9b1b33d255121a02ac1
      
https://github.com/Dolibarr/dolibarr/commit/46e54ac64e13e9096bffd9b1b33d255121a02ac1
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Fix 1455 outstanding amount


  Commit: 8ce8bf47ee5259dccdf8db8ade7044062061df80
      
https://github.com/Dolibarr/dolibarr/commit/8ce8bf47ee5259dccdf8db8ade7044062061df80
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

  Log Message:
  -----------
  Fix: The object deliverycompany was not used anymore and output of
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.

Conflicts:
        htdocs/core/modules/expedition/doc/pdf_merou.modules.php
        htdocs/core/modules/expedition/doc/pdf_rouget.modules.php


  Commit: 221d7b56aaf6d80376991df5f72b87a53e4cb161
      
https://github.com/Dolibarr/dolibarr/commit/221d7b56aaf6d80376991df5f72b87a53e4cb161
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

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

  Log Message:
  -----------
  Fix: The object deliverycompany was not used anymore and output of
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.

Conflicts:
        htdocs/core/modules/expedition/doc/pdf_merou.modules.php
        htdocs/core/modules/expedition/doc/pdf_rouget.modules.php


  Commit: 6740e0321aaa3c43f3e02839d4b6f2e0a05b487d
      
https://github.com/Dolibarr/dolibarr/commit/6740e0321aaa3c43f3e02839d4b6f2e0a05b487d
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php
    M htdocs/core/js/lib_head.js
    M htdocs/core/lib/ajax.lib.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  Merge pull request #1670 from FHenry/3.5

Fix [ bug #1349 ] AJAX contact selector does not work fine in Project


  Commit: 1cffc8d8f6abfa7fca7e46b6583df2dc05eb0aee
      
https://github.com/Dolibarr/dolibarr/commit/1cffc8d8f6abfa7fca7e46b6583df2dc05eb0aee
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/admin/expedition.php

  Log Message:
  -----------
  Merge branch '3.5' of github.com:fappels/dolibarr into fappels-3.5


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

  Changed paths:
    M ChangeLog
    M htdocs/admin/expedition.php

  Log Message:
  -----------
  Merge branch 'fappels-3.5' into 3.5


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

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php
    M htdocs/core/js/lib_head.js
    M htdocs/core/lib/ajax.lib.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/facture/fiche.php

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

Conflicts:
        ChangeLog


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

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/compta/facture.php
    M htdocs/expedition/fiche.php
    M htdocs/fichinter/fiche.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Merge pull request #1674 from atm-maxime/3.5

Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object (3.5 fix...


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

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object
Fix 1455 outstanding amount


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

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

  Log Message:
  -----------
  Fix: [ bug #1425 ]


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

  Changed paths:
    M ChangeLog
    M htdocs/core/class/html.formfile.class.php

  Log Message:
  -----------
  Fix: [ bug #1428 ] "Nothing" is shown in the middle of the screen in a
supplier order.


  Commit: 28fd8c68626641733d733ab8437f26d963fa2468
      
https://github.com/Dolibarr/dolibarr/commit/28fd8c68626641733d733ab8437f26d963fa2468
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/commande/fiche.php

  Log Message:
  -----------
  Fix: [ bug #1431 ] Reception and Send supplier order box has a weird top
margin.


  Commit: 8d1fdec8cf510835c45a1bddb61d266ac6a3febe
      
https://github.com/Dolibarr/dolibarr/commit/8d1fdec8cf510835c45a1bddb61d266ac6a3febe
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/admin/expedition.php
    M htdocs/comm/propal.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/js/lib_head.js
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/fourn/facture/list.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/element.php
    M htdocs/projet/fiche.php

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

Conflicts:
        htdocs/comm/propal.php
        htdocs/commande/fiche.php
        htdocs/compta/facture.php
        htdocs/core/lib/pdf.lib.php
        htdocs/core/modules/expedition/doc/pdf_merou.modules.php
        htdocs/core/modules/modProduct.class.php
        htdocs/fourn/commande/fiche.php
        htdocs/projet/fiche.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e2afa6853bf7...8d1fdec8cf51
reply via email to
[Prev in Thread] Current Thread [Next in Thread]