dolibarr-git
[Top][All Lists]
Advanced

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

[Dolibarr-git] [Dolibarr/dolibarr] d18326: Merge branch 'develop' of ssh


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] d18326: Merge branch 'develop' of ssh://address@hidden/Dol...
Date: Sat, 29 Oct 2011 11:05:05 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr

  Commit: d183265702063f388b305be9ed71263410c17096
      
https://github.com/Dolibarr/dolibarr/commit/d183265702063f388b305be9ed71263410c17096
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-10-29 (Sat, 29 Oct 2011)

  Changed paths:
    R .cvsignore
  M ChangeLog
  R build/.cvsignore
  R build/exe/doliwamp/.cvsignore
  R dev/.cvsignore
  R dev/phpunit/.cvsignore
  R dev/skeletons/.cvsignore
  R dev/test/.cvsignore
  R dev/xdebug/.cvsignore
  R doc/images/.cvsignore
  R htdocs/.cvsignore
  R htdocs/admin/.cvsignore
  M htdocs/compta/deplacement/fiche.php
  A htdocs/compta/localtax/class/localtax.class.php
  A htdocs/compta/localtax/clients.php
  A htdocs/compta/localtax/fiche.php
  A htdocs/compta/localtax/index.php
  A htdocs/compta/localtax/reglement.php
  M htdocs/compta/paiement/cheque/class/remisecheque.class.php
  M htdocs/compta/paiement/cheque/fiche.php
  R htdocs/conf/.cvsignore
  M htdocs/core/ajax/loadinplace.php
  M htdocs/core/ajax/saveinplace.php
  M htdocs/core/class/commonobject.class.php
  M htdocs/core/class/html.form.class.php
  A htdocs/core/js/datepicker.js
  A htdocs/core/js/editinplace.js
  A htdocs/core/js/jnotify.js
  M htdocs/core/lib/functions.lib.php
  M htdocs/core/lib/functions2.lib.php
  M htdocs/core/lib/security.lib.php
  M htdocs/core/lib/tax.lib.php
  M htdocs/core/menus/standard/eldy.lib.php
  R htdocs/core/modules/.cvsignore
  M htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
  R htdocs/core/modules/mailings/.cvsignore
  R htdocs/core/tpl/ajaxeditinplace.tpl.php
  M htdocs/fichinter/class/fichinter.class.php
  M htdocs/fichinter/fiche.php
  R htdocs/includes/.cvsignore
  A htdocs/includes/jquery/i18n/README
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-af.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-ar-DZ.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-ar.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-az.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-bg.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-bs.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-cs.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-eo.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-et.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-eu.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-fo.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-gl.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-he.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-hr.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-hy.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-id.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-ko.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-kz.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-lt.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-lv.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-ml.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-ms.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-rm.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-sk.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-sq.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-sr-SR.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-sr.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-ta.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-th.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-tj.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-uk.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-vi.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-zh-HK.js
  A htdocs/includes/jquery/i18n/jquery.ui.datepicker-zh-TW.js
  R htdocs/includes/jquery/plugins/flot/.cvsignore
  R htdocs/includes/jquery/plugins/jcrop/.cvsignore
  A htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js
  R htdocs/includes/nusoap/.cvsignore
  R htdocs/install/.cvsignore
  M htdocs/install/mysql/migration/3.1.0-3.2.0.sql
  A htdocs/install/mysql/tables/llx_localtax.sql
  M htdocs/langs/.htaccess
  R htdocs/langs/ca_ES/.cvsignore
  M htdocs/langs/ca_ES/bills.lang
  A htdocs/langs/ca_ES/js/jquery.ui.datepicker.js
  M htdocs/langs/ca_ES/main.lang
  A htdocs/langs/da_DK/js/jquery.ui.datepicker.js
  A htdocs/langs/de_DE/js/jquery.ui.datepicker.js
  A htdocs/langs/el_GR/js/jquery.ui.datepicker.js
  R htdocs/langs/en_AU/.cvsignore
  A htdocs/langs/en_AU/js/jquery.ui.datepicker.js
  A htdocs/langs/en_GB/js/jquery.ui.datepicker.js
  R htdocs/langs/en_IN/.cvsignore
  R htdocs/langs/en_NZ/.cvsignore
  A htdocs/langs/en_NZ/js/jquery.ui.datepicker.js
  R htdocs/langs/en_US/.cvsignore
  M htdocs/langs/en_US/compta.lang
  M htdocs/langs/en_US/main.lang
  R htdocs/langs/es_ES/.cvsignore
  M htdocs/langs/es_ES/bills.lang
  M htdocs/langs/es_ES/compta.lang
  A htdocs/langs/es_ES/js/jquery.ui.datepicker.js
  M htdocs/langs/es_ES/main.lang
  R htdocs/langs/es_PR/.cvsignore
  A htdocs/langs/fa_IR/js/jquery.ui.datepicker.js
  A htdocs/langs/fi_FI/js/jquery.ui.datepicker.js
  R htdocs/langs/fr_BE/.cvsignore
  A htdocs/langs/fr_CH/js/jquery.ui.datepicker.js
  R htdocs/langs/fr_FR/.cvsignore
  M htdocs/langs/fr_FR/compta.lang
  A htdocs/langs/fr_FR/js/jquery.ui.datepicker.js
  M htdocs/langs/fr_FR/main.lang
  A htdocs/langs/hu_HU/js/jquery.ui.datepicker.js
  A htdocs/langs/is_IS/js/jquery.ui.datepicker.js
  R htdocs/langs/it_IT/.cvsignore
  A htdocs/langs/it_IT/js/jquery.ui.datepicker.js
  A htdocs/langs/ja_JP/js/jquery.ui.datepicker.js
  A htdocs/langs/nb_NO/js/jquery.ui.datepicker.js
  R htdocs/langs/nl_BE/.cvsignore
  A htdocs/langs/nl_NL/js/jquery.ui.datepicker.js
  R htdocs/langs/pl_PL/.cvsignore
  A htdocs/langs/pl_PL/js/jquery.ui.datepicker.js
  A htdocs/langs/pt_BR/js/jquery.ui.datepicker.js
  R htdocs/langs/pt_PT/.cvsignore
  A htdocs/langs/pt_PT/js/jquery.ui.datepicker.js
  A htdocs/langs/ro_RO/js/jquery.ui.datepicker.js
  A htdocs/langs/ru_RU/js/jquery.ui.datepicker.js
  A htdocs/langs/sl_SI/js/jquery.ui.datepicker.js
  A htdocs/langs/sv_SE/js/jquery.ui.datepicker.js
  A htdocs/langs/tr_TR/js/jquery.ui.datepicker.js
  A htdocs/langs/zh_CN/js/jquery.ui.datepicker.js
  M htdocs/main.inc.php
  R htdocs/paypal/img/.cvsignore
  R htdocs/public/donations/.cvsignore
  R htdocs/support/.cvsignore
  R htdocs/theme/.cvsignore
  R htdocs/theme/auguria/.cvsignore
  R htdocs/theme/auguria/fckeditor/.cvsignore
  R htdocs/theme/auguria/fckeditor/images/.cvsignore
  R htdocs/theme/auguria/img/.cvsignore
  R htdocs/theme/auguria/img/menus/.cvsignore
  M htdocs/theme/auguria/style.css.php
  R htdocs/theme/bureau2crea/.cvsignore
  R htdocs/theme/bureau2crea/fckeditor/.cvsignore
  R htdocs/theme/bureau2crea/fckeditor/images/.cvsignore
  R htdocs/theme/bureau2crea/img/.cvsignore
  R htdocs/theme/bureau2crea/img/menus/.cvsignore
  M htdocs/theme/bureau2crea/style.css.php
  M htdocs/theme/cameleo/style.css.php
  R htdocs/theme/common/.cvsignore
  R htdocs/theme/common/flags/.cvsignore
  R htdocs/theme/common/mime/.cvsignore
  R htdocs/theme/common/treemenu/.cvsignore
  R htdocs/theme/eldy/.cvsignore
  R htdocs/theme/eldy/fckeditor/.cvsignore
  R htdocs/theme/eldy/fckeditor/images/.cvsignore
  R htdocs/theme/eldy/img/.cvsignore
  R htdocs/theme/eldy/img/menus/.cvsignore
  M htdocs/theme/eldy/style.css.php
  M htdocs/user/fiche.php
  M htdocs/user/group/perms.php
  R test/.cvsignore
  R test/phpunit/.cvsignore

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


  Commit: de842ef1e1a409c257335e3ec1f90d29fc3e1c02
      
