[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: |
Sat, 23 Jan 2016 02:52:36 -0800 |
Branch: refs/heads/develop
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: 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: 9ce6e2938cedc967026b68b5ce2cfb1cd291257e
https://github.com/Dolibarr/dolibarr/commit/9ce6e2938cedc967026b68b5ce2cfb1cd291257e
Author: arnaud <address@hidden>
Date: 2016-01-19 (Tue, 19 Jan 2016)
Changed paths:
M htdocs/bookmarks/card.php
Log Message:
-----------
FIX bookmark's user change after update if the user hasn't superadmin right
Commit: 48d674578be10041391f5b0adec19ca97ced3beb
https://github.com/Dolibarr/dolibarr/commit/48d674578be10041391f5b0adec19ca97ced3beb
Author: Alexis Algoud <address@hidden>
Date: 2016-01-19 (Tue, 19 Jan 2016)
Changed paths:
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
Log Message:
-----------
FIX line is refetch (and seems useless) unless it was modified by the hook
previous calling
Commit: 192c58f10dd6157101c0b5c327b20d5b32e596b8
https://github.com/Dolibarr/dolibarr/commit/192c58f10dd6157101c0b5c327b20d5b32e596b8
Author: aspangaro <address@hidden>
Date: 2016-01-21 (Thu, 21 Jan 2016)
Changed paths:
M htdocs/comm/index.php
Log Message:
-----------
Fix: Commercial index presentation - missing $var=!$var when we have no data
Commit: 8a36bda3d23d344cf1c6e2ac4b7d840b87629aae
https://github.com/Dolibarr/dolibarr/commit/8a36bda3d23d344cf1c6e2ac4b7d840b87629aae
Author: aspangaro <address@hidden>
Date: 2016-01-21 (Thu, 21 Jan 2016)
Changed paths:
M htdocs/projet/list.php
M htdocs/projet/tasks/list.php
Log Message:
-----------
Merge remote-tracking branch 'Upstream/3.9' into 3.9-p8
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: a4063346437c26c0a093d7327a8df0d82d135b6c
https://github.com/Dolibarr/dolibarr/commit/a4063346437c26c0a093d7327a8df0d82d135b6c
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
Log Message:
-----------
Merge pull request #4458 from
atm-alexis/FIX_bad_pdf_refetch_erase_hook_modification
FIX line refetch incompatible with hook practice
Commit: f2f4c60dbd5fa729612cb429d56c888491c2f2ac
https://github.com/Dolibarr/dolibarr/commit/f2f4c60dbd5fa729612cb429d56c888491c2f2ac
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/comm/index.php
Log Message:
-----------
Merge pull request #4469 from aspangaro/3.9-p8
Fix: Commercial index presentation - missing $var=!$var when we have no data
Commit: 50b0019ead204107919fec379b2dbf45c7aedea2
https://github.com/Dolibarr/dolibarr/commit/50b0019ead204107919fec379b2dbf45c7aedea2
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
A protection to avoid situation loosing all admin accounts
Commit: fedf1f3288addbc32ad6b0de1492058ceaea9ee5
https://github.com/Dolibarr/dolibarr/commit/fedf1f3288addbc32ad6b0de1492058ceaea9ee5
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Fix view of product image when using old path
Fix size of image uploaded on user.
Commit: 49a325e7aecb2ba33bac0c7cf5fa74dcefd3ba31
https://github.com/Dolibarr/dolibarr/commit/49a325e7aecb2ba33bac0c7cf5fa74dcefd3ba31
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Fix: We must ue the "small" size of imge to show on card pages.
Commit: dadc24462a417038e9a7d22aaa640fca524fdfb0
https://github.com/Dolibarr/dolibarr/commit/dadc24462a417038e9a7d22aaa640fca524fdfb0
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Fix: We must ue the "small" size of imge to show on card pages.
Commit: 540bb04cac9196921ac383b0c3d886d49dc4e8c5
https://github.com/Dolibarr/dolibarr/commit/540bb04cac9196921ac383b0c3d886d49dc4e8c5
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M dev/initdata/img/mybigcompany.png
Log Message:
-----------
Update demo init data
Commit: fac38db2bfe0ff1a6d608056430fba3ebd6267fb
https://github.com/Dolibarr/dolibarr/commit/fac38db2bfe0ff1a6d608056430fba3ebd6267fb
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/bookmarks/card.php
Log Message:
-----------
Merge pull request #4457 from atm-arnaud/3.8_fix_bookmarks_user_update
FIX bookmark's user change after update if the user isn't superadmin
Commit: 4c3f9db2a1c47e38da374765e5162cb88d17155d
https://github.com/Dolibarr/dolibarr/commit/4c3f9db2a1c47e38da374765e5162cb88d17155d
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
A dev/initdata/img/comapnycorp1company.png
A dev/initdata/img/compxp4523product.jpg
A dev/initdata/img/ldestailleur_200x200.jpg
Log Message:
-----------
Add demo data
Commit: b09d3663d622f62de9cc56c2b8a3adb575e13940
https://github.com/Dolibarr/dolibarr/commit/b09d3663d622f62de9cc56c2b8a3adb575e13940
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/bookmarks/card.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 1012fb8be1792e21116697ba237371e42190921b
https://github.com/Dolibarr/dolibarr/commit/1012fb8be1792e21116697ba237371e42190921b
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
A dev/initdata/img/companycorp2company.png
A dev/initdata/img/magicfoodstorecompany.png
A dev/initdata/img/valeencompany.png
Log Message:
-----------
Update demo data
Commit: 2b96c8f2059af0e09823e390de53aa56162f7ed8
https://github.com/Dolibarr/dolibarr/commit/2b96c8f2059af0e09823e390de53aa56162f7ed8
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-23 (Sat, 23 Jan 2016)
Changed paths:
M htdocs/holiday/card.php
Log Message:
-----------
FIX Noway to validate a leave request for some uer even if they have
permission for.
Commit: 627f606c4db7519759127fdfe2596677cea3f801
https://github.com/Dolibarr/dolibarr/commit/627f606c4db7519759127fdfe2596677cea3f801
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-23 (Sat, 23 Jan 2016)
Changed paths:
M htdocs/holiday/list.php
Log Message:
-----------
Fix list of leave request was not showing label correctly.
Commit: 3903ced5b4bed1e3be274e61266d2da248a4c217
https://github.com/Dolibarr/dolibarr/commit/3903ced5b4bed1e3be274e61266d2da248a4c217
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-23 (Sat, 23 Jan 2016)
Changed paths:
M htdocs/expensereport/list.php
M htdocs/holiday/list.php
Log Message:
-----------
Fix: link to add at wrong place
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: dc438792f4380145b56641c7a5a31169936873a9
https://github.com/Dolibarr/dolibarr/commit/dc438792f4380145b56641c7a5a31169936873a9
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/fourn/commande/card.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/fourn/commande/card.php
Commit: dbaa43f3be37d30eea93611f1631b05215ec801f
https://github.com/Dolibarr/dolibarr/commit/dbaa43f3be37d30eea93611f1631b05215ec801f
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-23 (Sat, 23 Jan 2016)
Changed paths:
A dev/initdata/img/comapnycorp1company.png
A dev/initdata/img/companycorp2company.png
A dev/initdata/img/compxp4523product.jpg
A dev/initdata/img/ldestailleur_200x200.jpg
A dev/initdata/img/magicfoodstorecompany.png
M dev/initdata/img/mybigcompany.png
A dev/initdata/img/valeencompany.png
M htdocs/bookmarks/card.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/fourn/commande/card.php
M htdocs/holiday/card.php
M htdocs/holiday/list.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
M htdocs/user/card.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/fourn/commande/card.php
htdocs/holiday/card.php
htdocs/holiday/list.php
htdocs/user/card.php
Commit: 4df584e57b28d1e219766ccdf203e629a6d7faf3
https://github.com/Dolibarr/dolibarr/commit/4df584e57b28d1e219766ccdf203e629a6d7faf3
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-23 (Sat, 23 Jan 2016)
Changed paths:
A dev/initdata/img/comapnycorp1company.png
A dev/initdata/img/companycorp2company.png
A dev/initdata/img/compxp4523product.jpg
A dev/initdata/img/ldestailleur_200x200.jpg
A dev/initdata/img/magicfoodstorecompany.png
M dev/initdata/img/mybigcompany.png
A dev/initdata/img/valeencompany.png
M htdocs/bookmarks/card.php
M htdocs/comm/index.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
M htdocs/expensereport/list.php
M htdocs/fourn/commande/card.php
M htdocs/holiday/card.php
M htdocs/holiday/list.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
M htdocs/user/card.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/core/lib/files.lib.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/9642bb44dc19...4df584e57b28