[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 30bfb0: Update categorie.php
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 30bfb0: Update categorie.php |
|
Date: |
Sun, 27 Sep 2015 12:29:36 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 30bfb0eee3c8c827f92662e0f5648c7753259711
https://github.com/Dolibarr/dolibarr/commit/30bfb0eee3c8c827f92662e0f5648c7753259711
Author: AlainRnet <address@hidden>
Date: 2015-09-22 (Tue, 22 Sep 2015)
Changed paths:
M htdocs/categories/categorie.php
Log Message:
-----------
Update categorie.php
voir https://github.com/Dolibarr/dolibarr/pull/3562
Commit: d5ab71ad0f429b3dea8704b6122c2ab32c576cd6
https://github.com/Dolibarr/dolibarr/commit/d5ab71ad0f429b3dea8704b6122c2ab32c576cd6
Author: Florian HENRY <address@hidden>
Date: 2015-09-22 (Tue, 22 Sep 2015)
Changed paths:
M htdocs/categories/edit.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/modBanque.class.php
M htdocs/langs/en_US/bills.lang
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: a70e73a963be33d0100b01bce011e44b17f5e7be
https://github.com/Dolibarr/dolibarr/commit/a70e73a963be33d0100b01bce011e44b17f5e7be
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-23 (Wed, 23 Sep 2015)
Changed paths:
M htdocs/comm/propal.php
Log Message:
-----------
FIX Missing validate button if permission are not valid.
Commit: 8309ed5c126b2ff230faabe9a0f9c980b4cf71b4
https://github.com/Dolibarr/dolibarr/commit/8309ed5c126b2ff230faabe9a0f9c980b4cf71b4
Author: fmarcet <address@hidden>
Date: 2015-09-23 (Wed, 23 Sep 2015)
Changed paths:
M htdocs/commande/list.php
Log Message:
-----------
FIX: When filter with empty status, by default get canceled status (-1)
Commit: 3ff8b3e4373a591f43a0ac0efdedbf2eeedb3ebf
https://github.com/Dolibarr/dolibarr/commit/3ff8b3e4373a591f43a0ac0efdedbf2eeedb3ebf
Author: fmarcet <address@hidden>
Date: 2015-09-23 (Wed, 23 Sep 2015)
Changed paths:
M htdocs/product/class/productcustomerprice.class.php
Log Message:
-----------
FIX: Error retrieving customer prices
Commit: 12a08ae4e1f241cd79c7b49947c7a18e376e5e28
https://github.com/Dolibarr/dolibarr/commit/12a08ae4e1f241cd79c7b49947c7a18e376e5e28
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-23 (Wed, 23 Sep 2015)
Changed paths:
M build/makepack-howto.txt
M htdocs/filefunc.inc.php
Log Message:
-----------
Prepare 3.8.1
Commit: 00447f8e72d12b8b27154b8b90b31432d60735ae
https://github.com/Dolibarr/dolibarr/commit/00447f8e72d12b8b27154b8b90b31432d60735ae
Author: Florian HENRY <address@hidden>
Date: 2015-09-23 (Wed, 23 Sep 2015)
Changed paths:
M build/debian/apache/dolibarr.conf
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
M htdocs/.gitignore
M htdocs/categories/categorie.php
M htdocs/comm/card.php
M htdocs/comm/propal.php
M htdocs/core/lib/files.lib.php
M htdocs/ecm/tpl/enablefiletreeajax.tpl.php
M htdocs/filefunc.inc.php
M htdocs/fourn/facture/paiement.php
M htdocs/theme/.gitignore
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 84fa92045c549bc8070f31439572567f571d024b
https://github.com/Dolibarr/dolibarr/commit/84fa92045c549bc8070f31439572567f571d024b
Author: Florian HENRY <address@hidden>
Date: 2015-09-23 (Wed, 23 Sep 2015)
Changed paths:
M htdocs/product/class/productcustomerprice.class.php
Log Message:
-----------
FIX : avoid SQL error when no sortfield send to method
Commit: 206d6d0f7ef027820cb0c1335dbf29b22706ee23
https://github.com/Dolibarr/dolibarr/commit/206d6d0f7ef027820cb0c1335dbf29b22706ee23
Author: Florian HENRY <address@hidden>
Date: 2015-09-23 (Wed, 23 Sep 2015)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
FIX : avoid SQL error in getValueFrom common object when all params are
not send
Commit: d633118bd48eaa60b308cc8bce1f80457940d7a7
https://github.com/Dolibarr/dolibarr/commit/d633118bd48eaa60b308cc8bce1f80457940d7a7
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-23 (Wed, 23 Sep 2015)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/product/class/productcustomerprice.class.php
Log Message:
-----------
Merge pull request #3574 from FHenry/3.8
FIX : avoid SQL error when no sortfield send to method (price by customer)
Commit: f3a28682eaeda0a7de9b0a3475b4b44e632d7330
https://github.com/Dolibarr/dolibarr/commit/f3a28682eaeda0a7de9b0a3475b4b44e632d7330
Author: tysauron <address@hidden>
Date: 2015-09-23 (Wed, 23 Sep 2015)
Changed paths:
M htdocs/core/lib/xcal.lib.php
Log Message:
-----------
For not error Undefined property: stdClass::$MAIN_AGENDA_EXPORT_CACHE
Commit: f8f1f4fd2b3710217cef96bbc94751cfff56fc6e
https://github.com/Dolibarr/dolibarr/commit/f8f1f4fd2b3710217cef96bbc94751cfff56fc6e
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-23 (Wed, 23 Sep 2015)
Changed paths:
M htdocs/categories/categorie.php
Log Message:
-----------
Merge branch 'patch-2' of https://github.com/AlainRnet/dolibarr into
AlainRnet-patch-2
Conflicts:
htdocs/categories/categorie.php
Commit: 7cfef16c24863ae610a1b781f306835604bebfc2
https://github.com/Dolibarr/dolibarr/commit/7cfef16c24863ae610a1b781f306835604bebfc2
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-23 (Wed, 23 Sep 2015)
Changed paths:
M htdocs/categories/categorie.php
Log Message:
-----------
git push origin 3.8Merge branch 'AlainRnet-patch-2' into 3.8
Commit: 9e185eec75599db024636c8665fac780c8b6ed00
https://github.com/Dolibarr/dolibarr/commit/9e185eec75599db024636c8665fac780c8b6ed00
Author: philippe <address@hidden>
Date: 2015-09-24 (Thu, 24 Sep 2015)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
FIX: order ref must not be translated
Commit: 3ee5920947fa21aeed86035981dbfabbc5d71b0e
https://github.com/Dolibarr/dolibarr/commit/3ee5920947fa21aeed86035981dbfabbc5d71b0e
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-24 (Thu, 24 Sep 2015)
Changed paths:
M htdocs/commande/list.php
M htdocs/product/class/productcustomerprice.class.php
Log Message:
-----------
Merge pull request #3571 from fmarcet/3.8
FIX: When filter with empty status, by default get canceled status (-1)
Commit: b5b90d1639ec089dfea94d253b5a8df58ede67fe
https://github.com/Dolibarr/dolibarr/commit/b5b90d1639ec089dfea94d253b5a8df58ede67fe
Author: fmarcet <address@hidden>
Date: 2015-09-25 (Fri, 25 Sep 2015)
Changed paths:
M htdocs/admin/company.php
M htdocs/societe/soc.php
Log Message:
-----------
FIX #3599 Not saving legal form
Commit: c0433928c69166a8bfd97726f6e5941eaf75f821
https://github.com/Dolibarr/dolibarr/commit/c0433928c69166a8bfd97726f6e5941eaf75f821
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-25 (Fri, 25 Sep 2015)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX sortder field was missing so manually added values were moved to
begin.
Commit: dcf3c0002366758aada1feae8d292e4e51da8506
https://github.com/Dolibarr/dolibarr/commit/dcf3c0002366758aada1feae8d292e4e51da8506
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-25 (Fri, 25 Sep 2015)
Changed paths:
M htdocs/commande/list.php
M htdocs/product/class/productcustomerprice.class.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 9d0cd148a890a85956412e88fcfb62a2baf79dd5
https://github.com/Dolibarr/dolibarr/commit/9d0cd148a890a85956412e88fcfb62a2baf79dd5
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-25 (Fri, 25 Sep 2015)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
Fix duplicate log
Commit: df0e64eb7c7c81cbcd14d5b3f64e658d56f07dc7
https://github.com/Dolibarr/dolibarr/commit/df0e64eb7c7c81cbcd14d5b3f64e658d56f07dc7
Author: aspangaro <address@hidden>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/md_exp/style.css.php
Log Message:
-----------
Fix centering on login page
Commit: b8bf21b905750b87c7bdab27424752c75d5180b4
https://github.com/Dolibarr/dolibarr/commit/b8bf21b905750b87c7bdab27424752c75d5180b4
Author: Juanjo Menent <address@hidden>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Merge pull request #3582 from grandoc/3.8
FIX: order ref must not be translated
Commit: 8dcd6158e324eb8cc7579f6aee7832ab2d33cf58
https://github.com/Dolibarr/dolibarr/commit/8dcd6158e324eb8cc7579f6aee7832ab2d33cf58
Author: BENKE Charlie <address@hidden>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
3.8 bad filtering caused by statut filter #3580
correction ported on 3.8 too, sorry for the bad step process
Commit: 7424b521ed6282959e0a4bf3d56fd346ba4648a1
https://github.com/Dolibarr/dolibarr/commit/7424b521ed6282959e0a4bf3d56fd346ba4648a1
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/md_exp/style.css.php
Log Message:
-----------
Merge pull request #3609 from aspangaro/3.8-20
Fix centering on login page
Commit: f3ba115ef06ccba863ea6d832a1b7c0c355584b7
https://github.com/Dolibarr/dolibarr/commit/f3ba115ef06ccba863ea6d832a1b7c0c355584b7
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M htdocs/core/modules/modProjet.class.php
Log Message:
-----------
Fix missing default value
Commit: 5f765419ea10d61c69e9fb64ea296633ac10bbc0
https://github.com/Dolibarr/dolibarr/commit/5f765419ea10d61c69e9fb64ea296633ac10bbc0
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M htdocs/projet/card.php
Log Message:
-----------
Fix because project module introduced opportunity, user may create
project (opportunity) even when thirdparty does not exists yet, so we
must provide a solution for this.
Commit: 9644e242aeeffc73f3aa727d75058b3e23395fd8
https://github.com/Dolibarr/dolibarr/commit/9644e242aeeffc73f3aa727d75058b3e23395fd8
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/md_exp/style.css.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 4e77a651d4ec58a4373141cd52a05a36bd5f7509
https://github.com/Dolibarr/dolibarr/commit/4e77a651d4ec58a4373141cd52a05a36bd5f7509
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M htdocs/admin/company.php
M htdocs/societe/soc.php
Log Message:
-----------
Merge pull request #3600 from fmarcet/3.8
FIX #3599 Not saving legal form
Commit: b99ef6b27c3a01a3df32af9399f2bb4db8cfbc8f
https://github.com/Dolibarr/dolibarr/commit/b99ef6b27c3a01a3df32af9399f2bb4db8cfbc8f
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M htdocs/admin/company.php
M htdocs/societe/soc.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 5a2dc88d4232ab29d8ff0efa6c4f5fda7ec21de7
https://github.com/Dolibarr/dolibarr/commit/5a2dc88d4232ab29d8ff0efa6c4f5fda7ec21de7
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
Merge pull request #3610 from defrance/patch-80
3.8 bad filtering caused by statut filter #3580
Commit: a3647bea4eaf2c67ae22c291edde71e4318fc02a
https://github.com/Dolibarr/dolibarr/commit/a3647bea4eaf2c67ae22c291edde71e4318fc02a
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M htdocs/compta/tva/clients.php
M htdocs/core/lib/tax.lib.php
Log Message:
-----------
Fix bad information in report
Commit: fef8203e65f6011abc744a23ca60b4a83c016fee
https://github.com/Dolibarr/dolibarr/commit/fef8203e65f6011abc744a23ca60b4a83c016fee
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: c707c899c1db7bd0109f2a6ac3eb5db8bd259448
https://github.com/Dolibarr/dolibarr/commit/c707c899c1db7bd0109f2a6ac3eb5db8bd259448
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M htdocs/core/lib/company.lib.php
Log Message:
-----------
Fix remove warning
Commit: dd88a799fb0c18d966571fc3f5fae8ee2b7e4bd8
https://github.com/Dolibarr/dolibarr/commit/dd88a799fb0c18d966571fc3f5fae8ee2b7e4bd8
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M htdocs/comm/action/index.php
Log Message:
-----------
FIX Event from ical stream should not be movable into calendar view
Commit: 9ecc8e5e6bcef48691fd82ec7a63331f9f88e58c
https://github.com/Dolibarr/dolibarr/commit/9ecc8e5e6bcef48691fd82ec7a63331f9f88e58c
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-26 (Sat, 26 Sep 2015)
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
Log Message:
-----------
FIX Regression on bad use of fk_account showing the bad bank account on
PDF.
Commit: d119e0496350a8c096736c73fc6e5b76ee19a4c3
https://github.com/Dolibarr/dolibarr/commit/d119e0496350a8c096736c73fc6e5b76ee19a4c3
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M htdocs/admin/company.php
M htdocs/compta/facture/list.php
M htdocs/compta/tva/clients.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/tax.lib.php
M htdocs/core/modules/modProjet.class.php
M htdocs/projet/card.php
M htdocs/societe/soc.php
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/md_exp/style.css.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 6aa13d418902031f181921d785c4e9c504357172
https://github.com/Dolibarr/dolibarr/commit/6aa13d418902031f181921d785c4e9c504357172
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix the $colorbackvmenu2 was removed with 3.8
Commit: 3f506552e36faf97ba8234fccc6cc4c4ccd3807b
https://github.com/Dolibarr/dolibarr/commit/3f506552e36faf97ba8234fccc6cc4c4ccd3807b
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-27 (Sun, 27 Sep 2015)
Changed paths:
M build/makepack-howto.txt
M htdocs/admin/company.php
M htdocs/admin/dict.php
M htdocs/categories/categorie.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/action/index.php
M htdocs/comm/propal.php
M htdocs/commande/list.php
M htdocs/compta/tva/clients.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/tax.lib.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/modProjet.class.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/product/class/productcustomerprice.class.php
M htdocs/projet/card.php
M htdocs/societe/soc.php
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md_exp/style.css.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/filefunc.inc.php
htdocs/theme/md_exp/style.css.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/3381d8efdd75...3f506552e36f