[Dolibarr-git] [Dolibarr/dolibarr] 2b6029: FIX Some fix on stock. Condition to view warehouse...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2b6029f5d348c763c6b440949fa93a6d5a75ea9d
      
https://github.com/Dolibarr/dolibarr/commit/2b6029f5d348c763c6b440949fa93a6d5a75ea9d
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M htdocs/product/class/product.class.php
    M htdocs/product/composition/card.php
    M htdocs/product/list.php
    M htdocs/product/reassort.php

  Log Message:
  -----------
  FIX Some fix on stock. Condition to view warehouse as column and
protection against infinite loop


  Commit: a83a291856e560645932e518f7845ca56d47dee4
      
https://github.com/Dolibarr/dolibarr/commit/a83a291856e560645932e518f7845ca56d47dee4
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M htdocs/core/js/select2_locale.js.php
    M htdocs/langs/en_US/main.lang

  Log Message:
  -----------
  Translation for one char


  Commit: 55e904bc0143cb57e64ee650e49dcbc4cd8b74e5
      
https://github.com/Dolibarr/dolibarr/commit/55e904bc0143cb57e64ee650e49dcbc4cd8b74e5
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M htdocs/accountancy/admin/journal.php
    M htdocs/cashdesk/index.php
    M htdocs/comm/action/listactions.php
    M htdocs/core/lib/accounting.lib.php
    M htdocs/core/modules/modAccounting.class.php
    M htdocs/langs/en_US/agenda.lang
    M htdocs/opensurvey/card.php
    M htdocs/opensurvey/class/opensurveysondage.class.php

  Log Message:
  -----------
  Debug for expert accounting module


  Commit: 986119d2b509aef3d8a0d49c73009556438c4200
      
https://github.com/Dolibarr/dolibarr/commit/986119d2b509aef3d8a0d49c73009556438c4200
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M dev/skeletons/skeleton_list.php
    M htdocs/accountancy/admin/account.php
    M htdocs/accountancy/admin/fiscalyear.php
    M htdocs/accountancy/admin/fiscalyear_card.php
    M htdocs/accountancy/bookkeeping/balance.php
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/class/html.formventilation.class.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php

  Log Message:
  -----------
  Start debug


  Commit: cba0ef5693695ee06188b6e79088783b6fea9bbd
      
https://github.com/Dolibarr/dolibarr/commit/cba0ef5693695ee06188b6e79088783b6fea9bbd
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-14 (Sat, 14 May 2016)

  Changed paths:
    M .gitignore
    M COPYRIGHT
    M composer.json
    R composer.lock
    M htdocs/adherents/list.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/interfaces.class.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/menus/standard/eldy_menu.php
    R htdocs/includes/pdfmake/pdfmake.js
    R htdocs/includes/pdfmake/pdfmake.min.js
    R htdocs/includes/pdfmake/vfs_fonts.js
    M htdocs/includes/restler/framework/Luracast/Restler/ApcCache.php
    M htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
    M htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
    M htdocs/includes/restler/framework/Luracast/Restler/Compose.php
    M htdocs/includes/restler/framework/Luracast/Restler/Data/ApiMethodInfo.php
    M htdocs/includes/restler/framework/Luracast/Restler/Data/Arr.php
    M htdocs/includes/restler/framework/Luracast/Restler/Data/Invalid.php
    M htdocs/includes/restler/framework/Luracast/Restler/Data/Object.php
    R htdocs/includes/restler/framework/Luracast/Restler/Data/String.php
    A htdocs/includes/restler/framework/Luracast/Restler/Data/Text.php
    M htdocs/includes/restler/framework/Luracast/Restler/Data/ValidationInfo.php
    M htdocs/includes/restler/framework/Luracast/Restler/Data/Validator.php
    M htdocs/includes/restler/framework/Luracast/Restler/Data/ValueObject.php
    M htdocs/includes/restler/framework/Luracast/Restler/Data/iValidate.php
    M htdocs/includes/restler/framework/Luracast/Restler/Data/iValueObject.php
    M htdocs/includes/restler/framework/Luracast/Restler/Defaults.php
    M htdocs/includes/restler/framework/Luracast/Restler/EventDispatcher.php
    A htdocs/includes/restler/framework/Luracast/Restler/Explorer.php
    A htdocs/includes/restler/framework/Luracast/Restler/ExplorerInfo.php
    M htdocs/includes/restler/framework/Luracast/Restler/Filter/RateLimit.php
    M htdocs/includes/restler/framework/Luracast/Restler/Flash.php
    M htdocs/includes/restler/framework/Luracast/Restler/Format/AmfFormat.php
    M htdocs/includes/restler/framework/Luracast/Restler/Format/CsvFormat.php
    A 
htdocs/includes/restler/framework/Luracast/Restler/Format/DependentFormat.php
    A 
