dolibarr-git
[Top][All Lists]
Advanced

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

[Dolibarr-git] [Dolibarr/dolibarr] b472a2: NEW decrease stock on expedit


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] b472a2: NEW decrease stock on expedition closing/classifyi...
Date: Thu, 02 Jun 2016 02:24:43 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b472a244db5ebacdc6b448bd4053c57b4e428dc8
      
https://github.com/Dolibarr/dolibarr/commit/b472a244db5ebacdc6b448bd4053c57b4e428dc8
  Author: Alexis Algoud <address@hidden>
  Date:   2016-04-25 (Mon, 25 Apr 2016)

  Changed paths:
    M htdocs/admin/stock.php
    M htdocs/commande/list.php
    M htdocs/core/class/conf.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/replenish.php

  Log Message:
  -----------
  NEW decrease stock on expedition closing/classifying


  Commit: b46c14812cabad557d31a784043476b484359d11
      
https://github.com/Dolibarr/dolibarr/commit/b46c14812cabad557d31a784043476b484359d11
  Author: Alexis Algoud <address@hidden>
  Date:   2016-04-25 (Mon, 25 Apr 2016)

  Changed paths:
    M htdocs/admin/stock.php
    M htdocs/commande/list.php
    M htdocs/core/class/conf.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/replenish.php

  Log Message:
  -----------
  Merge branch 'NEW_decrease_stock_expedition_classify' of 
github.com:atm-alexis/dolibarr into develop


  Commit: bf1f805bf6a268ab7fa571a6565cfaed39211e04
      
https://github.com/Dolibarr/dolibarr/commit/bf1f805bf6a268ab7fa571a6565cfaed39211e04
  Author: Alexis Algoud <address@hidden>
  Date:   2016-04-25 (Mon, 25 Apr 2016)

  Changed paths:
    M htdocs/langs/en_US/stocks.lang

  Log Message:
  -----------
  FIX trad


  Commit: 91bea8b9fea47e61db78791074e63487730ce2bb
      
