[Dolibarr-git] [Dolibarr/dolibarr] 568d5c: Fixed: Tracking number restor

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 568d5c: Fixed: Tracking number restor

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] 568d5c: Fixed: Tracking number restored on PDF shipments
Date:	Tue, 10 Feb 2015 12:34:09 -0800
  Branch: refs/heads/3.7
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 568d5cb5ba8f2eddc729a4b6d362f24fe6fcf1eb
      
https://github.com/Dolibarr/dolibarr/commit/568d5cb5ba8f2eddc729a4b6d362f24fe6fcf1eb
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/en_US/stocks.lang

  Log Message:
  -----------
  Fixed: Tracking number restored on PDF shipments
Fixed: Translation

Conflicts:
        htdocs/langs/en_US/agenda.lang


  Commit: 11dd32a8fd7d7d29061145203e7a329762d8d051
      
https://github.com/Dolibarr/dolibarr/commit/11dd32a8fd7d7d29061145203e7a329762d8d051
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M htdocs/core/modules/import/import_csv.modules.php

  Log Message:
  -----------
  FIXED Import module was not working with multi-company and importing 
everything in entity 1


  Commit: 04f83ae4ff9feddbf567dc1c94f41b083ee03cb7
      
https://github.com/Dolibarr/dolibarr/commit/04f83ae4ff9feddbf567dc1c94f41b083ee03cb7
  Author: Christophe Battarel <address@hidden>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

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

  Log Message:
  -----------
  FIX: always show fournprice select


  Commit: 25815924418bdc0f3f8a4679d2983094768e3433
      
https://github.com/Dolibarr/dolibarr/commit/25815924418bdc0f3f8a4679d2983094768e3433
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-31 (Sat, 31 Jan 2015)

  Changed paths:
    M htdocs/core/modules/import/import_csv.modules.php

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

FIXED Import module was not working with multi-company and importing eve...


  Commit: 87b75126aa2cbc5bbe5704bd926557aceeac3a7c
      
https://github.com/Dolibarr/dolibarr/commit/87b75126aa2cbc5bbe5704bd926557aceeac3a7c
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-31 (Sat, 31 Jan 2015)

  Changed paths:
    M htdocs/comm/action/class/actioncomm.class.php

  Log Message:
  -----------
  Fix missing set into specimen


  Commit: 3ec5b46864ed195f4c76192c6ac4d4a9fa7af711
      
https://github.com/Dolibarr/dolibarr/commit/3ec5b46864ed195f4c76192c6ac4d4a9fa7af711
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-31 (Sat, 31 Jan 2015)

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

  Log Message:
  -----------
  Merge pull request #2294 from altatof/fix_fournprice_visibility

FIX: always show fournprice select


  Commit: ef354834943a7af57c792a3e7d84cedca88ee8dc
      
