[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 56245e: FIX: only show projects of re
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 56245e: FIX: only show projects of related third if extern... |
|
Date: |
Sun, 16 Oct 2016 10:04:46 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 56245e2c9a888da1d84d02b5dbca99602975bd23
https://github.com/Dolibarr/dolibarr/commit/56245e2c9a888da1d84d02b5dbca99602975bd23
Author: Juanjo Menent <address@hidden>
Date: 2016-10-04 (Tue, 04 Oct 2016)
Changed paths:
M htdocs/core/boxes/box_project.php
Log Message:
-----------
FIX: only show projects of related third if external user
Commit: ee20704a8a1902319adcba6c4811d20113fd9e68
https://github.com/Dolibarr/dolibarr/commit/ee20704a8a1902319adcba6c4811d20113fd9e68
Author: florian HENRY <address@hidden>
Date: 2016-10-05 (Wed, 05 Oct 2016)
Changed paths:
M htdocs/societe/list.php
Log Message:
-----------
FIX : missing column into SQL on thridparty list
Commit: 02f4f6d039940cc00c184be6d64945104d5d706f
https://github.com/Dolibarr/dolibarr/commit/02f4f6d039940cc00c184be6d64945104d5d706f
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-06 (Thu, 06 Oct 2016)
Changed paths:
M htdocs/societe/list.php
Log Message:
-----------
Merge pull request #5839 from atm-florian/3.9
FIX : missing column into SQL on thridparty list
Commit: b19b624908fec916abd8851f37cb7d4ce7a2149e
https://github.com/Dolibarr/dolibarr/commit/b19b624908fec916abd8851f37cb7d4ce7a2149e
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-06 (Thu, 06 Oct 2016)
Changed paths:
M htdocs/core/boxes/box_project.php
Log Message:
-----------
Merge pull request #5834 from simnandez/3.8
FIX: only show projects of related third if external user
Commit: b7b18e3355aaecb52c64cafc1aa03775d2c90af4
https://github.com/Dolibarr/dolibarr/commit/b7b18e3355aaecb52c64cafc1aa03775d2c90af4
Author: Juanjo Menent <address@hidden>
Date: 2016-10-07 (Fri, 07 Oct 2016)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
FIX: Error when CATEGORIE_RECURSIV_ADD is enabled and new category is
daughter of an already linked to object
Commit: 298e5cee61bc2ccc8a8def653f8a2415433e9d3b
https://github.com/Dolibarr/dolibarr/commit/298e5cee61bc2ccc8a8def653f8a2415433e9d3b
Author: Juanjo Menent <address@hidden>
Date: 2016-10-07 (Fri, 07 Oct 2016)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
Fix #5843 best way fixing
Commit: 45dfb8ca628ee3e18fa782b4ef4962b3adb0f8ca
https://github.com/Dolibarr/dolibarr/commit/45dfb8ca628ee3e18fa782b4ef4962b3adb0f8ca
Author: Juanjo Menent <address@hidden>
Date: 2016-10-07 (Fri, 07 Oct 2016)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
Fix #5843 best way fixing
Commit: ffd486e3d65067845b5be2d4de026a1382820216
https://github.com/Dolibarr/dolibarr/commit/ffd486e3d65067845b5be2d4de026a1382820216
Author: Juanjo Menent <address@hidden>
Date: 2016-10-07 (Fri, 07 Oct 2016)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
Fix #5843 best way fixing
Commit: 3eb8a667bcaaa6228310d725aab2dcc769049c3a
https://github.com/Dolibarr/dolibarr/commit/3eb8a667bcaaa6228310d725aab2dcc769049c3a
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-11 (Tue, 11 Oct 2016)
Changed paths:
M htdocs/projet/tasks/list.php
Log Message:
-----------
Fix clean of search criteria
Commit: 24420edd46592ccc641aa02f2206437c38cf1290
https://github.com/Dolibarr/dolibarr/commit/24420edd46592ccc641aa02f2206437c38cf1290
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-11 (Tue, 11 Oct 2016)
Changed paths:
M htdocs/filefunc.inc.php
Log Message:
-----------
Prepare 4.0.2
Commit: 0b08db16a10aa4e178b412dc56f80c5b346b34e1
https://github.com/Dolibarr/dolibarr/commit/0b08db16a10aa4e178b412dc56f80c5b346b34e1
Author: aspangaro <address@hidden>
Date: 2016-10-13 (Thu, 13 Oct 2016)
Changed paths:
M htdocs/langs/en_US/main.lang
Log Message:
-----------
Fix: Missing language key
Commit: 567f7e5365ead8c4e0e372fbc62b65df3da2d330
https://github.com/Dolibarr/dolibarr/commit/567f7e5365ead8c4e0e372fbc62b65df3da2d330
Author: Sergio Sanchis Climent <address@hidden>
Date: 2016-10-14 (Fri, 14 Oct 2016)
Changed paths:
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/modSociete.class.php
Log Message:
-----------
FIX: #5340
Commit: 63a7b506b1991e4c8f4f03eb4770912d4f217706
https://github.com/Dolibarr/dolibarr/commit/63a7b506b1991e4c8f4f03eb4770912d4f217706
Author: Sergio Sanchis <address@hidden>
Date: 2016-10-14 (Fri, 14 Oct 2016)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
Fix: Error if exist extrafield
Commit: 4fb66cf7a411592c76ca39224754a7dd91064c2f
https://github.com/Dolibarr/dolibarr/commit/4fb66cf7a411592c76ca39224754a7dd91064c2f
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-15 (Sat, 15 Oct 2016)
Changed paths:
M htdocs/core/modules/modFTP.class.php
M htdocs/ftp/admin/ftpclient.php
M htdocs/ftp/index.php
Log Message:
-----------
Better explanation for ftp module setup to avoid error with FTPS/SFTP.
Commit: dda248cb577174b670cbc9d368ddb3f37290e618
https://github.com/Dolibarr/dolibarr/commit/dda248cb577174b670cbc9d368ddb3f37290e618
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-15 (Sat, 15 Oct 2016)
Changed paths:
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/modSociete.class.php
Log Message:
-----------
Merge pull request #5870 from olsesacl/#5340
FIX: #5340 Importing Tiers problem with capital field
Commit: cec792f142475446a8f285cb8a89ed932b21a592
https://github.com/Dolibarr/dolibarr/commit/cec792f142475446a8f285cb8a89ed932b21a592
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-15 (Sat, 15 Oct 2016)
Changed paths:
M htdocs/langs/en_US/main.lang
Log Message:
-----------
Merge pull request #5867 from aspangaro/4.0-p2
Fix: Missing language key
Commit: ac60dfa883c176026355e3f96cbadb0b7850ec61
https://github.com/Dolibarr/dolibarr/commit/ac60dfa883c176026355e3f96cbadb0b7850ec61
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-15 (Sat, 15 Oct 2016)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
Merge pull request #5873 from olsesacl/facture_list_sql_mode
FIX: Error show list invoice when sql_mode=only_full_group_by
Commit: 49e2b1ffdb215d22cff7e3e1a1e2e508b5c9edb2
https://github.com/Dolibarr/dolibarr/commit/49e2b1ffdb215d22cff7e3e1a1e2e508b5c9edb2
Author: aspangaro <address@hidden>
Date: 2016-10-15 (Sat, 15 Oct 2016)
Changed paths:
M htdocs/langs/en_US/loan.lang
M htdocs/loan/payment/card.php
Log Message:
-----------
Fix: Error with language key
Commit: 380ab8bfa55d6b4291c721229d0496ca6c23db7a
https://github.com/Dolibarr/dolibarr/commit/380ab8bfa55d6b4291c721229d0496ca6c23db7a
Author: aspangaro <address@hidden>
Date: 2016-10-15 (Sat, 15 Oct 2016)
Changed paths:
M htdocs/compta/bank/account.php
Log Message:
-----------
Fix: Show Ref/rowid of loan
Commit: 1beaf003f055aec5427c8303e4ee90734fe45e26
https://github.com/Dolibarr/dolibarr/commit/1beaf003f055aec5427c8303e4ee90734fe45e26
Author: aspangaro <address@hidden>
Date: 2016-10-15 (Sat, 15 Oct 2016)
Changed paths:
M htdocs/loan/class/paymentloan.class.php
M htdocs/loan/payment/payment.php
Log Message:
-----------
Fix #5875: Links to loans are incorrect in the bank account transactions tab
Commit: 25ba5074a7648605181d88f22cdded5d46351fe6
https://github.com/Dolibarr/dolibarr/commit/25ba5074a7648605181d88f22cdded5d46351fe6
Author: aspangaro <address@hidden>
Date: 2016-10-15 (Sat, 15 Oct 2016)
Changed paths:
M htdocs/loan/card.php
Log Message:
-----------
Fix: Problem of presentation
Commit: df581d89739cbf6793fbcb16b6eed946ac6baeb7
https://github.com/Dolibarr/dolibarr/commit/df581d89739cbf6793fbcb16b6eed946ac6baeb7
Author: aspangaro <address@hidden>
Date: 2016-10-15 (Sat, 15 Oct 2016)
Changed paths:
M htdocs/loan/payment/payment.php
Log Message:
-----------
Fix: In payment card, only the capital is considered as a payment, interest
and insurance are tax
Commit: 87e8ac51bedfe39de0ead9414b7ce70cc920996c
https://github.com/Dolibarr/dolibarr/commit/87e8ac51bedfe39de0ead9414b7ce70cc920996c
Author: Juanjo Menent <address@hidden>
Date: 2016-10-15 (Sat, 15 Oct 2016)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
Merge pull request #5843 from simnandez/3.8
FIX: Error when CATEGORIE_RECURSIV_ADD is enabled and new category is daughter
of an already linked to object
Commit: 9ab0bfe905708775e182d68ff1cd492bd2f015bb
https://github.com/Dolibarr/dolibarr/commit/9ab0bfe905708775e182d68ff1cd492bd2f015bb
Author: aspangaro <address@hidden>
Date: 2016-10-16 (Sun, 16 Oct 2016)
Changed paths:
M htdocs/langs/en_US/loan.lang
M htdocs/loan/payment/card.php
Log Message:
-----------
Fix: Add another key for bank rather than to modify one
Commit: f9a5074f2dd96c8cd038b3443dfb22b81da82f82
https://github.com/Dolibarr/dolibarr/commit/f9a5074f2dd96c8cd038b3443dfb22b81da82f82
Author: Juanjo Menent <address@hidden>
Date: 2016-10-16 (Sun, 16 Oct 2016)
Changed paths:
M htdocs/compta/bank/account.php
M htdocs/langs/en_US/loan.lang
M htdocs/loan/card.php
M htdocs/loan/class/paymentloan.class.php
M htdocs/loan/payment/card.php
M htdocs/loan/payment/payment.php
Log Message:
-----------
Merge pull request #5879 from aspangaro/4.0-p3
Fix: Some problems with loan module
Commit: 2695f3528424a586c50bcaafd4e056da0f55e265
https://github.com/Dolibarr/dolibarr/commit/2695f3528424a586c50bcaafd4e056da0f55e265
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-16 (Sun, 16 Oct 2016)
Changed paths:
M htdocs/projet/card.php
Log Message:
-----------
Fix to avoid scroll on confirm popup
Commit: 4c58793587fec948418ee90272ce3d55822fb331
https://github.com/Dolibarr/dolibarr/commit/4c58793587fec948418ee90272ce3d55822fb331
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-16 (Sun, 16 Oct 2016)
Changed paths:
M htdocs/compta/bank/account.php
M htdocs/compta/facture/list.php
M htdocs/langs/en_US/loan.lang
M htdocs/langs/en_US/main.lang
M htdocs/loan/card.php
M htdocs/loan/class/paymentloan.class.php
M htdocs/loan/payment/card.php
M htdocs/loan/payment/payment.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: 8edb51a017acca58c950f68e9dadd92a021dc29e
https://github.com/Dolibarr/dolibarr/commit/8edb51a017acca58c950f68e9dadd92a021dc29e
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-16 (Sun, 16 Oct 2016)
Changed paths:
M htdocs/projet/class/task.class.php
Log Message:
-----------
FIX Extra fields of task not copied on project cloning
Commit: 3d1ddbb92378b329f3c7d1f7195f893635120b78
https://github.com/Dolibarr/dolibarr/commit/3d1ddbb92378b329f3c7d1f7195f893635120b78
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-16 (Sun, 16 Oct 2016)
Changed paths:
M htdocs/categories/class/categorie.class.php
M htdocs/core/boxes/box_project.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: ab34885a894ffe334ac413936d2460498ced2da5
https://github.com/Dolibarr/dolibarr/commit/ab34885a894ffe334ac413936d2460498ced2da5
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-16 (Sun, 16 Oct 2016)
Changed paths:
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/modSociete.class.php
M htdocs/societe/list.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 2db38b4bcc1bb9976327c1e7f0f356a93bc4fe37
https://github.com/Dolibarr/dolibarr/commit/2db38b4bcc1bb9976327c1e7f0f356a93bc4fe37
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-16 (Sun, 16 Oct 2016)
Changed paths:
M htdocs/categories/class/categorie.class.php
M htdocs/core/boxes/box_project.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/modSociete.class.php
M htdocs/societe/list.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 4.0
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/societe/list.php
Commit: 28933c31dd002902c9b65a6535756f96d1e0252a
https://github.com/Dolibarr/dolibarr/commit/28933c31dd002902c9b65a6535756f96d1e0252a
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-16 (Sun, 16 Oct 2016)
Changed paths:
M htdocs/categories/class/categorie.class.php
M htdocs/compta/bank/account.php
M htdocs/compta/facture/list.php
M htdocs/core/boxes/box_project.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/modFTP.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/ftp/admin/ftpclient.php
M htdocs/ftp/index.php
M htdocs/langs/en_US/loan.lang
M htdocs/langs/en_US/main.lang
M htdocs/loan/card.php
M htdocs/loan/class/paymentloan.class.php
M htdocs/loan/payment/card.php
M htdocs/loan/payment/payment.php
M htdocs/projet/class/task.class.php
M htdocs/projet/tasks/list.php
M htdocs/societe/list.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
htdocs/projet/card.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/fe471c43d1dd...28933c31dd00