[Dolibarr-git] [Dolibarr/dolibarr] 56d209: Merge branch 'upstream/develo

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 56d209: Merge branch 'upstream/develo

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] 56d209: Merge branch 'upstream/develop'
Date:	Tue, 26 Nov 2013 07:29:39 -0800
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 56d20927128d546e37fb57cba006d62e2912caa8
      
https://github.com/Dolibarr/dolibarr/commit/56d20927128d546e37fb57cba006d62e2912caa8
  Author: aspangaro <address@hidden>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    M htdocs/margin/productMargins.php
    M htdocs/product/stock/replenish.php
    M htdocs/public/members/public_list.php

  Log Message:
  -----------
  Merge branch 'upstream/develop'


  Commit: b075e3c808b15d24df80c88d965db90e5cb27986
      
https://github.com/Dolibarr/dolibarr/commit/b075e3c808b15d24df80c88d965db90e5cb27986
  Author: aspangaro <address@hidden>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    M htdocs/langs/sk_SK/link.lang
    M htdocs/langs/sk_SK/printipp.lang

  Log Message:
  -----------
  Problem in my software


  Commit: ce9d952e6a0705480b08a7bd2ee1cda90677043a
      
https://github.com/Dolibarr/dolibarr/commit/ce9d952e6a0705480b08a7bd2ee1cda90677043a
  Author: aspangaro <address@hidden>
  Date:   2013-11-14 (Thu, 14 Nov 2013)

  Changed paths:
    M .tx/config
    M ChangeLog
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/tpl/freeproductline_create.tpl.php
    M htdocs/core/tpl/passwordforgotten.tpl.php
    M htdocs/core/tpl/predefinedproductline_create.tpl.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
    M htdocs/langs/ar_SA/admin.lang
    M htdocs/langs/ar_SA/companies.lang
    M htdocs/langs/ar_SA/compta.lang
    M htdocs/langs/ar_SA/languages.lang
    M htdocs/langs/ar_SA/main.lang
    M htdocs/langs/ar_SA/members.lang
    M htdocs/langs/ar_SA/projects.lang
    M htdocs/langs/ar_SA/users.lang
    M htdocs/langs/bg_BG/admin.lang
    M htdocs/langs/bg_BG/bookmarks.lang
    M htdocs/langs/bg_BG/companies.lang
    M htdocs/langs/bg_BG/compta.lang
    M htdocs/langs/bg_BG/languages.lang
    M htdocs/langs/bg_BG/main.lang
    M htdocs/langs/bg_BG/members.lang
    M htdocs/langs/bg_BG/projects.lang
    M htdocs/langs/bg_BG/users.lang
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/ca_ES/companies.lang
    M htdocs/langs/ca_ES/compta.lang
    M htdocs/langs/ca_ES/languages.lang
    M htdocs/langs/ca_ES/main.lang
    M htdocs/langs/ca_ES/members.lang
    M htdocs/langs/ca_ES/projects.lang
    M htdocs/langs/ca_ES/users.lang
    M htdocs/langs/da_DK/admin.lang
    M htdocs/langs/da_DK/companies.lang
    M htdocs/langs/da_DK/compta.lang
    M htdocs/langs/da_DK/languages.lang
    M htdocs/langs/da_DK/main.lang
    M htdocs/langs/da_DK/members.lang
    M htdocs/langs/da_DK/projects.lang
    M htdocs/langs/da_DK/users.lang
    M htdocs/langs/de_DE/admin.lang
    M htdocs/langs/de_DE/companies.lang
    M htdocs/langs/de_DE/compta.lang
    M htdocs/langs/de_DE/languages.lang
    M htdocs/langs/de_DE/main.lang
    M htdocs/langs/de_DE/members.lang
    M htdocs/langs/de_DE/products.lang
    M htdocs/langs/de_DE/projects.lang
    M htdocs/langs/de_DE/users.lang
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/el_GR/bills.lang
    M htdocs/langs/el_GR/companies.lang
    M htdocs/langs/el_GR/compta.lang
    M htdocs/langs/el_GR/languages.lang
    M htdocs/langs/el_GR/main.lang
    M htdocs/langs/el_GR/members.lang
    M htdocs/langs/el_GR/projects.lang
    M htdocs/langs/el_GR/users.lang
    M htdocs/langs/en_US/help.lang
    M htdocs/langs/en_US/languages.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/agenda.lang
    M htdocs/langs/es_ES/boxes.lang
    M htdocs/langs/es_ES/companies.lang
    M htdocs/langs/es_ES/compta.lang
    M htdocs/langs/es_ES/ecm.lang
    M htdocs/langs/es_ES/errors.lang
    M htdocs/langs/es_ES/help.lang
    M htdocs/langs/es_ES/holiday.lang
    M htdocs/langs/es_ES/languages.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/es_ES/members.lang
    M htdocs/langs/es_ES/orders.lang
    M htdocs/langs/es_ES/other.lang
    M htdocs/langs/es_ES/products.lang
    M htdocs/langs/es_ES/projects.lang
    M htdocs/langs/es_ES/stocks.lang
    M htdocs/langs/es_ES/users.lang
    M htdocs/langs/es_ES/withdrawals.lang
    M htdocs/langs/es_ES/workflow.lang
    M htdocs/langs/et_EE/admin.lang
    M htdocs/langs/et_EE/companies.lang
    M htdocs/langs/et_EE/compta.lang
    M htdocs/langs/et_EE/languages.lang
    M htdocs/langs/et_EE/main.lang
    M htdocs/langs/et_EE/members.lang
    M htdocs/langs/et_EE/projects.lang
    M htdocs/langs/et_EE/users.lang
    M htdocs/langs/fa_IR/admin.lang
    M htdocs/langs/fa_IR/banks.lang
    M htdocs/langs/fa_IR/companies.lang
    M htdocs/langs/fa_IR/compta.lang
    M htdocs/langs/fa_IR/install.lang
    M htdocs/langs/fa_IR/languages.lang
    M htdocs/langs/fa_IR/main.lang
    M htdocs/langs/fa_IR/members.lang
    M htdocs/langs/fa_IR/projects.lang
    M htdocs/langs/fa_IR/sms.lang
    M htdocs/langs/fa_IR/users.lang
    M htdocs/langs/fa_IR/withdrawals.lang
    M htdocs/langs/fa_IR/workflow.lang
    M htdocs/langs/fi_FI/admin.lang
    M htdocs/langs/fi_FI/companies.lang
    M htdocs/langs/fi_FI/compta.lang
    M htdocs/langs/fi_FI/languages.lang
    M htdocs/langs/fi_FI/main.lang
    M htdocs/langs/fi_FI/members.lang
    M htdocs/langs/fi_FI/projects.lang
    M htdocs/langs/fi_FI/users.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/companies.lang
    M htdocs/langs/fr_FR/help.lang
    M htdocs/langs/fr_FR/languages.lang
    M htdocs/langs/fr_FR/stocks.lang
    M htdocs/langs/he_IL/admin.lang
    M htdocs/langs/he_IL/companies.lang
    M htdocs/langs/he_IL/compta.lang
    M htdocs/langs/he_IL/languages.lang
    M htdocs/langs/he_IL/main.lang
    M htdocs/langs/he_IL/members.lang
    M htdocs/langs/he_IL/projects.lang
    M htdocs/langs/he_IL/users.lang
    M htdocs/langs/hu_HU/admin.lang
    M htdocs/langs/hu_HU/companies.lang
    M htdocs/langs/hu_HU/compta.lang
    M htdocs/langs/hu_HU/languages.lang
    M htdocs/langs/hu_HU/main.lang
    M htdocs/langs/hu_HU/members.lang
    M htdocs/langs/hu_HU/projects.lang
    M htdocs/langs/hu_HU/users.lang
    M htdocs/langs/is_IS/admin.lang
    M htdocs/langs/is_IS/companies.lang
    M htdocs/langs/is_IS/compta.lang
    M htdocs/langs/is_IS/languages.lang
    M htdocs/langs/is_IS/main.lang
    M htdocs/langs/is_IS/members.lang
    M htdocs/langs/is_IS/projects.lang
    M htdocs/langs/is_IS/users.lang
    M htdocs/langs/it_IT/admin.lang
    M htdocs/langs/it_IT/companies.lang
    M htdocs/langs/it_IT/compta.lang
    M htdocs/langs/it_IT/languages.lang
    M htdocs/langs/it_IT/main.lang
    M htdocs/langs/it_IT/members.lang
    M htdocs/langs/it_IT/projects.lang
    M htdocs/langs/it_IT/stocks.lang
    M htdocs/langs/it_IT/users.lang
    M htdocs/langs/ja_JP/admin.lang
    M htdocs/langs/ja_JP/companies.lang
    M htdocs/langs/ja_JP/compta.lang
    M htdocs/langs/ja_JP/languages.lang
    M htdocs/langs/ja_JP/main.lang
    M htdocs/langs/ja_JP/members.lang
    M htdocs/langs/ja_JP/projects.lang
    M htdocs/langs/ja_JP/users.lang
    M htdocs/langs/ko_KR/admin.lang
    M htdocs/langs/ko_KR/companies.lang
    M htdocs/langs/ko_KR/compta.lang
    M htdocs/langs/ko_KR/languages.lang
    M htdocs/langs/ko_KR/main.lang
    M htdocs/langs/ko_KR/members.lang
    M htdocs/langs/ko_KR/projects.lang
    M htdocs/langs/ko_KR/users.lang
    M htdocs/langs/nb_NO/admin.lang
    M htdocs/langs/nb_NO/companies.lang
    M htdocs/langs/nb_NO/compta.lang
    M htdocs/langs/nb_NO/languages.lang
    M htdocs/langs/nb_NO/main.lang
    M htdocs/langs/nb_NO/members.lang
    M htdocs/langs/nb_NO/projects.lang
    M htdocs/langs/nb_NO/users.lang
    M htdocs/langs/nl_NL/admin.lang
    M htdocs/langs/nl_NL/companies.lang
    M htdocs/langs/nl_NL/compta.lang
    M htdocs/langs/nl_NL/languages.lang
    M htdocs/langs/nl_NL/main.lang
    M htdocs/langs/nl_NL/members.lang
    M htdocs/langs/nl_NL/projects.lang
    M htdocs/langs/nl_NL/users.lang
    M htdocs/langs/pl_PL/admin.lang
    M htdocs/langs/pl_PL/companies.lang
    M htdocs/langs/pl_PL/compta.lang
    M htdocs/langs/pl_PL/languages.lang
    M htdocs/langs/pl_PL/main.lang
    M htdocs/langs/pl_PL/members.lang
    M htdocs/langs/pl_PL/projects.lang
    M htdocs/langs/pl_PL/users.lang
    M htdocs/langs/pt_PT/admin.lang
    M htdocs/langs/pt_PT/agenda.lang
    M htdocs/langs/pt_PT/banks.lang
    M htdocs/langs/pt_PT/companies.lang
    M htdocs/langs/pt_PT/compta.lang
    M htdocs/langs/pt_PT/languages.lang
    M htdocs/langs/pt_PT/mailmanspip.lang
    M htdocs/langs/pt_PT/main.lang
    M htdocs/langs/pt_PT/margins.lang
    M htdocs/langs/pt_PT/members.lang
    M htdocs/langs/pt_PT/opensurvey.lang
    M htdocs/langs/pt_PT/paypal.lang
    M htdocs/langs/pt_PT/projects.lang
    M htdocs/langs/pt_PT/users.lang
    M htdocs/langs/ro_RO/admin.lang
    M htdocs/langs/ro_RO/agenda.lang
    M htdocs/langs/ro_RO/companies.lang
    M htdocs/langs/ro_RO/compta.lang
    M htdocs/langs/ro_RO/holiday.lang
    M htdocs/langs/ro_RO/languages.lang
    M htdocs/langs/ro_RO/main.lang
    M htdocs/langs/ro_RO/members.lang
    M htdocs/langs/ro_RO/projects.lang
    M htdocs/langs/ro_RO/users.lang
    M htdocs/langs/ru_RU/admin.lang
    M htdocs/langs/ru_RU/companies.lang
    M htdocs/langs/ru_RU/compta.lang
    M htdocs/langs/ru_RU/languages.lang
    M htdocs/langs/ru_RU/main.lang
    M htdocs/langs/ru_RU/members.lang
    M htdocs/langs/ru_RU/projects.lang
    M htdocs/langs/ru_RU/users.lang
    M htdocs/langs/sl_SI/admin.lang
    M htdocs/langs/sl_SI/companies.lang
    M htdocs/langs/sl_SI/compta.lang
    M htdocs/langs/sl_SI/languages.lang
    M htdocs/langs/sl_SI/main.lang
    M htdocs/langs/sl_SI/members.lang
    M htdocs/langs/sl_SI/projects.lang
    M htdocs/langs/sl_SI/users.lang
    M htdocs/langs/sv_SE/admin.lang
    M htdocs/langs/sv_SE/companies.lang
    M htdocs/langs/sv_SE/compta.lang
    M htdocs/langs/sv_SE/languages.lang
    M htdocs/langs/sv_SE/main.lang
    M htdocs/langs/sv_SE/members.lang
    M htdocs/langs/sv_SE/projects.lang
    M htdocs/langs/sv_SE/users.lang
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/tr_TR/bills.lang
    M htdocs/langs/tr_TR/boxes.lang
    M htdocs/langs/tr_TR/categories.lang
    M htdocs/langs/tr_TR/companies.lang
    M htdocs/langs/tr_TR/compta.lang
    M htdocs/langs/tr_TR/ecm.lang
    M htdocs/langs/tr_TR/errors.lang
    M htdocs/langs/tr_TR/holiday.lang
    M htdocs/langs/tr_TR/languages.lang
    M htdocs/langs/tr_TR/main.lang
    M htdocs/langs/tr_TR/members.lang
    M htdocs/langs/tr_TR/orders.lang
    M htdocs/langs/tr_TR/other.lang
    M htdocs/langs/tr_TR/products.lang
    M htdocs/langs/tr_TR/projects.lang
    M htdocs/langs/tr_TR/stocks.lang
    M htdocs/langs/tr_TR/suppliers.lang
    M htdocs/langs/tr_TR/users.lang
    M htdocs/langs/tr_TR/withdrawals.lang
    A htdocs/langs/uz_UZ/admin.lang
    A htdocs/langs/uz_UZ/agenda.lang
    A htdocs/langs/uz_UZ/banks.lang
    A htdocs/langs/uz_UZ/bills.lang
    A htdocs/langs/uz_UZ/bookmarks.lang
    A htdocs/langs/uz_UZ/boxes.lang
    A htdocs/langs/uz_UZ/cashdesk.lang
    A htdocs/langs/uz_UZ/categories.lang
    A htdocs/langs/uz_UZ/commercial.lang
    A htdocs/langs/uz_UZ/companies.lang
    A htdocs/langs/uz_UZ/compta.lang
    A htdocs/langs/uz_UZ/contracts.lang
    A htdocs/langs/uz_UZ/cron.lang
    A htdocs/langs/uz_UZ/deliveries.lang
    A htdocs/langs/uz_UZ/dict.lang
    A htdocs/langs/uz_UZ/donations.lang
    A htdocs/langs/uz_UZ/ecm.lang
    A htdocs/langs/uz_UZ/errors.lang
    A htdocs/langs/uz_UZ/exports.lang
    A htdocs/langs/uz_UZ/externalsite.lang
    A htdocs/langs/uz_UZ/ftp.lang
    A htdocs/langs/uz_UZ/help.lang
    A htdocs/langs/uz_UZ/holiday.lang
    A htdocs/langs/uz_UZ/install.lang
    A htdocs/langs/uz_UZ/interventions.lang
    A htdocs/langs/uz_UZ/languages.lang
    A htdocs/langs/uz_UZ/ldap.lang
    A htdocs/langs/uz_UZ/mailmanspip.lang
    A htdocs/langs/uz_UZ/mails.lang
    A htdocs/langs/uz_UZ/main.lang
    A htdocs/langs/uz_UZ/margins.lang
    A htdocs/langs/uz_UZ/members.lang
    A htdocs/langs/uz_UZ/opensurvey.lang
    A htdocs/langs/uz_UZ/orders.lang
    A htdocs/langs/uz_UZ/oscommerce.lang
    A htdocs/langs/uz_UZ/other.lang
    A htdocs/langs/uz_UZ/paybox.lang
    A htdocs/langs/uz_UZ/paypal.lang
    A htdocs/langs/uz_UZ/products.lang
    A htdocs/langs/uz_UZ/projects.lang
    A htdocs/langs/uz_UZ/propal.lang
    A htdocs/langs/uz_UZ/sendings.lang
    A htdocs/langs/uz_UZ/shop.lang
    A htdocs/langs/uz_UZ/sms.lang
    A htdocs/langs/uz_UZ/stocks.lang
    A htdocs/langs/uz_UZ/suppliers.lang
    A htdocs/langs/uz_UZ/trips.lang
    A htdocs/langs/uz_UZ/users.lang
    A htdocs/langs/uz_UZ/withdrawals.lang
    A htdocs/langs/uz_UZ/workflow.lang
    M htdocs/langs/vi_VN/admin.lang
    M htdocs/langs/vi_VN/companies.lang
    M htdocs/langs/vi_VN/compta.lang
    M htdocs/langs/vi_VN/languages.lang
    M htdocs/langs/vi_VN/main.lang
    M htdocs/langs/vi_VN/members.lang
    M htdocs/langs/vi_VN/projects.lang
    M htdocs/langs/vi_VN/users.lang
    M htdocs/langs/zh_CN/admin.lang
    M htdocs/langs/zh_CN/agenda.lang
    M htdocs/langs/zh_CN/bills.lang
    M htdocs/langs/zh_CN/boxes.lang
    M htdocs/langs/zh_CN/companies.lang
    M htdocs/langs/zh_CN/compta.lang
    M htdocs/langs/zh_CN/cron.lang
    M htdocs/langs/zh_CN/ecm.lang
    M htdocs/langs/zh_CN/exports.lang
    M htdocs/langs/zh_CN/languages.lang
    M htdocs/langs/zh_CN/main.lang
    M htdocs/langs/zh_CN/members.lang
    M htdocs/langs/zh_CN/opensurvey.lang
    M htdocs/langs/zh_CN/projects.lang
    M htdocs/langs/zh_CN/stocks.lang
    M htdocs/langs/zh_CN/users.lang
    M htdocs/langs/zh_TW/admin.lang
    M htdocs/langs/zh_TW/companies.lang
    M htdocs/langs/zh_TW/compta.lang
    M htdocs/langs/zh_TW/languages.lang
    M htdocs/langs/zh_TW/main.lang
    M htdocs/langs/zh_TW/members.lang
    M htdocs/langs/zh_TW/projects.lang
    M htdocs/langs/zh_TW/users.lang
    M htdocs/main.inc.php
    M htdocs/product/class/product.class.php
    M htdocs/product/composition/fiche.php
    M htdocs/support/index.php
    M htdocs/theme/eldy/style.css.php

  Log Message:
  -----------
  Merge branch 'upstream/develop'


  Commit: 1f7e6a42c2f6ea58680488bde806252a28935a84
      
