[Dolibarr-git] [Dolibarr/dolibarr] 9ff3dc: Fix :: MySql Problem when create a salary payment

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 9ff3dc61896fd289bf1fab43266ba6d49d0b0516
      
https://github.com/Dolibarr/dolibarr/commit/9ff3dc61896fd289bf1fab43266ba6d49d0b0516
  Author: aspangaro <address@hidden>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

  Changed paths:
    M htdocs/compta/salaries/class/paymentsalary.class.php
    M htdocs/compta/salaries/fiche.php

  Log Message:
  -----------
  Fix :: MySql Problem when create a salary payment


  Commit: 66b4139e8fb3061253b6ff443969a20ad0166f9b
      
https://github.com/Dolibarr/dolibarr/commit/66b4139e8fb3061253b6ff443969a20ad0166f9b
  Author: aspangaro <address@hidden>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

  Changed paths:
    A .scrutinizer.yml
    M ChangeLog
    M build/makepack-dolibarr.pl
    R doc/images/dolibarr_screenshot10.png
    A doc/images/dolibarr_screenshot10_1280x800.png
    R doc/images/dolibarr_screenshot11.png
    R doc/images/dolibarr_screenshot12.png
    R doc/images/dolibarr_screenshot5.png
    A doc/images/dolibarr_screenshot5_1280x800.png
    R doc/images/dolibarr_screenshot7.png
    A doc/images/dolibarr_screenshot7_1280x800.png
    R doc/images/dolibarr_screenshot8.png
    A doc/images/dolibarr_screenshot8_1280x800.png
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/fiche.php
    A htdocs/categories/traduction.php
    M htdocs/conf/conf.php.example
    M htdocs/core/boxes/box_factures_fourn.php
    M htdocs/core/boxes/box_factures_fourn_imp.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/class/ldap.class.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/categories.lib.php
    M htdocs/core/lib/ecm.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/login/functions_ldap.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modECM.class.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/tpl/objectline_add.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/passwordforgotten.tpl.php
    M htdocs/ecm/index.php
    A htdocs/ecm/index_auto.php
    R htdocs/ecm/tpl/builddatabase.tpl.php
    A htdocs/ecm/tpl/enablefiletreeajax.tpl.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php
    M htdocs/imports/import.php
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/install/mysql/tables/llx_bank_account.sql
    A htdocs/install/mysql/tables/llx_categorie_lang.key.sql
    A htdocs/install/mysql/tables/llx_categorie_lang.sql
    M htdocs/langs/ca_ES/companies.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/es_ES/companies.lang
    M htdocs/langs/fr_FR/errors.lang
    M htdocs/langs/pt_PT/companies.lang
    M htdocs/main.inc.php
    M htdocs/product/fiche.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/task.php
    M htdocs/support/index.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/webservices/server_productorservice.php

  Log Message:
  -----------
  Merge branch 'upstream/develop'


  Commit: 73eec6b872321715cab4f0b718169c876f0cfe4a
      
https://github.com/Dolibarr/dolibarr/commit/73eec6b872321715cab4f0b718169c876f0cfe4a
  Author: aspangaro <address@hidden>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

  Changed paths:
    M htdocs/compta/bank/account.php
    M htdocs/compta/bank/search.php
    M htdocs/compta/bank/treso.php

  Log Message:
  -----------
  Fix :: Key language "Thirdparty" not traduced when module thirdparty is 
deactivated


  Commit: bab54f82649e8755556f2c7e9e48088d3726d061
      
https://github.com/Dolibarr/dolibarr/commit/bab54f82649e8755556f2c7e9e48088d3726d061
  Author: aspangaro <address@hidden>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

  Changed paths:
    M htdocs/compta/bank/account.php
    M htdocs/compta/bank/search.php
    M htdocs/compta/tva/class/tva.class.php

  Log Message:
  -----------
  Type bank & tva


  Commit: 06b386443d30fe68ddc1651e4acff61b37f859de
      
https://github.com/Dolibarr/dolibarr/commit/06b386443d30fe68ddc1651e4acff61b37f859de
  Author: aspangaro <address@hidden>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M .scrutinizer.yml
    M htdocs/adherents/canvas/actions_adherentcard_common.class.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/fiche.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/propal.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php
    M htdocs/contact/canvas/actions_contactcard_common.class.php
    M htdocs/contact/fiche.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/user/class/user.class.php
    M htdocs/user/fiche.php

  Log Message:
  -----------
  Merge branch 'upstream/develop'


  Commit: 11b0bc4b38157956308f4cb45982c7613fd00de0
      
https://github.com/Dolibarr/dolibarr/commit/11b0bc4b38157956308f4cb45982c7613fd00de0
  Author: aspangaro <address@hidden>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    M doc/images/dolibarr_screenshot1_300x188.png
    M doc/images/dolibarr_screenshot1_640x400.png
    M htdocs/adherents/document.php
    M htdocs/admin/system/perf.php
    M htdocs/comm/action/document.php
    M htdocs/comm/propal/document.php
    M htdocs/commande/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/core/ajax/ajaxdirpreview.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
    M htdocs/core/modules/project/task/pdf/doc_generic_task_odt.modules.php
    M htdocs/ecm/class/ecmdirectory.class.php
    M htdocs/ecm/docmine.php
    M htdocs/ecm/search.php
    M htdocs/fichinter/document.php
    M htdocs/fourn/commande/document.php
    M htdocs/fourn/facture/document.php
    M htdocs/install/repair.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/product/document.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/document.php
    M htdocs/projet/tasks/document.php
    M htdocs/societe/document.php

  Log Message:
  -----------
  Merge branch 'upstream/develop'


  Commit: eb926103e02e168a0d4a85ae164947bd8fafd189
      
