dolibarr-git
[Top][All Lists]
Advanced

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

[Dolibarr-git] [Dolibarr/dolibarr] 27caa5: Fix auto increment customer c


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 27caa5: Fix auto increment customer code must be done only...
Date: Wed, 01 Feb 2017 11:58:41 -0800

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 27caa586c20066fad6a1bdaff5a47f835be6d398
      
https://github.com/Dolibarr/dolibarr/commit/27caa586c20066fad6a1bdaff5a47f835be6d398
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Fix auto increment customer code must be done only if error is on
duplicate code


  Commit: 4bce208035259953b39f580063bf2c9908d36a77
      
https://github.com/Dolibarr/dolibarr/commit/4bce208035259953b39f580063bf2c9908d36a77
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M htdocs/core/tpl/objectline_view.tpl.php

  Log Message:
  -----------
  FIX detail of deposit and credit not was not visible into final invoice


  Commit: bc8ccd8ec5f7931e546f3422c6e207e50d82f1d5
      
https://github.com/Dolibarr/dolibarr/commit/bc8ccd8ec5f7931e546f3422c6e207e50d82f1d5
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M htdocs/core/class/discount.class.php

  Log Message:
  -----------
  Fix bad var set


  Commit: 7c638feb3bfa0ae338f9058e7ca5bb4236a9875e
      
https://github.com/Dolibarr/dolibarr/commit/7c638feb3bfa0ae338f9058e7ca5bb4236a9875e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M htdocs/margin/agentMargins.php
    M htdocs/margin/checkMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php

  Log Message:
  -----------
  Fix label of field


  Commit: 1e78c4c4182906599b464360aa40517d8324b776
      
https://github.com/Dolibarr/dolibarr/commit/1e78c4c4182906599b464360aa40517d8324b776
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M htdocs/societe/soc.php

  Log Message:
  -----------
  FIX Change the customer code only if error on duplicate


  Commit: e2ce31e1a7ed7dd9023825dd7566c2642c92415f
      
https://github.com/Dolibarr/dolibarr/commit/e2ce31e1a7ed7dd9023825dd7566c2642c92415f
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

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

  Log Message:
  -----------
  Add code comment


  Commit: c88e63ecc972eafaf70752144c4f5735529ca47e
      
https://github.com/Dolibarr/dolibarr/commit/c88e63ecc972eafaf70752144c4f5735529ca47e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/html.formmargin.class.php

  Log Message:
  -----------
  FIX #6259


  Commit: 2c07d2df22d08cf7a866323cf667d5ce6278eaaf
      
https://github.com/Dolibarr/dolibarr/commit/2c07d2df22d08cf7a866323cf667d5ce6278eaaf
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php

  Log Message:
  -----------
  Add comments


  Commit: fd90bf466b76a189b23415b2a0b15a6891f3cd7f
      
https://github.com/Dolibarr/dolibarr/commit/fd90bf466b76a189b23415b2a0b15a6891f3cd7f
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/html.formmargin.class.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/lib/margins.lib.php
    M htdocs/margin/productMargins.php
    M htdocs/societe/soc.php

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

Conflicts:
        htdocs/compta/facture/class/facture.class.php
        htdocs/societe/soc.php


  Commit: 4f76626f51adf5e4e07569c19d74e4d4a6030c6e
      
https://github.com/Dolibarr/dolibarr/commit/4f76626f51adf5e4e07569c19d74e4d4a6030c6e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php

  Log Message:
  -----------
  FIX Creation of credit note on invoice with deposit stole the discount.


  Commit: 24c21cca278daa937f4de20b1aebd82a1957ca4a
      
https://github.com/Dolibarr/dolibarr/commit/24c21cca278daa937f4de20b1aebd82a1957ca4a
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php

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


  Commit: b4b81d8dcb83f84f45292c73ff3820cc141d2d78
      
