[Dolibarr-git] [Dolibarr/dolibarr] 088d34: Problem of merging

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 088d34b4b2a07f90ac6f46394a3ed499a0695ac1
      
https://github.com/Dolibarr/dolibarr/commit/088d34b4b2a07f90ac6f46394a3ed499a0695ac1
  Author: aspangaro <address@hidden>
  Date:   2014-06-14 (Sat, 14 Jun 2014)

  Changed paths:
    M htdocs/compta/prelevement/class/bonprelevement.class.php

  Log Message:
  -----------
  Problem of merging


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

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/admin/fichinter.php
    M htdocs/admin/supplier_invoice.php
    M htdocs/admin/supplier_order.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/remise.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/fileupload.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/security2.lib.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/langs/ar_SA/admin.lang
    M htdocs/langs/ar_SA/languages.lang
    M htdocs/langs/bg_BG/admin.lang
    M htdocs/langs/bg_BG/languages.lang
    M htdocs/langs/bs_BA/admin.lang
    M htdocs/langs/bs_BA/languages.lang
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/ca_ES/languages.lang
    M htdocs/langs/cs_CZ/admin.lang
    M htdocs/langs/cs_CZ/companies.lang
    M htdocs/langs/cs_CZ/languages.lang
    M htdocs/langs/da_DK/admin.lang
    M htdocs/langs/da_DK/languages.lang
    M htdocs/langs/de_DE/admin.lang
    M htdocs/langs/de_DE/languages.lang
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/el_GR/contracts.lang
    M htdocs/langs/el_GR/exports.lang
    M htdocs/langs/el_GR/languages.lang
    M htdocs/langs/el_GR/main.lang
    M htdocs/langs/el_GR/products.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/languages.lang
    M htdocs/langs/es_ES/suppliers.lang
    M htdocs/langs/et_EE/admin.lang
    M htdocs/langs/et_EE/languages.lang
    M htdocs/langs/eu_ES/admin.lang
    M htdocs/langs/eu_ES/languages.lang
    M htdocs/langs/fa_IR/admin.lang
    M htdocs/langs/fa_IR/languages.lang
    M htdocs/langs/fi_FI/admin.lang
    M htdocs/langs/fi_FI/languages.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/languages.lang
    M htdocs/langs/he_IL/admin.lang
    M htdocs/langs/he_IL/languages.lang
    M htdocs/langs/hr_HR/admin.lang
    M htdocs/langs/hr_HR/agenda.lang
    M htdocs/langs/hr_HR/bills.lang
    M htdocs/langs/hr_HR/companies.lang
    M htdocs/langs/hr_HR/contracts.lang
    M htdocs/langs/hr_HR/deliveries.lang
    M htdocs/langs/hr_HR/languages.lang
    M htdocs/langs/hr_HR/main.lang
    M htdocs/langs/hr_HR/products.lang
    M htdocs/langs/hr_HR/propal.lang
    M htdocs/langs/hu_HU/admin.lang
    M htdocs/langs/hu_HU/languages.lang
    M htdocs/langs/id_ID/admin.lang
    M htdocs/langs/id_ID/languages.lang
    M htdocs/langs/is_IS/admin.lang
    M htdocs/langs/is_IS/languages.lang
    M htdocs/langs/it_IT/admin.lang
    M htdocs/langs/it_IT/languages.lang
    M htdocs/langs/ja_JP/admin.lang
    M htdocs/langs/ja_JP/languages.lang
    M htdocs/langs/ko_KR/admin.lang
    M htdocs/langs/ko_KR/languages.lang
    M htdocs/langs/lt_LT/admin.lang
    M htdocs/langs/lt_LT/languages.lang
    M htdocs/langs/lv_LV/admin.lang
    M htdocs/langs/lv_LV/languages.lang
    M htdocs/langs/mk_MK/admin.lang
    M htdocs/langs/mk_MK/languages.lang
    M htdocs/langs/nb_NO/admin.lang
    M htdocs/langs/nb_NO/languages.lang
    M htdocs/langs/nl_NL/admin.lang
    M htdocs/langs/nl_NL/languages.lang
    M htdocs/langs/pl_PL/admin.lang
    M htdocs/langs/pl_PL/languages.lang
    M htdocs/langs/pt_PT/admin.lang
    M htdocs/langs/pt_PT/languages.lang
    M htdocs/langs/ro_RO/admin.lang
    M htdocs/langs/ro_RO/languages.lang
    M htdocs/langs/ru_RU/admin.lang
    M htdocs/langs/ru_RU/languages.lang
    M htdocs/langs/sk_SK/admin.lang
    M htdocs/langs/sk_SK/languages.lang
    M htdocs/langs/sl_SI/admin.lang
    M htdocs/langs/sl_SI/install.lang
    M htdocs/langs/sl_SI/languages.lang
    M htdocs/langs/sq_AL/admin.lang
    M htdocs/langs/sq_AL/languages.lang
    M htdocs/langs/sv_SE/admin.lang
    M htdocs/langs/sv_SE/languages.lang
    M htdocs/langs/th_TH/admin.lang
    M htdocs/langs/th_TH/languages.lang
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/tr_TR/contracts.lang
    M htdocs/langs/tr_TR/install.lang
    M htdocs/langs/tr_TR/languages.lang
    M htdocs/langs/uk_UA/admin.lang
    M htdocs/langs/uk_UA/languages.lang
    M htdocs/langs/uz_UZ/admin.lang
    M htdocs/langs/uz_UZ/languages.lang
    M htdocs/langs/vi_VN/admin.lang
    M htdocs/langs/vi_VN/languages.lang
    M htdocs/langs/zh_CN/admin.lang
    M htdocs/langs/zh_CN/languages.lang
    M htdocs/langs/zh_TW/admin.lang
    M htdocs/langs/zh_TW/languages.lang
    M htdocs/main.inc.php
    M htdocs/master.inc.php
    M htdocs/public/demo/index.php
    M htdocs/public/members/new.php
    M htdocs/public/members/public_card.php
    M htdocs/public/members/public_list.php
    M htdocs/public/paybox/newpayment.php
    M htdocs/public/paybox/paymentko.php
    M htdocs/public/paybox/paymentok.php
    M htdocs/public/paypal/newpayment.php
    M htdocs/public/paypal/paymentko.php
    M htdocs/public/paypal/paymentok.php
    M htdocs/user/class/user.class.php
    M htdocs/user/class/usergroup.class.php
    M htdocs/user/fiche.php

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


  Commit: b9c1da7d27b07493297503e0fc60aed72ebe4203
      