https://github.com/Dolibarr/dolibarr/commit/91bea8b9fea47e61db78791074e63487730ce2bb
  Author: Alexis Algoud <address@hidden>
  Date:   2016-04-25 (Mon, 25 Apr 2016)

  Changed paths:
    M htdocs/expedition/class/expedition.class.php
    M htdocs/langs/en_US/other.lang

  Log Message:
  -----------
  fix inclusion


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

  Changed paths:
    M .gitignore
    M .scrutinizer.yml
    M COPYRIGHT
    M ChangeLog
    M build/exe/doliwamp/doliwamp.iss
    M build/exe/doliwamp/my.ini.install
    M build/makepack-dolibarr.pl
    M composer.json
    R composer.lock
    M dev/skeletons/skeleton_list.php
    M doc/images/dolibarr_screenshot1_1280x800.png
    M doc/images/dolibarr_screenshot1_300x188.png
    M doc/images/dolibarr_screenshot1_640x400.png
    M htdocs/accountancy/admin/account.php
    M htdocs/accountancy/admin/card.php
    A htdocs/accountancy/admin/categories.php
    M htdocs/accountancy/admin/fiscalyear.php
    M htdocs/accountancy/admin/fiscalyear_card.php
    M htdocs/accountancy/admin/index.php
    M htdocs/accountancy/admin/journal.php
    M htdocs/accountancy/bookkeeping/balance.php
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/class/accountancycategory.class.php
    M htdocs/accountancy/class/html.formventilation.class.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/adherents/canvas/actions_adherentcard_common.class.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/list.php
    M htdocs/admin/barcode.php
    M htdocs/admin/company.php
    M htdocs/admin/dict.php
    M htdocs/admin/fckeditor.php
    M htdocs/admin/loan.php
    M htdocs/admin/menus/edit.php
    M htdocs/admin/pdf.php
    M htdocs/admin/tools/eaccelerator.php
    M htdocs/admin/tools/export.php
    M htdocs/admin/websites.php
    M htdocs/api/admin/explorer.php
    M htdocs/api/class/api.class.php
    M htdocs/api/class/api_access.class.php
    M htdocs/api/index.php
    M htdocs/cashdesk/index.php
    M htdocs/categories/class/api_category.class.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/index.php
    M htdocs/categories/photos.php
    M htdocs/categories/traduction.php
    M htdocs/categories/viewcat.php
    M htdocs/comm/action/card.php
    M htdocs/comm/action/listactions.php
    M htdocs/comm/card.php
    M htdocs/comm/index.php
    A htdocs/comm/mailing/advtargetemailing.php
    M htdocs/comm/mailing/card.php
    M htdocs/comm/mailing/cibles.php
    A htdocs/comm/mailing/class/advtargetemailing.class.php
    A htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/api_commande.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/index.php
    M htdocs/commande/list.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/index.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/stats/cabyprodserv.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contrat/index.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/doleditor.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/fiscalyear.class.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formaccounting.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/class/interfaces.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/filemanagerdol/browser/default/browser.php
    M htdocs/core/filemanagerdol/connectors/php/config.php
    M htdocs/core/filemanagerdol/connectors/php/upload.php
    M htdocs/core/js/select2_locale.js.php
    M htdocs/core/lib/accounting.lib.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/emailing.lib.php
    M htdocs/core/lib/fichinter.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/pdf.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/resource.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/menus/standard/eldy_menu.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/cheque/doc/pdf_blochet.class.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
    M htdocs/core/modules/export/export_csv.modules.php
    M htdocs/core/modules/export/export_excel.modules.php
    M htdocs/core/modules/export/export_tsv.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
    A htdocs/core/modules/mailings/advthirdparties.modules.php
    M htdocs/core/modules/mailings/modules_mailings.php
    M htdocs/core/modules/modAccounting.class.php
    M htdocs/core/modules/modFckeditor.class.php
    M htdocs/core/modules/modProduct.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/modules/modWebsites.class.php
    M htdocs/core/modules/project/doc/pdf_baleine.modules.php
    M htdocs/core/modules/project/doc/pdf_beluga.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
    M htdocs/core/tpl/admin_extrafields_edit.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/core/tpl/resource_add.tpl.php
    M htdocs/custom/README.md
    M htdocs/document.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/exports/class/export.class.php
    M htdocs/exports/export.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fourn/card.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/list.php
    M htdocs/hrm/establishment/card.php
    A htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt
    A htdocs/includes/jquery/plugins/multiselect/css/ui.multiselect.css
    A htdocs/includes/jquery/plugins/multiselect/js/ui.multiselect.js
    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/index.php
    M htdocs/install/inc.php
    M htdocs/install/mysql/data/llx_10_c_regions.sql
    M htdocs/install/mysql/data/llx_20_c_departements.sql
    M htdocs/install/mysql/data/llx_accounting.sql
    A htdocs/install/mysql/data/llx_accounting_category.sql
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_accounting_account.sql
    A htdocs/install/mysql/tables/llx_accounting_journal.key.sql
    A htdocs/install/mysql/tables/llx_accounting_journal.sql
    M htdocs/install/mysql/tables/llx_accounting_system.sql
    A htdocs/install/mysql/tables/llx_advtargetemailing.key.sql
    A htdocs/install/mysql/tables/llx_advtargetemailing.sql
    A htdocs/install/mysql/tables/llx_categorie_account.key.sql
    A htdocs/install/mysql/tables/llx_categorie_account.sql
    M htdocs/install/mysql/tables/llx_element_resources.sql
    M htdocs/install/mysql/tables/llx_expedition.sql
    M htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
    M htdocs/install/mysql/tables/llx_product.sql
    M htdocs/install/mysql/tables/llx_resource.sql
    M htdocs/install/mysql/tables/llx_societe_remise_except.sql
    M htdocs/install/mysql/tables/llx_stock_mouvement.sql
    M htdocs/install/mysql/tables/llx_website.sql
    M htdocs/install/upgrade.php
    M htdocs/install/upgrade2.php
    M htdocs/langs/ar_SA/projects.lang
    M htdocs/langs/bn_BD/projects.lang
    M htdocs/langs/bs_BA/projects.lang
    M htdocs/langs/ca_ES/projects.lang
    M htdocs/langs/cs_CZ/projects.lang
    M htdocs/langs/da_DK/projects.lang
    M htdocs/langs/de_DE/projects.lang
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/categories.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/install.lang
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/members.lang
    M htdocs/langs/en_US/opensurvey.lang
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/en_US/supplier_proposal.lang
    M htdocs/langs/en_US/suppliers.lang
    M htdocs/langs/en_US/website.lang
    M htdocs/langs/es_ES/projects.lang
    M htdocs/langs/et_EE/projects.lang
    M htdocs/langs/eu_ES/projects.lang
    M htdocs/langs/fi_FI/projects.lang
    M htdocs/langs/fr_FR/projects.lang
    M htdocs/langs/he_IL/projects.lang
    M htdocs/langs/hr_HR/projects.lang
    M htdocs/langs/hu_HU/projects.lang
    M htdocs/langs/id_ID/projects.lang
    M htdocs/langs/is_IS/projects.lang
    M htdocs/langs/it_IT/projects.lang
    M htdocs/langs/ka_GE/projects.lang
    M htdocs/langs/kn_IN/projects.lang
    M htdocs/langs/ko_KR/projects.lang
    M htdocs/langs/lo_LA/projects.lang
    M htdocs/langs/lt_LT/projects.lang
    M htdocs/langs/lv_LV/projects.lang
    M htdocs/langs/mk_MK/projects.lang
    M htdocs/langs/nb_NO/projects.lang
    M htdocs/langs/nl_NL/projects.lang
    M htdocs/langs/pl_PL/projects.lang
    M htdocs/langs/pt_BR/projects.lang
    M htdocs/langs/pt_PT/projects.lang
    M htdocs/langs/ro_RO/projects.lang
    M htdocs/langs/ru_RU/projects.lang
    M htdocs/langs/sk_SK/projects.lang
    M htdocs/langs/sl_SI/projects.lang
    M htdocs/langs/sq_AL/projects.lang
    M htdocs/langs/sr_RS/projects.lang
    M htdocs/langs/sv_SE/projects.lang
    M htdocs/langs/sw_SW/projects.lang
    M htdocs/langs/tr_TR/projects.lang
    M htdocs/langs/uk_UA/projects.lang
    M htdocs/langs/uz_UZ/projects.lang
    M htdocs/langs/vi_VN/projects.lang
    M htdocs/langs/zh_CN/projects.lang
    M htdocs/langs/zh_TW/projects.lang
    M htdocs/main.inc.php
    M htdocs/opensurvey/card.php
    M htdocs/opensurvey/class/opensurveysondage.class.php
    M htdocs/opensurvey/list.php
    M htdocs/opensurvey/results.php
    M htdocs/product/card.php
    M htdocs/product/class/api_product.class.php
    M htdocs/product/class/html.formproduct.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/class/productbatch.class.php
    M htdocs/product/composition/card.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/list.php
    M htdocs/product/reassort.php
    M htdocs/product/reassortlot.php
    M htdocs/product/stock/card.php
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/product/stock/class/mouvementstock.class.php
    M htdocs/product/stock/massstockmove.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/replenish.php
    M htdocs/projet/activity/perday.php
    M htdocs/projet/admin/project.php
    M htdocs/projet/card.php
    M htdocs/projet/tasks/task.php
    M htdocs/public/opensurvey/studs.php
    M htdocs/public/websites/index.php
    M htdocs/resource/add.php
    M htdocs/resource/card.php
    A htdocs/resource/class/dolresource.class.php
    M htdocs/resource/class/html.formresource.class.php
    R htdocs/resource/class/resource.class.php
    A htdocs/resource/contact.php
    A htdocs/resource/document.php
    M htdocs/resource/element_resource.php
    M htdocs/resource/list.php
    A htdocs/resource/note.php
    M htdocs/societe/canvas/actions_card_common.class.php
    M htdocs/societe/class/api_contact.class.php
    M htdocs/societe/class/api_thirdparty.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/list.php
    M htdocs/societe/soc.php
    M htdocs/supplier_proposal/card.php
    M htdocs/supplier_proposal/list.php
    M htdocs/theme/eldy/ckeditor/config.js
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/ckeditor/config.js
    M htdocs/theme/md/style.css.php
    M htdocs/user/class/api_user.class.php
    M htdocs/user/class/user.class.php
    M htdocs/viewimage.php
    M htdocs/webservices/server_productorservice.php
    M htdocs/websites/class/website.class.php
    M htdocs/websites/class/websitepage.class.php
    M htdocs/websites/index.php
    M test/phpunit/AllTests.php
    A test/phpunit/RestAPIUserTest.php

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

