[Dolibarr-git] [Dolibarr/dolibarr] b2116c: Enhance packager:

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] b2116c: Enhance packager:

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] b2116c: Enhance packager:
Date:	Sun, 16 Mar 2014 12:07:50 -0700
  Branch: refs/heads/3.5_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b2116c37d896ae2ea004a1923543d0f446854240
      
https://github.com/Dolibarr/dolibarr/commit/b2116c37d896ae2ea004a1923543d0f446854240
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M build/debian/control
    R build/debian/patches/00list
    R build/debian/patches/install.dpatch
    A build/debian/patches/series
    A build/debian/patches/use-etc-dolibarr-conf.patch
    M build/debian/rules
    M build/debian/source/format
    M build/makepack-dolibarr.pl
    M build/tgz/tar_exclude.txt
    M build/zip/zip_exclude.txt
    R htdocs/langs/.htaccess

  Log Message:
  -----------
  Enhance packager:
- No need to be root to run script
- create git tag of version
- debian package do not use the deprecated dpatch command
- debian package is a quilt package (not native)
- debian package was missing file watch
- clean exclusion for zip and tgz package (exclusion must be done into
makepack-dolibarr.pl, not into specific package code)
- can publish files to sourceforge


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

  Changed paths:
    M build/debian/dolibarr.install
    M build/makepack-dolibarr.pl

  Log Message:
  -----------
  Script to prepare 3.3.5


  Commit: 7a741e06918fe5bd6d65f5da9a3cf427e3ea463c
      
https://github.com/Dolibarr/dolibarr/commit/7a741e06918fe5bd6d65f5da9a3cf427e3ea463c
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M build/debian/dolibarr.install
    M build/makepack-dolibarr.pl

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

Conflicts:
        build/makepack-dolibarr.pl


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

  Changed paths:
    M build/makepack-dolibarr.pl

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.4' into 3.5

Conflicts:
        build/debian/dolibarr.install
        build/makepack-dolibarr.pl


  Commit: 97677f08a98fc220e7836c53ce20bb092ef7033c
      
https://github.com/Dolibarr/dolibarr/commit/97677f08a98fc220e7836c53ce20bb092ef7033c
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

  Changed paths:
    M htdocs/projet/tasks/index.php

  Log Message:
  -----------
  Fix: Add protection to avoid memory hung


  Commit: 92e8f54e9a9658c3fdf90243ee0c33ab943a523e
      
https://github.com/Dolibarr/dolibarr/commit/92e8f54e9a9658c3fdf90243ee0c33ab943a523e
  Author: Gauthier <address@hidden>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

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

  Log Message:
  -----------
  error on ajax_constantonoff function


  Commit: 21bf2792485a68e1968e269de7b1efc33ccf86de
      
https://github.com/Dolibarr/dolibarr/commit/21bf2792485a68e1968e269de7b1efc33ccf86de
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

  Changed paths:
    M htdocs/theme/auguria/style.css.php

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


  Commit: ccc40362e7ea948d55119c29f4e2a6c4c533b4f8
      
https://github.com/Dolibarr/dolibarr/commit/ccc40362e7ea948d55119c29f4e2a6c4c533b4f8
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

  Changed paths:
    M htdocs/compta/deplacement/index.php

  Log Message:
  -----------
  Fix: Must use div for columns of index pages. Not table.


  Commit: fa56fe4e8b1d7cdb239b077661e0e34a8d443107
      
https://github.com/Dolibarr/dolibarr/commit/fa56fe4e8b1d7cdb239b077661e0e34a8d443107
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

  Changed paths:
    M htdocs/comm/action/document.php
    M htdocs/comm/propal/document.php
    M htdocs/compta/deplacement/document.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/sociales/document.php
    M htdocs/contrat/document.php
    M htdocs/fichinter/document.php
    M htdocs/fourn/facture/document.php
    M htdocs/langs/en_US/main.lang
    M htdocs/product/document.php

  Log Message:
  -----------
  Corrected Unknown error message typo


  Commit: 89a4c51153846cc32cad413514595f95b4102e87
      
