[Dolibarr-git] [Dolibarr/dolibarr] b8f326: FIX: dont retrieve new buying

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] b8f326: FIX: dont retrieve new buying

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] b8f326: FIX: dont retrieve new buying price on margin disp...
Date:	Tue, 12 Apr 2016 06:05:30 -0700
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b8f3264f60b7174674746b3ea9499e64d7c14162
      
https://github.com/Dolibarr/dolibarr/commit/b8f3264f60b7174674746b3ea9499e64d7c14162
  Author: Christophe Battarel <address@hidden>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    M htdocs/margin/lib/margins.lib.php

  Log Message:
  -----------
  FIX: dont retrieve new buying price on margin display


  Commit: 024f55d46182eb5d10035161fb396d687d2d0376
      
https://github.com/Dolibarr/dolibarr/commit/024f55d46182eb5d10035161fb396d687d2d0376
  Author: Christophe Battarel <address@hidden>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php

  Log Message:
  -----------
  FIX: systematic rounding causes prices to be updated without reason


  Commit: deeb6f604d7e8052c04257d40970104cf9849277
      
https://github.com/Dolibarr/dolibarr/commit/deeb6f604d7e8052c04257d40970104cf9849277
  Author: Juanjo Menent <address@hidden>
  Date:   2016-04-03 (Sun, 03 Apr 2016)

  Changed paths:
    M htdocs/margin/lib/margins.lib.php

  Log Message:
  -----------
  Merge pull request #4905 from altatof/fix_margin_display

FIX: dont retrieve new buying price on margin display


  Commit: 6a4ca98ad9f25523244892780b928c76cd99e28c
      
https://github.com/Dolibarr/dolibarr/commit/6a4ca98ad9f25523244892780b928c76cd99e28c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-04 (Mon, 04 Apr 2016)

  Changed paths:
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php

  Log Message:
  -----------
  Merge pull request #4908 from altatof/fix_bad_rounding

FIX: systematic rounding causes prices to be updated without reason


  Commit: 1f723cb8d0b15e922e36532cedf164ed5b6a655d
      
https://github.com/Dolibarr/dolibarr/commit/1f723cb8d0b15e922e36532cedf164ed5b6a655d
  Author: Florian HENRY <address@hidden>
  Date:   2016-04-07 (Thu, 07 Apr 2016)

  Changed paths:
    M htdocs/core/class/html.formmail.class.php

  Log Message:
  -----------
  FIX : Template email must take care of positino column


  Commit: f62a45ddfc0a0cdc10ec15187c02cac0e5429fab
      
https://github.com/Dolibarr/dolibarr/commit/f62a45ddfc0a0cdc10ec15187c02cac0e5429fab
  Author: Florian HENRY <address@hidden>
  Date:   2016-04-07 (Thu, 07 Apr 2016)

  Changed paths:
    M htdocs/compta/facture.php

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


  Commit: 9d6efde9357d5025745206730651797fb4615862
      
https://github.com/Dolibarr/dolibarr/commit/9d6efde9357d5025745206730651797fb4615862
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2016-04-07 (Thu, 07 Apr 2016)

  Changed paths:
    M htdocs/core/modules/syslog/mod_syslog_sentry.php

  Log Message:
  -----------
  Prevent sentry logging error with 3.9 update

Since we don't ship the required libraries anymore,
if the module had been enabled before upgrade,
the code was failing making Dolibarr totally unusable.

Mitigated the issue by disabling sentry logging
if the required libraries are unavailable.


  Commit: eb7bba956805d9b3e582e96fc688c056a1472050
      
https://github.com/Dolibarr/dolibarr/commit/eb7bba956805d9b3e582e96fc688c056a1472050
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-08 (Fri, 08 Apr 2016)

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

  Log Message:
  -----------
  Fix translation


  Commit: 5753f217451b33a589feab210322e81f81cc9f56
      