https://github.com/Dolibarr/dolibarr/commit/1f7e6a42c2f6ea58680488bde806252a28935a84
  Author: Grand Philippe <address@hidden>
  Date:   2013-11-24 (Sun, 24 Nov 2013)

  Changed paths:
    M htdocs/install/mysql/migration/2.1.0-2.2.0.sql

  Log Message:
  -----------
  add a Social contributions type and fix some language stuff


  Commit: bb8f113e67bb048b478477f453b787f6f46f1328
      
https://github.com/Dolibarr/dolibarr/commit/bb8f113e67bb048b478477f453b787f6f46f1328
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-11-24 (Sun, 24 Nov 2013)

  Changed paths:
    M htdocs/install/mysql/migration/2.1.0-2.2.0.sql

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

add a Social contributions type and fix some language stuff


  Commit: 8cd0647d7e74df8b00200dc63f64dace6daf909a
      
https://github.com/Dolibarr/dolibarr/commit/8cd0647d7e74df8b00200dc63f64dace6daf909a
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-11-24 (Sun, 24 Nov 2013)

  Changed paths:
    M htdocs/user/param_ihm.php

  Log Message:
  -----------
  Fix: business rule to protect button and action was not synchronized


  Commit: 4cf2c3d58ca0ebaae3c664c2ec3f2f3bce269b90
      
