[Dolibarr-git] [Dolibarr/dolibarr] 6b0316: Improved margins es

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 6b0316: Improved margins es_ES transl

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] 6b0316: Improved margins es_ES translation
Date:	Wed, 17 Apr 2013 14:18:04 -0700
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 6b031616fae895799cfac055fe0385409e1fe7ec
      
https://github.com/Dolibarr/dolibarr/commit/6b031616fae895799cfac055fe0385409e1fe7ec
  Author: Marcos García <address@hidden>
  Date:   2013-04-14 (Sun, 14 Apr 2013)

  Changed paths:
    M htdocs/langs/es_ES/margins.lang

  Log Message:
  -----------
  Improved margins es_ES translation


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

  Changed paths:
    M htdocs/commande/orderstoinvoice.php

  Log Message:
  -----------
  Fixed bug #807: Margins modules with orders2invoice does not respect cost 
price
Also, removed duplicated requires in orderstoinvoice.php


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

  Changed paths:
    M htdocs/commande/orderstoinvoice.php

  Log Message:
  -----------
  Converted indentation to tabs


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

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Updated changelog


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

  Changed paths:
    M htdocs/langs/es_ES/margins.lang

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

Improved margins module es_ES translation


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

  Changed paths:
    M ChangeLog
    M htdocs/commande/orderstoinvoice.php

  Log Message:
  -----------
  Merge pull request #830 from marcosgdf/bug-807

Fixed bug #807: Margins modules with orders2invoice does not respect cost price


  Commit: e27e5e9c44bd25bc32c3c59d15080b862a4f3902
      
https://github.com/Dolibarr/dolibarr/commit/e27e5e9c44bd25bc32c3c59d15080b862a4f3902
  Author: simnandez <address@hidden>
  Date:   2013-04-14 (Sun, 14 Apr 2013)

  Changed paths:
    M htdocs/langs/ca_ES/margins.lang

  Log Message:
  -----------
  Improved margins ca_ES translation


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

  Changed paths:
    M htdocs/holiday/define_holiday.php
    M htdocs/holiday/index.php
    M htdocs/holiday/month_report.php
    M htdocs/holiday/view_log.php
    M htdocs/langs/es_ES/agenda.lang
    M htdocs/langs/es_ES/holiday.lang
    M htdocs/langs/es_ES/main.lang

  Log Message:
  -----------
  Improved es_ES holidays translations


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

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

  Log Message:
  -----------
  Improved holidays module translations


  Commit: 67b803243ff6a7fbc4ccd386983e953f0db1b960
      
https://github.com/Dolibarr/dolibarr/commit/67b803243ff6a7fbc4ccd386983e953f0db1b960
  Author: Juanjo Menent <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M htdocs/holiday/class/holiday.class.php
    M htdocs/holiday/define_holiday.php
    M htdocs/holiday/fiche.php
    M htdocs/holiday/index.php
    M htdocs/holiday/month_report.php
    M htdocs/holiday/view_log.php
    M htdocs/langs/en_US/holiday.lang
    M htdocs/langs/es_ES/agenda.lang
    M htdocs/langs/es_ES/holiday.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/fr_FR/holiday.lang

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

Improved es_ES holidays translations


  Commit: 76132206bf549bd0558fc3746eb361725303813a
      
https://github.com/Dolibarr/dolibarr/commit/76132206bf549bd0558fc3746eb361725303813a
  Author: simnandez <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M ChangeLog
    M htdocs/comm/prospect/fiche.php

  Log Message:
  -----------
  Fix: Bad link to all proposals into Third party card if customer is
prospect


  Commit: 21056d2b78bec5b04f719678a663629baa645051
      