https://github.com/Dolibarr/dolibarr/commit/89a4c51153846cc32cad413514595f95b4102e87
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

  Changed paths:
    M ChangeLog
    M htdocs/langs/en_US/languages.lang
    A htdocs/langs/es_CL/admin.lang
    A htdocs/langs/es_CL/agenda.lang
    A htdocs/langs/es_CL/bills.lang
    A htdocs/langs/es_CL/boxes.lang
    A htdocs/langs/es_CL/commercial.lang
    A htdocs/langs/es_CL/companies.lang
    A htdocs/langs/es_CL/compta.lang
    A htdocs/langs/es_CL/ecm.lang
    A htdocs/langs/es_CL/install.lang
    A htdocs/langs/es_CL/main.lang
    A htdocs/langs/es_CL/members.lang
    A htdocs/langs/es_CL/orders.lang
    A htdocs/langs/es_CL/other.lang
    A htdocs/langs/es_CL/products.lang
    A htdocs/langs/es_CL/projects.lang
    A htdocs/langs/es_CL/propal.lang
    A htdocs/langs/es_CL/workflow.lang

  Log Message:
  -----------
  Added es_CL language


  Commit: 4209ad740c17d40bd45d8ff14bb012795a36ef8a
      
https://github.com/Dolibarr/dolibarr/commit/4209ad740c17d40bd45d8ff14bb012795a36ef8a
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

  Changed paths:
    M ChangeLog

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


  Commit: 78ec0054d95acc96dc25f91e8eac46bf8d42d6a8
      
https://github.com/Dolibarr/dolibarr/commit/78ec0054d95acc96dc25f91e8eac46bf8d42d6a8
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Added bug number for agenda extrafield problems


  Commit: be97066a74f94aa8f566873972edd9620f9d3895
      
https://github.com/Dolibarr/dolibarr/commit/be97066a74f94aa8f566873972edd9620f9d3895
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

  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:
  -----------
  Fix: Bug into sql request because of incomplete group by


  Commit: 20262a01649d874a6973eb286d2c54d49752bf1a
      
https://github.com/Dolibarr/dolibarr/commit/20262a01649d874a6973eb286d2c54d49752bf1a
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/db/mysql.class.php
    M htdocs/core/db/mysqli.class.php

  Log Message:
  -----------
  Fix bug #1295: Error when creating an agenda extrafield with a number as 
reference


  Commit: 67de6699d619f94445814010ca23e8d80820f77f
      
https://github.com/Dolibarr/dolibarr/commit/67de6699d619f94445814010ca23e8d80820f77f
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M htdocs/langs/pt_PT/main.lang

  Log Message:
  -----------
  Fix: Translation of number for pt_PT


  Commit: 324402be0d8ce7c35663e11af89415f657e4e645
      
https://github.com/Dolibarr/dolibarr/commit/324402be0d8ce7c35663e11af89415f657e4e645
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/db/mysql.class.php
    M htdocs/core/db/mysqli.class.php

  Log Message:
  -----------
  Merge pull request #1465 from marcosgdf/bug-1295

Fixed bug 1295: Error when creating an agenda extrafield with a number as 
reference


  Commit: 5ee17a2f14da746deef4de485526c7ef57301f77
      
https://github.com/Dolibarr/dolibarr/commit/5ee17a2f14da746deef4de485526c7ef57301f77
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

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

  Log Message:
  -----------
  Merge pull request #1460 from atm-gauthier/3.5

error on ajax_constantonoff function


  Commit: 86ad05c22ed126b8442cd08d7a54454a6dc6a3ab
      
https://github.com/Dolibarr/dolibarr/commit/86ad05c22ed126b8442cd08d7a54454a6dc6a3ab
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M htdocs/comm/action/document.php
    M htdocs/comm/propal/document.php
    M htdocs/compta/deplacement/document.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/sociales/document.php
    M htdocs/contrat/document.php
    M htdocs/fichinter/document.php
    M htdocs/fourn/facture/document.php
    M htdocs/langs/en_US/main.lang
    M htdocs/product/document.php

  Log Message:
  -----------
  Merge pull request #1461 from marcosgdf/unknown-error

Corrected Unknown error message typo


  Commit: 8d081525aeec6f35eeaf1ca87f882580a14d7602
      
