[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 2b7b7e: Fix: for avoid conflict with
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 2b7b7e: Fix: for avoid conflict with "global $m" in memory... |
|
Date: |
Sat, 30 Jan 2016 07:00:20 -0800 |
Branch: refs/heads/3.9
Home: https://github.com/Dolibarr/dolibarr
Commit: 2b7b7e014d5c7ae10985975d26284cca58d36995
https://github.com/Dolibarr/dolibarr/commit/2b7b7e014d5c7ae10985975d26284cca58d36995
Author: Regis Houssin <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/comm/mailing/cibles.php
Log Message:
-----------
Fix: for avoid conflict with "global $m" in memory.lib.php
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: 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: 8a80e065801686e3d9791cdd3c1f4cbbc737f4b1
https://github.com/Dolibarr/dolibarr/commit/8a80e065801686e3d9791cdd3c1f4cbbc737f4b1
Author: Regis Houssin <address@hidden>
Date: 2016-01-28 (Thu, 28 Jan 2016)
Changed paths:
M htdocs/commande/orderstoinvoice.php
Log Message:
-----------
Fix: missing field "label"
Commit: 6eecf2f29a15fa15cc427bd1c84aae567270792f
https://github.com/Dolibarr/dolibarr/commit/6eecf2f29a15fa15cc427bd1c84aae567270792f
Author: phf <address@hidden>
Date: 2016-01-28 (Thu, 28 Jan 2016)
Changed paths:
M htdocs/expedition/list.php
Log Message:
-----------
FIX filter by socid if from customer card
Commit: cd58c93de67446d912021b6cbbf02b959b335e00
https://github.com/Dolibarr/dolibarr/commit/cd58c93de67446d912021b6cbbf02b959b335e00
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-28 (Thu, 28 Jan 2016)
Changed paths:
M htdocs/core/modules/modECM.class.php
Log Message:
-----------
FIX If option to hide automatic ECM is on, dont show menu.
Commit: f5a4b9db310567be9a50ea2ff9e37842b076eb85
https://github.com/Dolibarr/dolibarr/commit/f5a4b9db310567be9a50ea2ff9e37842b076eb85
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-30 (Sat, 30 Jan 2016)
Changed paths:
M htdocs/expedition/list.php
Log Message:
-----------
Merge pull request #4520 from atm-ph/fix_3.8_show_all_shipping_by_socid
FIX filter by socid if from customer card
Commit: e574ebe34cdc894e63cfe96fa6a1b1e789ac7d9c
https://github.com/Dolibarr/dolibarr/commit/e574ebe34cdc894e63cfe96fa6a1b1e789ac7d9c
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-30 (Sat, 30 Jan 2016)
Changed paths:
M htdocs/commande/orderstoinvoice.php
Log Message:
-----------
Merge pull request #4514 from hregis/3.8_bug2
Fix: missing field "label"
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: 3591f51918a0f092d02f7986d9411b3977becfc9
https://github.com/Dolibarr/dolibarr/commit/3591f51918a0f092d02f7986d9411b3977becfc9
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-30 (Sat, 30 Jan 2016)
Changed paths:
M htdocs/comm/mailing/cibles.php
Log Message:
-----------
Merge pull request #4480 from hregis/3.8_bug
Fix: for avoid conflict with "global $m" in memory.lib.php
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: dfd4d36bdffe7a82e68b8ca7d49a85ac73c02ded
https://github.com/Dolibarr/dolibarr/commit/dfd4d36bdffe7a82e68b8ca7d49a85ac73c02ded
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-30 (Sat, 30 Jan 2016)
Changed paths:
M htdocs/contrat/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
Commit: 5e9fd25a6ed200ef455c498648950e1ab962948d
https://github.com/Dolibarr/dolibarr/commit/5e9fd25a6ed200ef455c498648950e1ab962948d
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-30 (Sat, 30 Jan 2016)
Changed paths:
M htdocs/comm/mailing/cibles.php
M htdocs/commande/orderstoinvoice.php
M htdocs/contrat/card.php
M htdocs/core/modules/modECM.class.php
M htdocs/expedition/list.php
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.9
Compare:
https://github.com/Dolibarr/dolibarr/compare/129f5aad8ea1...5e9fd25a6ed2