https://github.com/Dolibarr/dolibarr/commit/b4b81d8dcb83f84f45292c73ff3820cc141d2d78
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-29 (Sun, 29 Jan 2017)

  Changed paths:
    M htdocs/comm/mailing/cibles.php
    M htdocs/core/modules/mailings/advthirdparties.modules.php
    M htdocs/core/modules/mailings/contacts1.modules.php
    M htdocs/core/modules/mailings/contacts2.modules.php
    M htdocs/core/modules/mailings/contacts3.modules.php
    M htdocs/core/modules/mailings/contacts4.modules.php
    M htdocs/core/modules/mailings/example.modules.php
    M htdocs/core/modules/mailings/fraise.modules.php
    M htdocs/core/modules/mailings/framboise.modules.php
    M htdocs/core/modules/mailings/modules_mailings.php
    M htdocs/core/modules/mailings/pomme.modules.php
    M htdocs/core/modules/mailings/thirdparties.modules.php
    M htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
    M htdocs/core/modules/mailings/xinputfile.modules.php
    M htdocs/core/modules/mailings/xinputuser.modules.php
    M htdocs/langs/en_US/mails.lang
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php

  Log Message:
  -----------
  Fix css and missing translation key


  Commit: 756919de2a0a62ee86fa328a93415fbe3764c366
      
https://github.com/Dolibarr/dolibarr/commit/756919de2a0a62ee86fa328a93415fbe3764c366
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-29 (Sun, 29 Jan 2017)

  Changed paths:
    M htdocs/comm/mailing/card.php
    M htdocs/comm/mailing/cibles.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/langs/en_US/mails.lang

  Log Message:
  -----------
  Fix deadlock feature: could not solve a situation where an emailing was
validated by error.


  Commit: d7c2bdba384fbe2627664a99198a26ec742afbab
      
https://github.com/Dolibarr/dolibarr/commit/d7c2bdba384fbe2627664a99198a26ec742afbab
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-29 (Sun, 29 Jan 2017)

  Changed paths:
    M htdocs/core/lib/security.lib.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix: link was useless with a nofollow tag.


  Commit: 45c99d9d24efae791f8c75ab0c3790346c77e8c3
      
https://github.com/Dolibarr/dolibarr/commit/45c99d9d24efae791f8c75ab0c3790346c77e8c3
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-29 (Sun, 29 Jan 2017)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix HTML5 error


  Commit: 92e61e67070d8030cdd172feb7ebbadaa6204d81
      
https://github.com/Dolibarr/dolibarr/commit/92e61e67070d8030cdd172feb7ebbadaa6204d81
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-29 (Sun, 29 Jan 2017)

  Changed paths:
    M htdocs/comm/mailing/cibles.php

  Log Message:
  -----------
  Fix hide url if not defined


  Commit: ff8b7e6e4d3259ac4121a89c7d5dc05fd61e8616
      
https://github.com/Dolibarr/dolibarr/commit/ff8b7e6e4d3259ac4121a89c7d5dc05fd61e8616
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-29 (Sun, 29 Jan 2017)

  Changed paths:
    M htdocs/comm/mailing/card.php

  Log Message:
  -----------
  Fix size of email


  Commit: 45263c85ecc3b3a0cf521ee04d8443fcc5c9bfed
      
https://github.com/Dolibarr/dolibarr/commit/45263c85ecc3b3a0cf521ee04d8443fcc5c9bfed
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-29 (Sun, 29 Jan 2017)

  Changed paths:
    M htdocs/comm/mailing/class/mailing.class.php
    M htdocs/comm/mailing/list.php

  Log Message:
  -----------
  Fix in emailing


  Commit: 5e4509953d79c8714bdb0a5df2ad97801456aecd
      
https://github.com/Dolibarr/dolibarr/commit/5e4509953d79c8714bdb0a5df2ad97801456aecd
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-29 (Sun, 29 Jan 2017)

  Changed paths:
    M htdocs/core/modules/modProduct.class.php
    M htdocs/exports/export.php
    M htdocs/langs/en_US/products.lang

  Log Message:
  -----------
  Associated product must be on another export profile


  Commit: f16e65c6b11bbfe38ef0921689389a670c9c9810
      
https://github.com/Dolibarr/dolibarr/commit/f16e65c6b11bbfe38ef0921689389a670c9c9810
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-30 (Mon, 30 Jan 2017)

  Changed paths:
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/perweek.php

  Log Message:
  -----------
  Fix css


  Commit: aaa2e393c3c47719b3c0d6aad5945adb08b61185
      
https://github.com/Dolibarr/dolibarr/commit/aaa2e393c3c47719b3c0d6aad5945adb08b61185
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-31 (Tue, 31 Jan 2017)

  Changed paths:
    M htdocs/core/tpl/login.tpl.php

  Log Message:
  -----------
  Fix css


  Commit: 2db372d99da31991bfbe2655e8372804c2826451
      