https://github.com/Dolibarr/dolibarr/commit/5753f217451b33a589feab210322e81f81cc9f56
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-08 (Fri, 08 Apr 2016)

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

  Log Message:
  -----------
  Missing translations


  Commit: 80caf58866d5de31f39d99d46d3b3155cea65134
      
https://github.com/Dolibarr/dolibarr/commit/80caf58866d5de31f39d99d46d3b3155cea65134
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-08 (Fri, 08 Apr 2016)

  Changed paths:
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  FIX Default vat is not set correctly when an error occured and we use
VAT identified by a code.


  Commit: daa1aed3633ead45c650d16bfade6ca30075f21c
      
https://github.com/Dolibarr/dolibarr/commit/daa1aed3633ead45c650d16bfade6ca30075f21c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-08 (Fri, 08 Apr 2016)

  Changed paths:
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Bad placeholder


  Commit: 2ffe06b1b3b1f0321ea8e729b509b695cfbc371b
      
https://github.com/Dolibarr/dolibarr/commit/2ffe06b1b3b1f0321ea8e729b509b695cfbc371b
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-08 (Fri, 08 Apr 2016)

  Changed paths:
    M htdocs/core/modules/syslog/mod_syslog_sentry.php

  Log Message:
  -----------
  Merge pull request #4965 from GPCsolutions/3.9-sentry

Prevent sentry logging error with 3.9 update


  Commit: 234f3e331d55516992cd1273fd9bc60c6bfb7e0f
      
https://github.com/Dolibarr/dolibarr/commit/234f3e331d55516992cd1273fd9bc60c6bfb7e0f
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-08 (Fri, 08 Apr 2016)

  Changed paths:
    M htdocs/core/class/html.formmail.class.php

  Log Message:
  -----------
  Merge pull request #4962 from FHenry/3.8

FIX : Template email must take care of position column


  Commit: f90cffd74ab07245968688514f0e7fd63040a71f
      
https://github.com/Dolibarr/dolibarr/commit/f90cffd74ab07245968688514f0e7fd63040a71f
  Author: Frédéric FRANCE <address@hidden>
  Date:   2016-04-09 (Sat, 09 Apr 2016)

  Changed paths:
    M htdocs/includes/nusoap/lib/nusoap.php

  Log Message:
  -----------
  Update nusoap.php

re-establish user-agent


  Commit: 507b9a29564e5ae1989619efc8e0bbc109a326cb
      
https://github.com/Dolibarr/dolibarr/commit/507b9a29564e5ae1989619efc8e0bbc109a326cb
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-09 (Sat, 09 Apr 2016)

  Changed paths:
    M htdocs/core/modules/syslog/mod_syslog_sentry.php

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


  Commit: b5dfa2e446f53d80d1b03e5cf77796a42e2c48d6
      
https://github.com/Dolibarr/dolibarr/commit/b5dfa2e446f53d80d1b03e5cf77796a42e2c48d6
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-09 (Sat, 09 Apr 2016)

  Changed paths:
    M htdocs/includes/nusoap/lib/nusoap.php

  Log Message:
  -----------
  Merge pull request #4975 from frederic34/patch-7

FIX re-establish user-agent when using nusoap client


  Commit: 9169adf4ceab98ad04a180653f205b4b928b7cf8
      
https://github.com/Dolibarr/dolibarr/commit/9169adf4ceab98ad04a180653f205b4b928b7cf8
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2016-04-09 (Sat, 09 Apr 2016)

  Changed paths:
    M htdocs/compta/index.php

  Log Message:
  -----------
  FIX #4766 VAT not shown in supplier invoice popup

Close #4766


  Commit: b2f922291fefb66eb845ae7fce78ef536bcf60ae
      
https://github.com/Dolibarr/dolibarr/commit/b2f922291fefb66eb845ae7fce78ef536bcf60ae
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2016-04-09 (Sat, 09 Apr 2016)

  Changed paths:
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php

  Log Message:
  -----------
  FIX #4851 Project selector in supplier invoices shows the project label twice