https://github.com/Dolibarr/dolibarr/commit/eb926103e02e168a0d4a85ae164947bd8fafd189
  Author: aspangaro <address@hidden>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    M htdocs/compta/tva/class/tva.class.php
    M htdocs/compta/tva/fiche.php
    M htdocs/compta/tva/reglement.php

  Log Message:
  -----------
  TVA : Add type_payment & num_payment who are missing


  Commit: 4caedaf3e5e6299348bbf3f64f06d5e5b441c3b2
      
https://github.com/Dolibarr/dolibarr/commit/4caedaf3e5e6299348bbf3f64f06d5e5b441c3b2
  Author: aspangaro <address@hidden>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    M htdocs/compta/salaries/class/paymentsalary.class.php
    M htdocs/compta/salaries/fiche.php
    M htdocs/compta/salaries/index.php

  Log Message:
  -----------
  Salaries : typo & presentation


  Commit: d1392f7a5ffb9a1219ae03d1abd36884c1fa6ee1
      
https://github.com/Dolibarr/dolibarr/commit/d1392f7a5ffb9a1219ae03d1abd36884c1fa6ee1
  Author: aspangaro <address@hidden>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Changelog


  Commit: 501b7209de7cf4483845164cde29947072aefdb5
      
https://github.com/Dolibarr/dolibarr/commit/501b7209de7cf4483845164cde29947072aefdb5
  Author: aspangaro <address@hidden>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    M htdocs/core/modules/modDeplacement.class.php

  Log Message:
  -----------
  Move module trips into family "hr"


  Commit: c6e2afb11e5a07b962eeb7a8f6ade05336e9e772
      
https://github.com/Dolibarr/dolibarr/commit/c6e2afb11e5a07b962eeb7a8f6ade05336e9e772
  Author: aspangaro <address@hidden>
  Date:   2014-05-01 (Thu, 01 May 2014)

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

  Log Message:
  -----------
  Social contrib. :: Replace index.php by $_SERVER["PHP_SELF"]


  Commit: 3b265c8d5350d00e0e1a4148a6d17aa458fb6d5e
      
https://github.com/Dolibarr/dolibarr/commit/3b265c8d5350d00e0e1a4148a6d17aa458fb6d5e
  Author: aspangaro <address@hidden>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    M htdocs/compta/tva/reglement.php

  Log Message:
  -----------
  TVA :: Add sortfield & search


  Commit: ca0b6c26df295b8ea5095da9fa8722deb91b6a85
      
https://github.com/Dolibarr/dolibarr/commit/ca0b6c26df295b8ea5095da9fa8722deb91b6a85
  Author: aspangaro <address@hidden>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    M htdocs/compta/salaries/class/paymentsalary.class.php
    M htdocs/compta/tva/class/tva.class.php

  Log Message:
  -----------
  Translation


  Commit: 270e58637fe27c0d4b5106c16b7ab8fc6b067e49
      
https://github.com/Dolibarr/dolibarr/commit/270e58637fe27c0d4b5106c16b7ab8fc6b067e49
  Author: aspangaro <address@hidden>
  Date:   2014-05-01 (Thu, 01 May 2014)

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

  Log Message:
  -----------
  Salaries payments :: Add sortfield & search


  Commit: 6a200105b980f186e40307f6271870f9533efc7d
      
https://github.com/Dolibarr/dolibarr/commit/6a200105b980f186e40307f6271870f9533efc7d
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    M ChangeLog
    M htdocs/compta/bank/account.php
    M htdocs/compta/bank/search.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/salaries/class/paymentsalary.class.php
    M htdocs/compta/salaries/fiche.php
    M htdocs/compta/salaries/index.php
    M htdocs/compta/sociales/index.php
    M htdocs/compta/tva/class/tva.class.php
    M htdocs/compta/tva/fiche.php
    M htdocs/compta/tva/reglement.php
    M htdocs/core/modules/modDeplacement.class.php

  Log Message:
  -----------
  Merge branch 'develop' of github.com:aspangaro/dolibarr into
aspangaro-develop

Conflicts:
        ChangeLog


  Commit: 1c0b0ef8c96f4045c81eafe2315d993758ca9205
      
https://github.com/Dolibarr/dolibarr/commit/1c0b0ef8c96f4045c81eafe2315d993758ca9205
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    M ChangeLog
    M htdocs/compta/bank/account.php
    M htdocs/compta/bank/search.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/salaries/class/paymentsalary.class.php
    M htdocs/compta/salaries/fiche.php
    M htdocs/compta/salaries/index.php
    M htdocs/compta/sociales/index.php
    M htdocs/compta/tva/class/tva.class.php
    M htdocs/compta/tva/fiche.php
    M htdocs/compta/tva/reglement.php
    M htdocs/core/modules/modDeplacement.class.php

  Log Message:
  -----------
  Merge branch 'aspangaro-develop' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/3719fc123431...1c0b0ef8c96f