[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] c71d57: Fix: for avoid division by 0
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] c71d57: Fix: for avoid division by 0 |
|
Date: |
Fri, 05 Feb 2016 03:14:50 -0800 |
Branch: refs/heads/3.7_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: c71d578931ed9126937fdcb3dda0e8e5a332f0c8
https://github.com/Dolibarr/dolibarr/commit/c71d578931ed9126937fdcb3dda0e8e5a332f0c8
Author: Regis Houssin <address@hidden>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
Fix: for avoid division by 0
Commit: c65babf3b5a7a525f4f7b5617b072f692ad24564
https://github.com/Dolibarr/dolibarr/commit/c65babf3b5a7a525f4f7b5617b072f692ad24564
Author: Regis Houssin <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M .travis.yml
A build/travis-ci/apache.conf
M composer.json
M htdocs/accountancy/admin/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.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/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/filefunc.inc.php
M htdocs/product/ajax/products.php
M htdocs/product/class/product.class.php
M test/phpunit/AllTests.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.7_bug
Commit: a2c820854106c2cb4e644b64ef393e0566a56a9b
https://github.com/Dolibarr/dolibarr/commit/a2c820854106c2cb4e644b64ef393e0566a56a9b
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Prepare 3.6.5
Commit: f13df0f952c286fbf3c9a5164930c9397acde26d
https://github.com/Dolibarr/dolibarr/commit/f13df0f952c286fbf3c9a5164930c9397acde26d
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Prepare 3.7.3
Commit: f8e156ea3077eddbd9bfce237c947e5b7217b6c1
https://github.com/Dolibarr/dolibarr/commit/f8e156ea3077eddbd9bfce237c947e5b7217b6c1
Author: fmarcet <address@hidden>
Date: 2015-12-29 (Tue, 29 Dec 2015)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Commit: cebb996120064713c6a8975e0282883b7bfbacb7
https://github.com/Dolibarr/dolibarr/commit/cebb996120064713c6a8975e0282883b7bfbacb7
Author: fmarcet <address@hidden>
Date: 2015-12-29 (Tue, 29 Dec 2015)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Commit: c004342976ae1cf5fe9d3c994b6a7637ae603d81
https://github.com/Dolibarr/dolibarr/commit/c004342976ae1cf5fe9d3c994b6a7637ae603d81
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-31 (Thu, 31 Dec 2015)
Changed paths:
M htdocs/core/lib/company.lib.php
Log Message:
-----------
FIX #3694
Commit: a234482d085dfde843851941a7c8d27fa57d34e6
https://github.com/Dolibarr/dolibarr/commit/a234482d085dfde843851941a7c8d27fa57d34e6
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-31 (Thu, 31 Dec 2015)
Changed paths:
M htdocs/core/lib/company.lib.php
Log Message:
-----------
FIX #3694
Commit: 35ce670bf260f63ab8b3df391d7857f8144cb026
https://github.com/Dolibarr/dolibarr/commit/35ce670bf260f63ab8b3df391d7857f8144cb026
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-02 (Sat, 02 Jan 2016)
Changed paths:
M htdocs/install/upgrade.php
Log Message:
-----------
Fix to allow phpunit of migration process for 3.4 to 3.5
Commit: b46aec8e7e9eca19cb1739f94fe99267298b4a26
https://github.com/Dolibarr/dolibarr/commit/b46aec8e7e9eca19cb1739f94fe99267298b4a26
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-02 (Sat, 02 Jan 2016)
Changed paths:
M htdocs/install/upgrade.php
Log Message:
-----------
Fix to allow phpunit of migration process for 3.5 to 3.6
Commit: 0cad938e095358a08848e033accc6aab133daf01
https://github.com/Dolibarr/dolibarr/commit/0cad938e095358a08848e033accc6aab133daf01
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-02 (Sat, 02 Jan 2016)
Changed paths:
M htdocs/install/upgrade.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/install/upgrade.php
Commit: e4640ca4c361a06ab63dba0e681e027d459b3921
https://github.com/Dolibarr/dolibarr/commit/e4640ca4c361a06ab63dba0e681e027d459b3921
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-02 (Sat, 02 Jan 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/install/upgrade.php
Commit: cafe148f7278be9e7ca0abec6ab6cf1e65ea0d36
https://github.com/Dolibarr/dolibarr/commit/cafe148f7278be9e7ca0abec6ab6cf1e65ea0d36
Author: fmarcet <address@hidden>
Date: 2016-01-04 (Mon, 04 Jan 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Commit: d8360a2a0169886c3c9be771202be480db12b534
https://github.com/Dolibarr/dolibarr/commit/d8360a2a0169886c3c9be771202be480db12b534
Author: fmarcet <address@hidden>
Date: 2016-01-07 (Thu, 07 Jan 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Commit: f2178f0369981dce326e4d67e44ae7493539d550
https://github.com/Dolibarr/dolibarr/commit/f2178f0369981dce326e4d67e44ae7493539d550
Author: Raphaël Doursenaud <address@hidden>
Date: 2016-01-08 (Fri, 08 Jan 2016)
Changed paths:
M htdocs/admin/agenda_extsites.php
Log Message:
-----------
FIX #4291 Correctly filter external calendar GETPOSTs
Commit: 36dc8b1ce79c972c867b804778c5b780caea8a56
https://github.com/Dolibarr/dolibarr/commit/36dc8b1ce79c972c867b804778c5b780caea8a56
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-08 (Fri, 08 Jan 2016)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
FIX #4341
Commit: c2b8be9aaf654193dc8afc9a296c744354552841
https://github.com/Dolibarr/dolibarr/commit/c2b8be9aaf654193dc8afc9a296c744354552841
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-08 (Fri, 08 Jan 2016)
Changed paths:
M htdocs/admin/agenda_extsites.php
Log Message:
-----------
Merge pull request #4355 from GPCsolutions/3.6-4291
FIX #4291 Correctly filter external calendar GETPOSTs
Commit: a26a6c2449f89e8e2a426864c9a2c77dd95873c9
https://github.com/Dolibarr/dolibarr/commit/a26a6c2449f89e8e2a426864c9a2c77dd95873c9
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-08 (Fri, 08 Jan 2016)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Fix sql injection even when code is on several lines
Commit: 5414cb6f12ce4bf1d804d22b4ac5fe72e6eaf25f
https://github.com/Dolibarr/dolibarr/commit/5414cb6f12ce4bf1d804d22b4ac5fe72e6eaf25f
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-08 (Fri, 08 Jan 2016)
Changed paths:
M htdocs/admin/agenda_extsites.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: e008922919b5ddff2a718e113566536177ffddc1
https://github.com/Dolibarr/dolibarr/commit/e008922919b5ddff2a718e113566536177ffddc1
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-08 (Fri, 08 Jan 2016)
Changed paths:
M htdocs/admin/agenda_extsites.php
M htdocs/main.inc.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/admin/agenda_extsites.php
Commit: 40f0d0c9f2bfdab905adb5ee1a805a3945d37c22
https://github.com/Dolibarr/dolibarr/commit/40f0d0c9f2bfdab905adb5ee1a805a3945d37c22
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
Merge pull request #4321 from fmarcet/3.7
FIX: Email templates not compatible with Multicompany
Commit: 801e2bca4b4b844c419889b03b7eba0e1d34d3bf
https://github.com/Dolibarr/dolibarr/commit/801e2bca4b4b844c419889b03b7eba0e1d34d3bf
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
Fix #4239
Commit: 861376e4613b9cf8d7e69203536314457330c1da
https://github.com/Dolibarr/dolibarr/commit/861376e4613b9cf8d7e69203536314457330c1da
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M ChangeLog
M htdocs/admin/agenda_extsites.php
M htdocs/admin/dict.php
M htdocs/main.inc.php
Log Message:
-----------
Merge branch '3.7' of github.com:Dolibarr/dolibarr into 3.7
Commit: 79992b494793747a54a0cba8d26c5fc1f1599f55
https://github.com/Dolibarr/dolibarr/commit/79992b494793747a54a0cba8d26c5fc1f1599f55
Author: fmarcet <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/societe/index.php
Log Message:
-----------
FIX: The third dashboard don't consider user permissions
Commit: 947f718329b436a5190886984f1370fa9f47d25d
https://github.com/Dolibarr/dolibarr/commit/947f718329b436a5190886984f1370fa9f47d25d
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/societe/index.php
Log Message:
-----------
Merge pull request #4408 from fmarcet/3.7
FIX: The third dashboard don't consider user permissions
Commit: 905f9d78edbfe2089ed48dbbc17769ae06f6bb79
https://github.com/Dolibarr/dolibarr/commit/905f9d78edbfe2089ed48dbbc17769ae06f6bb79
Author: Regis Houssin <address@hidden>
Date: 2016-01-15 (Fri, 15 Jan 2016)
Changed paths:
M htdocs/fourn/commande/card.php
Log Message:
-----------
Fix: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9)
Commit: 6aeb18ed7532aa534a3fc261145fd29f928238e6
https://github.com/Dolibarr/dolibarr/commit/6aeb18ed7532aa534a3fc261145fd29f928238e6
Author: Regis Houssin <address@hidden>
Date: 2016-01-15 (Fri, 15 Jan 2016)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
Revert "Fix: for avoid division by 0"
This reverts commit c71d578931ed9126937fdcb3dda0e8e5a332f0c8.
Commit: 6e30d5e516095138e1b358ae39bf8f318e86d9b9
https://github.com/Dolibarr/dolibarr/commit/6e30d5e516095138e1b358ae39bf8f318e86d9b9
Author: Regis Houssin <address@hidden>
Date: 2016-01-15 (Fri, 15 Jan 2016)
Changed paths:
M ChangeLog
M build/debian/changelog
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
M htdocs/filefunc.inc.php
M htdocs/fourn/product/list.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.7_bug
Commit: da637db162be2131c03366513796579e97280183
https://github.com/Dolibarr/dolibarr/commit/da637db162be2131c03366513796579e97280183
Author: Marcos García de La Fuente <address@hidden>
Date: 2016-01-18 (Mon, 18 Jan 2016)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
Log Message:
-----------
FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays
Commit: 535d3bc0879c9726788dc1181021ed19b4230eec
https://github.com/Dolibarr/dolibarr/commit/535d3bc0879c9726788dc1181021ed19b4230eec
Author: Regis Houssin <address@hidden>
Date: 2016-01-18 (Mon, 18 Jan 2016)
Changed paths:
M htdocs/admin/agenda_extsites.php
M htdocs/admin/dict.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/main.inc.php
M htdocs/societe/index.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.7_bug
Commit: 9d63cb0156fb74bf5c54586a5b87a079bc3e2a97
https://github.com/Dolibarr/dolibarr/commit/9d63cb0156fb74bf5c54586a5b87a079bc3e2a97
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/fourn/commande/card.php
Log Message:
-----------
Merge pull request #4452 from hregis/3.7_bug
Fix: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9)
Commit: 9fd56df03fd6485a40a0c1e5665b429e80455190
https://github.com/Dolibarr/dolibarr/commit/9fd56df03fd6485a40a0c1e5665b429e80455190
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
Log Message:
-----------
Merge pull request #4444 from marcosgdf/bug-4440-2
FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays
Commit: 9be246baa5edb11fe67e22861502544adab879f5
https://github.com/Dolibarr/dolibarr/commit/9be246baa5edb11fe67e22861502544adab879f5
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-23 (Sat, 23 Jan 2016)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Commit: 83263e242e72effdcd4038e59971f3780895ed0c
https://github.com/Dolibarr/dolibarr/commit/83263e242e72effdcd4038e59971f3780895ed0c
Author: Marcos García de La Fuente <address@hidden>
Date: 2016-01-23 (Sat, 23 Jan 2016)
Changed paths:
M htdocs/product/class/product.class.php
M htdocs/product/price.php
Log Message:
-----------
Corrected typo of PR #4444
Commit: 0814fa76f870b3afaa1559ca648769453e5fbb03
https://github.com/Dolibarr/dolibarr/commit/0814fa76f870b3afaa1559ca648769453e5fbb03
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-25 (Mon, 25 Jan 2016)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
FIX CVE CVE-2015-8685
Commit: ed16699de65f7c4799aa2c5cae1d035d92f3adc9
https://github.com/Dolibarr/dolibarr/commit/ed16699de65f7c4799aa2c5cae1d035d92f3adc9
Author: Raphaël Doursenaud <address@hidden>
Date: 2016-01-25 (Mon, 25 Jan 2016)
Changed paths:
M htdocs/admin/agenda_extsites.php
Log Message:
-----------
FIX #4291 Correctly filter external calendar GETPOSTs
Commit: c1b6630c16af823b94e4a95de425b98bef58412f
https://github.com/Dolibarr/dolibarr/commit/c1b6630c16af823b94e4a95de425b98bef58412f
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-25 (Mon, 25 Jan 2016)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/main.inc.php
Commit: feb114625dabb7f80cea24297b951ca97e12ea92
https://github.com/Dolibarr/dolibarr/commit/feb114625dabb7f80cea24297b951ca97e12ea92
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-25 (Mon, 25 Jan 2016)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Commit: c2efee8a2923be093f159dbb87f4a3aed693cab2
https://github.com/Dolibarr/dolibarr/commit/c2efee8a2923be093f159dbb87f4a3aed693cab2
Author: fmarcet <address@hidden>
Date: 2016-01-26 (Tue, 26 Jan 2016)
Changed paths:
M htdocs/contrat/card.php
Log Message:
-----------
FIX: Contrat card don't consider user permissions to show active/unactive
service button
Commit: 2e7d88dffb3042d58e42170426435edd42f56088
https://github.com/Dolibarr/dolibarr/commit/2e7d88dffb3042d58e42170426435edd42f56088
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-30 (Sat, 30 Jan 2016)
Changed paths:
M htdocs/contrat/card.php
Log Message:
-----------
Merge pull request #4499 from fmarcet/3.7
FIX: Contrat card don't consider user permissions to show active/unactive
service button
Commit: b27e31b3ae73d312781fd0390fb6853e7e80202f
https://github.com/Dolibarr/dolibarr/commit/b27e31b3ae73d312781fd0390fb6853e7e80202f
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-30 (Sat, 30 Jan 2016)
Changed paths:
M htdocs/product/class/product.class.php
M htdocs/product/price.php
Log Message:
-----------
Merge pull request #4483 from marcosgdf/bug-4440-3
Corrected typo of PR #4444
Commit: c9661ee20e1c931a000c6dbe4d9806f76343fd57
https://github.com/Dolibarr/dolibarr/commit/c9661ee20e1c931a000c6dbe4d9806f76343fd57
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-30 (Sat, 30 Jan 2016)
Changed paths:
M htdocs/product/class/product.class.php
M htdocs/product/price.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Commit: d9e089256e3f4af66baefdff07e372d2c3b9c352
https://github.com/Dolibarr/dolibarr/commit/d9e089256e3f4af66baefdff07e372d2c3b9c352
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-31 (Sun, 31 Jan 2016)
Changed paths:
M build/debian/copyright
Log Message:
-----------
Fix path to copyrighted files
Commit: 1b23ede8576a2a9c92195e18636f664d59808842
https://github.com/Dolibarr/dolibarr/commit/1b23ede8576a2a9c92195e18636f664d59808842
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-31 (Sun, 31 Jan 2016)
Changed paths:
M build/debian/copyright
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Commit: 0076512d5bfd25dc9283ce7e7abc930bda464a10
https://github.com/Dolibarr/dolibarr/commit/0076512d5bfd25dc9283ce7e7abc930bda464a10
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-31 (Sun, 31 Jan 2016)
Changed paths:
M build/debian/copyright
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Commit: a5898d9414943243cc6f8ae3b59af9fbb4b187cb
https://github.com/Dolibarr/dolibarr/commit/a5898d9414943243cc6f8ae3b59af9fbb4b187cb
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-05 (Fri, 05 Feb 2016)
Changed paths:
M ChangeLog
M build/debian/copyright
M htdocs/admin/agenda_extsites.php
M htdocs/admin/dict.php
M htdocs/contrat/card.php
M htdocs/core/class/html.form.class.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/fourn/commande/card.php
M htdocs/main.inc.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
M htdocs/societe/index.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.7_backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/d9ac5e9cc3d3...a5898d941494
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] c71d57: Fix: for avoid division by 0,
Laurent Destailleur <=