https://github.com/Dolibarr/dolibarr/commit/8d081525aeec6f35eeaf1ca87f882580a14d7602
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge pull request #1464 from marcosgdf/changelog

Updated changelog


  Commit: 241ae7a4d1f0d60656c7179bb758b106a326de12
      
https://github.com/Dolibarr/dolibarr/commit/241ae7a4d1f0d60656c7179bb758b106a326de12
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/lib/project.lib.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/time.php

  Log Message:
  -----------
  Fix: Miscellaneous bugs on tasks management

Conflicts:
        htdocs/core/lib/project.lib.php


  Commit: 7684e9e4f728c5a4e1f0b993cef900747a4b1a9f
      
https://github.com/Dolibarr/dolibarr/commit/7684e9e4f728c5a4e1f0b993cef900747a4b1a9f
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M htdocs/langs/pt_BR/main.lang
    M test/phpunit/AllTests.php
    A test/phpunit/Functions2LibTest.php
    R test/phpunit/Functions2Test.php
    A test/phpunit/FunctionsLibTest.php
    R test/phpunit/FunctionsTest.php
    A test/phpunit/LangTest.php

  Log Message:
  -----------
  Fix: Add PHPUnit test to check main.lang files does not contains rubish
values for keys SeparatorXXX
Fix: Add PHPUnit test to check main.lang files does not contains rubish
values for keys FormatDateShortJaxaXXX


  Commit: 4a983811d04afe120958e2b8dbf52e73dd052c69
      
https://github.com/Dolibarr/dolibarr/commit/4a983811d04afe120958e2b8dbf52e73dd052c69
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-12 (Wed, 12 Mar 2014)

  Changed paths:
    M htdocs/projet/index.php

  Log Message:
  -----------
  Fix: Avoid home project page to hung when too many tasks opened.


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

  Changed paths:
    M htdocs/projet/index.php

  Log Message:
  -----------
  Fix: Avoid home project page to hung when too many tasks opened.


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

  Changed paths:
    M htdocs/user/class/usergroup.class.php

  Log Message:
  -----------
  Fix: Regression, so introduce option to restore old behaviour.


  Commit: da5610bf3f99d9cd0e967c2a801e2705bc86c5a7
      
https://github.com/Dolibarr/dolibarr/commit/da5610bf3f99d9cd0e967c2a801e2705bc86c5a7
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M ChangeLog
    M htdocs/langs/en_US/languages.lang
    A htdocs/langs/es_CL/admin.lang
    A htdocs/langs/es_CL/agenda.lang
    A htdocs/langs/es_CL/bills.lang
    A htdocs/langs/es_CL/boxes.lang
    A htdocs/langs/es_CL/commercial.lang
    A htdocs/langs/es_CL/companies.lang
    A htdocs/langs/es_CL/compta.lang
    A htdocs/langs/es_CL/ecm.lang
    A htdocs/langs/es_CL/install.lang
    A htdocs/langs/es_CL/main.lang
    A htdocs/langs/es_CL/members.lang
    A htdocs/langs/es_CL/orders.lang
    A htdocs/langs/es_CL/other.lang
    A htdocs/langs/es_CL/products.lang
    A htdocs/langs/es_CL/projects.lang
    A htdocs/langs/es_CL/propal.lang
    A htdocs/langs/es_CL/workflow.lang

  Log Message:
  -----------
  Merge branch 'es_CL-language' of https://github.com/marcosgdf/dolibarr
into marcosgdf-es_CL-language

Conflicts:
        ChangeLog


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

  Changed paths:
    M build/debian/changelog
    M build/doxygen/dolibarr-doxygen.doxyfile
    M build/exe/doliwamp/doliwamp.iss
    M build/perl/virtualmin/dolibarr.pl
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Fix: Prepare for 3.5.2


  Commit: 561a1a1aacf1541b4245c04c4f8a9a98dd3f2177
      