Close #4851


  Commit: 1026484da1ec129a47cc84d4ec16e3d4863189df
      
https://github.com/Dolibarr/dolibarr/commit/1026484da1ec129a47cc84d4ec16e3d4863189df
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2016-04-09 (Sat, 09 Apr 2016)

  Changed paths:
    M htdocs/fourn/facture/paiement.php

  Log Message:
  -----------
  FIX #4748 Supplier invoice payment confirmation amount is not translated

Close #4748


  Commit: 7cc1288bb2c4c9b86802f761664ff5903ff1b8a2
      
https://github.com/Dolibarr/dolibarr/commit/7cc1288bb2c4c9b86802f761664ff5903ff1b8a2
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2016-04-09 (Sat, 09 Apr 2016)

  Changed paths:
    M htdocs/projet/element.php

  Log Message:
  -----------
  FIX #4743 UI glitch in project summary page

Close #4743


  Commit: 3135cf720d8ccfc8ff09b821e664fd4be3a66edb
      
https://github.com/Dolibarr/dolibarr/commit/3135cf720d8ccfc8ff09b821e664fd4be3a66edb
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2016-04-09 (Sat, 09 Apr 2016)

  Changed paths:
    M htdocs/compta/bank/search.php

  Log Message:
  -----------
  FIX #4737 Bank transacion type selector translation is cropped

Close #4737


  Commit: b9de3d5852d59d0ca9ca0f73852ffdb431e29fe8
      
https://github.com/Dolibarr/dolibarr/commit/b9de3d5852d59d0ca9ca0f73852ffdb431e29fe8
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2016-04-09 (Sat, 09 Apr 2016)

  Changed paths:
    M htdocs/core/menus/standard/eldy.lib.php

  Log Message:
  -----------
  FIX #4442 Missing translation in Banks menu

Close #4442


  Commit: 865f9defff1b2ca8b23684c59e44f03b94bd0d26
      
https://github.com/Dolibarr/dolibarr/commit/865f9defff1b2ca8b23684c59e44f03b94bd0d26
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2016-04-09 (Sat, 09 Apr 2016)

  Changed paths:
    M htdocs/fourn/commande/index.php

  Log Message:
  -----------
  FIX #4424 Missing email of user popup in supplier orders area

Close #4424


  Commit: af473df2143a275a4d1704a2ac2dfaaefa5dfa48
      
https://github.com/Dolibarr/dolibarr/commit/af473df2143a275a4d1704a2ac2dfaaefa5dfa48
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2016-04-09 (Sat, 09 Apr 2016)

  Changed paths:
    M htdocs/fourn/facture/card.php

  Log Message:
  -----------
  FIX #4742 Able to delete a supplier invoice with a registered payment

Close #4742


  Commit: 15d927375132469cd89c7fcf834be5ccc9886495
      
https://github.com/Dolibarr/dolibarr/commit/15d927375132469cd89c7fcf834be5ccc9886495
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2016-04-10 (Sun, 10 Apr 2016)

  Changed paths:
    M htdocs/fourn/facture/paiement.php

  Log Message:
  -----------
  FIX #4747 Missing UI background when registering a supplier invoice payment

Close #4747


  Commit: 7acbf1dd92112dfbdfdc6228ac4e8f0660531a90
      
https://github.com/Dolibarr/dolibarr/commit/7acbf1dd92112dfbdfdc6228ac4e8f0660531a90
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2016-04-10 (Sun, 10 Apr 2016)

  Changed paths:
    M htdocs/user/index.php

  Log Message:
  -----------
  FIX #4874 SQL error when listing users

Close #4874


  Commit: 4f5d96150a8ff719c515580f39268cca95cdff60
      