https://github.com/Dolibarr/dolibarr/commit/de842ef1e1a409c257335e3ec1f90d29fc3e1c02
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-10-29 (Sat, 29 Oct 2011)

  Changed paths:
    M htdocs/core/lib/functions.lib.php
  M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
  M htdocs/core/modules/societe/modules_societe.class.php

  Log Message:
  -----------
  Doxygen
Fix: Bad vars


  Commit: ac183e248308a5e1e7393b0bc3334e834dd542d7
      
https://github.com/Dolibarr/dolibarr/commit/ac183e248308a5e1e7393b0bc3334e834dd542d7
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-10-29 (Sat, 29 Oct 2011)

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

  Log Message:
  -----------
  Optimize speed


  Commit: fd9619f4cd7794e7fd2ff1ffc7e7ff01e6c4b9a7
      
https://github.com/Dolibarr/dolibarr/commit/fd9619f4cd7794e7fd2ff1ffc7e7ff01e6c4b9a7
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-10-29 (Sat, 29 Oct 2011)

  Changed paths:
    M htdocs/societe/class/societe.class.php
  M test/phpunit/SocieteTest.php

  Log Message:
  -----------
  Fix: Property not loaded
Enhance phpunit


  Commit: 784f696c852cf7a00597e48e2ef36914235fa1f2
      
https://github.com/Dolibarr/dolibarr/commit/784f696c852cf7a00597e48e2ef36914235fa1f2
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-10-29 (Sat, 29 Oct 2011)

  Changed paths:
    M htdocs/compta/resultat/clientfourn.php
  M htdocs/compta/resultat/index.php
  M htdocs/compta/stats/cabyuser.php
  M htdocs/compta/stats/casoc.php
  M htdocs/compta/stats/index.php
  M htdocs/compta/tva/quadri.php
  M htdocs/core/class/conf.class.php
  M htdocs/core/lib/accountancy.lib.php
  M htdocs/filefunc.inc.php
  M htdocs/master.inc.php

  Log Message:
  -----------
  Qual: Some fixes to make working with PHP option error_reporting
E_STRICT


  Commit: d46241e380aac4b44e6ffeda331d950126e93dca
      
https://github.com/Dolibarr/dolibarr/commit/d46241e380aac4b44e6ffeda331d950126e93dca
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-10-29 (Sat, 29 Oct 2011)

  Changed paths:
    M htdocs/langs/el_GR/compta.lang
  M htdocs/langs/en_US/compta.lang

  Log Message:
  -----------
  Fix: Translations


Compare: https://github.com/Dolibarr/dolibarr/compare/5d23da1...d46241e



reply via email to

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