[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 03eadc: FIX: User id correction on ho
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 03eadc: FIX: User id correction on holiday request |
|
Date: |
Sat, 08 Jul 2017 13:20:08 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 03eadcebf1c636cb8a9d4c5945d33d5929c8f082
https://github.com/Dolibarr/dolibarr/commit/03eadcebf1c636cb8a9d4c5945d33d5929c8f082
Author: Ferran Marcet <address@hidden>
Date: 2017-06-19 (Mon, 19 Jun 2017)
Changed paths:
M htdocs/holiday/card.php
Log Message:
-----------
FIX: User id correction on holiday request
Commit: c4546b6da6b7ca71b5f640184b22b3d0394b8139
https://github.com/Dolibarr/dolibarr/commit/c4546b6da6b7ca71b5f640184b22b3d0394b8139
Author: fmarcet <address@hidden>
Date: 2017-06-19 (Mon, 19 Jun 2017)
Changed paths:
M htdocs/holiday/card.php
Log Message:
-----------
FIX: User id correction on holiday request
Commit: f694939fc74e81d823be4c56b51d66f64d793abb
https://github.com/Dolibarr/dolibarr/commit/f694939fc74e81d823be4c56b51d66f64d793abb
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-19 (Mon, 19 Jun 2017)
Changed paths:
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
Log Message:
-----------
Fix migration with pgsql
Commit: 6fb0fc7b714709d1c83488c0d40726567532a1b0
https://github.com/Dolibarr/dolibarr/commit/6fb0fc7b714709d1c83488c0d40726567532a1b0
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-19 (Mon, 19 Jun 2017)
Changed paths:
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: 12d7b92556ac7afc54ce5e85f81015f466dfbe1b
https://github.com/Dolibarr/dolibarr/commit/12d7b92556ac7afc54ce5e85f81015f466dfbe1b
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-19 (Mon, 19 Jun 2017)
Changed paths:
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 1745d06bb7e64771fc98af245f09711301aa80ac
https://github.com/Dolibarr/dolibarr/commit/1745d06bb7e64771fc98af245f09711301aa80ac
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-19 (Mon, 19 Jun 2017)
Changed paths:
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 1f83bef1b5f4b6be67a9b5d62bf30a2ff291331c
https://github.com/Dolibarr/dolibarr/commit/1f83bef1b5f4b6be67a9b5d62bf30a2ff291331c
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-20 (Tue, 20 Jun 2017)
Changed paths:
M htdocs/holiday/card.php
Log Message:
-----------
Merge pull request #7035 from fmarcet/3.9
Fix: User id correction on holiday request
Commit: 99c78675222640e1890c678ba0fbc13fc64ee4ad
https://github.com/Dolibarr/dolibarr/commit/99c78675222640e1890c678ba0fbc13fc64ee4ad
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-27 (Tue, 27 Jun 2017)
Changed paths:
M .travis.yml
Log Message:
-----------
Fix travis
Commit: a8d7764146bdc4de5836dc90570895a8a014f4c6
https://github.com/Dolibarr/dolibarr/commit/a8d7764146bdc4de5836dc90570895a8a014f4c6
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-27 (Tue, 27 Jun 2017)
Changed paths:
M htdocs/holiday/card.php
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 65b9b70ff8ad62147bf5186ac07a9e3ac3a67ee2
https://github.com/Dolibarr/dolibarr/commit/65b9b70ff8ad62147bf5186ac07a9e3ac3a67ee2
Author: arnaud <address@hidden>
Date: 2017-06-27 (Tue, 27 Jun 2017)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
FIX invoice page list
Commit: f899408fc986feff921b7da353e279c8686c20f1
https://github.com/Dolibarr/dolibarr/commit/f899408fc986feff921b7da353e279c8686c20f1
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-27 (Tue, 27 Jun 2017)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
Merge pull request #7063 from atm-arnaud/FIX_invoice_page_list
FIX invoice page list
Commit: 4283b1ee30b294b975c34236897a0944a6901371
https://github.com/Dolibarr/dolibarr/commit/4283b1ee30b294b975c34236897a0944a6901371
Author: fmarcet <address@hidden>
Date: 2017-06-28 (Wed, 28 Jun 2017)
Changed paths:
M htdocs/holiday/card.php
Log Message:
-----------
FIX: User id correction on holiday request
Commit: 724392a5575a2bc70c630b4dddc06d8d998ce37a
https://github.com/Dolibarr/dolibarr/commit/724392a5575a2bc70c630b4dddc06d8d998ce37a
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-29 (Thu, 29 Jun 2017)
Changed paths:
M htdocs/holiday/card.php
Log Message:
-----------
Merge pull request #7073 from fmarcet/3.9
FIX: User id correction on holiday request
Commit: a695fa9c6e448c3be77c55321f3584b6a95fc1d0
https://github.com/Dolibarr/dolibarr/commit/a695fa9c6e448c3be77c55321f3584b6a95fc1d0
Author: arnaud <address@hidden>
Date: 2017-06-29 (Thu, 29 Jun 2017)
Changed paths:
M htdocs/holiday/list.php
Log Message:
-----------
FIX holidays with postgresql like on rowid integer
Commit: 9da9dff3c3d1037e5e0d249a413ea3fd56d1f4b3
https://github.com/Dolibarr/dolibarr/commit/9da9dff3c3d1037e5e0d249a413ea3fd56d1f4b3
Author: arnaud <address@hidden>
Date: 2017-06-29 (Thu, 29 Jun 2017)
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
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
Log Message:
-----------
Merge branch '5.0' of github.com:Dolibarr/dolibarr into
FIX_holidays_postgresql
Commit: 6e8c83b2a960cc5f2c9e33a1e9ce7ba19c3eeb96
https://github.com/Dolibarr/dolibarr/commit/6e8c83b2a960cc5f2c9e33a1e9ce7ba19c3eeb96
Author: florian HENRY <address@hidden>
Date: 2017-06-29 (Thu, 29 Jun 2017)
Changed paths:
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/compta/paiement/class/cpaiement.class.php
Log Message:
-----------
fix class error (given by eclipse Oxygen version)
Commit: f79b72f724b67a4a2e7938b9cb56c8ee8d9c179b
https://github.com/Dolibarr/dolibarr/commit/f79b72f724b67a4a2e7938b9cb56c8ee8d9c179b
Author: arnaud <address@hidden>
Date: 2017-06-29 (Thu, 29 Jun 2017)
Changed paths:
M htdocs/compta/sociales/card.php
Log Message:
-----------
FIX edit sociale was emptying label
Commit: ca6ce2ba8b0aa8fcb4568ce74646b13cc3d30393
https://github.com/Dolibarr/dolibarr/commit/ca6ce2ba8b0aa8fcb4568ce74646b13cc3d30393
Author: arnaud <address@hidden>
Date: 2017-06-30 (Fri, 30 Jun 2017)
Changed paths:
M htdocs/compta/facture/list.php
M htdocs/product/stats/facture.php
Log Message:
-----------
FIX status were wrong on product referent list
Commit: e1ae97e66123b1565eb2769d98f199526ac7e2b3
https://github.com/Dolibarr/dolibarr/commit/e1ae97e66123b1565eb2769d98f199526ac7e2b3
Author: John <address@hidden>
Date: 2017-07-04 (Tue, 04 Jul 2017)
Changed paths:
M htdocs/contrat/class/contrat.class.php
Log Message:
-----------
Fix return method
Commit: 31b94c1d3f13553bfbcc36977d701652b1148d90
https://github.com/Dolibarr/dolibarr/commit/31b94c1d3f13553bfbcc36977d701652b1148d90
Author: phf <address@hidden>
Date: 2017-07-05 (Wed, 05 Jul 2017)
Changed paths:
M htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
M htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
M htdocs/core/modules/supplier_payment/modules_supplier_payment.php
Log Message:
-----------
Fix 7109 - class name already exist for customer payment
Commit: a072b23a5e5df764de2a2e08d874d59b25bf3ce6
https://github.com/Dolibarr/dolibarr/commit/a072b23a5e5df764de2a2e08d874d59b25bf3ce6
Author: jfefe <address@hidden>
Date: 2017-07-06 (Thu, 06 Jul 2017)
Changed paths:
M htdocs/fourn/commande/card.php
Log Message:
-----------
FIX #7075 : bad path for document
Commit: a6f1e08c194e7b8f3b3ebf191eaa0f10c57ad7bb
https://github.com/Dolibarr/dolibarr/commit/a6f1e08c194e7b8f3b3ebf191eaa0f10c57ad7bb
Author: gauthier <address@hidden>
Date: 2017-07-07 (Fri, 07 Jul 2017)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
FIX : we have to check if contact doesn't already exist on add_contact()
function
Commit: eef027acb496a05a73fac9cf3232f6a205a531e0
https://github.com/Dolibarr/dolibarr/commit/eef027acb496a05a73fac9cf3232f6a205a531e0
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-07 (Fri, 07 Jul 2017)
Changed paths:
M htdocs/holiday/list.php
Log Message:
-----------
Merge pull request #7080 from atm-arnaud/FIX_holidays_postgresql
FIX holidays postgresql search
Commit: b0359b465905c42e377869086cd8c39a1ce9276f
https://github.com/Dolibarr/dolibarr/commit/b0359b465905c42e377869086cd8c39a1ce9276f
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-07 (Fri, 07 Jul 2017)
Changed paths:
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/compta/paiement/class/cpaiement.class.php
Log Message:
-----------
Merge pull request #7081 from atm-florian/5.0
fix class error (given by eclipse Oxygen version)
Commit: d58682c574807705a3e24dd45394903cdc94359c
https://github.com/Dolibarr/dolibarr/commit/d58682c574807705a3e24dd45394903cdc94359c
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-07 (Fri, 07 Jul 2017)
Changed paths:
M htdocs/compta/sociales/card.php
Log Message:
-----------
Merge pull request #7088 from atm-arnaud/FIX_edit_social_emptying_label
FIX edit sociale was emptying label
Commit: c6fc7313b141d50020054a556ae782505fbab6f2
https://github.com/Dolibarr/dolibarr/commit/c6fc7313b141d50020054a556ae782505fbab6f2
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-07 (Fri, 07 Jul 2017)
Changed paths:
M htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
M htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
M htdocs/core/modules/supplier_payment/modules_supplier_payment.php
Log Message:
-----------
Merge pull request #7116 from atm-ph/fix_7109
FIX 7109 - class name already exist for customer payment
Commit: 12a41d7dd2a96edbecf23a69dfc715fd91b9d796
https://github.com/Dolibarr/dolibarr/commit/12a41d7dd2a96edbecf23a69dfc715fd91b9d796
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-07 (Fri, 07 Jul 2017)
Changed paths:
M htdocs/compta/facture/list.php
M htdocs/product/stats/facture.php
Log Message:
-----------
Merge pull request #7091 from
atm-arnaud/FIX_referent_invoice_list_in_product_card
FIX status were wrong on product for invoice referent list
Commit: 4c1b485d4784209ceff2203b1c6e1b99abaee9ec
https://github.com/Dolibarr/dolibarr/commit/4c1b485d4784209ceff2203b1c6e1b99abaee9ec
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-07 (Fri, 07 Jul 2017)
Changed paths:
M htdocs/compta/facture/list.php
M htdocs/holiday/card.php
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 4.0
Conflicts:
htdocs/compta/facture/list.php
Commit: fd5f992be407240af5d25e76fc0b54fd6ff41bdd
https://github.com/Dolibarr/dolibarr/commit/fd5f992be407240af5d25e76fc0b54fd6ff41bdd
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-07 (Fri, 07 Jul 2017)
Changed paths:
M htdocs/compta/facture/list.php
M htdocs/product/stats/facture.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: b7af0cca63cc7afa886510afaa13195585e0be84
https://github.com/Dolibarr/dolibarr/commit/b7af0cca63cc7afa886510afaa13195585e0be84
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-07 (Fri, 07 Jul 2017)
Changed paths:
M htdocs/compta/facture/list.php
M htdocs/holiday/card.php
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
M htdocs/product/stats/facture.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/compta/facture/list.php
htdocs/holiday/card.php
Commit: 0d575b4cdf2798e6e8e318ceb051b08e20649283
https://github.com/Dolibarr/dolibarr/commit/0d575b4cdf2798e6e8e318ceb051b08e20649283
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-07 (Fri, 07 Jul 2017)
Changed paths:
M htdocs/contrat/class/contrat.class.php
Log Message:
-----------
Merge pull request #7107 from atm-john/fix_contract_card
Fix return method
Commit: bd0dba6439d57508ff8f4a14cd7ead54e735b88e
https://github.com/Dolibarr/dolibarr/commit/bd0dba6439d57508ff8f4a14cd7ead54e735b88e
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-07 (Fri, 07 Jul 2017)
Changed paths:
M htdocs/fourn/commande/card.php
Log Message:
-----------
Update card.php
Better fix for future
Commit: 5046852caa42dd6dd7ef4ac1bf66817e5e9c2c7f
https://github.com/Dolibarr/dolibarr/commit/5046852caa42dd6dd7ef4ac1bf66817e5e9c2c7f
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-07 (Fri, 07 Jul 2017)
Changed paths:
M htdocs/fourn/commande/card.php
Log Message:
-----------
Merge pull request #7121 from jfefe/patch-14
Bad path for document file
Commit: efd292e8f506cd042d2d90636e26e26514ed2f2a
https://github.com/Dolibarr/dolibarr/commit/efd292e8f506cd042d2d90636e26e26514ed2f2a
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-07 (Fri, 07 Jul 2017)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #7126 from atm-gauthier/FIX_add_contact
FIX : we have to check if contact doesn't already exist on add_contact
Commit: 8db4e91888e9c8fd9850ed64ffc0e409ad6179bb
https://github.com/Dolibarr/dolibarr/commit/8db4e91888e9c8fd9850ed64ffc0e409ad6179bb
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-08 (Sat, 08 Jul 2017)
Changed paths:
M htdocs/core/class/doleditor.class.php
M htdocs/core/class/interfaces.class.php
M htdocs/langs/en_US/modulebuilder.lang
M htdocs/modulebuilder/index.php
M htdocs/modulebuilder/template/admin/about.php
M htdocs/modulebuilder/template/admin/setup.php
M htdocs/modulebuilder/template/class/MyObject.txt
M htdocs/modulebuilder/template/core/boxes/mybox.php
M htdocs/modulebuilder/template/core/modules/modMyModule.class.php
M htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.php
M
htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/modulebuilder/template/scripts/myobject.php
M htdocs/modulebuilder/template/sql/data.sql
M htdocs/modulebuilder/template/test/phpunit/MyModuleFunctionalTest.php
M htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
Log Message:
-----------
Debug modulebuilder
Commit: cf6745b1ae2f9c67cdfdcee9aaeb64d9e093d8fb
https://github.com/Dolibarr/dolibarr/commit/cf6745b1ae2f9c67cdfdcee9aaeb64d9e093d8fb
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-08 (Sat, 08 Jul 2017)
Changed paths:
M htdocs/core/class/interfaces.class.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/langs/en_US/main.lang
M htdocs/modulebuilder/index.php
A htdocs/modulebuilder/template/SPECIFICATIONS.md
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/modulebuilder/template/myobject_list.php
Log Message:
-----------
Debug module builder
Commit: ba3b6b6aa5d372d41869eb0559d3e8bbfb64d561
https://github.com/Dolibarr/dolibarr/commit/ba3b6b6aa5d372d41869eb0559d3e8bbfb64d561
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-08 (Sat, 08 Jul 2017)
Changed paths:
M htdocs/commande/class/commande.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/expensereport/card.php
M htdocs/expensereport/class/expensereport.class.php
Log Message:
-----------
Better support of vat with code in expense report
Commit: 4290be7ee6cadfc1fbeb41c2f39ce6c391db9c06
https://github.com/Dolibarr/dolibarr/commit/4290be7ee6cadfc1fbeb41c2f39ce6c391db9c06
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-08 (Sat, 08 Jul 2017)
Changed paths:
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/fourn/commande/card.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: f40afcf023da1ffb4d0c0c0d1e4f56d1f6fd69ca
https://github.com/Dolibarr/dolibarr/commit/f40afcf023da1ffb4d0c0c0d1e4f56d1f6fd69ca
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-08 (Sat, 08 Jul 2017)
Changed paths:
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/list.php
M htdocs/compta/paiement/class/cpaiement.class.php
M htdocs/compta/sociales/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
M htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
M htdocs/core/modules/supplier_payment/modules_supplier_payment.php
M htdocs/expensereport/card.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/fourn/commande/card.php
M htdocs/holiday/card.php
M htdocs/holiday/list.php
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
M htdocs/product/stats/facture.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/facture/list.php
htdocs/compta/paiement/class/cpaiement.class.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stats/facture.php
Commit: f32b27e8bdb37fbe0b29f32fc75b7644fc1cc9c0
https://github.com/Dolibarr/dolibarr/commit/f32b27e8bdb37fbe0b29f32fc75b7644fc1cc9c0
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-08 (Sat, 08 Jul 2017)
Changed paths:
M htdocs/expensereport/card.php
M htdocs/expensereport/class/expensereport.class.php
Log Message:
-----------
Better management of vat with code
Commit: 00e1fab1af1dc1870815f3e3f652c4ba0a2e1c30
https://github.com/Dolibarr/dolibarr/commit/00e1fab1af1dc1870815f3e3f652c4ba0a2e1c30
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-08 (Sat, 08 Jul 2017)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
Fix bad var
Commit: 8a9c38114f0cf47e2d5614c4dcf76c6fc8b9a691
https://github.com/Dolibarr/dolibarr/commit/8a9c38114f0cf47e2d5614c4dcf76c6fc8b9a691
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-08 (Sat, 08 Jul 2017)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Fix bug reported by scrutinizer
Commit: a562e5a91929b315f0d12da1049709cd5caf5b4e
https://github.com/Dolibarr/dolibarr/commit/a562e5a91929b315f0d12da1049709cd5caf5b4e
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-08 (Sat, 08 Jul 2017)
Changed paths:
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/journal/expensereportsjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
M htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql
M htdocs/langs/en_US/accountancy.lang
M test/phpunit/CodingSqlTest.php
Log Message:
-----------
Maxi debug of accountancy ledger page.
Commit: d2232833592cd4391e1dbf8b25fa0799ab0d68e0
https://github.com/Dolibarr/dolibarr/commit/d2232833592cd4391e1dbf8b25fa0799ab0d68e0
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-08 (Sat, 08 Jul 2017)
Changed paths:
M htdocs/core/modules/DolibarrModules.class.php
Log Message:
-----------
Fix phpcs
Commit: 45d8fbb19e3626b21eaee22e2f2f3a862a6c2ba7
https://github.com/Dolibarr/dolibarr/commit/45d8fbb19e3626b21eaee22e2f2f3a862a6c2ba7
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-08 (Sat, 08 Jul 2017)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/expensereport/class/expensereport.class.php
Log Message:
-----------
Fix gravatar
Commit: 7b6e60077a51205a62e6801a6187da7c1ae0b196
https://github.com/Dolibarr/dolibarr/commit/7b6e60077a51205a62e6801a6187da7c1ae0b196
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-08 (Sat, 08 Jul 2017)
Changed paths:
M htdocs/expensereport/class/paymentexpensereport.class.php
M htdocs/expensereport/payment/payment.php
Log Message:
-----------
FIX id of user not saved when making a payment of expense report
Commit: 9d0cb07ff9b813b1793a64ff9d76d18df1463e94
https://github.com/Dolibarr/dolibarr/commit/9d0cb07ff9b813b1793a64ff9d76d18df1463e94
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-08 (Sat, 08 Jul 2017)
Changed paths:
M htdocs/expensereport/class/paymentexpensereport.class.php
M htdocs/expensereport/payment/payment.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/expensereport/payment/payment.php
Commit: 65ea0fc2b44e1e96df58c613693483512c07f0f4
https://github.com/Dolibarr/dolibarr/commit/65ea0fc2b44e1e96df58c613693483512c07f0f4
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-08 (Sat, 08 Jul 2017)
Changed paths:
M htdocs/install/mysql/migration/repair.sql
Log Message:
-----------
FIX value of user id filled to 0 in llx_bank_url when recording an
expense report.
Commit: b61f7c0179433d13334aea9ae53d65f87741fee2
https://github.com/Dolibarr/dolibarr/commit/b61f7c0179433d13334aea9ae53d65f87741fee2
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-08 (Sat, 08 Jul 2017)
Changed paths:
M htdocs/install/mysql/migration/repair.sql
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Commit: 4d560a8e031fea412466b3415f095be9060538e1
https://github.com/Dolibarr/dolibarr/commit/4d560a8e031fea412466b3415f095be9060538e1
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-08 (Sat, 08 Jul 2017)
Changed paths:
M htdocs/langs/en_US/main.lang
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: eec10660ab2a8ed4b366e29be08cf77912779cbc
https://github.com/Dolibarr/dolibarr/commit/eec10660ab2a8ed4b366e29be08cf77912779cbc
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-08 (Sat, 08 Jul 2017)
Changed paths:
M htdocs/install/mysql/migration/repair.sql
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/ff2b2e5b644d...eec10660ab2a