Conflicts:
        htdocs/expedition/class/expedition.class.php
        htdocs/product/stock/replenish.php


  Commit: 8d0e5479a0f61cb87812151348f825debffc52a0
      
https://github.com/Dolibarr/dolibarr/commit/8d0e5479a0f61cb87812151348f825debffc52a0
  Author: Alexis Algoud <address@hidden>
  Date:   2016-05-14 (Sat, 14 May 2016)

  Changed paths:
    M htdocs/admin/stock.php
    M htdocs/commande/list.php
    M htdocs/core/class/conf.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/product/class/product.class.php
    M htdocs/product/stock/product.php

  Log Message:
  -----------
  Rename var


  Commit: 5106f40a56ff352fef782b50f2a7524619542ac7
      
https://github.com/Dolibarr/dolibarr/commit/5106f40a56ff352fef782b50f2a7524619542ac7
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M htdocs/admin/stock.php
    M htdocs/commande/list.php
    M htdocs/core/class/conf.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/product/class/product.class.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/replenish.php

  Log Message:
  -----------
  Merge branch 'develop_NEW_decrease_stock_expedition_classify' of
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_decrease_stock_expedition_classify

Conflicts:
        htdocs/expedition/class/expedition.class.php


  Commit: 79cee4b8fbd2dfe4e6ec818d9c835611650298a8
      
https://github.com/Dolibarr/dolibarr/commit/79cee4b8fbd2dfe4e6ec818d9c835611650298a8
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M htdocs/admin/stock.php
    M htdocs/commande/list.php
    M htdocs/core/class/conf.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/product/class/product.class.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/replenish.php

  Log Message:
  -----------
  git push origin developMerge branch 
'atm-alexis-develop_NEW_decrease_stock_expedition_classify' into develop


  Commit: 0f53993c6fbe7eea05fb0fefc743036209c8be1c
      
https://github.com/Dolibarr/dolibarr/commit/0f53993c6fbe7eea05fb0fefc743036209c8be1c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M htdocs/core/modules/modOauth.class.php
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    A htdocs/install/mysql/tables/llx_oauth_state.sql
    A htdocs/install/mysql/tables/llx_oauth_token.sql
    M htdocs/product/class/product.class.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b8ee75ce2305...0f53993c6fbe

reply via email to

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