[Dolibarr-git] [Dolibarr/dolibarr] a6ce7b: Fix: Regression for negative

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] a6ce7b: Fix: Regression for negative

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] a6ce7b: Fix: Regression for negative proposal lines.
Date:	Sat, 23 Mar 2013 19:21:47 -0700
  Branch: refs/heads/3.3_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a6ce7bb42815bcf56fcff3154fe9295ac476d76e
      
https://github.com/Dolibarr/dolibarr/commit/a6ce7bb42815bcf56fcff3154fe9295ac476d76e
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-08 (Fri, 08 Mar 2013)

  Changed paths:
    M htdocs/comm/propal.php

  Log Message:
  -----------
  Fix: Regression for negative proposal lines.

Conflicts:
        htdocs/comm/propal.php


  Commit: f620e6948fc711c560fd823c6846bd8e989a23d3
      
https://github.com/Dolibarr/dolibarr/commit/f620e6948fc711c560fd823c6846bd8e989a23d3
  Author: Christophe Battarel <address@hidden>
  Date:   2013-03-11 (Mon, 11 Mar 2013)

  Changed paths:
    M htdocs/comm/propal.php

  Log Message:
  -----------
  fix wrong value name when updating buyingprice


  Commit: 633a15f10dfab83606d870099053aa72b4c99b52
      
https://github.com/Dolibarr/dolibarr/commit/633a15f10dfab83606d870099053aa72b4c99b52
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-11 (Mon, 11 Mar 2013)

  Changed paths:
    M dev/skeletons/modMyModule.class.php
    M htdocs/core/modules/modBanque.class.php
    M htdocs/exports/class/export.class.php

  Log Message:
  -----------
  Fix: Usage of order into export broken when filters are used


  Commit: 710ea872a92a1a9c82ec6a782e880a7151440415
      
https://github.com/Dolibarr/dolibarr/commit/710ea872a92a1a9c82ec6a782e880a7151440415
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-11 (Mon, 11 Mar 2013)

  Changed paths:
    M htdocs/comm/propal.php

  Log Message:
  -----------
  Merge pull request #727 from cbattarel/3.3

fix wrong value name when updating buyingprice


  Commit: 06e931632d76c7a6c4b7df81822c5d4f30edaae5
      
https://github.com/Dolibarr/dolibarr/commit/06e931632d76c7a6c4b7df81822c5d4f30edaae5
  Author: Grand Philippe <address@hidden>
  Date:   2013-03-11 (Mon, 11 Mar 2013)

  Changed paths:
    M htdocs/langs/en_US/admin.lang
    M htdocs/societe/admin/societe_extrafields.php

  Log Message:
  -----------
  fix some translations


  Commit: 979a36e94131ad64db1d620cba2d20074238346e
      
https://github.com/Dolibarr/dolibarr/commit/979a36e94131ad64db1d620cba2d20074238346e
  Author: Grand Philippe <address@hidden>
  Date:   2013-03-11 (Mon, 11 Mar 2013)

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

  Log Message:
  -----------
  fix some translations


  Commit: dd248e9d584a6302d056b1ed007e26e28c1717cf
      
https://github.com/Dolibarr/dolibarr/commit/dd248e9d584a6302d056b1ed007e26e28c1717cf
  Author: Grand Philippe <address@hidden>
  Date:   2013-03-11 (Mon, 11 Mar 2013)

  Changed paths:
    M README
    M README-FR
    M README.md
    M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
    M htdocs/langs/ar_SA/admin.lang
    M htdocs/langs/da_DK/admin.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/et_EE/admin.lang
    M htdocs/langs/fa_IR/admin.lang
    M htdocs/langs/fi_FI/admin.lang
    M htdocs/langs/he_IL/admin.lang
    M htdocs/langs/hu_HU/admin.lang
    M htdocs/langs/is_IS/admin.lang
    M htdocs/langs/ja_JP/admin.lang
    M htdocs/langs/pl_PL/admin.lang
    M htdocs/langs/ro_RO/admin.lang
    M htdocs/langs/ru_RU/admin.lang
    M htdocs/product/stock/product.php

  Log Message:
  -----------
  fix : dyslexia


  Commit: fe072d992cb5add7b848408324e65271bd46939b
      
