[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] e9d65e: FIX : need to filter on aa.en
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] e9d65e: FIX : need to filter on aa.entity for same account... |
|
Date: |
Mon, 25 Jun 2018 16:25:44 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: e9d65ea751cf068b04a2e1f333c74da7462e8e5f
https://github.com/Dolibarr/dolibarr/commit/e9d65ea751cf068b04a2e1f333c74da7462e8e5f
Author: gauthier <address@hidden>
Date: 2018-06-14 (Thu, 14 Jun 2018)
Changed paths:
M htdocs/accountancy/customer/list.php
Log Message:
-----------
FIX : need to filter on aa.entity for same accounting accounts available in
several entities
Commit: a21e138c7046a11baf65bdba6e62b8b511f9fb6f
https://github.com/Dolibarr/dolibarr/commit/a21e138c7046a11baf65bdba6e62b8b511f9fb6f
Author: Ferran Marcet <address@hidden>
Date: 2018-06-15 (Fri, 15 Jun 2018)
Changed paths:
M htdocs/compta/facture/card.php
M htdocs/compta/paiement/class/paiement.class.php
Log Message:
-----------
Fix: Avoid converting into reduction twice and draft invoice
Commit: 5d6cd381b9999c6f615904c54217c4721965f6d5
https://github.com/Dolibarr/dolibarr/commit/5d6cd381b9999c6f615904c54217c4721965f6d5
Author: altatof <address@hidden>
Date: 2018-06-15 (Fri, 15 Jun 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Fix <br/> detection
Commit: 63fb82931cb0d8427503cb27f437ac6eb6704082
https://github.com/Dolibarr/dolibarr/commit/63fb82931cb0d8427503cb27f437ac6eb6704082
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-18 (Mon, 18 Jun 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Update functions.lib.php
Commit: 95dfa1f7aaf616c9dd9f1be6eb3d756991abe70a
https://github.com/Dolibarr/dolibarr/commit/95dfa1f7aaf616c9dd9f1be6eb3d756991abe70a
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-18 (Mon, 18 Jun 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge pull request #8973 from altatof/FIX_HTML_DETECTION
Fix <br/> detection
Commit: fed61930d5e50916eaed657211b2ba943032db3b
https://github.com/Dolibarr/dolibarr/commit/fed61930d5e50916eaed657211b2ba943032db3b
Author: gauthier <address@hidden>
Date: 2018-06-18 (Mon, 18 Jun 2018)
Changed paths:
M htdocs/accountancy/customer/list.php
Log Message:
-----------
FIX : clause must not be there
Commit: 5d6d43d53953dfa98dbb53cd72e150757d9b6c7d
https://github.com/Dolibarr/dolibarr/commit/5d6d43d53953dfa98dbb53cd72e150757d9b6c7d
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-18 (Mon, 18 Jun 2018)
Changed paths:
M htdocs/accountancy/customer/list.php
Log Message:
-----------
Merge pull request #8964 from atm-gauthier/6.0_accounting_entity
FIX : need to filter on aa.entity for same accounting accounts available in
several entities
Commit: df056980b5bbcaeb45ee28e818956f9fc273984c
https://github.com/Dolibarr/dolibarr/commit/df056980b5bbcaeb45ee28e818956f9fc273984c
Author: atm-greg <address@hidden>
Date: 2018-06-19 (Tue, 19 Jun 2018)
Changed paths:
M htdocs/product/stock/product.php
Log Message:
-----------
fix bad result on fetch ProductStockEntrepot
Commit: 8fc2f7441cf340ae2dae1e77b89e7ad82b05d3b1
https://github.com/Dolibarr/dolibarr/commit/8fc2f7441cf340ae2dae1e77b89e7ad82b05d3b1
Author: Regis Houssin <address@hidden>
Date: 2018-06-20 (Wed, 20 Jun 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Fix: to avoid deleting line breaks
Commit: 2fab4d7f76224ed220aa5570824c2839722485cb
https://github.com/Dolibarr/dolibarr/commit/2fab4d7f76224ed220aa5570824c2839722485cb
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-06-20 (Wed, 20 Jun 2018)
Changed paths:
M htdocs/langs/en_US/propal.lang
Log Message:
-----------
FIX: proposal: missing contact type translation key
Commit: 5bee3245785a5ab475c463bbd69b85ca5818ccee
https://github.com/Dolibarr/dolibarr/commit/5bee3245785a5ab475c463bbd69b85ca5818ccee
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-22 (Fri, 22 Jun 2018)
Changed paths:
M htdocs/compta/paiement/class/paiement.class.php
Log Message:
-----------
Update paiement.class.php
Commit: cfc8e8b0ef84b4731b50f8489bff1276e37f68c5
https://github.com/Dolibarr/dolibarr/commit/cfc8e8b0ef84b4731b50f8489bff1276e37f68c5
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-22 (Fri, 22 Jun 2018)
Changed paths:
M htdocs/compta/paiement/class/paiement.class.php
Log Message:
-----------
Merge pull request #8972 from fmarcet/7.0
FIX Avoid converting into reduction twice and draft invoice
Commit: dab264c6418b97bc686a6fb1d3771ecab9470395
https://github.com/Dolibarr/dolibarr/commit/dab264c6418b97bc686a6fb1d3771ecab9470395
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-22 (Fri, 22 Jun 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge pull request #8994 from hregis/6.0_multicompany
Fix: to avoid deleting line breaks
Commit: bd7277431f0d1d6b8e2a9d620ca9b5d3a7d794c4
https://github.com/Dolibarr/dolibarr/commit/bd7277431f0d1d6b8e2a9d620ca9b5d3a7d794c4
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-22 (Fri, 22 Jun 2018)
Changed paths:
M htdocs/product/stock/product.php
Log Message:
-----------
Merge pull request #8986 from atm-greg/fix_desired_stock
FIX bad result on fetch ProductStockEntrepot
Commit: 8414ceaddbf4a253f2c50ab4749f6c86e26efc27
https://github.com/Dolibarr/dolibarr/commit/8414ceaddbf4a253f2c50ab4749f6c86e26efc27
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-22 (Fri, 22 Jun 2018)
Changed paths:
M htdocs/langs/en_US/propal.lang
Log Message:
-----------
Merge pull request #9000 from ATM-Marc/FIX_7.0_propal_contact_SHIPPING
FIX: proposal: missing contact type translation key
Commit: 533c19cc2cf7cc3b5a23327c5d4b67e25353b5d6
https://github.com/Dolibarr/dolibarr/commit/533c19cc2cf7cc3b5a23327c5d4b67e25353b5d6
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-22 (Fri, 22 Jun 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/accountancy/customer/list.php
htdocs/core/lib/functions.lib.php
Commit: d458b383ad0c5319e17fe47cec625b65a91773fe
https://github.com/Dolibarr/dolibarr/commit/d458b383ad0c5319e17fe47cec625b65a91773fe
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-22 (Fri, 22 Jun 2018)
Changed paths:
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/langs/en_US/propal.lang
M htdocs/product/stock/product.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: ca04ffe42011b5b156ab1b9e3cd1f9a787a72014
https://github.com/Dolibarr/dolibarr/commit/ca04ffe42011b5b156ab1b9e3cd1f9a787a72014
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-22 (Fri, 22 Jun 2018)
Changed paths:
M htdocs/accountancy/admin/journals_list.php
Log Message:
-----------
Load lang
Commit: edec89ef1e23b0310b77a60b71110a15533110b2
https://github.com/Dolibarr/dolibarr/commit/edec89ef1e23b0310b77a60b71110a15533110b2
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-23 (Sat, 23 Jun 2018)
Changed paths:
M ChangeLog
Log Message:
-----------
Prepare 7.0.3
Commit: 16f940b637453cdb76361dab71f21ad6285f93c7
https://github.com/Dolibarr/dolibarr/commit/16f940b637453cdb76361dab71f21ad6285f93c7
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-23 (Sat, 23 Jun 2018)
Changed paths:
M htdocs/filefunc.inc.php
Log Message:
-----------
Prepare 7.0.4
Commit: bc716852583ceaef638ec674b714215737f5084a
https://github.com/Dolibarr/dolibarr/commit/bc716852583ceaef638ec674b714215737f5084a
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-25 (Mon, 25 Jun 2018)
Changed paths:
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/migration/repair.sql
Log Message:
-----------
Fix migration error
Commit: 97976fbb43a04ce249333407cbf21ac8b567314d
https://github.com/Dolibarr/dolibarr/commit/97976fbb43a04ce249333407cbf21ac8b567314d
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-25 (Mon, 25 Jun 2018)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Fix type of parameter must be string
Commit: d9fc1e0b5dacae0a2b4ad6cd986411e9c741d22d
https://github.com/Dolibarr/dolibarr/commit/d9fc1e0b5dacae0a2b4ad6cd986411e9c741d22d
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-25 (Mon, 25 Jun 2018)
Changed paths:
M htdocs/expensereport/card.php
M htdocs/holiday/card.php
Log Message:
-----------
Fix param to avoid to create holiday or expense report in wrong entity.
Commit: 36402c22eef49d60edd73a2f312f8e28fe0bd1cb
https://github.com/Dolibarr/dolibarr/commit/36402c22eef49d60edd73a2f312f8e28fe0bd1cb
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-25 (Mon, 25 Jun 2018)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/main.inc.php
M htdocs/product/card.php
M htdocs/societe/ajax/company.php
Log Message:
-----------
FIX SQL Injections reported by mu shcor (ADLab of Venustech)
Commit: 9b46ae50f01e78e8cdef2f474cbf32630be399e2
https://github.com/Dolibarr/dolibarr/commit/9b46ae50f01e78e8cdef2f474cbf32630be399e2
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-25 (Mon, 25 Jun 2018)
Changed paths:
M htdocs/expensereport/class/expensereport.class.php
Log Message:
-----------
Fix left join on expensereport lines
Commit: 9f77ea0ece8d9ecf427fc4862127e80cd1fdc612
https://github.com/Dolibarr/dolibarr/commit/9f77ea0ece8d9ecf427fc4862127e80cd1fdc612
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-25 (Mon, 25 Jun 2018)
Changed paths:
M htdocs/core/lib/company.lib.php
Log Message:
-----------
Code comment
Commit: 52eddbf809d0976c11ff6b57d1dba877b7c38e86
https://github.com/Dolibarr/dolibarr/commit/52eddbf809d0976c11ff6b57d1dba877b7c38e86
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-26 (Tue, 26 Jun 2018)
Changed paths:
M htdocs/langs/fr_FR/other.lang
Log Message:
-----------
Sync transifex
Commit: 7f8570f7202da188aa581fa1ef731987b6a16c11
https://github.com/Dolibarr/dolibarr/commit/7f8570f7202da188aa581fa1ef731987b6a16c11
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-26 (Tue, 26 Jun 2018)
Changed paths:
M htdocs/compta/facture/fiche-rec.php
Log Message:
-----------
Fix lang loading
Commit: 5c93fa1bfbd37479646c25ccc7b5516b71476d9a
https://github.com/Dolibarr/dolibarr/commit/5c93fa1bfbd37479646c25ccc7b5516b71476d9a
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-26 (Tue, 26 Jun 2018)
Changed paths:
M ChangeLog
M htdocs/accountancy/admin/journals_list.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/expensereport/card.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/filefunc.inc.php
M htdocs/holiday/card.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/langs/en_US/propal.lang
M htdocs/langs/fr_FR/other.lang
M htdocs/main.inc.php
M htdocs/product/card.php
M htdocs/product/stock/product.php
M htdocs/societe/ajax/company.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/journals_list.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/other.lang
Commit: cbe682582edf4c3724302fb0fb1ebff477e00b83
https://github.com/Dolibarr/dolibarr/commit/cbe682582edf4c3724302fb0fb1ebff477e00b83
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-26 (Tue, 26 Jun 2018)
Changed paths:
M htdocs/admin/dict.php
M htdocs/core/ajax/ajaxdirtree.php
M htdocs/core/class/html.formother.class.php
M htdocs/don/tpl/linkedobjectblock.tpl.php
M htdocs/fichinter/card.php
M htdocs/fichinter/index.php
M htdocs/fichinter/stats/index.php
M htdocs/fichinter/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/facture/list.php
M htdocs/fourn/facture/rapport.php
M htdocs/fourn/recap-fourn.php
M htdocs/install/mysql/data/llx_c_ecotaxe.sql
M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
M htdocs/install/mysql/tables/llx_c_ecotaxe.sql
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/16ea07861565...cbe682582edf
**NOTE:** This service been marked for deprecation:
https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.