htdocs/includes/restler/framework/Luracast/Restler/Format/DependentMultiFormat.php
    M htdocs/includes/restler/framework/Luracast/Restler/Format/Format.php
    M htdocs/includes/restler/framework/Luracast/Restler/Format/HtmlFormat.php
    M htdocs/includes/restler/framework/Luracast/Restler/Format/JsFormat.php
    M htdocs/includes/restler/framework/Luracast/Restler/Format/JsonFormat.php
    M htdocs/includes/restler/framework/Luracast/Restler/Format/MultiFormat.php
    M htdocs/includes/restler/framework/Luracast/Restler/Format/PlistFormat.php
    M htdocs/includes/restler/framework/Luracast/Restler/Format/TsvFormat.php
    M htdocs/includes/restler/framework/Luracast/Restler/Format/UploadFormat.php
    M 
htdocs/includes/restler/framework/Luracast/Restler/Format/UrlEncodedFormat.php
    M htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php
    M htdocs/includes/restler/framework/Luracast/Restler/Format/YamlFormat.php
    M 
htdocs/includes/restler/framework/Luracast/Restler/Format/iDecodeStream.php
    M htdocs/includes/restler/framework/Luracast/Restler/Format/iFormat.php
    M htdocs/includes/restler/framework/Luracast/Restler/HumanReadableCache.php
    A 
htdocs/includes/restler/framework/Luracast/Restler/InvalidAuthCredentials.php
    A htdocs/includes/restler/framework/Luracast/Restler/MemcacheCache.php
    A htdocs/includes/restler/framework/Luracast/Restler/PassThrough.php
    M htdocs/includes/restler/framework/Luracast/Restler/Redirect.php
    M htdocs/includes/restler/framework/Luracast/Restler/Resources.php
    M htdocs/includes/restler/framework/Luracast/Restler/RestException.php
    M htdocs/includes/restler/framework/Luracast/Restler/Restler.php
    M htdocs/includes/restler/framework/Luracast/Restler/Routes.php
    M htdocs/includes/restler/framework/Luracast/Restler/Scope.php
    M htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php
    M htdocs/includes/restler/framework/Luracast/Restler/UI/FormStyles.php
    M htdocs/includes/restler/framework/Luracast/Restler/UI/Forms.php
    M htdocs/includes/restler/framework/Luracast/Restler/UI/Nav.php
    M htdocs/includes/restler/framework/Luracast/Restler/UI/Tags.php
    M htdocs/includes/restler/framework/Luracast/Restler/User.php
    M htdocs/includes/restler/framework/Luracast/Restler/Util.php
    M htdocs/includes/restler/framework/Luracast/Restler/composer.json
    A htdocs/includes/restler/framework/Luracast/Restler/explorer/css/reset.css
    A htdocs/includes/restler/framework/Luracast/Restler/explorer/css/screen.css
    A 
htdocs/includes/restler/framework/Luracast/Restler/explorer/images/explorer_icons.png
    A 
htdocs/includes/restler/framework/Luracast/Restler/explorer/images/logo_small.png
    A 
htdocs/includes/restler/framework/Luracast/Restler/explorer/images/throbber.gif
    A htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
    A 
htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/backbone-min.js
    A 
htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-1.0.0.js
    A 
htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.7.3.pack.js
    A 
htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery-1.8.0.min.js
    A 
htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.ba-bbq.min.js
    A 
htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.slideto.min.js
    A 
htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.wiggle.min.js
    A 
htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/shred.bundle.js
    A 
htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/shred/content.js
    A 
htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js
    A htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js
    A 
htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/underscore-min.js
    A htdocs/includes/restler/framework/Luracast/Restler/explorer/o2c.html
    A htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js
    A 
htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js
    M htdocs/includes/restler/framework/Luracast/Restler/iAuthenticate.php
    M htdocs/includes/restler/framework/Luracast/Restler/iCache.php
    M htdocs/includes/restler/framework/Luracast/Restler/iCompose.php
    M htdocs/includes/restler/framework/Luracast/Restler/iFilter.php
    M htdocs/includes/restler/framework/Luracast/Restler/iIdentifyUser.php
    M 
htdocs/includes/restler/framework/Luracast/Restler/iProvideMultiVersionApi.php
    M htdocs/includes/restler/framework/Luracast/Restler/iUseAuthentication.php
    M htdocs/includes/restler/framework/Luracast/Restler/views/debug.php
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/langs/en_US/other.lang
    M htdocs/main.inc.php
    M htdocs/product/card.php
    M htdocs/resource/class/dolresource.class.php
    M htdocs/supplier_proposal/card.php
    M htdocs/supplier_proposal/list.php
    M htdocs/user/class/api_user.class.php
    M htdocs/user/class/user.class.php
    M test/phpunit/AllTests.php
    A test/phpunit/RestAPIUserTest.php

  Log Message:
  -----------
  Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/af38d0382529...cba0ef569369