https://github.com/Dolibarr/dolibarr/commit/fe072d992cb5add7b848408324e65271bd46939b
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-12 (Tue, 12 Mar 2013)

  Changed paths:
    M htdocs/webservices/server_productorservice.php

  Log Message:
  -----------
  Fix: WSDL of productorservice was not valid. Normalize field names.


  Commit: 5c4b537a65768ccfc33005e8fe24e7032844aa69
      
https://github.com/Dolibarr/dolibarr/commit/5c4b537a65768ccfc33005e8fe24e7032844aa69
  Author: simnandez <address@hidden>
  Date:   2013-03-12 (Tue, 12 Mar 2013)

  Changed paths:
    M ChangeLog
    M htdocs/compta/resultat/index.php

  Log Message:
  -----------
  Fix: [ bug #762 ] Bad profit calculation in Reporting


  Commit: b88d261c9033572b79049d827499513231276d5c
      
https://github.com/Dolibarr/dolibarr/commit/b88d261c9033572b79049d827499513231276d5c
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-12 (Tue, 12 Mar 2013)

  Changed paths:
    M ChangeLog
    M htdocs/compta/resultat/index.php

  Log Message:
  -----------
  Merge pull request #735 from simnandez/3.3

Fix: [ bug #762 ] Bad profit calculation in Reporting


  Commit: 9c1f70996a844c0631de0168240c704e25282f7a
      
https://github.com/Dolibarr/dolibarr/commit/9c1f70996a844c0631de0168240c704e25282f7a
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-12 (Tue, 12 Mar 2013)

  Changed paths:
    M README
    M README-FR
    M README.md
    M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
    M htdocs/langs/ar_SA/admin.lang
    M htdocs/langs/da_DK/admin.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/et_EE/admin.lang
    M htdocs/langs/fa_IR/admin.lang
    M htdocs/langs/fi_FI/admin.lang
    M htdocs/langs/he_IL/admin.lang
    M htdocs/langs/hu_HU/admin.lang
    M htdocs/langs/is_IS/admin.lang
    M htdocs/langs/ja_JP/admin.lang
    M htdocs/langs/pl_PL/admin.lang
    M htdocs/langs/ro_RO/admin.lang
    M htdocs/langs/ru_RU/admin.lang
    M htdocs/product/stock/product.php
    M htdocs/societe/admin/societe_extrafields.php

  Log Message:
  -----------
  Merge pull request #731 from grandoc/3.3

fix some translations


  Commit: bb2776f4cc184e053e75bd9c053124647ab609a9
      
https://github.com/Dolibarr/dolibarr/commit/bb2776f4cc184e053e75bd9c053124647ab609a9
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-12 (Tue, 12 Mar 2013)

  Changed paths:
    M htdocs/webservices/server_user.php

  Log Message:
  -----------
  Fix: Bad field


  Commit: c83691e35a2cb71ce0d108dbfde3ceb9545a52b9
      
https://github.com/Dolibarr/dolibarr/commit/c83691e35a2cb71ce0d108dbfde3ceb9545a52b9
  Author: jfefe <address@hidden>
  Date:   2013-03-12 (Tue, 12 Mar 2013)

  Changed paths:
    M htdocs/webservices/server_user.php

  Log Message:
  -----------
  Missing field fk_thirdparty in user webservice


  Commit: d4621c3921c1ecd3400ea1b66e276484980cfeba
      
https://github.com/Dolibarr/dolibarr/commit/d4621c3921c1ecd3400ea1b66e276484980cfeba
  Author: fhenry <address@hidden>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

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

  Log Message:
  -----------
  Fix syntax error


  Commit: 5ed94ae9becad9f70ad6f3249ec0a6c289595931
      
https://github.com/Dolibarr/dolibarr/commit/5ed94ae9becad9f70ad6f3249ec0a6c289595931
  Author: Grand Philippe <address@hidden>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

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

  Log Message:
  -----------
  fix trad


  Commit: 2d09eb6f8c47c91c9582e4c3a9ce48d6379c1066
      
https://github.com/Dolibarr/dolibarr/commit/2d09eb6f8c47c91c9582e4c3a9ce48d6379c1066
  Author: Grand Philippe <address@hidden>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

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

  Log Message:
  -----------
  fix trad


  Commit: 82297f52c95a8833a35d44a2adfdb68e68ff45fc
      
https://github.com/Dolibarr/dolibarr/commit/82297f52c95a8833a35d44a2adfdb68e68ff45fc
  Author: Grand Philippe <address@hidden>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

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

  Log Message:
  -----------
  fix trad


  Commit: 96013ba9a6c3ea2c2ed5a3b9ce15427f3afeae4b
      
https://github.com/Dolibarr/dolibarr/commit/96013ba9a6c3ea2c2ed5a3b9ce15427f3afeae4b
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

  Changed paths:
    M htdocs/webservices/server_user.php

  Log Message:
  -----------
  Merge pull request #739 from jfefe/ws_3.3

Missing field fk_thirdparty in user webservice


  Commit: 6fc57fb90d6aab8190417c2c9815609a4e771ca7
      
https://github.com/Dolibarr/dolibarr/commit/6fc57fb90d6aab8190417c2c9815609a4e771ca7
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

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

  Log Message:
  -----------
  Merge pull request #740 from FHenry/3.3

Fix syntax error


  Commit: 55856bdc3679841febf968646a0f6485c01d3eb3
      
https://github.com/Dolibarr/dolibarr/commit/55856bdc3679841febf968646a0f6485c01d3eb3
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

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

  Log Message:
  -----------
  Merge pull request #741 from grandoc/3.3

fix trad


  Commit: d6c18c1789d4f0913c461ab15bca76f015a8f0f9
      
https://github.com/Dolibarr/dolibarr/commit/d6c18c1789d4f0913c461ab15bca76f015a8f0f9
  Author: Regis Houssin <address@hidden>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

  Changed paths:
    M htdocs/exports/class/export.class.php

  Log Message:
  -----------
  Fix: for avoid sql errors with predefined export models


  Commit: 72effa3f25b2e6495ee7893c59ef53bb787a2c1c
      
https://github.com/Dolibarr/dolibarr/commit/72effa3f25b2e6495ee7893c59ef53bb787a2c1c
  Author: fhenry <address@hidden>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

  Changed paths:
    M htdocs/admin/expedition.php

  Log Message:
  -----------
  Fix part of bugs [ bug #766 ]


  Commit: 010207532f2d9c6cacb0d32addbed483899b9bf0
      
https://github.com/Dolibarr/dolibarr/commit/010207532f2d9c6cacb0d32addbed483899b9bf0
  Author: Grand Philippe <address@hidden>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

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

  Log Message:
  -----------
  fix trad


  Commit: 95c9d19d5eb8e41f86e5818ec96b11c63584e584
      
https://github.com/Dolibarr/dolibarr/commit/95c9d19d5eb8e41f86e5818ec96b11c63584e584
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

  Changed paths:
    M htdocs/exports/class/export.class.php

  Log Message:
  -----------
  Fix: Restore ability to filter on '0'


  Commit: 1ac78d0e83a8ac22478df11685433aa3dcfb907b
      
https://github.com/Dolibarr/dolibarr/commit/1ac78d0e83a8ac22478df11685433aa3dcfb907b
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

  Changed paths:
    M htdocs/admin/expedition.php

  Log Message:
  -----------
  Merge pull request #744 from FHenry/3.3

Fix part of bugs [ bug #766 ]


  Commit: 63e3b5742cec64ec1e4f60946c7cd429e3e12d88
      
https://github.com/Dolibarr/dolibarr/commit/63e3b5742cec64ec1e4f60946c7cd429e3e12d88
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

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

  Log Message:
  -----------
  Merge pull request #745 from grandoc/3.3

fix trad


  Commit: 36e99e100b0641109de62ea7ee478c1d5cd403bf
      
https://github.com/Dolibarr/dolibarr/commit/36e99e100b0641109de62ea7ee478c1d5cd403bf
  Author: Grand Philippe <address@hidden>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

  Changed paths:
    M htdocs/langs/ar_SA/bills.lang
    M htdocs/langs/bg_BG/bills.lang
    M htdocs/langs/da_DK/bills.lang
    M htdocs/langs/el_GR/bills.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/et_EE/bills.lang
    M htdocs/langs/fi_FI/bills.lang
    M htdocs/langs/he_IL/bills.lang
    M htdocs/langs/hu_HU/bills.lang
    M htdocs/langs/is_IS/bills.lang
    M htdocs/langs/ja_JP/bills.lang
    M htdocs/langs/nb_NO/bills.lang
    M htdocs/langs/nl_NL/bills.lang
    M htdocs/langs/pl_PL/bills.lang
    M htdocs/langs/ro_RO/bills.lang
    M htdocs/langs/sv_SE/bills.lang
    M htdocs/langs/zh_CN/bills.lang
    M htdocs/langs/zh_TW/bills.lang

  Log Message:
  -----------
  fix trad


  Commit: a5181a06e4f7c8767e445d771c0d263c67209ca3
      
https://github.com/Dolibarr/dolibarr/commit/a5181a06e4f7c8767e445d771c0d263c67209ca3
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

  Changed paths:
    M htdocs/langs/ar_SA/bills.lang
    M htdocs/langs/bg_BG/bills.lang
    M htdocs/langs/da_DK/bills.lang
    M htdocs/langs/el_GR/bills.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/et_EE/bills.lang
    M htdocs/langs/fi_FI/bills.lang
    M htdocs/langs/he_IL/bills.lang
    M htdocs/langs/hu_HU/bills.lang
    M htdocs/langs/is_IS/bills.lang
    M htdocs/langs/ja_JP/bills.lang
    M htdocs/langs/nb_NO/bills.lang
    M htdocs/langs/nl_NL/bills.lang
    M htdocs/langs/pl_PL/bills.lang
    M htdocs/langs/ro_RO/bills.lang
    M htdocs/langs/sv_SE/bills.lang
    M htdocs/langs/zh_CN/bills.lang
    M htdocs/langs/zh_TW/bills.lang

  Log Message:
  -----------
  Merge pull request #747 from grandoc/3.3

fix trad


  Commit: ed8586939457a0c572294ff4cf66d29b655f27fe
      
https://github.com/Dolibarr/dolibarr/commit/ed8586939457a0c572294ff4cf66d29b655f27fe
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

  Changed paths:
    M htdocs/admin/expedition.php
    M htdocs/langs/ar_SA/bills.lang
    M htdocs/langs/bg_BG/bills.lang
    M htdocs/langs/da_DK/bills.lang
    M htdocs/langs/el_GR/bills.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/et_EE/bills.lang
    M htdocs/langs/fi_FI/bills.lang
    M htdocs/langs/he_IL/bills.lang
    M htdocs/langs/hu_HU/bills.lang
    M htdocs/langs/is_IS/bills.lang
    M htdocs/langs/ja_JP/bills.lang
    M htdocs/langs/nb_NO/bills.lang
    M htdocs/langs/nl_NL/bills.lang
    M htdocs/langs/pl_PL/bills.lang
    M htdocs/langs/ro_RO/bills.lang
    M htdocs/langs/sv_SE/bills.lang
    M htdocs/langs/zh_CN/bills.lang
    M htdocs/langs/zh_TW/bills.lang

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


  Commit: c0e5cacafcb9cfa31c77d38e19936a3473f6f3ab
      
https://github.com/Dolibarr/dolibarr/commit/c0e5cacafcb9cfa31c77d38e19936a3473f6f3ab
  Author: simnandez <address@hidden>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

  Changed paths:
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/index.php
    M htdocs/langs/ca_ES/orders.lang
    M htdocs/langs/es_ES/orders.lang

  Log Message:
  -----------
  Fix: Bad orders list viewstatut filter if expeditons module is disabled


  Commit: 1a62cdfbe85a5af570827932a370c3bae765142a
      
https://github.com/Dolibarr/dolibarr/commit/1a62cdfbe85a5af570827932a370c3bae765142a
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

  Changed paths:
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php

  Log Message:
  -----------
  Fix: Use better test to show localtax to avoid problem when switching
from different country.


  Commit: d590aa56eb281517b6baf9726201cf0afa5d9f28
      
https://github.com/Dolibarr/dolibarr/commit/d590aa56eb281517b6baf9726201cf0afa5d9f28
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-16 (Sat, 16 Mar 2013)

  Changed paths:
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/index.php
    M htdocs/langs/ca_ES/orders.lang
    M htdocs/langs/es_ES/orders.lang

  Log Message:
  -----------
  Merge pull request #749 from simnandez/3.3

Fix: Bad orders list viewstatut filter if expeditons module is disabled


  Commit: 013b7eca1092aae986d805f1cc846064a2e227aa
      
https://github.com/Dolibarr/dolibarr/commit/013b7eca1092aae986d805f1cc846064a2e227aa
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-16 (Sat, 16 Mar 2013)

  Changed paths:
    M htdocs/commande/liste.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/langs/ca_ES/orders.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/es_ES/orders.lang
    M htdocs/langs/fr_FR/orders.lang

  Log Message:
  -----------
  Fix: A better fix for status/list of orders.
There was a confusion because of bad translation key StatusOrderToBill
that in fact mean "StatusOrderDelivered".
More explanation:
http://wiki.dolibarr.org/index.php/Module_Customers_Orders#Life_cycle_.2F_Business_rules


  Commit: 54f963f8ae5ca2999396421b38968f34dcd10383
      
https://github.com/Dolibarr/dolibarr/commit/54f963f8ae5ca2999396421b38968f34dcd10383
  Author: simnandez <address@hidden>
  Date:   2013-03-16 (Sat, 16 Mar 2013)

  Changed paths:
    M htdocs/langs/ca_ES/orders.lang
    M htdocs/langs/es_ES/orders.lang

  Log Message:
  -----------
  Trad:  Fix: A better fix for status/list of orders.

There was a confusion because of bad translation key StatusOrderToBill
that in fact mean "StatusOrderDelivered".


  Commit: d2d0f83fa0d87d846332482ef95428d1c8796676
      
https://github.com/Dolibarr/dolibarr/commit/d2d0f83fa0d87d846332482ef95428d1c8796676
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-17 (Sun, 17 Mar 2013)

  Changed paths:
    M htdocs/langs/ca_ES/orders.lang
    M htdocs/langs/es_ES/orders.lang

  Log Message:
  -----------
  Merge pull request #754 from simnandez/3.3

Trad:  Fix: A better fix for status/list of orders.


  Commit: e59084cafcb861c2aa80cd796c67f898c62f1ca6
      
https://github.com/Dolibarr/dolibarr/commit/e59084cafcb861c2aa80cd796c67f898c62f1ca6
  Author: Christophe Battarel <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

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

  Log Message:
  -----------
  various fixes on margin :
- fix on sortorder
- fix for credit notes
- fix for total


  Commit: f8291a9efe62388b05fd3ffa79df94a7be61a576
      
https://github.com/Dolibarr/dolibarr/commit/f8291a9efe62388b05fd3ffa79df94a7be61a576
  Author: Christophe Battarel <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

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

  Log Message:
  -----------
  use ifsql function


  Commit: 8a6adb8a49344502761886e07a24c9db6abc2042
      
https://github.com/Dolibarr/dolibarr/commit/8a6adb8a49344502761886e07a24c9db6abc2042
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

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

  Log Message:
  -----------
  Merge pull request #756 from cbattarel/3.3

various fixes on margin :


  Commit: e2f28b6c519b596ec30a5219affc2d064b821053
      
https://github.com/Dolibarr/dolibarr/commit/e2f28b6c519b596ec30a5219affc2d064b821053
  Author: Christophe Battarel <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    R htdocs/commissions/admin/commissions.php
    R htdocs/commissions/index.php
    R htdocs/commissions/lib/commissions.lib.php
    R htdocs/core/modules/modCommissions.class.php
    R htdocs/langs/ca_ES/commissions.lang
    R htdocs/langs/en_US/commissions.lang
    R htdocs/langs/es_ES/commissions.lang
    R htdocs/langs/fr_FR/commissions.lang
    R htdocs/theme/auguria/img/object_commissions.png
    R htdocs/theme/bureau2crea/img/object_commissions.png
    R htdocs/theme/cameleo/img/object_commissions.png
    R htdocs/theme/eldy/img/object_commissions.png

  Log Message:
  -----------
  remove experimental commissions module


  Commit: f4996b4054be80f1e347d4eb189bc31fd6567106
      
https://github.com/Dolibarr/dolibarr/commit/f4996b4054be80f1e347d4eb189bc31fd6567106
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

  Changed paths:
    R htdocs/commissions/admin/commissions.php
    R htdocs/commissions/index.php
    R htdocs/commissions/lib/commissions.lib.php
    R htdocs/core/modules/modCommissions.class.php
    R htdocs/langs/ca_ES/commissions.lang
    R htdocs/langs/en_US/commissions.lang
    R htdocs/langs/es_ES/commissions.lang
    R htdocs/langs/fr_FR/commissions.lang
    R htdocs/theme/auguria/img/object_commissions.png
    R htdocs/theme/bureau2crea/img/object_commissions.png
    R htdocs/theme/cameleo/img/object_commissions.png
    R htdocs/theme/eldy/img/object_commissions.png

  Log Message:
  -----------
  Merge pull request #757 from cbattarel/3.3

remove experimental commissions module


  Commit: c7666cbc3d8d9538726a8ad111ad14276bcb6653
      
https://github.com/Dolibarr/dolibarr/commit/c7666cbc3d8d9538726a8ad111ad14276bcb6653
  Author: Christophe Battarel <address@hidden>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M htdocs/commande/class/commande.class.php

  Log Message:
  -----------
  fix getting buying price when creating automatically an order from a proposal 
(with first option activated in workflow module)


  Commit: 7f4fd06f19a8f14ffc5de4848e171772e70c0630
      
https://github.com/Dolibarr/dolibarr/commit/7f4fd06f19a8f14ffc5de4848e171772e70c0630
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M htdocs/commande/class/commande.class.php

  Log Message:
  -----------
  Merge pull request #761 from cbattarel/3.3

fix getting buying price when creating automatically an order from a proposal


  Commit: 7aa59ef76e40031828ded866d4b0304910c5f57d
      
https://github.com/Dolibarr/dolibarr/commit/7aa59ef76e40031828ded866d4b0304910c5f57d
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-23 (Sat, 23 Mar 2013)

  Changed paths:
    M ChangeLog
    M README
    M README-FR
    M README.md
    M dev/skeletons/modMyModule.class.php
    M htdocs/admin/expedition.php
    M htdocs/comm/mailing/fiche.php
    M htdocs/comm/propal.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/liste.php
    R htdocs/commissions/admin/commissions.php
    R htdocs/commissions/index.php
    R htdocs/commissions/lib/commissions.lib.php
    M htdocs/compta/resultat/index.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/modBanque.class.php
    R htdocs/core/modules/modCommissions.class.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/exports/class/export.class.php
    M htdocs/index.php
    M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
    M htdocs/langs/ar_SA/admin.lang
    M htdocs/langs/ar_SA/bills.lang
    M htdocs/langs/bg_BG/bills.lang
    R htdocs/langs/ca_ES/commissions.lang
    M htdocs/langs/ca_ES/orders.lang
    M htdocs/langs/da_DK/admin.lang
    M htdocs/langs/da_DK/bills.lang
    M htdocs/langs/el_GR/bills.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/bills.lang
    R htdocs/langs/en_US/commissions.lang
    M htdocs/langs/en_US/orders.lang
    R htdocs/langs/es_ES/commissions.lang
    M htdocs/langs/es_ES/orders.lang
    M htdocs/langs/et_EE/admin.lang
    M htdocs/langs/et_EE/bills.lang
    M htdocs/langs/fa_IR/admin.lang
    M htdocs/langs/fi_FI/admin.lang
    M htdocs/langs/fi_FI/bills.lang
    R htdocs/langs/fr_FR/commissions.lang
    M htdocs/langs/fr_FR/orders.lang
    M htdocs/langs/he_IL/admin.lang
    M htdocs/langs/he_IL/bills.lang
    M htdocs/langs/hu_HU/admin.lang
    M htdocs/langs/hu_HU/bills.lang
    M htdocs/langs/is_IS/admin.lang
    M htdocs/langs/is_IS/bills.lang
    M htdocs/langs/ja_JP/admin.lang
    M htdocs/langs/ja_JP/bills.lang
    M htdocs/langs/nb_NO/bills.lang
    M htdocs/langs/nl_NL/bills.lang
    M htdocs/langs/pl_PL/admin.lang
    M htdocs/langs/pl_PL/bills.lang
    M htdocs/langs/ro_RO/admin.lang
    M htdocs/langs/ro_RO/bills.lang
    M htdocs/langs/ru_RU/admin.lang
    M htdocs/langs/sv_SE/bills.lang
    M htdocs/langs/zh_CN/bills.lang
    M htdocs/langs/zh_TW/bills.lang
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/margin/tabs/productMargins.php
    M htdocs/margin/tabs/thirdpartyMargins.php
    M htdocs/product/stock/product.php
    M htdocs/societe/admin/societe_extrafields.php
    R htdocs/theme/auguria/img/object_commissions.png
    R htdocs/theme/bureau2crea/img/object_commissions.png
    R htdocs/theme/cameleo/img/object_commissions.png
    R htdocs/theme/eldy/img/object_commissions.png
    M htdocs/webservices/server_productorservice.php
    M htdocs/webservices/server_user.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.3_backported


Compare: 
https://github.com/Dolibarr/dolibarr/compare/7ca1cedd12c8...7aa59ef76e40
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] a6ce7b: Fix: Regression for negative proposal lines., Laurent Destailleur, 2013/03/08
- [Dolibarr-git] [Dolibarr/dolibarr] a6ce7b: Fix: Regression for negative proposal lines., Laurent Destailleur, 2013/03/11
- [Dolibarr-git] [Dolibarr/dolibarr] a6ce7b: Fix: Regression for negative proposal lines., Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] c74f68: Fix: dol_is_dir may not be loaded, so call fails
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] a890c7: Fix: Option to hide if no permission instead of gr...
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] a6ce7b: Fix: Regression for negative proposal lines.
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] 2a67af: New: when adding an action, we can define a free c...
Index(es):
- Date
- Thread