[Dolibarr-git] [Dolibarr/dolibarr] 0467da: Fix userlocaltax

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 0467da: Fix userlocaltax

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] 0467da: Fix userlocaltax
Date:	Fri, 29 Apr 2016 08:53:44 -0700
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 0467dac43d22fcb5f5c23d756c449ee1a2e321f0
      
https://github.com/Dolibarr/dolibarr/commit/0467dac43d22fcb5f5c23d756c449ee1a2e321f0
  Author: Sergio Sanchis Climent <address@hidden>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

  Changed paths:
    M htdocs/core/lib/price.lib.php

  Log Message:
  -----------
  Fix userlocaltax

Is posible userlocaltax1_rate or userlocaltax2_rate have value 0.0000 and no 
enter in if, now check if diferent 0 and now enter


  Commit: 4d7503968807f97f685401a4c75336e3bd2b9817
      
https://github.com/Dolibarr/dolibarr/commit/4d7503968807f97f685401a4c75336e3bd2b9817
  Author: Sergio Sanchis Climent <address@hidden>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

  Changed paths:
    M htdocs/core/lib/price.lib.php

  Log Message:
  -----------
  Edited correctly for check values


  Commit: 236d4d777184dcdf012ff52df591f334bb911871
      
https://github.com/Dolibarr/dolibarr/commit/236d4d777184dcdf012ff52df591f334bb911871
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

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

  Log Message:
  -----------
  Fix add Croatia into list of country in EEC


  Commit: 988c0131d211138e32f265cc470c2286b435038f
      
https://github.com/Dolibarr/dolibarr/commit/988c0131d211138e32f265cc470c2286b435038f
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

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

  Log Message:
  -----------
  Fix: markRate can be 100


  Commit: 217fef3d49fa608d4227708fad27deb4dee5cfdb
      
https://github.com/Dolibarr/dolibarr/commit/217fef3d49fa608d4227708fad27deb4dee5cfdb
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

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

  Log Message:
  -----------
  FIX #4291 Correctly filter bank card GETPOSTs


  Commit: 7e1c3d9f1bcba2b16967fbb4c20f54df078febae
      
https://github.com/Dolibarr/dolibarr/commit/7e1c3d9f1bcba2b16967fbb4c20f54df078febae
  Author: aspangaro <address@hidden>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

  Changed paths:
    M htdocs/expensereport/list.php

  Log Message:
  -----------
  Fix: #4394 Untranslated label in list of expense reports


  Commit: 0993ac90ebf69dc6110b30ecfa8d68b31b150fc3
      
https://github.com/Dolibarr/dolibarr/commit/0993ac90ebf69dc6110b30ecfa8d68b31b150fc3
  Author: Frédéric FRANCE <address@hidden>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Update facture.php


  Commit: 605d830d107d0fc104dbfd6585ad8bd7311ca387
      
https://github.com/Dolibarr/dolibarr/commit/605d830d107d0fc104dbfd6585ad8bd7311ca387
  Author: phf <address@hidden>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

  Changed paths:
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

  Log Message:
  -----------
  FIX if we dont use SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE the hour is 
displayed on pdf


  Commit: 81f91487615deca5988952c4a4a095564b383176
      
https://github.com/Dolibarr/dolibarr/commit/81f91487615deca5988952c4a4a095564b383176
  Author: phf <address@hidden>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

  Changed paths:
    M htdocs/comm/action/class/actioncomm.class.php

  Log Message:
  -----------
  FIX can't clone event


  Commit: d0aca962d69d022b7eb20ebfb6c1b4574b6a7c98
      
https://github.com/Dolibarr/dolibarr/commit/d0aca962d69d022b7eb20ebfb6c1b4574b6a7c98
  Author: Regis Houssin <address@hidden>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

  Changed paths:
    M htdocs/opensurvey/wizard/index.php

  Log Message:
  -----------
  Fix: ajax error with multicompany module


  Commit: b8f52edf8420cf71fb42ec1e038b1838d4ad5a0f
      
https://github.com/Dolibarr/dolibarr/commit/b8f52edf8420cf71fb42ec1e038b1838d4ad5a0f
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

  Changed paths:
    M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php

  Log Message:
  -----------
  FIX: Sql syntax error in doc_generic_task_odt


  Commit: f64615da62eab4c5b4bc7ae7e4ca6a897506f685
      
https://github.com/Dolibarr/dolibarr/commit/f64615da62eab4c5b4bc7ae7e4ca6a897506f685
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

  Changed paths:
    A dev/initdata/img/applepieproduct.jpg
    A dev/initdata/img/dolidroid_114x114.png
    A dev/initdata/img/dolidroid_512x512_en.png
    A dev/initdata/img/dolidroid_screenshot_home_720x1280.png
    A dev/initdata/img/genericcustomer.png
    A dev/initdata/img/indiancompany.png
    A dev/initdata/img/logo_nltechno_94x100.png
    A dev/initdata/img/nocountrycomp.png
    A dev/initdata/img/pearpieproduct.jpg
    A dev/initdata/img/pinkdressproduct.jpg
    M dev/initdata/img/printcompany.png
    A dev/initdata/img/rolluproduct.jpg
    A dev/initdata/img/spanishcompany.png
    A dev/initdata/img/swisstouch.png
    A dev/initdata/img/teclibcompany.png

  Log Message:
  -----------
  Complete demo samples


  Commit: ff94a5ec71503fc90b779da6cf3a1c94e69d0b11
      
https://github.com/Dolibarr/dolibarr/commit/ff94a5ec71503fc90b779da6cf3a1c94e69d0b11
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

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

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


  Commit: c0515a469dc7c2bc369c31dd2f52dded0ec48513
      
https://github.com/Dolibarr/dolibarr/commit/c0515a469dc7c2bc369c31dd2f52dded0ec48513
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

  Changed paths:
    M htdocs/admin/delais.php

  Log Message:
  -----------
  FIX Option to disable meteo was not set correctly in edit mode


  Commit: 7c4a9d140b7cb5c70cc5ff577175f55802898216
      
https://github.com/Dolibarr/dolibarr/commit/7c4a9d140b7cb5c70cc5ff577175f55802898216
  Author: jfefe <address@hidden>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

  Changed paths:
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/tpl/resource_add.tpl.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
    M htdocs/resource/element_resource.php
    M htdocs/resource/list.php

  Log Message:
  -----------
  Replace reserved keyword "Resource" by "DolResource"

# Conflicts:
#       htdocs/resource/list.php


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

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/tpl/resource_add.tpl.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
    M htdocs/resource/element_resource.php
    M htdocs/resource/list.php

  Log Message:
  -----------
  Merge branch 'dol_resource' of https://github.com/aternatik/dolibarr
into aternatik-dol_resource

Conflicts:
        dev/initdata/img/printcompany.png
        htdocs/compta/bank/card.php


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

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/tpl/resource_add.tpl.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
    M htdocs/resource/element_resource.php
    M htdocs/resource/list.php

  Log Message:
  -----------
  Merge branch 'aternatik-dol_resource' into develop


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

  Changed paths:
    M htdocs/api/class/api_access.class.php
    M htdocs/commande/class/api_commande.class.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/product/class/api_product.class.php
    M htdocs/societe/class/api_contact.class.php
    M htdocs/user/class/api_user.class.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/88842ccd8b1d...14838d222ba2
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] 0467da: Fix userlocaltax, Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] 0a6761: Fix wrong qty total in ca by prod/serv report
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] 4f4c6d: Update edit.php
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] 0a6761: Fix wrong qty total in ca by prod/serv report
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] 4f4c6d: Update edit.php
Index(es):
- Date
- Thread