https://github.com/Dolibarr/dolibarr/commit/4f5d96150a8ff719c515580f39268cca95cdff60
  Author: Juanjo Menent <address@hidden>
  Date:   2016-04-10 (Sun, 10 Apr 2016)

  Changed paths:
    M htdocs/compta/index.php

  Log Message:
  -----------
  Merge pull request #4977 from marcosgdf/bug-4766

FIX #4766 VAT not shown in supplier invoice popup


  Commit: 3dbaa38cb4c0290d59ac98580cd15caf41832320
      
https://github.com/Dolibarr/dolibarr/commit/3dbaa38cb4c0290d59ac98580cd15caf41832320
  Author: Juanjo Menent <address@hidden>
  Date:   2016-04-10 (Sun, 10 Apr 2016)

  Changed paths:
    M htdocs/fourn/facture/paiement.php

  Log Message:
  -----------
  Merge pull request #4979 from marcosgdf/bug-4748

FIX #4748 Supplier invoice payment confirmation amount is not translated


  Commit: c3472f78795a207af1bd8055667477e914b2849a
      
https://github.com/Dolibarr/dolibarr/commit/c3472f78795a207af1bd8055667477e914b2849a
  Author: Juanjo Menent <address@hidden>
  Date:   2016-04-10 (Sun, 10 Apr 2016)

  Changed paths:
    M htdocs/fourn/commande/index.php

  Log Message:
  -----------
  Merge pull request #4984 from marcosgdf/bug-4424

FIX #4424 Missing email of user popup in supplier orders area


  Commit: be0b7c86ff43cc235a5ea6eb5b7fcd609ce54116
      
https://github.com/Dolibarr/dolibarr/commit/be0b7c86ff43cc235a5ea6eb5b7fcd609ce54116
  Author: Juanjo Menent <address@hidden>
  Date:   2016-04-10 (Sun, 10 Apr 2016)

  Changed paths:
    M htdocs/fourn/facture/card.php

  Log Message:
  -----------
  Merge pull request #4985 from marcosgdf/bug-4742

FIX #4742 Able to delete a supplier invoice with a registered payment


  Commit: e27def479f64782e952faac8d22061ed05c2e34d
      
https://github.com/Dolibarr/dolibarr/commit/e27def479f64782e952faac8d22061ed05c2e34d
  Author: Juanjo Menent <address@hidden>
  Date:   2016-04-10 (Sun, 10 Apr 2016)

  Changed paths:
    M htdocs/fourn/facture/paiement.php

  Log Message:
  -----------
  Merge pull request #4986 from marcosgdf/bug-4747

FIX #4747 Missing UI background when registering a supplier invoice payment


  Commit: ddb1d06ad4aa91f2b13bfbed246d49d0027661d8
      
https://github.com/Dolibarr/dolibarr/commit/ddb1d06ad4aa91f2b13bfbed246d49d0027661d8
  Author: Juanjo Menent <address@hidden>
  Date:   2016-04-10 (Sun, 10 Apr 2016)

  Changed paths:
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge pull request #4980 from marcosgdf/3.8

FIX #4743 UI glitch in project summary page


  Commit: f25bf642572147949c0db6960b586f82a87a3729
      
https://github.com/Dolibarr/dolibarr/commit/f25bf642572147949c0db6960b586f82a87a3729
  Author: Juanjo Menent <address@hidden>
  Date:   2016-04-10 (Sun, 10 Apr 2016)

  Changed paths:
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php

  Log Message:
  -----------
  Merge pull request #4978 from marcosgdf/bug-4851

FIX #4851 Project selector in supplier invoices shows the project label twice


  Commit: b7275edfb8db5a92e19a901ac61b22a0bd107370
      
https://github.com/Dolibarr/dolibarr/commit/b7275edfb8db5a92e19a901ac61b22a0bd107370
  Author: Florian HENRY <address@hidden>
  Date:   2016-04-11 (Mon, 11 Apr 2016)

  Changed paths:
    M htdocs/admin/dict.php

  Log Message:
  -----------
  FIX  #4989


  Commit: 23bb2eaf8a4e1be3fdf22db1d4b05324bf6287a3
      