https://github.com/Dolibarr/dolibarr/commit/2db372d99da31991bfbe2655e8372804c2826451
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-31 (Tue, 31 Jan 2017)

  Changed paths:
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php

  Log Message:
  -----------
  Fix css


  Commit: fbf99865061a31bfb699ad1922b358ef6aaf80ea
      
https://github.com/Dolibarr/dolibarr/commit/fbf99865061a31bfb699ad1922b358ef6aaf80ea
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-31 (Tue, 31 Jan 2017)

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

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


  Commit: 9a9b31c9c0291a5cb659eb88b85046e33ca22787
      
https://github.com/Dolibarr/dolibarr/commit/9a9b31c9c0291a5cb659eb88b85046e33ca22787
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
    M htdocs/contact/card.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/langs/en_US/projects.lang
    M htdocs/product/card.php
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Fix cancel button + logic to close project when setting opp to WON/LOST.


  Commit: fbbf8cd8a4227f94e8831aed0eabd02f73c96d0f
      
https://github.com/Dolibarr/dolibarr/commit/fbbf8cd8a4227f94e8831aed0eabd02f73c96d0f
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
    M htdocs/contact/agenda.php
    M htdocs/fourn/commande/info.php
    M htdocs/projet/info.php
    M htdocs/societe/agenda.php

  Log Message:
  -----------
  Fix bad side effect of uniformizing a constant name.


  Commit: 924a08a0785dd86502014b1864f28fc5bd1307c0
      
https://github.com/Dolibarr/dolibarr/commit/924a08a0785dd86502014b1864f28fc5bd1307c0
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
    M htdocs/product/stock/massstockmove.php
    M htdocs/product/stock/replenishorders.php

  Log Message:
  -----------
  Fix code should use 5.0 framework


  Commit: 9b37b52f45c3e4c4ef776c282d0e4685d60155bc
      
https://github.com/Dolibarr/dolibarr/commit/9b37b52f45c3e4c4ef776c282d0e4685d60155bc
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
    M htdocs/public/demo/index.php
    M htdocs/theme/eldy/style.css.php

  Log Message:
  -----------
  Fix css


  Commit: c3fb559d3b9c133b88f3f085338fc7171855d755
      
https://github.com/Dolibarr/dolibarr/commit/c3fb559d3b9c133b88f3f085338fc7171855d755
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
    M htdocs/comm/mailing/card.php
    M htdocs/comm/mailing/cibles.php
    M htdocs/comm/mailing/class/mailing.class.php
    M htdocs/comm/mailing/list.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/contact/agenda.php
    M htdocs/contact/card.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/discount.class.php
    M htdocs/core/class/html.formmargin.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/lib/security.lib.php
    M htdocs/core/modules/mailings/advthirdparties.modules.php
    M htdocs/core/modules/mailings/contacts1.modules.php
    M htdocs/core/modules/mailings/contacts2.modules.php
    M htdocs/core/modules/mailings/contacts3.modules.php
    M htdocs/core/modules/mailings/contacts4.modules.php
    M htdocs/core/modules/mailings/example.modules.php
    M htdocs/core/modules/mailings/fraise.modules.php
    M htdocs/core/modules/mailings/framboise.modules.php
    M htdocs/core/modules/mailings/modules_mailings.php
    M htdocs/core/modules/mailings/pomme.modules.php
    M htdocs/core/modules/mailings/thirdparties.modules.php
    M htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
    M htdocs/core/modules/mailings/xinputfile.modules.php
    M htdocs/core/modules/mailings/xinputuser.modules.php
    M htdocs/core/modules/modProduct.class.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/exports/export.php
    M htdocs/fourn/commande/info.php
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/main.inc.php
    M htdocs/margin/agentMargins.php
    M htdocs/margin/checkMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/lib/margins.lib.php
    M htdocs/margin/productMargins.php
    M htdocs/product/card.php
    M htdocs/product/stock/massstockmove.php
    M htdocs/product/stock/replenishorders.php
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/perweek.php
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/info.php
    M htdocs/public/demo/index.php
    M htdocs/societe/agenda.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php

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

Conflicts:
        htdocs/core/modules/modProduct.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/d945a0de927b...c3fb559d3b9c

reply via email to

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