https://github.com/Dolibarr/dolibarr/commit/4cf2c3d58ca0ebaae3c664c2ec3f2f3bce269b90
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-11-24 (Sun, 24 Nov 2013)

  Changed paths:
    M htdocs/install/mysql/migration/2.1.0-2.2.0.sql

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


  Commit: f98ec89dec9ab5484db719cc87f79090c7d27201
      
https://github.com/Dolibarr/dolibarr/commit/f98ec89dec9ab5484db719cc87f79090c7d27201
  Author: aspangaro <address@hidden>
  Date:   2013-11-24 (Sun, 24 Nov 2013)

  Changed paths:
    M .gitignore
    M .tx/config
    M ChangeLog
    M build/debian/README.howto
    M build/debian/changelog
    M build/makepack-dolibarr.pl
    M build/makepack-dolibarrmodule.pl
    M build/obs/README
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    A dev/fixnotabfiles.sh
    M dev/initdata/mysqldump_dolibarr_3.5.0.sql
    M dev/translation/autotranslator.class.php
    M dev/translation/txpush.sh
    M htdocs/adherents/admin/adherent.php
    M htdocs/adherents/fiche.php
    M htdocs/admin/company.php
    M htdocs/admin/mailing.php
    M htdocs/admin/proxy.php
    M htdocs/admin/security_other.php
    M htdocs/admin/system/about.php
    M htdocs/boutique/commande/class/boutiquecommande.class.php
    M htdocs/categories/categorie.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/fiche.php
    M htdocs/comm/list.php
    M htdocs/comm/mailing/fiche.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/document.php
    M htdocs/comm/prospect/list.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/document.php
    M htdocs/commande/fiche.php
    M htdocs/compta/charges/index.php
    M htdocs/compta/facture.php
    M htdocs/compta/prelevement/bons.php
    M htdocs/compta/prelevement/factures.php
    M htdocs/compta/prelevement/fiche-rejet.php
    M htdocs/compta/prelevement/fiche-stat.php
    M htdocs/compta/prelevement/fiche.php
    M htdocs/compta/prelevement/ligne.php
    M htdocs/compta/prelevement/lignes.php
    M htdocs/compta/prelevement/liste.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/list.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/fiche.php
    M htdocs/core/ajax/ajaxdirtree.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formfile.class.php
    A htdocs/core/class/link.class.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/js/lib_head.js
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/xcal.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/mailings/modules_mailings.php
    M htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
    M htdocs/core/tpl/ajaxrow.tpl.php
    M htdocs/core/tpl/document_actions_post_headers.tpl.php
    M htdocs/core/tpl/document_actions_pre_headers.tpl.php
    M htdocs/core/tpl/freeproductline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/predefinedproductline_create.tpl.php
    M htdocs/cron/card.php
    M htdocs/ecm/index.php
    M htdocs/ecm/tpl/builddatabase.tpl.php
    M htdocs/fichinter/fiche.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/commande/document.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/fourn/fiche.php
    M htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
    M htdocs/includes/odtphp/odf.php
    M htdocs/install/mysql/data/llx_c_tva.sql
    M htdocs/install/mysql/migration/2.1.0-2.2.0.sql
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
    M htdocs/install/mysql/tables/llx_c_chargesociales.sql
    M htdocs/install/mysql/tables/llx_societe_rib.sql
    M htdocs/langs/el_GR/agenda.lang
    M htdocs/langs/el_GR/boxes.lang
    M htdocs/langs/el_GR/companies.lang
    M htdocs/langs/el_GR/errors.lang
    M htdocs/langs/el_GR/holiday.lang
    M htdocs/langs/el_GR/main.lang
    M htdocs/langs/el_GR/members.lang
    M htdocs/langs/el_GR/orders.lang
    M htdocs/langs/el_GR/other.lang
    M htdocs/langs/el_GR/products.lang
    M htdocs/langs/el_GR/projects.lang
    M htdocs/langs/el_GR/users.lang
    M htdocs/langs/el_GR/withdrawals.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/banks.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/cron.lang
    M htdocs/langs/en_US/dict.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/margins.lang
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/en_US/printipp.lang
    M htdocs/langs/en_US/suppliers.lang
    M htdocs/langs/en_US/withdrawals.lang
    M htdocs/langs/es_ES/companies.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/banks.lang
    M htdocs/langs/fr_FR/companies.lang
    M htdocs/langs/fr_FR/cron.lang
    M htdocs/langs/fr_FR/dict.lang
    M htdocs/langs/fr_FR/help.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/langs/fr_FR/margins.lang
    M htdocs/langs/fr_FR/projects.lang
    M htdocs/langs/fr_FR/suppliers.lang
    M htdocs/langs/lv_LV/admin.lang
    M htdocs/langs/lv_LV/agenda.lang
    M htdocs/langs/lv_LV/boxes.lang
    M htdocs/langs/lv_LV/cashdesk.lang
    M htdocs/langs/lv_LV/companies.lang
    M htdocs/langs/lv_LV/externalsite.lang
    M htdocs/langs/lv_LV/ftp.lang
    M htdocs/langs/lv_LV/install.lang
    M htdocs/langs/lv_LV/languages.lang
    M htdocs/langs/lv_LV/link.lang
    M htdocs/langs/lv_LV/main.lang
    M htdocs/langs/lv_LV/oscommerce.lang
    M htdocs/langs/lv_LV/printipp.lang
    M htdocs/langs/lv_LV/products.lang
    M htdocs/langs/lv_LV/shop.lang
    M htdocs/langs/lv_LV/sms.lang
    M htdocs/langs/lv_LV/workflow.lang
    R htdocs/link/class/link.class.php
    M htdocs/main.inc.php
    M htdocs/product/composition/fiche.php
    M htdocs/product/fiche.php
    M htdocs/product/liste.php
    M htdocs/product/stock/fiche.php
    M htdocs/public/cron/cron_run_jobs.php
    A htdocs/societe/class/address.class.php
    M htdocs/societe/class/companybankaccount.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/localtaxes.php
    M htdocs/societe/rib.php
    M htdocs/societe/soc.php
    M htdocs/societe/societe.php
    M htdocs/support/index.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/user/index.php
    M htdocs/user/param_ihm.php
    M htdocs/webservices/server_contact.php
    M scripts/emailings/mailing-send.php
    M test/phpunit/CompanyBankAccountTest.php
    M test/phpunit/DateLibTest.php
    M test/phpunit/DateLibTzFranceTest.php
    M test/phpunit/WebservicesOrdersTest.php

  Log Message:
  -----------
  Merge branch 'upstream/3.5'


  Commit: e1b4d012353d54d98014a69d7c67d219a4a1ef89
      
