[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 1a9e98: Fix categories bug
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 1a9e98: Fix categories bug |
Date: |
Thu, 11 Sep 2014 08:45:19 -0700 |
Branch: refs/heads/3.6_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: 1a9e98cda9563b42f1f7e7d1faf215d165ff34bb
https://github.com/Dolibarr/dolibarr/commit/1a9e98cda9563b42f1f7e7d1faf215d165ff34bb
Author: Raphaël Doursenaud <address@hidden>
Date: 2014-08-14 (Thu, 14 Aug 2014)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
Fix categories bug
When using the string type,
$typeid == 1 matched all strings making other conditions ineffective.
Commit: 8670a89ecb8f6742420486dc20125e680d62c740
https://github.com/Dolibarr/dolibarr/commit/8670a89ecb8f6742420486dc20125e680d62c740
Author: Cedric <address@hidden>
Date: 2014-08-14 (Thu, 14 Aug 2014)
Changed paths:
M ChangeLog
M htdocs/compta/facture.php
Log Message:
-----------
Fix #1544: Can remove date from invoice
Commit: 739d309a0d3e38becd20c28bf07e41078fcf49c7
https://github.com/Dolibarr/dolibarr/commit/739d309a0d3e38becd20c28bf07e41078fcf49c7
Author: Raphaël Doursenaud <address@hidden>
Date: 2014-08-14 (Thu, 14 Aug 2014)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
Updated category fix
Categories ID can be passed as strings
PSR code formatting
Commit: c6637207f88ad57bf3a6586d5899ad560ff18723
https://github.com/Dolibarr/dolibarr/commit/c6637207f88ad57bf3a6586d5899ad560ff18723
Author: Maxime Kohlhaas <address@hidden>
Date: 2014-08-14 (Thu, 14 Aug 2014)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Fix : VAT and NPR rates where coming from multiprice...
Commit: e760201a595f49419836936b76c7c2add421bb3b
https://github.com/Dolibarr/dolibarr/commit/e760201a595f49419836936b76c7c2add421bb3b
Author: Maxime Kohlhaas <address@hidden>
Date: 2014-08-14 (Thu, 14 Aug 2014)
Changed paths:
M ChangeLog
M htdocs/adherents/fiche.php
M htdocs/admin/tools/update.php
M htdocs/compta/facture.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/lib/pdf.lib.php
M htdocs/main.inc.php
M htdocs/product/class/product.class.php
M htdocs/projet/class/project.class.php
M htdocs/projet/class/task.class.php
M htdocs/projet/element.php
M htdocs/societe/soc.php
M htdocs/theme/eldy/graph-color.php
M htdocs/theme/eldy/style.css.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5
Commit: e7a8de18bf17c269830abc92fd4cf3d6888f763c
https://github.com/Dolibarr/dolibarr/commit/e7a8de18bf17c269830abc92fd4cf3d6888f763c
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-17 (Sun, 17 Aug 2014)
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/eldy/style.css.php
Log Message:
-----------
Fix: Minimum size for captcha
Commit: 86f1d59e3cfa7d82f7ed3461bb3debd95473321d
https://github.com/Dolibarr/dolibarr/commit/86f1d59e3cfa7d82f7ed3461bb3debd95473321d
Author: Regis Houssin <address@hidden>
Date: 2014-08-17 (Sun, 17 Aug 2014)
Changed paths:
M htdocs/core/js/lib_head.js
M htdocs/core/lib/ajax.lib.php
Log Message:
-----------
Fix: broken feature: add param for use only "disabled" with delConstant
and "enabled" with setConstant
Commit: 741c093ac94504b7e409853fd88d75c816254c63
https://github.com/Dolibarr/dolibarr/commit/741c093ac94504b7e409853fd88d75c816254c63
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-17 (Sun, 17 Aug 2014)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Merge pull request #1828 from atm-maxime/3.5
Fix : VAT and NPR rates where coming from multiprice...
Commit: 50eb2e2c152a936644997696d6849ce51407b8d8
https://github.com/Dolibarr/dolibarr/commit/50eb2e2c152a936644997696d6849ce51407b8d8
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-18 (Mon, 18 Aug 2014)
Changed paths:
M htdocs/product/fiche.php
Log Message:
-----------
Fix: backlink was wrong after deleting product or service.
Commit: 9fdfc740dee3129ef6ab0436321f81088e01f92e
https://github.com/Dolibarr/dolibarr/commit/9fdfc740dee3129ef6ab0436321f81088e01f92e
Author: Regis Houssin <address@hidden>
Date: 2014-08-18 (Mon, 18 Aug 2014)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Fix: define new ref before trigger
Commit: 2cba55758b32f6435338a45fea3de5bbbd3ce63d
https://github.com/Dolibarr/dolibarr/commit/2cba55758b32f6435338a45fea3de5bbbd3ce63d
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-21 (Thu, 21 Aug 2014)
Changed paths:
M ChangeLog
M htdocs/compta/facture.php
Log Message:
-----------
Merge branch 'fix_1544' of github.com:KreizIT/dolibarr into
KreizIT-fix_1544
Conflicts:
ChangeLog
Commit: 8705dd4d1b9dd9e0a8e389bd00c2dd9b7404e2cd
https://github.com/Dolibarr/dolibarr/commit/8705dd4d1b9dd9e0a8e389bd00c2dd9b7404e2cd
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-21 (Thu, 21 Aug 2014)
Changed paths:
M ChangeLog
M htdocs/compta/facture.php
Log Message:
-----------
Merge branch 'KreizIT-fix_1544' into 3.5
Commit: b0163fbed25b3b4bef00d3ab07b65fc96668afca
https://github.com/Dolibarr/dolibarr/commit/b0163fbed25b3b4bef00d3ab07b65fc96668afca
Author: Alexis Algoud <address@hidden>
Date: 2014-08-22 (Fri, 22 Aug 2014)
Changed paths:
M htdocs/fichinter/class/fichinter.class.php
Log Message:
-----------
FIX error sql on update ficheinter
Commit: 4d0301f5df09140c32a8fcd512f276a5fc47e9a3
https://github.com/Dolibarr/dolibarr/commit/4d0301f5df09140c32a8fcd512f276a5fc47e9a3
Author: Juanjo Menent <address@hidden>
Date: 2014-08-23 (Sat, 23 Aug 2014)
Changed paths:
M htdocs/fichinter/class/fichinter.class.php
Log Message:
-----------
Merge pull request #1844 from atm-alexis/3.5
FIX error sql on update ficheinter
Commit: 28ad819ab4a9e3f7c3de6b593ce5e1dcb636034e
https://github.com/Dolibarr/dolibarr/commit/28ad819ab4a9e3f7c3de6b593ce5e1dcb636034e
Author: Regis Houssin <address@hidden>
Date: 2014-08-26 (Tue, 26 Aug 2014)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Fix: error in strict mode
Commit: cdd716eb9d126c784a34c5ab35cae7ad78ce2c46
https://github.com/Dolibarr/dolibarr/commit/cdd716eb9d126c784a34c5ab35cae7ad78ce2c46
Author: Regis Houssin <address@hidden>
Date: 2014-08-27 (Wed, 27 Aug 2014)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Fix: error with php strict mode
Commit: a446318649ed655967f0f42a8f71fd48ab5103db
https://github.com/Dolibarr/dolibarr/commit/a446318649ed655967f0f42a8f71fd48ab5103db
Author: Regis Houssin <address@hidden>
Date: 2014-08-27 (Wed, 27 Aug 2014)
Changed paths:
M htdocs/core/tpl/document_actions_pre_headers.tpl.php
Log Message:
-----------
Fix: strict mode anarchy ;-)
check your variable please
Commit: 4fdd98c4a75b719d3b0729fadca6d9eca138ac50
https://github.com/Dolibarr/dolibarr/commit/4fdd98c4a75b719d3b0729fadca6d9eca138ac50
Author: Regis Houssin <address@hidden>
Date: 2014-08-28 (Thu, 28 Aug 2014)
Changed paths:
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
Fix: another strict mode alert
Commit: 48f9ef25740d6e188e2ccf3f5b3c14732911e030
https://github.com/Dolibarr/dolibarr/commit/48f9ef25740d6e188e2ccf3f5b3c14732911e030
Author: Regis Houssin <address@hidden>
Date: 2014-08-28 (Thu, 28 Aug 2014)
Changed paths:
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
Fix: php strict mode saga
Commit: 1aad1b6acd7decfce50a4d19602d6e1ab373950d
https://github.com/Dolibarr/dolibarr/commit/1aad1b6acd7decfce50a4d19602d6e1ab373950d
Author: Regis Houssin <address@hidden>
Date: 2014-08-28 (Thu, 28 Aug 2014)
Changed paths:
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
Log Message:
-----------
Fix: strict mode
Commit: ff04729a07ca1b82bb8499d318fc686b2ba2d512
https://github.com/Dolibarr/dolibarr/commit/ff04729a07ca1b82bb8499d318fc686b2ba2d512
Author: Regis Houssin <address@hidden>
Date: 2014-08-28 (Thu, 28 Aug 2014)
Changed paths:
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
Log Message:
-----------
Fix: strict mode
Commit: bff33166a59bf5e4ba20b9bdbd274a44f36b4741
https://github.com/Dolibarr/dolibarr/commit/bff33166a59bf5e4ba20b9bdbd274a44f36b4741
Author: Florian HENRY <address@hidden>
Date: 2014-09-01 (Mon, 01 Sep 2014)
Changed paths:
M htdocs/categories/fiche.php
Log Message:
-----------
Fix missing $user in create method
Commit: 1f0653dd6d23a0ef6cf06ea7b2074ef940aefae7
https://github.com/Dolibarr/dolibarr/commit/1f0653dd6d23a0ef6cf06ea7b2074ef940aefae7
Author: Juanjo Menent <address@hidden>
Date: 2014-09-01 (Mon, 01 Sep 2014)
Changed paths:
M htdocs/categories/fiche.php
Log Message:
-----------
Merge pull request #1860 from FHenry/3.5
Fix missing $user in create method
Commit: 67b308cb2549550777d76551800db94c4cf2b3d0
https://github.com/Dolibarr/dolibarr/commit/67b308cb2549550777d76551800db94c4cf2b3d0
Author: Florian HENRY <address@hidden>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/comm/action/listactions.php
Log Message:
-----------
Fix: list event view lost type event filter
Commit: 911aca399ddad5ecc9ebe7100eff5f89d31687f4
https://github.com/Dolibarr/dolibarr/commit/911aca399ddad5ecc9ebe7100eff5f89d31687f4
Author: Florian HENRY <address@hidden>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/comm/action/class/actioncomm.class.php
Log Message:
-----------
save code event
Commit: 576512e339fe1c5caf16a57dbc9a0ed8355ea827
https://github.com/Dolibarr/dolibarr/commit/576512e339fe1c5caf16a57dbc9a0ed8355ea827
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
Merge pull request #1815 from GPCsolutions/catbug
Fix categories bug
Commit: 660557b4dd7cc64bc3dddb3e980978b6eab28921
https://github.com/Dolibarr/dolibarr/commit/660557b4dd7cc64bc3dddb3e980978b6eab28921
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/listactions.php
Log Message:
-----------
Merge pull request #1862 from FHenry/3.5
Fix: list event view lost type event filter
Commit: b536c8a10c0d5267af13c8ffb3bd31aae558c1d5
https://github.com/Dolibarr/dolibarr/commit/b536c8a10c0d5267af13c8ffb3bd31aae558c1d5
Author: Florian HENRY <address@hidden>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
A htdocs/theme/amarok/img/object_address.png
Log Message:
-----------
Add missing image into amarok theme
Commit: 522b5a91bc8d9b7a87bbf2269384725b29d3202a
https://github.com/Dolibarr/dolibarr/commit/522b5a91bc8d9b7a87bbf2269384725b29d3202a
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-06 (Sat, 06 Sep 2014)
Changed paths:
M htdocs/compta/facture.php
M htdocs/core/class/html.form.class.php
M htdocs/fourn/facture/fiche.php
Log Message:
-----------
Fix: Filter on direction of payment mode was not working.
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/fiche.php
Commit: b728ccb52faf5c54e0a8971ab0bbea0aa82d7748
https://github.com/Dolibarr/dolibarr/commit/b728ccb52faf5c54e0a8971ab0bbea0aa82d7748
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-11 (Thu, 11 Sep 2014)
Changed paths:
A htdocs/theme/amarok/img/object_address.png
Log Message:
-----------
Merge pull request #1865 from FHenry/3.5
Add missing image into amarok theme
Commit: 2b9fdabca2df6ca6d448cd3d8129eef9063318a0
https://github.com/Dolibarr/dolibarr/commit/2b9fdabca2df6ca6d448cd3d8129eef9063318a0
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-11 (Thu, 11 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/categories/class/categorie.class.php
M htdocs/categories/fiche.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/listactions.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/tpl/document_actions_pre_headers.tpl.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fourn/facture/fiche.php
M htdocs/product/fiche.php
A htdocs/theme/amarok/img/object_address.png
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
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6_backported
Conflicts:
ChangeLog
htdocs/categories/class/categorie.class.php
htdocs/compta/facture.php
htdocs/core/js/lib_head.js
Compare:
https://github.com/Dolibarr/dolibarr/compare/3b0a156edd2a...2b9fdabca2df