https://github.com/Dolibarr/dolibarr/commit/21056d2b78bec5b04f719678a663629baa645051
  Author: Regis Houssin <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M htdocs/compta/sociales/charges.php
    M htdocs/compta/sociales/class/chargesociales.class.php
    M htdocs/compta/tva/class/tva.class.php
    M htdocs/compta/tva/fiche.php

  Log Message:
  -----------
  Fix: missing current entity record


  Commit: 7177e59ea4a0f3b1491956782bac930278ad8b5f
      
https://github.com/Dolibarr/dolibarr/commit/7177e59ea4a0f3b1491956782bac930278ad8b5f
  Author: Regis Houssin <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M htdocs/compta/sociales/class/chargesociales.class.php

  Log Message:
  -----------
  Fix: missing quote


  Commit: 7d6c89169cd189ba1df0c09b924a632761695e2c
      
https://github.com/Dolibarr/dolibarr/commit/7d6c89169cd189ba1df0c09b924a632761695e2c
  Author: fhenry <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M htdocs/cashdesk/class/Facturation.class.php

  Log Message:
  -----------
  Fix [ bug #789 ] VAT not being calculated in POS


  Commit: 1602fcf7bc31355b4cd1a7befd0d0de6caf3a107
      
https://github.com/Dolibarr/dolibarr/commit/1602fcf7bc31355b4cd1a7befd0d0de6caf3a107
  Author: Juanjo Menent <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M htdocs/cashdesk/class/Facturation.class.php

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

Fix [ bug #789 ] VAT not being calculated in POS


  Commit: 90a2a86dbb0597e8be39089ccd5eb2f7f0bdc57d
      
https://github.com/Dolibarr/dolibarr/commit/90a2a86dbb0597e8be39089ccd5eb2f7f0bdc57d
  Author: simnandez <address@hidden>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update ChangeLog


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

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/lib/functions2.lib.php
    M test/phpunit/NumberingModulesTest.php

  Log Message:
  -----------
  Fix: bug into is_erasable function.

Conflicts:
        test/phpunit/NumberingModulesTest.php


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

  Changed paths:
    M test/phpunit/NumberingModulesTest.php

  Log Message:
  -----------
  Qual: Include is_erasable() into test

Conflicts:
        test/phpunit/NumberingModulesTest.php


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

  Changed paths:
    M htdocs/admin/dict.php

  Log Message:
  -----------
  Fix bug
http://www.dolibarr.org/forum/527-bugs-on-a-stable-version/22542-table-prefix-bug


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

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  update change log


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

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update changelog


  Commit: 5c50b1db57a64c05d0888b63181698b59176dcc9
      
https://github.com/Dolibarr/dolibarr/commit/5c50b1db57a64c05d0888b63181698b59176dcc9
  Author: Regis Houssin <address@hidden>
  Date:   2013-04-17 (Wed, 17 Apr 2013)

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

  Log Message:
  -----------
  Fix: use empty instead isset


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

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php

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

Fix [ bug #824 ] MAIN_DB_PREFIX not use into dictionnary


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

  Changed paths:
    M ChangeLog
    M test/phpunit/NumberingModulesTest.php

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

Conflicts:
        ChangeLog
        htdocs/admin/dict.php
        htdocs/comm/prospect/fiche.php


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

  Changed paths:
    M ChangeLog
    A htdocs/core/boxes/box_ficheinter.php
    M htdocs/core/modules/modFicheinter.class.php
    M htdocs/langs/ca_ES/boxes.lang
    M htdocs/langs/en_US/boxes.lang
    M htdocs/langs/es_ES/boxes.lang
    M htdocs/langs/fr_FR/boxes.lang

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c9074231b51f...29b397361174
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] 6b0316: Improved margins es_ES translation, Juanjo Menent, 2013/04/14
- [Dolibarr-git] [Dolibarr/dolibarr] 6b0316: Improved margins es_ES translation, Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] e2156b: Fix bug
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] 52a0df: Fix: Bad translation
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] 6b0316: Improved margins es_ES translation
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] 90b9e7: Fixed bug #807: Margins modules with orders2invoic...
Index(es):
- Date
- Thread