https://github.com/Dolibarr/dolibarr/commit/561a1a1aacf1541b4245c04c4f8a9a98dd3f2177
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-14 (Fri, 14 Mar 2014)

  Changed paths:
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/tpl/document_actions_post_headers.tpl.php
    M htdocs/core/tpl/document_actions_pre_headers.tpl.php
    M htdocs/projet/document.php
    M htdocs/projet/tasks/document.php

  Log Message:
  -----------
  Fix: Miscellaneous problems on task tabs (withproject parameter lost and
download fails).


  Commit: f9c48be2a91e160921ed8a4ac33af727eeb36e9b
      
https://github.com/Dolibarr/dolibarr/commit/f9c48be2a91e160921ed8a4ac33af727eeb36e9b
  Author: philippe grand <address@hidden>
  Date:   2014-03-14 (Fri, 14 Mar 2014)

  Changed paths:
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php

  Log Message:
  -----------
  fix : display specimen


  Commit: 317134c29df7928484b131f6ed1c822ba347188e
      
https://github.com/Dolibarr/dolibarr/commit/317134c29df7928484b131f6ed1c822ba347188e
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-14 (Fri, 14 Mar 2014)

  Changed paths:
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php

  Log Message:
  -----------
  Merge pull request #1467 from grandoc/3.5

fix : display specimen


  Commit: 3f6b319d4107168b239d0c8d0dcf58eaaddc547f
      
https://github.com/Dolibarr/dolibarr/commit/3f6b319d4107168b239d0c8d0dcf58eaaddc547f
  Author: Florian Henry <address@hidden>
  Date:   2014-03-14 (Fri, 14 Mar 2014)

  Changed paths:
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/discount.class.php
    M htdocs/core/modules/modSociete.class.php

  Log Message:
  -----------
  Fix deposit invoice


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

  Changed paths:
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/discount.class.php
    M htdocs/core/modules/modSociete.class.php

  Log Message:
  -----------
  Merge pull request #1471 from FHenry/3.5

Fix deposit invoice


  Commit: 1cb71674d70d58da1515e67c17e82126fd69679e
      
https://github.com/Dolibarr/dolibarr/commit/1cb71674d70d58da1515e67c17e82126fd69679e
  Author: kaos <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M htdocs/holiday/fiche.php

  Log Message:
  -----------
  fixes #1300


  Commit: f55bdc64bd03d708f2d5731bad721de587baa979
      
https://github.com/Dolibarr/dolibarr/commit/f55bdc64bd03d708f2d5731bad721de587baa979
  Author: kaos <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M htdocs/holiday/fiche.php

  Log Message:
  -----------
  fixes #1300


  Commit: 5025d11a16e0a3c817031226f1833fa219872b71
      
https://github.com/Dolibarr/dolibarr/commit/5025d11a16e0a3c817031226f1833fa219872b71
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M htdocs/holiday/fiche.php

  Log Message:
  -----------
  Merge pull request #1476 from tbasilici/3.5

3.5


  Commit: 4db8af8a53ef0cf093e18d884727c189fc243038
      
https://github.com/Dolibarr/dolibarr/commit/4db8af8a53ef0cf093e18d884727c189fc243038
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M scripts/contracts/email_expire_services_to_representatives.php

  Log Message:
  -----------
  Fix: sql syntax error with pgsql


  Commit: 18c4d890ddc468681f6cbffe4baad3f9d22c7bb3
      