https://github.com/Dolibarr/dolibarr/commit/ef354834943a7af57c792a3e7d84cedca88ee8dc
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-02-01 (Sun, 01 Feb 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/paiement/liste.php

  Log Message:
  -----------
  Fix: [ bug #1819 ] SQL error when searching for an invoice payment


  Commit: 0c6364403850cb293ed92b9e1906a58b2f70862e
      
https://github.com/Dolibarr/dolibarr/commit/0c6364403850cb293ed92b9e1906a58b2f70862e
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-02-01 (Sun, 01 Feb 2015)

  Changed paths:
    M ChangeLog
    M htdocs/comm/mailing/fiche.php

  Log Message:
  -----------
  Fix: [ bug #1819 ] SQL error when searching for an invoice payment


  Commit: fb865e818490ba2008d2d44fc1a4a5737e4e5478
      
https://github.com/Dolibarr/dolibarr/commit/fb865e818490ba2008d2d44fc1a4a5737e4e5478
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-02-02 (Mon, 02 Feb 2015)

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

  Log Message:
  -----------
  FIXED Removed deprecated forcing SSLv3 for CURL

Since the Poodle vulnerability, SSLv3 has been supersedded by TLS.
Many services do not offer SSLv3 anymore.
CURL has also been patched in PHP so it now auto-negociates the most 
appropriate protocol.
This prevented most API calls from working.


  Commit: 3ad61e4dc8e3676e9c0537d8db2614411d7716a7
      
https://github.com/Dolibarr/dolibarr/commit/3ad61e4dc8e3676e9c0537d8db2614411d7716a7
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/paiement/liste.php

  Log Message:
  -----------
  Merge pull request #2307 from marcosgdf/bug-1819

Fix: [ bug #1819 ] SQL error when searching for an invoice payment


  Commit: fd93e9f322f2c91d25f454d901f5be63370de8f3
      
https://github.com/Dolibarr/dolibarr/commit/fd93e9f322f2c91d25f454d901f5be63370de8f3
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M ChangeLog
    M htdocs/comm/mailing/fiche.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1812' into 3.6


  Commit: 3bb6a5e8aff68b3984299afc8f194a79d68c8f26
      
https://github.com/Dolibarr/dolibarr/commit/3bb6a5e8aff68b3984299afc8f194a79d68c8f26
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/paiement/liste.php

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

Conflicts:
        ChangeLog


  Commit: 212319b1f825e4ee746fed78c20de0bae06800c7
      
https://github.com/Dolibarr/dolibarr/commit/212319b1f825e4ee746fed78c20de0bae06800c7
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #2313 from GPCsolutions/3.6-ssl

FIXED Removed deprecated forcing SSLv3 for CURL


  Commit: eb2c5c29b787b8aa9c2a9669006ae83ab0f1f83c
      
https://github.com/Dolibarr/dolibarr/commit/eb2c5c29b787b8aa9c2a9669006ae83ab0f1f83c
  Author: Arnaud Aujon Chevallier <address@hidden>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M htdocs/webservices/server_order.php

  Log Message:
  -----------
  FIXES Webservice : fk_delivery_address not saved


  Commit: 65efa7ddf76d442264c9aff8c995fecd78a6df00
      
https://github.com/Dolibarr/dolibarr/commit/65efa7ddf76d442264c9aff8c995fecd78a6df00
  Author: Arnaud Aujon <address@hidden>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M htdocs/contact/class/contact.class.php
    M htdocs/webservices/server_contact.php

  Log Message:
  -----------
  FIXED #1824 Add ref_ext for Contact webservices

Add possibility to use ref_ext to reference contact using webservice, field was 
present but not saved and not used to fetch object


  Commit: b8b9df7b953e6e8ba5226cd7096433c3e57a1813
      
https://github.com/Dolibarr/dolibarr/commit/b8b9df7b953e6e8ba5226cd7096433c3e57a1813
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

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

  Log Message:
  -----------
  Fix: [ bug #1827 ] Tax reports gives incorrect amounts when using external 
modules that create lines with special codes


  Commit: 6eb0d340326906d115e0ef4340ee427fd4df14db
      
https://github.com/Dolibarr/dolibarr/commit/6eb0d340326906d115e0ef4340ee427fd4df14db
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-07 (Sat, 07 Feb 2015)

  Changed paths:
    M htdocs/contact/class/contact.class.php
    M htdocs/webservices/server_contact.php

  Log Message:
  -----------
  Merge pull request #2325 from aaujon/3.6-webservices-contact

FIXED #1824 Add ref_ext for Contact webservices


  Commit: d10e28db36f117f3e2215ac52cc717a4ed50cd94
      
https://github.com/Dolibarr/dolibarr/commit/d10e28db36f117f3e2215ac52cc717a4ed50cd94
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-07 (Sat, 07 Feb 2015)

  Changed paths:
    M htdocs/webservices/server_order.php

  Log Message:
  -----------
  Merge pull request #2326 from aaujon/3.6-webservice-order

FIXES Webservice : fk_delivery_address not saved


  Commit: e8b2b22c3262ede42998d2e864d13027431196cb
      
https://github.com/Dolibarr/dolibarr/commit/e8b2b22c3262ede42998d2e864d13027431196cb
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-07 (Sat, 07 Feb 2015)

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

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

Conflicts:
        ChangeLog


  Commit: 07877bc3818ed6a9ec2e1cabf5be4dd6d0748638
      
https://github.com/Dolibarr/dolibarr/commit/07877bc3818ed6a9ec2e1cabf5be4dd6d0748638
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-07 (Sat, 07 Feb 2015)

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

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1827' into 3.6


  Commit: 039a184d70bb8ae6b19fb531d8bf45aa8ca256c7
      
https://github.com/Dolibarr/dolibarr/commit/039a184d70bb8ae6b19fb531d8bf45aa8ca256c7
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

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

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

Conflicts:
        htdocs/core/tpl/objectline_edit.tpl.php


  Commit: ddb95e5765e72b31e9805601a29530825cc1df8a
      
https://github.com/Dolibarr/dolibarr/commit/ddb95e5765e72b31e9805601a29530825cc1df8a
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M ChangeLog
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/mailing/card.php
    M htdocs/compta/paiement/list.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/lib/geturl.lib.php
    M htdocs/core/lib/tax.lib.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/agenda.lang
    M htdocs/webservices/server_contact.php
    M htdocs/webservices/server_order.php

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

Conflicts:
        htdocs/comm/mailing/fiche.php
        htdocs/compta/paiement/liste.php
        htdocs/contact/class/contact.class.php
        htdocs/core/lib/tax.lib.php
        htdocs/core/modules/expedition/doc/pdf_merou.modules.php
        htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
        htdocs/langs/en_US/agenda.lang
        htdocs/webservices/server_contact.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/abcf4480de79...ddb95e5765e7
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] 568d5c: Fixed: Tracking number restored on PDF shipments, Laurent Destailleur <=
- [Dolibarr-git] [Dolibarr/dolibarr] 568d5c: Fixed: Tracking number restored on PDF shipments, Laurent Destailleur, 2015/02/10
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] 04f83a: FIX: always show fournprice select
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] 568d5c: Fixed: Tracking number restored on PDF shipments
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] 04f83a: FIX: always show fournprice select
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] 568d5c: Fixed: Tracking number restored on PDF shipments
Index(es):
- Date
- Thread