https://github.com/Dolibarr/dolibarr/commit/23bb2eaf8a4e1be3fdf22db1d4b05324bf6287a3
  Author: Florian HENRY <address@hidden>
  Date:   2016-04-11 (Mon, 11 Apr 2016)

  Changed paths:
    M htdocs/admin/dict.php

  Log Message:
  -----------
  remove debug


  Commit: 8035742779d1b7f9c4afe90fb6b6fd44a3a9aa2e
      
https://github.com/Dolibarr/dolibarr/commit/8035742779d1b7f9c4afe90fb6b6fd44a3a9aa2e
  Author: Florian HENRY <address@hidden>
  Date:   2016-04-11 (Mon, 11 Apr 2016)

  Changed paths:
    M htdocs/core/class/html.formmail.class.php

  Log Message:
  -----------
  FIX fetchAllEMailTemplate


  Commit: 791df0c9ea4e657c2d80c51d91b9c41886463551
      
https://github.com/Dolibarr/dolibarr/commit/791df0c9ea4e657c2d80c51d91b9c41886463551
  Author: Christophe Battarel <address@hidden>
  Date:   2016-04-11 (Mon, 11 Apr 2016)

  Changed paths:
    M htdocs/fourn/class/fournisseur.product.class.php

  Log Message:
  -----------
  FIX: correct display of minimum buying price


  Commit: 983b2c9a210c11a56f7af7376686afaef70ba8b6
      
https://github.com/Dolibarr/dolibarr/commit/983b2c9a210c11a56f7af7376686afaef70ba8b6
  Author: Christophe Battarel <address@hidden>
  Date:   2016-04-11 (Mon, 11 Apr 2016)

  Changed paths:
    M htdocs/product/composition/card.php

  Log Message:
  -----------
  FIX: real min buying price


  Commit: 292373cf8401f190ccc7269838d0e0efdff5d0c6
      
https://github.com/Dolibarr/dolibarr/commit/292373cf8401f190ccc7269838d0e0efdff5d0c6
  Author: Christophe Battarel <address@hidden>
  Date:   2016-04-11 (Mon, 11 Apr 2016)

  Changed paths:
    M htdocs/product/composition/card.php

  Log Message:
  -----------
  forgot new discount field


  Commit: 46dd3c0cec6f4961979e2d993438b7cd4c299986
      
https://github.com/Dolibarr/dolibarr/commit/46dd3c0cec6f4961979e2d993438b7cd4c299986
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-11 (Mon, 11 Apr 2016)

  Changed paths:
    M htdocs/compta/bank/search.php

  Log Message:
  -----------
  Merge pull request #4982 from marcosgdf/bug-4737

FIX #4737 Bank transacion type selector translation is cropped


  Commit: 4d14f3e6f267014c660062ecbd41f7cb21f3f346
      
https://github.com/Dolibarr/dolibarr/commit/4d14f3e6f267014c660062ecbd41f7cb21f3f346
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-11 (Mon, 11 Apr 2016)

  Changed paths:
    M htdocs/core/menus/standard/eldy.lib.php

  Log Message:
  -----------
  Merge pull request #4983 from marcosgdf/bug-4442

FIX #4442 Missing translation in Banks menu


  Commit: 3127432a4d99bd9eea5b4d1d6a070ed0895d0c7d
      
https://github.com/Dolibarr/dolibarr/commit/3127432a4d99bd9eea5b4d1d6a070ed0895d0c7d
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-11 (Mon, 11 Apr 2016)

  Changed paths:
    M htdocs/user/index.php

  Log Message:
  -----------
  Merge pull request #4987 from marcosgdf/bug-4874

FIX #4874 SQL error when listing users


  Commit: fabeb37b65a8dbee4ed1442a8f04001923f5a1d0
      