https://github.com/Dolibarr/dolibarr/commit/18c4d890ddc468681f6cbffe4baad3f9d22c7bb3
  Author: Florian Henry <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

  Log Message:
  -----------
  Fix [ bug #1283 ] ROUGET Shipment PDF


  Commit: ee70f21f58b3c18d1b07d80d36d27657b49e587a
      
https://github.com/Dolibarr/dolibarr/commit/ee70f21f58b3c18d1b07d80d36d27657b49e587a
  Author: Florian Henry <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M htdocs/holiday/fiche.php
    M scripts/contracts/email_expire_services_to_representatives.php

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


  Commit: 76256294913cd6e515d66f1bef48cdb37cf2f1ad
      
https://github.com/Dolibarr/dolibarr/commit/76256294913cd6e515d66f1bef48cdb37cf2f1ad
  Author: Florian Henry <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php

  Log Message:
  -----------
  Fix [ bug #1294 ] Expedition model Merou having problems with long names


  Commit: 997e16fec7e171299dec07bd75dde66b8371cc57
      
https://github.com/Dolibarr/dolibarr/commit/997e16fec7e171299dec07bd75dde66b8371cc57
  Author: Drosis Nikos <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

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

  Log Message:
  -----------
  Update user.class.php

String translated twice


  Commit: 9172beb282a7d89bb6442673247a5a1e29ca5ccc
      
https://github.com/Dolibarr/dolibarr/commit/9172beb282a7d89bb6442673247a5a1e29ca5ccc
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

  Log Message:
  -----------
  Merge pull request #1483 from FHenry/3.5

3.5


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

  Changed paths:
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

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


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

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/debian/control
    R build/debian/patches/00list
    R build/debian/patches/install.dpatch
    A build/debian/patches/series
    A build/debian/patches/use-etc-dolibarr-conf.patch
    M build/debian/rules
    M build/debian/source/format
    M build/doxygen/dolibarr-doxygen.doxyfile
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-dolibarr.pl
    M build/perl/virtualmin/dolibarr.pl
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M build/tgz/tar_exclude.txt
    M build/zip/zip_exclude.txt
    M htdocs/comm/action/document.php
    M htdocs/comm/propal/document.php
    M htdocs/compta/deplacement/document.php
    M htdocs/compta/deplacement/index.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/sociales/document.php
    M htdocs/contrat/document.php
    M htdocs/core/class/discount.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/db/mysql.class.php
    M htdocs/core/db/mysqli.class.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/tpl/document_actions_post_headers.tpl.php
    M htdocs/core/tpl/document_actions_pre_headers.tpl.php
    M htdocs/fichinter/document.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/facture/document.php
    M htdocs/holiday/fiche.php
    R htdocs/langs/.htaccess
    M htdocs/langs/en_US/languages.lang
    M htdocs/langs/en_US/main.lang
    A htdocs/langs/es_CL/admin.lang
    A htdocs/langs/es_CL/agenda.lang
    A htdocs/langs/es_CL/bills.lang
    A htdocs/langs/es_CL/boxes.lang
    A htdocs/langs/es_CL/commercial.lang
    A htdocs/langs/es_CL/companies.lang
    A htdocs/langs/es_CL/compta.lang
    A htdocs/langs/es_CL/ecm.lang
    A htdocs/langs/es_CL/install.lang
    A htdocs/langs/es_CL/main.lang
    A htdocs/langs/es_CL/members.lang
    A htdocs/langs/es_CL/orders.lang
    A htdocs/langs/es_CL/other.lang
    A htdocs/langs/es_CL/products.lang
    A htdocs/langs/es_CL/projects.lang
    A htdocs/langs/es_CL/propal.lang
    A htdocs/langs/es_CL/workflow.lang
    M htdocs/langs/pt_BR/main.lang
    M htdocs/langs/pt_PT/main.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/document.php
    M htdocs/projet/document.php
    M htdocs/projet/index.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/document.php
    M htdocs/projet/tasks/index.php
    M htdocs/projet/tasks/time.php
    M htdocs/theme/auguria/style.css.php
    M htdocs/user/class/user.class.php
    M htdocs/user/class/usergroup.class.php
    M scripts/contracts/email_expire_services_to_representatives.php
    M test/phpunit/AllTests.php
    A test/phpunit/Functions2LibTest.php
    R test/phpunit/Functions2Test.php
    A test/phpunit/FunctionsLibTest.php
    R test/phpunit/FunctionsTest.php
    A test/phpunit/LangTest.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/de7ff41905de...c80a5840912b
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] b2116c: Enhance packager:, Laurent Destailleur, 2014/03/08
- [Dolibarr-git] [Dolibarr/dolibarr] b2116c: Enhance packager:, Laurent Destailleur, 2014/03/08
- [Dolibarr-git] [Dolibarr/dolibarr] b2116c: Enhance packager:, Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] 2d3c70: Fix: When cloning product, autogenerating barcode ...
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] ed4f7f: Fix: error
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] b2116c: Enhance packager:
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] f652a4: Script to prepare 3.3.5
Index(es):
- Date
- Thread