https://github.com/Dolibarr/dolibarr/commit/b9c1da7d27b07493297503e0fc60aed72ebe4203
  Author: aspangaro <address@hidden>
  Date:   2014-06-15 (Sun, 15 Jun 2014)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/compta/bank/account.php
    M htdocs/compta/bank/index.php
    M htdocs/compta/facture.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php
    M htdocs/fichinter/fiche.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/fourn/paiement/fiche.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/contact.php
    M htdocs/projet/element.php
    A htdocs/projet/ganttchart.inc.php
    R htdocs/projet/ganttchart.php
    M htdocs/projet/ganttview.php
    M htdocs/projet/note.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/contact.php
    M htdocs/projet/tasks/document.php
    M htdocs/projet/tasks/note.php
    M htdocs/projet/tasks/task.php
    M htdocs/projet/tasks/time.php
    M htdocs/societe/soc.php
    M htdocs/user/class/usergroup.class.php

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


  Commit: f4efd3b2e8bd9eea63037afe4f9f8e308c048899
      
https://github.com/Dolibarr/dolibarr/commit/f4efd3b2e8bd9eea63037afe4f9f8e308c048899
  Author: aspangaro <address@hidden>
  Date:   2014-06-15 (Sun, 15 Jun 2014)

  Changed paths:
    M htdocs/admin/dons.php
    M htdocs/core/modules/dons/html_cerfafr.html
    M htdocs/core/modules/dons/html_cerfafr.modules.php
    M htdocs/core/modules/modDon.class.php
    M htdocs/langs/fr_FR/donations.lang

  Log Message:
  -----------
  Move donation receipt to french model cerfa 11580*03


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

  Changed paths:
    M htdocs/admin/dons.php
    M htdocs/core/modules/dons/html_cerfafr.html
    M htdocs/core/modules/dons/html_cerfafr.modules.php
    M htdocs/core/modules/modDon.class.php
    M htdocs/langs/fr_FR/donations.lang

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

Move donation receipt to french model cerfa 11580*03


Compare: 
https://github.com/Dolibarr/dolibarr/compare/656dd940111b...534e5743798a