https://github.com/Dolibarr/dolibarr/commit/fabeb37b65a8dbee4ed1442a8f04001923f5a1d0
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-11 (Mon, 11 Apr 2016)

  Changed paths:
    M htdocs/admin/dict.php
    M htdocs/core/class/html.formmail.class.php

  Log Message:
  -----------
  Merge pull request #4990 from FHenry/3.9

FIX  #4989


  Commit: d0e3d9db7643ff74195f0a89a1deda78e5d4be36
      
https://github.com/Dolibarr/dolibarr/commit/d0e3d9db7643ff74195f0a89a1deda78e5d4be36
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-11 (Mon, 11 Apr 2016)

  Changed paths:
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/product/composition/card.php

  Log Message:
  -----------
  Merge pull request #4992 from altatof/fix_minimum_buying_price

FIX: correct display of minimum buying price


  Commit: 8342a61ea918ba774e866db944384bfe9cb6a47c
      
https://github.com/Dolibarr/dolibarr/commit/8342a61ea918ba774e866db944384bfe9cb6a47c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-12 (Tue, 12 Apr 2016)

  Changed paths:
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/includes/nusoap/lib/nusoap.php
    M htdocs/margin/lib/margins.lib.php
    M htdocs/product/composition/card.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.7' into 3.8

Conflicts:
        htdocs/core/tpl/objectline_edit.tpl.php
        htdocs/fourn/class/fournisseur.product.class.php
        htdocs/fourn/facture/card.php
        htdocs/product/composition/card.php


  Commit: e61c83d708192369394baf545f23ceabb4afd1f5
      
https://github.com/Dolibarr/dolibarr/commit/e61c83d708192369394baf545f23ceabb4afd1f5
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-12 (Tue, 12 Apr 2016)

  Changed paths:
    M htdocs/compta/bank/search.php
    M htdocs/compta/index.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/commande/index.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/includes/nusoap/lib/nusoap.php
    M htdocs/margin/lib/margins.lib.php
    M htdocs/product/composition/card.php
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.8' into 3.9

Conflicts:
        htdocs/fourn/facture/paiement.php


  Commit: 8d46d76f965fb158620da43775f977f9a19c1e53
      
https://github.com/Dolibarr/dolibarr/commit/8d46d76f965fb158620da43775f977f9a19c1e53
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-12 (Tue, 12 Apr 2016)

  Changed paths:
    M htdocs/admin/dict.php
    M htdocs/compta/bank/search.php
    M htdocs/compta/index.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/syslog/mod_syslog_sentry.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/commande/index.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/includes/nusoap/lib/nusoap.php
    M htdocs/margin/lib/margins.lib.php
    M htdocs/product/composition/card.php
    M htdocs/projet/element.php
    M htdocs/societe/soc.php
    M htdocs/user/index.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.9' into develop

Conflicts:
        htdocs/fourn/facture/paiement.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/fedcad31e034...8d46d76f965f
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] b8f326: FIX: dont retrieve new buying price on margin disp..., Juanjo Menent, 2016/04/03
- [Dolibarr-git] [Dolibarr/dolibarr] b8f326: FIX: dont retrieve new buying price on margin disp..., Laurent Destailleur, 2016/04/09
- [Dolibarr-git] [Dolibarr/dolibarr] b8f326: FIX: dont retrieve new buying price on margin disp..., Laurent Destailleur, 2016/04/12
- [Dolibarr-git] [Dolibarr/dolibarr] b8f326: FIX: dont retrieve new buying price on margin disp..., Laurent Destailleur, 2016/04/12
- [Dolibarr-git] [Dolibarr/dolibarr] b8f326: FIX: dont retrieve new buying price on margin disp..., Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] b8f326: FIX: dont retrieve new buying price on margin disp...
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] df8bba: Add icone for website module
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] b8f326: FIX: dont retrieve new buying price on margin disp...
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] 84d326: FIX: Problem with dolibarr installation/migration ...
Index(es):
- Date
- Thread