dolibarr-git
[Top][All Lists]
Advanced

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

[Dolibarr-git] [Dolibarr/dolibarr] bbaa34: Defaulted PDF model document


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] bbaa34: Defaulted PDF model document with default value (s...
Date: Fri, 09 Aug 2013 16:14:06 -0700

  Branch: refs/heads/3.4_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: bbaa344801c7a7c824db748759acee6374a88ab7
      
https://github.com/Dolibarr/dolibarr/commit/bbaa344801c7a7c824db748759acee6374a88ab7
  Author: Florian Henry <address@hidden>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

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

  Log Message:
  -----------
  Defaulted PDF model document with default value (set in admin) for
Shipping and delivery


  Commit: d6f31d61bfb54ef14aa5bfbb473e923f130e5723
      
https://github.com/Dolibarr/dolibarr/commit/d6f31d61bfb54ef14aa5bfbb473e923f130e5723
  Author: Florian Henry <address@hidden>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php

  Log Message:
  -----------
  Fix Typhon model $mysoc global is missing


  Commit: 293f556d21f61d67f76d7bbb0181c0ca0ffb77e0
      
https://github.com/Dolibarr/dolibarr/commit/293f556d21f61d67f76d7bbb0181c0ca0ffb77e0
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/livraison/class/livraison.class.php

  Log Message:
  -----------
  Merge pull request #1137 from FHenry/3.4

Defaulted PDF model document with default value (set in admin) for


  Commit: f9c2910f845af6dc020d064a51aa308e75ac0ab8
      
https://github.com/Dolibarr/dolibarr/commit/f9c2910f845af6dc020d064a51aa308e75ac0ab8
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M htdocs/admin/expedition.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php

  Log Message:
  -----------
  Fix : Numbering on supplier invoice was not saved and on shipment displayed 
error when ok


  Commit: 1c24f9e35e4fdbf6ff31708d40dd7e575275ac10
      
https://github.com/Dolibarr/dolibarr/commit/1c24f9e35e4fdbf6ff31708d40dd7e575275ac10
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M htdocs/admin/expedition.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php

  Log Message:
  -----------
  Merge pull request #1138 from atm-maxime/3.4

Fix : Numbering on supplier invoice was not saved and on shipment displa...


  Commit: 3bc7d3c877a6b1f6ae1a97609b13c5aa2ed11431
      
https://github.com/Dolibarr/dolibarr/commit/3bc7d3c877a6b1f6ae1a97609b13c5aa2ed11431
  Author: Florian Henry <address@hidden>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

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

  Log Message:
  -----------
  Fix extrafeild thirdparty import and export


  Commit: 21bdabc2482ca71ebc0fd428735cc057cc712ebd
      
https://github.com/Dolibarr/dolibarr/commit/21bdabc2482ca71ebc0fd428735cc057cc712ebd
  Author: Florian Henry <address@hidden>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M htdocs/admin/expedition.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php

  Log Message:
  -----------
  Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4


  Commit: 72e0b7579efb49208ea3d6905969a6ff5beefa63
      
https://github.com/Dolibarr/dolibarr/commit/72e0b7579efb49208ea3d6905969a6ff5beefa63
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

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

  Log Message:
  -----------
  Merge pull request #1141 from FHenry/3.4

Fix extrafield thirdparty import and export


  Commit: 4d3738410eb15c134b8c03ae37a8042bcd2a49e6
      
https://github.com/Dolibarr/dolibarr/commit/4d3738410eb15c134b8c03ae37a8042bcd2a49e6
  Author: Florian Henry <address@hidden>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M htdocs/public/emailing/mailing-unsubscribe.php

  Log Message:
  -----------
  update no_email column on unsubcribe link for contact


  Commit: 22447cd0b7c9658d0987afb3cd49b74415935b34
      
https://github.com/Dolibarr/dolibarr/commit/22447cd0b7c9658d0987afb3cd49b74415935b34
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M htdocs/public/emailing/mailing-unsubscribe.php

  Log Message:
  -----------
  Merge pull request #1142 from FHenry/3.4

update no_email column on unsubcribe link for contact


  Commit: ecfca853a1158e9f94b19c902d731142ba615945
      
https://github.com/Dolibarr/dolibarr/commit/ecfca853a1158e9f94b19c902d731142ba615945
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M htdocs/contrat/liste.php

  Log Message:
  -----------
  Fix: Search on contract ref


  Commit: c4ebdf18e702e1d8838148d41ffadbb91ee592f7
      
https://github.com/Dolibarr/dolibarr/commit/c4ebdf18e702e1d8838148d41ffadbb91ee592f7
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M htdocs/contrat/liste.php

  Log Message:
  -----------
  Fix: search on contract ref


  Commit: f765288f12ac349da5afb16b1f81006e5f14cc13
      
https://github.com/Dolibarr/dolibarr/commit/f765288f12ac349da5afb16b1f81006e5f14cc13
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
        ChangeLog


  Commit: e9df22dcc09b6166980a19b3f551cdd60a1af820
      
https://github.com/Dolibarr/dolibarr/commit/e9df22dcc09b6166980a19b3f551cdd60a1af820
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Fix: restore lost info into changelog.
Add note of todo for next versions.


  Commit: ba2c6d4d54f1fb61b98b1df4fff30f4ba6b9d716
      
https://github.com/Dolibarr/dolibarr/commit/ba2c6d4d54f1fb61b98b1df4fff30f4ba6b9d716
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M htdocs/core/class/html.form.class.php
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Fix: Confirm boxes with jmobile


  Commit: bd33e8a9629ff92921bd11a03f19a59ca143393a
      
https://github.com/Dolibarr/dolibarr/commit/bd33e8a9629ff92921bd11a03f19a59ca143393a
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    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/modSociete.class.php
    M htdocs/exports/export.php

  Log Message:
  -----------
  Fix: Export of country


  Commit: 4786c90c4a8e018b164a7270ef15c7281d24a536
      
https://github.com/Dolibarr/dolibarr/commit/4786c90c4a8e018b164a7270ef15c7281d24a536
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M htdocs/core/modules/modAgenda.class.php
    M htdocs/core/modules/modFournisseur.class.php
    M htdocs/core/modules/modPropale.class.php
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/fr_FR/agenda.lang

  Log Message:
  -----------
  Fix: Pb into export descriptions


  Commit: 1fb8baa92e27865966370fa7c421bd79dafaa87d
      
https://github.com/Dolibarr/dolibarr/commit/1fb8baa92e27865966370fa7c421bd79dafaa87d
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M htdocs/core/modules/export/export_excel2007.modules.php
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/fr_FR/errors.lang

  Log Message:
  -----------
  Fix: [ bug #1009 ] ZipArchive' not found


  Commit: d8778ce0f7ca9937e74c0ecb18babce9eadd4104
      
https://github.com/Dolibarr/dolibarr/commit/d8778ce0f7ca9937e74c0ecb18babce9eadd4104
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M htdocs/fourn/fiche.php

  Log Message:
  -----------
  Fix: [ bug #1010 ] change index.php to list.php in fourn/fiche


  Commit: 8b0169f468f248aded34033112319883178f38a3
      
https://github.com/Dolibarr/dolibarr/commit/8b0169f468f248aded34033112319883178f38a3
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

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

  Log Message:
  -----------
  Fix: [ bug #991 ] Error when adding a product in POS when no Tax is
associated to the country of the company


  Commit: 3730d874c92b2801b426a4596439b51cf4aaf3f1
      
https://github.com/Dolibarr/dolibarr/commit/3730d874c92b2801b426a4596439b51cf4aaf3f1
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

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

  Log Message:
  -----------
  Fix: [ bug #991 ] Error when adding a product in POS when no Tax is
associated to the country of the company


  Commit: 4ec86717be6c9616e3a62661d213a5f7f5546d05
      
https://github.com/Dolibarr/dolibarr/commit/4ec86717be6c9616e3a62661d213a5f7f5546d05
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-03 (Sat, 03 Aug 2013)

  Changed paths:
    M htdocs/langs/ca_ES/withdrawals.lang
    M htdocs/langs/de_DE/withdrawals.lang
    M htdocs/langs/en_US/withdrawals.lang
    M htdocs/langs/es_ES/withdrawals.lang
    M htdocs/langs/fr_FR/withdrawals.lang
    M htdocs/langs/ja_JP/commercial.lang
    M htdocs/langs/ja_JP/companies.lang
    M htdocs/langs/ja_JP/compta.lang
    M htdocs/langs/ja_JP/contracts.lang
    M htdocs/langs/ja_JP/withdrawals.lang
    M htdocs/langs/sl_SI/withdrawals.lang
    M htdocs/langs/tr_TR/withdrawals.lang
    M htdocs/langs/zh_CN/admin.lang
    M htdocs/langs/zh_CN/agenda.lang
    M htdocs/langs/zh_CN/banks.lang
    M htdocs/langs/zh_CN/bills.lang
    M htdocs/langs/zh_CN/boxes.lang
    M htdocs/langs/zh_CN/categories.lang
    M htdocs/langs/zh_CN/commercial.lang
    M htdocs/langs/zh_CN/companies.lang
    M htdocs/langs/zh_CN/compta.lang
    M htdocs/langs/zh_CN/contracts.lang
    M htdocs/langs/zh_CN/ecm.lang
    M htdocs/langs/zh_CN/errors.lang
    M htdocs/langs/zh_CN/exports.lang
    M htdocs/langs/zh_CN/help.lang
    M htdocs/langs/zh_CN/install.lang
    M htdocs/langs/zh_CN/interventions.lang
    M htdocs/langs/zh_CN/ldap.lang
    M htdocs/langs/zh_CN/mails.lang
    M htdocs/langs/zh_CN/main.lang
    M htdocs/langs/zh_CN/members.lang
    M htdocs/langs/zh_CN/orders.lang
    M htdocs/langs/zh_CN/other.lang
    M htdocs/langs/zh_CN/products.lang
    M htdocs/langs/zh_CN/projects.lang
    M htdocs/langs/zh_CN/propal.lang
    M htdocs/langs/zh_CN/sendings.lang
    M htdocs/langs/zh_CN/stocks.lang
    M htdocs/langs/zh_CN/suppliers.lang
    M htdocs/langs/zh_CN/users.lang
    M htdocs/langs/zh_CN/withdrawals.lang
    M htdocs/langs/zh_TW/admin.lang
    M htdocs/langs/zh_TW/agenda.lang
    M htdocs/langs/zh_TW/banks.lang
    M htdocs/langs/zh_TW/boxes.lang
    M htdocs/langs/zh_TW/categories.lang
    M htdocs/langs/zh_TW/commercial.lang
    M htdocs/langs/zh_TW/companies.lang
    M htdocs/langs/zh_TW/compta.lang
    M htdocs/langs/zh_TW/contracts.lang
    M htdocs/langs/zh_TW/ecm.lang
    M htdocs/langs/zh_TW/errors.lang
    M htdocs/langs/zh_TW/exports.lang
    M htdocs/langs/zh_TW/install.lang
    M htdocs/langs/zh_TW/interventions.lang
    M htdocs/langs/zh_TW/ldap.lang
    M htdocs/langs/zh_TW/mails.lang
    M htdocs/langs/zh_TW/members.lang
    M htdocs/langs/zh_TW/orders.lang
    M htdocs/langs/zh_TW/products.lang
    M htdocs/langs/zh_TW/projects.lang
    M htdocs/langs/zh_TW/propal.lang
    M htdocs/langs/zh_TW/suppliers.lang
    M htdocs/langs/zh_TW/withdrawals.lang

  Log Message:
  -----------
  Fix: Bad char %


  Commit: b01fd7b7399a0b2d0df183b6798f57de5565145a
      
https://github.com/Dolibarr/dolibarr/commit/b01fd7b7399a0b2d0df183b6798f57de5565145a
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    A dev/fixperms.sh

  Log Message:
  -----------
  Fix: Permission into git repo are wrong for some files.


  Commit: a7b182c37cb8b90fcee8880db7df0bd9d3f4c298
      
https://github.com/Dolibarr/dolibarr/commit/a7b182c37cb8b90fcee8880db7df0bd9d3f4c298
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M htdocs/langs/ca_ES/withdrawals.lang
    M htdocs/langs/de_DE/withdrawals.lang
    M htdocs/langs/en_US/withdrawals.lang
    M htdocs/langs/es_ES/withdrawals.lang
    M htdocs/langs/fr_FR/withdrawals.lang
    M htdocs/langs/ja_JP/commercial.lang
    M htdocs/langs/ja_JP/companies.lang
    M htdocs/langs/ja_JP/compta.lang
    M htdocs/langs/ja_JP/contracts.lang
    M htdocs/langs/ja_JP/withdrawals.lang
    M htdocs/langs/sl_SI/withdrawals.lang
    M htdocs/langs/tr_TR/withdrawals.lang
    M htdocs/langs/zh_CN/admin.lang
    M htdocs/langs/zh_CN/agenda.lang
    M htdocs/langs/zh_CN/banks.lang
    M htdocs/langs/zh_CN/bills.lang
    M htdocs/langs/zh_CN/boxes.lang
    M htdocs/langs/zh_CN/categories.lang
    M htdocs/langs/zh_CN/commercial.lang
    M htdocs/langs/zh_CN/companies.lang
    M htdocs/langs/zh_CN/compta.lang
    M htdocs/langs/zh_CN/contracts.lang
    M htdocs/langs/zh_CN/ecm.lang
    M htdocs/langs/zh_CN/errors.lang
    M htdocs/langs/zh_CN/exports.lang
    M htdocs/langs/zh_CN/help.lang
    M htdocs/langs/zh_CN/install.lang
    M htdocs/langs/zh_CN/interventions.lang
    M htdocs/langs/zh_CN/ldap.lang
    M htdocs/langs/zh_CN/mails.lang
    M htdocs/langs/zh_CN/main.lang
    M htdocs/langs/zh_CN/members.lang
    M htdocs/langs/zh_CN/orders.lang
    M htdocs/langs/zh_CN/other.lang
    M htdocs/langs/zh_CN/products.lang
    M htdocs/langs/zh_CN/projects.lang
    M htdocs/langs/zh_CN/propal.lang
    M htdocs/langs/zh_CN/sendings.lang
    M htdocs/langs/zh_CN/stocks.lang
    M htdocs/langs/zh_CN/suppliers.lang
    M htdocs/langs/zh_CN/users.lang
    M htdocs/langs/zh_CN/withdrawals.lang
    M htdocs/langs/zh_TW/admin.lang
    M htdocs/langs/zh_TW/agenda.lang
    M htdocs/langs/zh_TW/banks.lang
    M htdocs/langs/zh_TW/boxes.lang
    M htdocs/langs/zh_TW/categories.lang
    M htdocs/langs/zh_TW/commercial.lang
    M htdocs/langs/zh_TW/companies.lang
    M htdocs/langs/zh_TW/compta.lang
    M htdocs/langs/zh_TW/contracts.lang
    M htdocs/langs/zh_TW/ecm.lang
    M htdocs/langs/zh_TW/errors.lang
    M htdocs/langs/zh_TW/exports.lang
    M htdocs/langs/zh_TW/install.lang
    M htdocs/langs/zh_TW/interventions.lang
    M htdocs/langs/zh_TW/ldap.lang
    M htdocs/langs/zh_TW/mails.lang
    M htdocs/langs/zh_TW/members.lang
    M htdocs/langs/zh_TW/orders.lang
    M htdocs/langs/zh_TW/products.lang
    M htdocs/langs/zh_TW/projects.lang
    M htdocs/langs/zh_TW/propal.lang
    M htdocs/langs/zh_TW/suppliers.lang
    M htdocs/langs/zh_TW/withdrawals.lang

  Log Message:
  -----------
  Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4


  Commit: 784c8acaf7d541966b616c907e30aa4b4249af81
      
https://github.com/Dolibarr/dolibarr/commit/784c8acaf7d541966b616c907e30aa4b4249af81
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/el_GR/agenda.lang
    M htdocs/langs/el_GR/banks.lang
    M htdocs/langs/el_GR/bills.lang
    M htdocs/langs/el_GR/bookmarks.lang
    M htdocs/langs/el_GR/boxes.lang
    M htdocs/langs/el_GR/cashdesk.lang
    M htdocs/langs/el_GR/categories.lang
    M htdocs/langs/el_GR/commercial.lang
    A htdocs/langs/el_GR/commissions.lang
    M htdocs/langs/el_GR/companies.lang
    M htdocs/langs/el_GR/compta.lang
    M htdocs/langs/el_GR/contracts.lang
    A htdocs/langs/el_GR/cron.lang
    M htdocs/langs/el_GR/deliveries.lang
    M htdocs/langs/el_GR/dict.lang
    M htdocs/langs/el_GR/donations.lang
    M htdocs/langs/el_GR/ecm.lang
    M htdocs/langs/el_GR/errors.lang
    M htdocs/langs/el_GR/exports.lang
    M htdocs/langs/el_GR/externalsite.lang
    M htdocs/langs/el_GR/ftp.lang
    M htdocs/langs/el_GR/help.lang
    A htdocs/langs/el_GR/holiday.lang
    M htdocs/langs/el_GR/install.lang
    M htdocs/langs/el_GR/interventions.lang
    M htdocs/langs/el_GR/languages.lang
    M htdocs/langs/el_GR/ldap.lang
    A htdocs/langs/el_GR/mailmanspip.lang
    M htdocs/langs/el_GR/mails.lang
    M htdocs/langs/el_GR/main.lang
    A htdocs/langs/el_GR/margins.lang
    M htdocs/langs/el_GR/members.lang
    A htdocs/langs/el_GR/opensurvey.lang
    M htdocs/langs/el_GR/orders.lang
    M htdocs/langs/el_GR/oscommerce.lang
    M htdocs/langs/el_GR/other.lang
    M htdocs/langs/el_GR/paybox.lang
    M htdocs/langs/el_GR/paypal.lang
    M htdocs/langs/el_GR/products.lang
    M htdocs/langs/el_GR/projects.lang
    M htdocs/langs/el_GR/propal.lang
    M htdocs/langs/el_GR/sendings.lang
    M htdocs/langs/el_GR/shop.lang
    M htdocs/langs/el_GR/sms.lang
    M htdocs/langs/el_GR/stocks.lang
    M htdocs/langs/el_GR/suppliers.lang
    M htdocs/langs/el_GR/trips.lang
    M htdocs/langs/el_GR/users.lang
    M htdocs/langs/el_GR/withdrawals.lang
    M htdocs/langs/el_GR/workflow.lang

  Log Message:
  -----------
  Trans: Upgrade language file


  Commit: 04caccc5f31ce7c86ea8b2b09e31c44585429929
      
https://github.com/Dolibarr/dolibarr/commit/04caccc5f31ce7c86ea8b2b09e31c44585429929
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    A dev/fixperms.sh

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


  Commit: afae841ae492f71e18f377e30d52cdce1f72a025
      
https://github.com/Dolibarr/dolibarr/commit/afae841ae492f71e18f377e30d52cdce1f72a025
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    A Mail/PEAR.php b/htdocs/includes/nusoap/lib/Mail/PEAR.php
    R Mail/PEAR.php b/htdocs/includes/nusoap/lib/Mail/PEAR.php
    A Mail/RFC822.php b/htdocs/includes/nusoap/lib/Mail/RFC822.php
    R Mail/RFC822.php b/htdocs/includes/nusoap/lib/Mail/RFC822.php
    R Mail/mail.php b/htdocs/includes/nusoap/lib/Mail/mail.php
    A Mail/mail.php b/htdocs/includes/nusoap/lib/Mail/mail.php
    A Mail/mime.php b/htdocs/includes/nusoap/lib/Mail/mime.php
    R Mail/mime.php b/htdocs/includes/nusoap/lib/Mail/mime.php
    R Mail/mimeDecode.php b/htdocs/includes/nusoap/lib/Mail/mimeDecode.php
    A Mail/mimeDecode.php b/htdocs/includes/nusoap/lib/Mail/mimeDecode.php
    R Mail/mimePart.php b/htdocs/includes/nusoap/lib/Mail/mimePart.php
    A Mail/mimePart.php b/htdocs/includes/nusoap/lib/Mail/mimePart.php
    R Mail/null.php b/htdocs/includes/nusoap/lib/Mail/null.php
    A Mail/null.php b/htdocs/includes/nusoap/lib/Mail/null.php
    R Mail/sendmail.php b/htdocs/includes/nusoap/lib/Mail/sendmail.php
    A Mail/sendmail.php b/htdocs/includes/nusoap/lib/Mail/sendmail.php
    A Mail/smtp.php b/htdocs/includes/nusoap/lib/Mail/smtp.php
    R Mail/smtp.php b/htdocs/includes/nusoap/lib/Mail/smtp.php
    R htdocs/adherents/admin/adherent_extrafields.php
    A htdocs/adherents/admin/adherent_extrafields.php
    A htdocs/adherents/admin/public.php
    R htdocs/adherents/admin/public.php
    R htdocs/adherents/cartes/carte.php
    A htdocs/adherents/cartes/carte.php
    R htdocs/adherents/class/adherentstats.class.php
    A htdocs/adherents/class/adherentstats.class.php
    A htdocs/adherents/stats/byproperties.php
    R htdocs/adherents/stats/byproperties.php
    R htdocs/adherents/stats/geo.php
    A htdocs/adherents/stats/geo.php
    R htdocs/admin/pdf.php
    A htdocs/admin/pdf.php
    A htdocs/admin/proxy.php
    R htdocs/admin/proxy.php
    R htdocs/admin/sms.php
    A htdocs/admin/sms.php
    A htdocs/admin/system/xcache.php
    R htdocs/admin/system/xcache.php
    A htdocs/admin/translation.php
    R htdocs/admin/translation.php
    R htdocs/admin/workflow.php
    A htdocs/admin/workflow.php
    A htdocs/comm/action/document.php
    R htdocs/comm/action/document.php
    R htdocs/comm/admin/propal_extrafields.php
    A htdocs/comm/admin/propal_extrafields.php
    A htdocs/comm/list.php
    R htdocs/comm/list.php
    A htdocs/comm/prospect/list.php
    R htdocs/comm/prospect/list.php
    R htdocs/commande/customer.php
    A htdocs/commande/customer.php
    R htdocs/commande/orderstoinvoice.php
    A htdocs/commande/orderstoinvoice.php
    A htdocs/compta/deplacement/list.php
    R htdocs/compta/deplacement/list.php
    A htdocs/compta/deplacement/stats/index.php
    R htdocs/compta/deplacement/stats/index.php
    R htdocs/compta/journal/purchasesjournal.php
    A htdocs/compta/journal/purchasesjournal.php
    R htdocs/compta/journal/sellsjournal.php
    A htdocs/compta/journal/sellsjournal.php
    A htdocs/compta/paiement_charge.php
    R htdocs/compta/paiement_charge.php
    A htdocs/contact/list.php
    R htdocs/contact/list.php
    A htdocs/core/boxes/box_contacts.php
    R htdocs/core/boxes/box_contacts.php
    R htdocs/core/boxes/box_members.php
    A htdocs/core/boxes/box_members.php
    R htdocs/core/class/CSMSFile.class.php
    A htdocs/core/class/CSMSFile.class.php
    A htdocs/core/class/commondocgenerator.class.php
    R htdocs/core/class/commondocgenerator.class.php
    A htdocs/core/class/extrafields.class.php
    R htdocs/core/class/extrafields.class.php
    R htdocs/core/class/genericobject.class.php
    A htdocs/core/class/genericobject.class.php
    A htdocs/core/class/hookmanager.class.php
    R htdocs/core/class/hookmanager.class.php
    A htdocs/core/class/html.formsms.class.php
    R htdocs/core/class/html.formsms.class.php
    R htdocs/core/class/rssparser.class.php
    A htdocs/core/class/rssparser.class.php
    R htdocs/core/class/smtps.class.php
    A htdocs/core/class/smtps.class.php
    A htdocs/core/class/vcard.class.php
    R htdocs/core/class/vcard.class.php
    R htdocs/core/filemanagerdol/browser/default/browser.php
    A htdocs/core/filemanagerdol/browser/default/browser.php
    A htdocs/core/filemanagerdol/browser/default/frmactualfolder.php
    R htdocs/core/filemanagerdol/browser/default/frmactualfolder.php
    A htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php
    R htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php
    A htdocs/core/filemanagerdol/browser/default/frmfolders.php
    R htdocs/core/filemanagerdol/browser/default/frmfolders.php
    R htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
    A htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
    R htdocs/core/filemanagerdol/browser/default/frmupload.php
    A htdocs/core/filemanagerdol/browser/default/frmupload.php
    R htdocs/core/filemanagerdol/connectors/php/basexml.php
    A htdocs/core/filemanagerdol/connectors/php/basexml.php
    A htdocs/core/filemanagerdol/connectors/php/commands.php
    R htdocs/core/filemanagerdol/connectors/php/commands.php
    A htdocs/core/filemanagerdol/connectors/php/config.php
    R htdocs/core/filemanagerdol/connectors/php/config.php
    A htdocs/core/filemanagerdol/connectors/php/connector.php
    R htdocs/core/filemanagerdol/connectors/php/connector.php
    A htdocs/core/filemanagerdol/connectors/php/io.php
    R htdocs/core/filemanagerdol/connectors/php/io.php
    R htdocs/core/filemanagerdol/connectors/php/upload.php
    A htdocs/core/filemanagerdol/connectors/php/upload.php
    R htdocs/core/filemanagerdol/connectors/php/util.php
    A htdocs/core/filemanagerdol/connectors/php/util.php
    A htdocs/core/modules/contract/mod_contract_magre.php
    R htdocs/core/modules/contract/mod_contract_magre.php
    R htdocs/core/modules/contract/mod_contract_serpis.php
    A htdocs/core/modules/contract/mod_contract_serpis.php
    A htdocs/core/modules/contract/modules_contract.php
    R htdocs/core/modules/contract/modules_contract.php
    R htdocs/core/modules/expedition/mod_expedition_ribera.php
    A htdocs/core/modules/expedition/mod_expedition_ribera.php
    A htdocs/core/modules/expedition/mod_expedition_safor.php
    R htdocs/core/modules/expedition/mod_expedition_safor.php
    R htdocs/core/modules/export/export_excel2007.modules.php
    A htdocs/core/modules/export/export_excel2007.modules.php
    R htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    A htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    A htdocs/core/modules/mailings/contacts1.modules.php
    R htdocs/core/modules/mailings/contacts1.modules.php
    A htdocs/core/modules/mailings/contacts2.modules.php
    R htdocs/core/modules/mailings/contacts2.modules.php
    A htdocs/core/modules/mailings/contacts3.modules.php
    R htdocs/core/modules/mailings/contacts3.modules.php
    A htdocs/core/modules/mailings/thirdparties.modules.php
    R htdocs/core/modules/mailings/thirdparties.modules.php
    R htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
    A htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
    R htdocs/core/modules/modOpenSurvey.class.php
    A htdocs/core/modules/modOpenSurvey.class.php
    R htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
    A htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
    A htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    R htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    A htdocs/core/tools.php
    R htdocs/core/tools.php
    R htdocs/core/triggers/interface_20_all_Logevents.class.php
    A htdocs/core/triggers/interface_20_all_Logevents.class.php
    R htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
    A htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
    A htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
    R htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
    A htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
    R htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
    R htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
    A htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
    A htdocs/core/triggers/interface_50_modNotification_Notification.class.php
    R htdocs/core/triggers/interface_50_modNotification_Notification.class.php
    R htdocs/fichinter/list.php
    A htdocs/fichinter/list.php
    R htdocs/fichinter/tpl/linkedobjectblock.tpl.php
    A htdocs/fichinter/tpl/linkedobjectblock.tpl.php
    A htdocs/filefunc.inc.php
    R htdocs/filefunc.inc.php
    A htdocs/fourn/commande/index.php
    R htdocs/fourn/commande/index.php
    R htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
    A htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
    R htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
    A htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
    A htdocs/includes/fpdfi/filters/FilterASCII85.php
    R htdocs/includes/fpdfi/filters/FilterASCII85.php
    A htdocs/includes/fpdfi/filters/FilterASCII85_FPDI.php
    R htdocs/includes/fpdfi/filters/FilterASCII85_FPDI.php
    R htdocs/includes/fpdfi/filters/FilterLZW.php
    A htdocs/includes/fpdfi/filters/FilterLZW.php
    R htdocs/includes/fpdfi/filters/FilterLZW_FPDI.php
    A htdocs/includes/fpdfi/filters/FilterLZW_FPDI.php
    A htdocs/includes/fpdfi/fpdf_tpl.php
    R htdocs/includes/fpdfi/fpdf_tpl.php
    R htdocs/includes/fpdfi/fpdi.php
    A htdocs/includes/fpdfi/fpdi.php
    R htdocs/includes/fpdfi/fpdi2tcpdf_bridge.php
    A htdocs/includes/fpdfi/fpdi2tcpdf_bridge.php
    A htdocs/includes/fpdfi/fpdi_pdf_parser.php
    R htdocs/includes/fpdfi/fpdi_pdf_parser.php
    A htdocs/includes/fpdfi/pdf_context.php
    R htdocs/includes/fpdfi/pdf_context.php
    A htdocs/includes/fpdfi/pdf_parser.php
    R htdocs/includes/fpdfi/pdf_parser.php
    R 
htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.php
    A 
htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.php
    R htdocs/includes/tcpdf/config/lang/afr.php
    A htdocs/includes/tcpdf/config/lang/afr.php
    R htdocs/includes/tcpdf/config/lang/ara.php
    A htdocs/includes/tcpdf/config/lang/ara.php
    A htdocs/includes/tcpdf/config/lang/aze.php
    R htdocs/includes/tcpdf/config/lang/aze.php
    R htdocs/includes/tcpdf/config/lang/bel.php
    A htdocs/includes/tcpdf/config/lang/bel.php
    A htdocs/includes/tcpdf/config/lang/cat.php
    R htdocs/includes/tcpdf/config/lang/cat.php
    R htdocs/includes/tcpdf/config/lang/ces.php
    A htdocs/includes/tcpdf/config/lang/ces.php
    R htdocs/includes/tcpdf/config/lang/chi.php
    A htdocs/includes/tcpdf/config/lang/chi.php
    A htdocs/includes/tcpdf/config/lang/cym.php
    R htdocs/includes/tcpdf/config/lang/cym.php
    A htdocs/includes/tcpdf/config/lang/dan.php
    R htdocs/includes/tcpdf/config/lang/dan.php
    A htdocs/includes/tcpdf/config/lang/est.php
    R htdocs/includes/tcpdf/config/lang/est.php
    A htdocs/includes/tcpdf/config/lang/eus.php
    R htdocs/includes/tcpdf/config/lang/eus.php
    A htdocs/includes/tcpdf/config/lang/fra.php
    R htdocs/includes/tcpdf/config/lang/fra.php
    R htdocs/includes/tcpdf/config/lang/gle.php
    A htdocs/includes/tcpdf/config/lang/gle.php
    R htdocs/includes/tcpdf/config/lang/glg.php
    A htdocs/includes/tcpdf/config/lang/glg.php
    A htdocs/includes/tcpdf/config/lang/hat.php
    R htdocs/includes/tcpdf/config/lang/hat.php
    A htdocs/includes/tcpdf/config/lang/heb.php
    R htdocs/includes/tcpdf/config/lang/heb.php
    R htdocs/includes/tcpdf/config/lang/hrv.php
    A htdocs/includes/tcpdf/config/lang/hrv.php
    R htdocs/includes/tcpdf/config/lang/hun.php
    A htdocs/includes/tcpdf/config/lang/hun.php
    A htdocs/includes/tcpdf/config/lang/hye.php
    R htdocs/includes/tcpdf/config/lang/hye.php
    A htdocs/includes/tcpdf/config/lang/ind.php
    R htdocs/includes/tcpdf/config/lang/ind.php
    R htdocs/includes/tcpdf/config/lang/kat.php
    A htdocs/includes/tcpdf/config/lang/kat.php
    R htdocs/includes/tcpdf/config/lang/kor.php
    A htdocs/includes/tcpdf/config/lang/kor.php
    A htdocs/includes/tcpdf/config/lang/mkd.php
    R htdocs/includes/tcpdf/config/lang/mkd.php
    A htdocs/includes/tcpdf/config/lang/mlt.php
    R htdocs/includes/tcpdf/config/lang/mlt.php
    R htdocs/includes/tcpdf/config/lang/msa.php
    A htdocs/includes/tcpdf/config/lang/msa.php
    R htdocs/includes/tcpdf/config/lang/nld.php
    A htdocs/includes/tcpdf/config/lang/nld.php
    R htdocs/includes/tcpdf/config/lang/nob.php
    A htdocs/includes/tcpdf/config/lang/nob.php
    R htdocs/includes/tcpdf/config/lang/pol.php
    A htdocs/includes/tcpdf/config/lang/pol.php
    A htdocs/includes/tcpdf/config/lang/por.php
    R htdocs/includes/tcpdf/config/lang/por.php
    R htdocs/includes/tcpdf/config/lang/ron.php
    A htdocs/includes/tcpdf/config/lang/ron.php
    R htdocs/includes/tcpdf/config/lang/rus.php
    A htdocs/includes/tcpdf/config/lang/rus.php
    R htdocs/includes/tcpdf/config/lang/slv.php
    A htdocs/includes/tcpdf/config/lang/slv.php
    A htdocs/includes/tcpdf/config/lang/spa.php
    R htdocs/includes/tcpdf/config/lang/spa.php
    R htdocs/includes/tcpdf/config/lang/sqi.php
    A htdocs/includes/tcpdf/config/lang/sqi.php
    A htdocs/includes/tcpdf/config/lang/srp.php
    R htdocs/includes/tcpdf/config/lang/srp.php
    A htdocs/includes/tcpdf/config/lang/swa.php
    R htdocs/includes/tcpdf/config/lang/swa.php
    A htdocs/includes/tcpdf/config/lang/swe.php
    R htdocs/includes/tcpdf/config/lang/swe.php
    R htdocs/includes/tcpdf/config/lang/urd.php
    A htdocs/includes/tcpdf/config/lang/urd.php
    A htdocs/includes/tcpdf/config/lang/yid.php
    R htdocs/includes/tcpdf/config/lang/yid.php
    R htdocs/includes/tcpdf/config/lang/zho.php
    A htdocs/includes/tcpdf/config/lang/zho.php
    A htdocs/opensurvey/admin/index.php
    R htdocs/opensurvey/admin/index.php
    A htdocs/opensurvey/adminstuds.php
    R htdocs/opensurvey/adminstuds.php
    A htdocs/opensurvey/adminstuds_preview.php
    R htdocs/opensurvey/adminstuds_preview.php
    R htdocs/opensurvey/fonctions.php
    A htdocs/opensurvey/fonctions.php
    A htdocs/opensurvey/index.php
    R htdocs/opensurvey/index.php
    R htdocs/opensurvey/list.php
    A htdocs/opensurvey/list.php
    R htdocs/opensurvey/public/choix_autre.php
    A htdocs/opensurvey/public/choix_autre.php
    A htdocs/opensurvey/public/choix_date.php
    R htdocs/opensurvey/public/choix_date.php
    R htdocs/opensurvey/public/create_survey.php
    A htdocs/opensurvey/public/create_survey.php
    R htdocs/opensurvey/public/exportcsv.php
    A htdocs/opensurvey/public/exportcsv.php
    R htdocs/opensurvey/public/index.php
    A htdocs/opensurvey/public/index.php
    A htdocs/opensurvey/public/studs.php
    R htdocs/opensurvey/public/studs.php
    R htdocs/product/admin/product_extrafields.php
    A htdocs/product/admin/product_extrafields.php
    R htdocs/product/canvas/product/actions_card_product.class.php
    A htdocs/product/canvas/product/actions_card_product.class.php
    R htdocs/product/canvas/product/index.php
    A htdocs/product/canvas/product/index.php
    R htdocs/product/canvas/product/tpl/card_create.tpl.php
    A htdocs/product/canvas/product/tpl/card_create.tpl.php
    R htdocs/product/canvas/product/tpl/card_edit.tpl.php
    A htdocs/product/canvas/product/tpl/card_edit.tpl.php
    A htdocs/product/canvas/product/tpl/card_view.tpl.php
    R htdocs/product/canvas/product/tpl/card_view.tpl.php
    A htdocs/product/canvas/product/tpl/index.php
    R htdocs/product/canvas/product/tpl/index.php
    R htdocs/product/canvas/product/tpl/list.tpl.php
    A htdocs/product/canvas/product/tpl/list.tpl.php
    R htdocs/product/canvas/service/actions_card_service.class.php
    A htdocs/product/canvas/service/actions_card_service.class.php
    A htdocs/product/canvas/service/tpl/card_create.tpl.php
    R htdocs/product/canvas/service/tpl/card_create.tpl.php
    R htdocs/product/canvas/service/tpl/card_edit.tpl.php
    A htdocs/product/canvas/service/tpl/card_edit.tpl.php
    A htdocs/product/canvas/service/tpl/card_view.tpl.php
    R htdocs/product/canvas/service/tpl/card_view.tpl.php
    A htdocs/product/document.php
    R htdocs/product/document.php
    A htdocs/projet/admin/project_extrafields.php
    R htdocs/projet/admin/project_extrafields.php
    R htdocs/public/paypal/index.php
    A htdocs/public/paypal/index.php
    R htdocs/public/paypal/newpayment.php
    A htdocs/public/paypal/newpayment.php
    A htdocs/public/paypal/paymentko.php
    R htdocs/public/paypal/paymentko.php
    A htdocs/public/paypal/paymentok.php
    R htdocs/public/paypal/paymentok.php
    A htdocs/societe/admin/contact_extrafields.php
    R htdocs/societe/admin/contact_extrafields.php
    R htdocs/societe/admin/societe_extrafields.php
    A htdocs/societe/admin/societe_extrafields.php
    R htdocs/theme/amarok/graph-color.php
    A htdocs/theme/amarok/graph-color.php
    R htdocs/theme/amarok/index.php
    A htdocs/theme/amarok/index.php
    A htdocs/theme/amarok/style.css.php
    R htdocs/theme/amarok/style.css.php
    A htdocs/theme/amarok/tpl/index.php
    R htdocs/theme/amarok/tpl/index.php
    A htdocs/theme/auguria/graph-color.php
    R htdocs/theme/auguria/graph-color.php
    A htdocs/webservices/server_category.php
    R htdocs/webservices/server_category.php
    R htdocs/webservices/server_invoice.php
    A htdocs/webservices/server_invoice.php
    A htdocs/webservices/server_productorservice.php
    R htdocs/webservices/server_productorservice.php
    R htdocs/webservices/server_supplier_invoice.php
    A htdocs/webservices/server_supplier_invoice.php
    R htdocs/webservices/server_thirdparty.php
    A htdocs/webservices/server_thirdparty.php
    R import.lib.php b/htdocs/core/lib/import.lib.php
    A import.lib.php b/htdocs/core/lib/import.lib.php
    A paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
    R paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
    R paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
    A paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
    R paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php
    A paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php
    A scripts/company/export-contacts-xls-example.php
    R scripts/company/export-contacts-xls-example.php
    A scripts/company/sync_contacts_dolibarr2ldap.php
    R scripts/company/sync_contacts_dolibarr2ldap.php
    A scripts/withdrawals/build_withdrawal_file.php
    R scripts/withdrawals/build_withdrawal_file.php
    A ws.lib.php b/htdocs/core/lib/ws.lib.php
    R ws.lib.php b/htdocs/core/lib/ws.lib.php

  Log Message:
  -----------
  Fix: Permissions on files


  Commit: c3dd7c3b3996fde610ce486644bf549649b0ca59
      
https://github.com/Dolibarr/dolibarr/commit/c3dd7c3b3996fde610ce486644bf549649b0ca59
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modDeplacement.class.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/core/modules/modFournisseur.class.php

  Log Message:
  -----------
  Fix: Tons of regression after renaming note field into note_private.


  Commit: 4346a3f90f2a861055a10fd8d46f483f90558421
      
https://github.com/Dolibarr/dolibarr/commit/4346a3f90f2a861055a10fd8d46f483f90558421
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  Fix: Param must be a regex string

Conflicts:
        htdocs/core/class/html.formfile.class.php


  Commit: f57aaf4f4a9744450acbdc67950961ea578f452c
      
https://github.com/Dolibarr/dolibarr/commit/f57aaf4f4a9744450acbdc67950961ea578f452c
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M htdocs/expedition/shipment.php

  Log Message:
  -----------
  Fix: Do not load class like it should


  Commit: 23516a466c372a7c80a86c827768ddf3ad452672
      
https://github.com/Dolibarr/dolibarr/commit/23516a466c372a7c80a86c827768ddf3ad452672
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  Fix: Pb with predefined invoices


  Commit: 0f867550333842ed1eac789b06b6ce75efbb5da7
      
https://github.com/Dolibarr/dolibarr/commit/0f867550333842ed1eac789b06b6ce75efbb5da7
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/sendings.lib.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/livraison/class/livraison.class.php
    M htdocs/livraison/fiche.php

  Log Message:
  -----------
  Fix: Found a dozen of bugs into sub module delivery of module shipment.

Conflicts:
        htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
        htdocs/expedition/class/expedition.class.php
        htdocs/expedition/fiche.php


  Commit: b9e1a57f678af6aa6eb4fde6990d20e40638dde0
      
https://github.com/Dolibarr/dolibarr/commit/b9e1a57f678af6aa6eb4fde6990d20e40638dde0
  Author: simnandez <address@hidden>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/admin/supplier_invoice.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php

  Log Message:
  -----------
  Fix: [ bug #1029 ] Tulip numbering mask


  Commit: 75701ee99595b37c76688f7390df3c7650a74ff0
      
https://github.com/Dolibarr/dolibarr/commit/75701ee99595b37c76688f7390df3c7650a74ff0
  Author: Florian Henry <address@hidden>
  Date:   2013-08-09 (Fri, 09 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  Fix: Supplier invoice and supplier order are not displayed into object
link into agenda event card


  Commit: e56ef31cfb16873bc9f7c10ded57b7f03c49ca37
      
https://github.com/Dolibarr/dolibarr/commit/e56ef31cfb16873bc9f7c10ded57b7f03c49ca37
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-09 (Fri, 09 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  Merge pull request #1174 from FHenry/3.4

Fix: Supplier invoice and supplier order are not displayed into object


  Commit: ba58ab153bf673341bb7edc0ece801ebb8a991e3
      
https://github.com/Dolibarr/dolibarr/commit/ba58ab153bf673341bb7edc0ece801ebb8a991e3
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-09 (Fri, 09 Aug 2013)

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.4


  Commit: ea238281a499f65f7c75cf1705bc1b80fafed3e6
      
https://github.com/Dolibarr/dolibarr/commit/ea238281a499f65f7c75cf1705bc1b80fafed3e6
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-09 (Fri, 09 Aug 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.4' into 3.4_backported


Compare: 
https://github.com/Dolibarr/dolibarr/compare/41ec5d144fe2...ea238281a499

reply via email to

[Prev in Thread] Current Thread [Next in Thread]