[Dolibarr-git] [Dolibarr/dolibarr] ba0e9c: Fix [ bug #843 ] Erreur SQL b

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] ba0e9c: Fix [ bug #843 ] Erreur SQL b

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] ba0e9c: Fix [ bug #843 ] Erreur SQL box_stock
Date:	Sat, 27 Apr 2013 16:25:12 -0700
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ba0e9c0c1931694e0cc9c515087b4e39f9ecf9d5
      
https://github.com/Dolibarr/dolibarr/commit/ba0e9c0c1931694e0cc9c515087b4e39f9ecf9d5
  Author: fhenry <address@hidden>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/core/boxes/box_produits_alerte_stock.php

  Log Message:
  -----------
  Fix [ bug #843 ] Erreur SQL box_stock
fix [ bug #842 ] Erreur SQL Propal


  Commit: 52a1e811475af78e9fbbeaa55aef74768ebbb076
      
https://github.com/Dolibarr/dolibarr/commit/52a1e811475af78e9fbbeaa55aef74768ebbb076
  Author: fhenry <address@hidden>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php

  Log Message:
  -----------
  [ bug #842 ] Erreur SQL Propal


  Commit: 23a7aae08455b0f6f145c289db23c8dc633ecb47
      
https://github.com/Dolibarr/dolibarr/commit/23a7aae08455b0f6f145c289db23c8dc633ecb47
  Author: fhenry <address@hidden>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

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

  Log Message:
  -----------
  [ bug #841 ] Erreur compta/index


  Commit: 57637d3a07fe67ae46a8682a91bfeede798a90ce
      
https://github.com/Dolibarr/dolibarr/commit/57637d3a07fe67ae46a8682a91bfeede798a90ce
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/compta/facture/list.php
    M htdocs/core/boxes/box_produits_alerte_stock.php

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

Fix [ bug #843 ] Erreur SQL box_stock


  Commit: fb1c306b31d3f0624f0bf1c7b9693f32c3915a35
      
https://github.com/Dolibarr/dolibarr/commit/fb1c306b31d3f0624f0bf1c7b9693f32c3915a35
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M htdocs/langs/nl_NL/admin.lang
    M htdocs/langs/nl_NL/commercial.lang

  Log Message:
  -----------
  Update nl


  Commit: 08808c58cd1fc20b054674663d18588d045ff666
      
https://github.com/Dolibarr/dolibarr/commit/08808c58cd1fc20b054674663d18588d045ff666
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec

  Log Message:
  -----------
  Prepare 3.3.2


  Commit: 026195689b8f820ec0880bf6e230b9d4ffe7fcff
      
https://github.com/Dolibarr/dolibarr/commit/026195689b8f820ec0880bf6e230b9d4ffe7fcff
  Author: Grand Philippe <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

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

  Log Message:
  -----------
  fix undefined offset


  Commit: 436b6259c05e2fd56610365ad1470e712126ad7d
      
https://github.com/Dolibarr/dolibarr/commit/436b6259c05e2fd56610365ad1470e712126ad7d
  Author: simnandez <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

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

  Log Message:
  -----------
  Fix: finish merge


  Commit: b2129a519d070f4bc4793339cf18180a1868561e
      
https://github.com/Dolibarr/dolibarr/commit/b2129a519d070f4bc4793339cf18180a1868561e
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

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

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

fix undefined offset


  Commit: cd7f94d515ffa724cc6acb1bbab3360e6320a6f0
      
https://github.com/Dolibarr/dolibarr/commit/cd7f94d515ffa724cc6acb1bbab3360e6320a6f0
  Author: fhenry <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

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

  Log Message:
  -----------
  [ bug #849 ] BUG PGSQL


  Commit: 4badcf5a75265616b75c6c04d2f246aad2d3fcff
      
https://github.com/Dolibarr/dolibarr/commit/4badcf5a75265616b75c6c04d2f246aad2d3fcff
  Author: fhenry <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

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

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


  Commit: 521929b740c0353cf9f2aee49bdb80151484b703
      
https://github.com/Dolibarr/dolibarr/commit/521929b740c0353cf9f2aee49bdb80151484b703
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

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

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

[ bug #849 ] BUG PGSQL


  Commit: bc7015a431465522d83ef3b65240915f845bb49b
      
https://github.com/Dolibarr/dolibarr/commit/bc7015a431465522d83ef3b65240915f845bb49b
  Author: fhenry <address@hidden>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M htdocs/compta/index.php

  Log Message:
  -----------
  fix [ bug #850 ] Dolibarr PGSQL


  Commit: 733ff62ec826fb944a80fca384e530d6290a92f5
      
https://github.com/Dolibarr/dolibarr/commit/733ff62ec826fb944a80fca384e530d6290a92f5
  Author: fhenry <address@hidden>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

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


  Commit: 2f72bbca5ab19a6e39700207f18f50a7b2efda60
      
https://github.com/Dolibarr/dolibarr/commit/2f72bbca5ab19a6e39700207f18f50a7b2efda60
  Author: Regis Houssin <address@hidden>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M htdocs/master.inc.php

  Log Message:
  -----------
  Fix: broken features with multicompany


  Commit: d162a61d41118af12f30df6d80402a52a3d1d65a
      
https://github.com/Dolibarr/dolibarr/commit/d162a61d41118af12f30df6d80402a52a3d1d65a
  Author: Regis Houssin <address@hidden>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix: use $conf->entity if defined


  Commit: ed5a00a79de12322b436e20ec47a42f4da528073
      
https://github.com/Dolibarr/dolibarr/commit/ed5a00a79de12322b436e20ec47a42f4da528073
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M htdocs/compta/index.php

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

fix [ bug #850 ] Dolibarr PGSQL


  Commit: 016b4a2baaa24381e437ad9637a3d6619818eae7
      
https://github.com/Dolibarr/dolibarr/commit/016b4a2baaa24381e437ad9637a3d6619818eae7
  Author: Regis Houssin <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/exportimport.php
    M htdocs/contact/fiche.php
    M htdocs/contact/ldap.php
    M htdocs/contact/perso.php
    M htdocs/contact/vcard.php

  Log Message:
  -----------
  Fix: security problem with multicompany


  Commit: 9e1487fc6126237b300a6990f5c20c3522c7e270
      
https://github.com/Dolibarr/dolibarr/commit/9e1487fc6126237b300a6990f5c20c3522c7e270
  Author: fhenry <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

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

  Log Message:
  -----------
  Fix bug Pgsql


  Commit: 4ff5922a55dc987f9ab8a5ea7c16be664ec165bf
      
https://github.com/Dolibarr/dolibarr/commit/4ff5922a55dc987f9ab8a5ea7c16be664ec165bf
  Author: fhenry <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

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

  Log Message:
  -----------
  Fix pgSQL bug


  Commit: b67faf1eb14560da9f66736048d70affcc2f7eae
      
https://github.com/Dolibarr/dolibarr/commit/b67faf1eb14560da9f66736048d70affcc2f7eae
  Author: fhenry <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

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

  Log Message:
  -----------
  Fix PgSQL


  Commit: 36e6269b24b846efdf50c1736260709c16a31187
      
https://github.com/Dolibarr/dolibarr/commit/36e6269b24b846efdf50c1736260709c16a31187
  Author: Regis Houssin <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/document.php
    M htdocs/comm/action/fiche.php
    M htdocs/comm/action/info.php
    M htdocs/core/lib/security.lib.php

  Log Message:
  -----------
  Fix: big security problem with multicompany


  Commit: c969d17e48af89e58850e1abc954153525bec5b9
      
https://github.com/Dolibarr/dolibarr/commit/c969d17e48af89e58850e1abc954153525bec5b9
  Author: Regis Houssin <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

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

  Log Message:
  -----------
  Fix: avoid error


  Commit: c0a3271d7618463a69af7f1adccbefabf7f35039
      
https://github.com/Dolibarr/dolibarr/commit/c0a3271d7618463a69af7f1adccbefabf7f35039
  Author: Regis Houssin <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

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

  Log Message:
  -----------
  Fix: bypass the second test if the first is ok


  Commit: 652e0c1b5f5c921909b396605f7c45cce9d1b586
      
https://github.com/Dolibarr/dolibarr/commit/652e0c1b5f5c921909b396605f7c45cce9d1b586
  Author: Marcos García <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

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

  Log Message:
  -----------
  Corrected translation key


  Commit: 44a1120c0646e18d953cd1429725014895a60245
      
https://github.com/Dolibarr/dolibarr/commit/44a1120c0646e18d953cd1429725014895a60245
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M htdocs/compta/facture/impayees.php
    M htdocs/fourn/facture/impayees.php

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

Fix bug Pgsql


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

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

  Log Message:
  -----------
  Merge pull request #889 from marcosgdf/translations

Corrected translation key


  Commit: 3203283fe98eaf5d95a5c281fc8a26edb771cc3d
      
https://github.com/Dolibarr/dolibarr/commit/3203283fe98eaf5d95a5c281fc8a26edb771cc3d
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-27 (Sat, 27 Apr 2013)

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

  Log Message:
  -----------
  Fix: remove warning


  Commit: 24309a7f172d12029fd438c4b85fc34fbe618a94
      
https://github.com/Dolibarr/dolibarr/commit/24309a7f172d12029fd438c4b85fc34fbe618a94
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-27 (Sat, 27 Apr 2013)

  Changed paths:
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/document.php
    M htdocs/comm/action/fiche.php
    M htdocs/comm/action/info.php
    M htdocs/compta/facture/impayees.php
    M htdocs/compta/index.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/exportimport.php
    M htdocs/contact/fiche.php
    M htdocs/contact/ldap.php
    M htdocs/contact/perso.php
    M htdocs/contact/vcard.php
    M htdocs/core/lib/security.lib.php
    M htdocs/core/modules/syslog/mod_syslog_file.php
    M htdocs/fourn/facture/impayees.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/includes/nusoap/lib/nusoap.php
    M htdocs/main.inc.php
    M htdocs/master.inc.php

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


  Commit: 1065645fb67bc90899c6b470d133ece67fe45e00
      
https://github.com/Dolibarr/dolibarr/commit/1065645fb67bc90899c6b470d133ece67fe45e00
  Author: Marcos García <address@hidden>
  Date:   2013-04-27 (Sat, 27 Apr 2013)

  Changed paths:
    M ChangeLog
    M htdocs/expedition/class/expedition.class.php

  Log Message:
  -----------
  Fix: [ bug #857 ] Invoice created from shipment does not have the order 
discount


  Commit: ecaea4c575af1c85957fadf369d0b06c6124a809
      
https://github.com/Dolibarr/dolibarr/commit/ecaea4c575af1c85957fadf369d0b06c6124a809
  Author: Marcos García <address@hidden>
  Date:   2013-04-27 (Sat, 27 Apr 2013)

  Changed paths:
    M htdocs/expedition/tpl/linkedobjectblock.tpl.php

  Log Message:
  -----------
  Corrected incorrect lang trans key


  Commit: 7a115a92166968e5b7f03940e2f437304743fba3
      
https://github.com/Dolibarr/dolibarr/commit/7a115a92166968e5b7f03940e2f437304743fba3
  Author: Marcos García <address@hidden>
  Date:   2013-04-27 (Sat, 27 Apr 2013)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Expedition class name was not being translated when creating invoice from it


  Commit: 8e7b72d09ee07edd3f793fd45db12d3d6a91c11a
      
https://github.com/Dolibarr/dolibarr/commit/8e7b72d09ee07edd3f793fd45db12d3d6a91c11a
  Author: Marcos García <address@hidden>
  Date:   2013-04-27 (Sat, 27 Apr 2013)

  Changed paths:
    M htdocs/langs/en_US/holiday.lang
    M htdocs/langs/es_ES/holiday.lang

  Log Message:
  -----------
  Fixed incorrect translations in holidays module


  Commit: bd2b363e4023a61cf2bbc2dce12dd955757a0322
      
https://github.com/Dolibarr/dolibarr/commit/bd2b363e4023a61cf2bbc2dce12dd955757a0322
  Author: Marcos García <address@hidden>
  Date:   2013-04-27 (Sat, 27 Apr 2013)

  Changed paths:
    M htdocs/holiday/class/holiday.class.php
    M htdocs/holiday/fiche.php
    M htdocs/langs/bg_BG/holiday.lang
    M htdocs/langs/en_US/holiday.lang
    M htdocs/langs/es_ES/holiday.lang
    M htdocs/langs/fr_FR/holiday.lang

  Log Message:
  -----------
  Modified traslation keys to reflect expected translation


  Commit: 0672d10a3f9f04dbec5dc9e6d25680850e65ef3b
      
https://github.com/Dolibarr/dolibarr/commit/0672d10a3f9f04dbec5dc9e6d25680850e65ef3b
  Author: Marcos García <address@hidden>
  Date:   2013-04-27 (Sat, 27 Apr 2013)

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

  Log Message:
  -----------
  Fixed typos


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

  Changed paths:
    M htdocs/user/logout.php

  Log Message:
  -----------
  Propagation of param missing.


  Commit: 9dc0a19ed332a0dfbcc24013f84d84056b7921da
      
https://github.com/Dolibarr/dolibarr/commit/9dc0a19ed332a0dfbcc24013f84d84056b7921da
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-27 (Sat, 27 Apr 2013)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  More logs


  Commit: 38bc86dc2a1a10a18ceb93b3bdf6332470e8546f
      
https://github.com/Dolibarr/dolibarr/commit/38bc86dc2a1a10a18ceb93b3bdf6332470e8546f
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-27 (Sat, 27 Apr 2013)

  Changed paths:
    M htdocs/core/menus/standard/auguria_menu.php
    M htdocs/core/menus/standard/eldy_menu.php

  Log Message:
  -----------
  Missing menu entry for home page


  Commit: 07baa244ed6931687b04d937a6ee190ba08a45c7
      
https://github.com/Dolibarr/dolibarr/commit/07baa244ed6931687b04d937a6ee190ba08a45c7
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-27 (Sat, 27 Apr 2013)

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

  Log Message:
  -----------
  No need to make a test on a var


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

  Changed paths:
    M htdocs/compta/facture.php
    M htdocs/expedition/tpl/linkedobjectblock.tpl.php

  Log Message:
  -----------
  Merge pull request #892 from marcosgdf/expedition-translations

Corrected incorrect lang trans key


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

  Changed paths:
    M ChangeLog
    M htdocs/expedition/class/expedition.class.php

  Log Message:
  -----------
  Merge pull request #891 from marcosgdf/bug-857

Fix: [ bug #857 ] Invoice created from shipment does not have the order ...


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

  Changed paths:
    M htdocs/holiday/class/holiday.class.php
    M htdocs/holiday/fiche.php
    M htdocs/langs/bg_BG/holiday.lang
    M htdocs/langs/en_US/holiday.lang
    M htdocs/langs/es_ES/holiday.lang
    M htdocs/langs/fr_FR/holiday.lang

  Log Message:
  -----------
  Merge pull request #894 from marcosgdf/holidays-translations

Holidays translations


  Commit: 757473cf8640bea3ee2941d0e96f1e6a11bf5c5c
      
https://github.com/Dolibarr/dolibarr/commit/757473cf8640bea3ee2941d0e96f1e6a11bf5c5c
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-27 (Sat, 27 Apr 2013)

  Changed paths:
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Replace table with div


  Commit: 2e81fa342ebeadaf234635cde76bf6d2ce60383d
      
https://github.com/Dolibarr/dolibarr/commit/2e81fa342ebeadaf234635cde76bf6d2ce60383d
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-27 (Sat, 27 Apr 2013)

  Changed paths:
    M htdocs/categories/categorie.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/edit.php
    M htdocs/categories/fiche.php
    M htdocs/comm/fiche.php
    M htdocs/contact/list.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/get_menudiv.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/search_page.php
    M htdocs/fourn/fiche.php
    M htdocs/langs/en_US/categories.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/fr_FR/categories.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/langs/fr_FR/products.lang
    M htdocs/societe/agenda.php
    M htdocs/societe/soc.php
    M htdocs/theme/eldy/style.css.php

  Log Message:
  -----------
  Uniformize code, order of fiels in card and language files.


  Commit: 7b85baa5e4b43633ceafae5b1e9762e62abf4612
      
https://github.com/Dolibarr/dolibarr/commit/7b85baa5e4b43633ceafae5b1e9762e62abf4612
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-27 (Sat, 27 Apr 2013)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/core/modules/barcode/phpbarcode.modules.php
    M htdocs/holiday/fiche.php
    M htdocs/langs/ar_SA/admin.lang
    M htdocs/langs/ar_SA/products.lang
    M htdocs/langs/bg_BG/admin.lang
    M htdocs/langs/bg_BG/products.lang
    M htdocs/langs/ca_ES/admin.lang
    A htdocs/langs/ca_ES/holiday.lang
    M htdocs/langs/ca_ES/products.lang
    M htdocs/langs/da_DK/admin.lang
    M htdocs/langs/da_DK/products.lang
    M htdocs/langs/de_AT/admin.lang
    M htdocs/langs/de_AT/products.lang
    M htdocs/langs/de_DE/admin.lang
    M htdocs/langs/de_DE/products.lang
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/el_GR/products.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/holiday.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/boxes.lang
    M htdocs/langs/es_ES/holiday.lang
    M htdocs/langs/es_ES/products.lang
    M htdocs/langs/et_EE/admin.lang
    M htdocs/langs/et_EE/products.lang
    M htdocs/langs/fa_IR/admin.lang
    M htdocs/langs/fa_IR/products.lang
    M htdocs/langs/fi_FI/admin.lang
    M htdocs/langs/fi_FI/products.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/holiday.lang
    M htdocs/langs/fr_FR/products.lang
    M htdocs/langs/he_IL/admin.lang
    M htdocs/langs/he_IL/products.lang
    M htdocs/langs/hu_HU/admin.lang
    M htdocs/langs/hu_HU/products.lang
    M htdocs/langs/is_IS/admin.lang
    M htdocs/langs/is_IS/products.lang
    M htdocs/langs/it_IT/admin.lang
    M htdocs/langs/it_IT/products.lang
    M htdocs/langs/ja_JP/admin.lang
    M htdocs/langs/ja_JP/products.lang
    M htdocs/langs/nb_NO/admin.lang
    M htdocs/langs/nb_NO/products.lang
    M htdocs/langs/nl_BE/admin.lang
    M htdocs/langs/nl_BE/products.lang
    M htdocs/langs/nl_NL/admin.lang
    M htdocs/langs/nl_NL/products.lang
    M htdocs/langs/pl_PL/admin.lang
    M htdocs/langs/pl_PL/products.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_BR/products.lang
    M htdocs/langs/pt_PT/admin.lang
    M htdocs/langs/pt_PT/products.lang
    M htdocs/langs/ro_RO/admin.lang
    M htdocs/langs/ro_RO/products.lang
    M htdocs/langs/ru_RU/admin.lang
    M htdocs/langs/ru_RU/products.lang
    M htdocs/langs/sl_SI/admin.lang
    M htdocs/langs/sl_SI/products.lang
    M htdocs/langs/sv_SE/admin.lang
    M htdocs/langs/sv_SE/products.lang
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/tr_TR/products.lang
    M htdocs/langs/zh_CN/admin.lang
    M htdocs/langs/zh_CN/products.lang
    M htdocs/langs/zh_TW/admin.lang
    M htdocs/langs/zh_TW/products.lang
    M htdocs/margin/admin/margin.php

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


  Commit: 80e470a4ce864f8107eb93544b95dd0a61e74fde
      
https://github.com/Dolibarr/dolibarr/commit/80e470a4ce864f8107eb93544b95dd0a61e74fde
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-27 (Sat, 27 Apr 2013)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/impayees.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/index.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/modules/syslog/mod_syslog_file.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/facture/impayees.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/holiday/fiche.php
    M htdocs/langs/bg_BG/holiday.lang
    M htdocs/langs/en_US/holiday.lang
    M htdocs/langs/es_ES/holiday.lang
    M htdocs/langs/fr_FR/holiday.lang
    M htdocs/langs/nl_NL/admin.lang
    M htdocs/langs/nl_NL/commercial.lang

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

Conflicts:
        htdocs/comm/propal/class/propal.class.php
        htdocs/compta/facture.php
        htdocs/compta/facture/impayees.php
        htdocs/compta/index.php
        htdocs/core/boxes/box_produits_alerte_stock.php
        htdocs/core/class/html.form.class.php
        htdocs/core/modules/syslog/mod_syslog_file.php
        htdocs/fourn/facture/impayees.php
        htdocs/holiday/class/holiday.class.php
        htdocs/holiday/fiche.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e86800516e5e...80e470a4ce86
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] ba0e9c: Fix [ bug #843 ] Erreur SQL box_stock, Laurent Destailleur, 2013/04/23
- [Dolibarr-git] [Dolibarr/dolibarr] ba0e9c: Fix [ bug #843 ] Erreur SQL box_stock, Laurent Destailleur, 2013/04/24
- [Dolibarr-git] [Dolibarr/dolibarr] ba0e9c: Fix [ bug #843 ] Erreur SQL box_stock, Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] 54f0d1: Fix : use standard method to show extrafields
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] e17e12: Usage
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] ba0e9c: Fix [ bug #843 ] Erreur SQL box_stock
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] b3e205: Fix: Remove warning
Index(es):
- Date
- Thread