https://github.com/Dolibarr/dolibarr/commit/e1b4d012353d54d98014a69d7c67d219a4a1ef89
  Author: aspangaro <address@hidden>
  Date:   2013-11-24 (Sun, 24 Nov 2013)

  Changed paths:
    M htdocs/adherents/fiche.php
    M htdocs/comm/fiche.php
    M htdocs/contact/fiche.php
    M htdocs/contact/list.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/langs/en_US/companies.lang
    M htdocs/societe/soc.php
    A htdocs/theme/common/skype_callbutton.png
    A htdocs/theme/common/skype_chatbutton.png

  Log Message:
  -----------
  Improvement of the Skype button
Perm & add a button"Chat"


  Commit: b71406f12da3ad0239375cf1679f30ff70fb1455
      
https://github.com/Dolibarr/dolibarr/commit/b71406f12da3ad0239375cf1679f30ff70fb1455
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

  Changed paths:
    M htdocs/adherents/fiche.php
    M htdocs/comm/fiche.php
    M htdocs/contact/fiche.php
    M htdocs/contact/list.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/install/mysql/migration/2.1.0-2.2.0.sql
    M htdocs/langs/en_US/companies.lang
    M htdocs/societe/soc.php
    A htdocs/theme/common/skype_callbutton.png
    A htdocs/theme/common/skype_chatbutton.png
    M htdocs/user/param_ihm.php

  Log Message:
  -----------
  Merge pull request #1322 from aspangaro/develop

Improvement of the Skype button


Compare: 
https://github.com/Dolibarr/dolibarr/compare/7ea595fa6df3...b71406f12da3
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] 56d209: Merge branch 'upstream/develop', Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] 203a98: fix language and standardize code
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] 8981f5: Fix: typo
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] 203a98: fix language and standardize code
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] 8981f5: Fix: typo
Index(es):
- Date
- Thread