[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 406f26: FIX JSON.parse not needeed an
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 406f26: FIX JSON.parse not needeed and missing simple quot... |
|
Date: |
Sun, 27 Jan 2019 09:28:04 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 406f26b9d2a8c27904ac36be4c4b4ba2edd0b9be
https://github.com/Dolibarr/dolibarr/commit/406f26b9d2a8c27904ac36be4c4b4ba2edd0b9be
Author: Regis Houssin <address@hidden>
Date: 2019-01-21 (Mon, 21 Jan 2019)
Changed paths:
M htdocs/takepos/takepos.php
Log Message:
-----------
FIX JSON.parse not needeed and missing simple quote escaping
Commit: 0a36a487c461878f5f167aaf89bee39004568375
https://github.com/Dolibarr/dolibarr/commit/0a36a487c461878f5f167aaf89bee39004568375
Author: Regis Houssin <address@hidden>
Date: 2019-01-21 (Mon, 21 Jan 2019)
Changed paths:
M htdocs/takepos/takepos.php
Log Message:
-----------
FIX remove unused option
Commit: b3dfbaf38ca1f1ff2bf4e51a884ff8668a46217e
https://github.com/Dolibarr/dolibarr/commit/b3dfbaf38ca1f1ff2bf4e51a884ff8668a46217e
Author: jfefe <address@hidden>
Date: 2019-01-23 (Wed, 23 Jan 2019)
Changed paths:
M htdocs/product/inventory/card.php
Log Message:
-----------
FIX: wrong permission test for inventory creation
Commit: 84e1f92acd2eddc186c0d06b0e909863d0c0bd78
https://github.com/Dolibarr/dolibarr/commit/84e1f92acd2eddc186c0d06b0e909863d0c0bd78
Author: gauthier <address@hidden>
Date: 2019-01-23 (Wed, 23 Jan 2019)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
FIX : when we add a payment on an invoice which already has payments with
credit note or deposit amount, and then we get an excess received, discount
amount must be $total_paiements + $total_creditnote_and_deposit -
$object->total_ttc;
Commit: 4c70c05e200099e16034de8f579735423dd25dd5
https://github.com/Dolibarr/dolibarr/commit/4c70c05e200099e16034de8f579735423dd25dd5
Author: Frédéric FRANCE <address@hidden>
Date: 2019-01-23 (Wed, 23 Jan 2019)
Changed paths:
M htdocs/website/index.php
Log Message:
-----------
fix travis
Commit: 822706000f3ea4ed847822f67d32a671488ce0c1
https://github.com/Dolibarr/dolibarr/commit/822706000f3ea4ed847822f67d32a671488ce0c1
Author: florian HENRY <address@hidden>
Date: 2019-01-24 (Thu, 24 Jan 2019)
Changed paths:
M htdocs/core/tpl/contacts.tpl.php
Log Message:
-----------
fix broken link into contact tpl
Commit: 97cc414b298b461f5c0e27e79851d6d1e31d7ff8
https://github.com/Dolibarr/dolibarr/commit/97cc414b298b461f5c0e27e79851d6d1e31d7ff8
Author: Laurent Destailleur <address@hidden>
Date: 2019-01-26 (Sat, 26 Jan 2019)
Changed paths:
M build/exe/doliwamp/Languages/MyEnglish.isl
M build/exe/doliwamp/Languages/MyFrench.isl
Log Message:
-----------
Update doliwamp
Commit: 43694f9384c981899ed755fb035fa7e5b93d73c6
https://github.com/Dolibarr/dolibarr/commit/43694f9384c981899ed755fb035fa7e5b93d73c6
Author: Laurent Destailleur <address@hidden>
Date: 2019-01-26 (Sat, 26 Jan 2019)
Changed paths:
M build/exe/doliwamp/rundoliadmin.bat.install
M build/exe/doliwamp/rundolihelp.bat.install
M build/exe/doliwamp/rundoliwamp.bat.install
Log Message:
-----------
FIX Compatibility with windows 10
Commit: 6867a8a88a0ba8b68a3d3f5a0455b3cb8175a68e
https://github.com/Dolibarr/dolibarr/commit/6867a8a88a0ba8b68a3d3f5a0455b3cb8175a68e
Author: Laurent Destailleur <address@hidden>
Date: 2019-01-26 (Sat, 26 Jan 2019)
Changed paths:
M build/exe/doliwamp/Languages/MyFrench.isl
Log Message:
-----------
Typo
Commit: 7f13319d9abb6fad4fcde6b6047d8fe38b6b1965
https://github.com/Dolibarr/dolibarr/commit/7f13319d9abb6fad4fcde6b6047d8fe38b6b1965
Author: Laurent Destailleur <address@hidden>
Date: 2019-01-26 (Sat, 26 Jan 2019)
Log Message:
-----------
Merge pull request #10402 from frederic34/patch-2
fix travis
Commit: 8d019a275916852cefb6fd4727ece94f232d5b47
https://github.com/Dolibarr/dolibarr/commit/8d019a275916852cefb6fd4727ece94f232d5b47
Author: Laurent Destailleur <address@hidden>
Date: 2019-01-26 (Sat, 26 Jan 2019)
Changed paths:
M htdocs/core/tpl/contacts.tpl.php
Log Message:
-----------
Merge pull request #10409 from atm-florian/9.0
fix broken link into contact tpl
Commit: ab6393a93908fe4e4d14784882b1f3d797c5c81f
https://github.com/Dolibarr/dolibarr/commit/ab6393a93908fe4e4d14784882b1f3d797c5c81f
Author: Laurent Destailleur <address@hidden>
Date: 2019-01-26 (Sat, 26 Jan 2019)
Changed paths:
M htdocs/product/inventory/card.php
Log Message:
-----------
Merge pull request #10396 from Librethic/9.0-fix-inventory-create
FIX: wrong permission test for inventory creation
Commit: c6fe94c4551c9b22e2f744db223e33869bb93e7f
https://github.com/Dolibarr/dolibarr/commit/c6fe94c4551c9b22e2f744db223e33869bb93e7f
Author: Laurent Destailleur <address@hidden>
Date: 2019-01-26 (Sat, 26 Jan 2019)
Changed paths:
M htdocs/takepos/takepos.php
Log Message:
-----------
Merge pull request #10388 from hregis/9.0_bug
FIX JSON.parse not needeed and missing simple quote escaping
Commit: 7785f3e3e2696a5d8f67a8014988240019195e5d
https://github.com/Dolibarr/dolibarr/commit/7785f3e3e2696a5d8f67a8014988240019195e5d
Author: Laurent Destailleur <address@hidden>
Date: 2019-01-26 (Sat, 26 Jan 2019)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
Merge pull request #10397 from
atm-gauthier/8.0_fix_discount_on_excess_with_creditnote_or_deposit
FIX : when we add a payment on an invoice which already has payments …
Commit: ba87284a90b27da467f6496972109e29cb947808
https://github.com/Dolibarr/dolibarr/commit/ba87284a90b27da467f6496972109e29cb947808
Author: Laurent Destailleur <address@hidden>
Date: 2019-01-26 (Sat, 26 Jan 2019)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: 3118e92d2bd29ad66e6b9884297af2db958d25a5
https://github.com/Dolibarr/dolibarr/commit/3118e92d2bd29ad66e6b9884297af2db958d25a5
Author: Laurent Destailleur <address@hidden>
Date: 2019-01-26 (Sat, 26 Jan 2019)
Changed paths:
M htdocs/core/tpl/contacts.tpl.php
M htdocs/product/inventory/card.php
M htdocs/takepos/takepos.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: 46b6d162109a49765b2d1787f45bb8889ba6fc34
https://github.com/Dolibarr/dolibarr/commit/46b6d162109a49765b2d1787f45bb8889ba6fc34
Author: Frédéric FRANCE <address@hidden>
Date: 2019-01-27 (Sun, 27 Jan 2019)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
correct menu
Commit: 94d3f038eb6dbe5794d56a904cf85c8794f6ee79
https://github.com/Dolibarr/dolibarr/commit/94d3f038eb6dbe5794d56a904cf85c8794f6ee79
Author: Xebax <address@hidden>
Date: 2019-01-27 (Sun, 27 Jan 2019)
Changed paths:
M htdocs/user/class/api_users.class.php
Log Message:
-----------
FIX 'statut' is ignored when updating a user with the REST API.
Commit: d59097f65c25c9b8529a402475f1ac211aaed850
https://github.com/Dolibarr/dolibarr/commit/d59097f65c25c9b8529a402475f1ac211aaed850
Author: Laurent Destailleur <address@hidden>
Date: 2019-01-27 (Sun, 27 Jan 2019)
Changed paths:
M htdocs/admin/modules.php
Log Message:
-----------
Fix upload of module file
Commit: 3c88816bf8602d87044c32c7138b91aa7eb542d1
https://github.com/Dolibarr/dolibarr/commit/3c88816bf8602d87044c32c7138b91aa7eb542d1
Author: Laurent Destailleur <address@hidden>
Date: 2019-01-27 (Sun, 27 Jan 2019)
Changed paths:
M htdocs/admin/modules.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: 05ba39715620645561a2a15079e1fffa09e8a092
https://github.com/Dolibarr/dolibarr/commit/05ba39715620645561a2a15079e1fffa09e8a092
Author: Laurent Destailleur <address@hidden>
Date: 2019-01-27 (Sun, 27 Jan 2019)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Merge pull request #10421 from frederic34/patch-2
correct menu
Commit: 3e78807cbc46be908ecc59e7d2ceacd2c7b33a2e
https://github.com/Dolibarr/dolibarr/commit/3e78807cbc46be908ecc59e7d2ceacd2c7b33a2e
Author: Laurent Destailleur <address@hidden>
Date: 2019-01-27 (Sun, 27 Jan 2019)
Changed paths:
M htdocs/user/class/api_users.class.php
Log Message:
-----------
Merge pull request #10424 from EuskalMoneta/7.0
FIX 'statut' is ignored when updating a user with the REST API.
Commit: a78db451780f08a1926769b61020c59efb618da3
https://github.com/Dolibarr/dolibarr/commit/a78db451780f08a1926769b61020c59efb618da3
Author: Laurent Destailleur <address@hidden>
Date: 2019-01-27 (Sun, 27 Jan 2019)
Changed paths:
M htdocs/user/class/api_users.class.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Commit: 7a7fd657ed2a082b46b9875881abcfc6b44efab0
https://github.com/Dolibarr/dolibarr/commit/7a7fd657ed2a082b46b9875881abcfc6b44efab0
Author: Laurent Destailleur <address@hidden>
Date: 2019-01-27 (Sun, 27 Jan 2019)
Changed paths:
M htdocs/user/class/api_users.class.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: c291450a077d556c36b2fbd788077a11b4f8808f
https://github.com/Dolibarr/dolibarr/commit/c291450a077d556c36b2fbd788077a11b4f8808f
Author: Laurent Destailleur <address@hidden>
Date: 2019-01-27 (Sun, 27 Jan 2019)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: 97545af1fde0d59ba5f3de0d40387d0722becb9d
https://github.com/Dolibarr/dolibarr/commit/97545af1fde0d59ba5f3de0d40387d0722becb9d
Author: Laurent Destailleur <address@hidden>
Date: 2019-01-27 (Sun, 27 Jan 2019)
Changed paths:
M build/exe/doliwamp/Languages/MyEnglish.isl
M build/exe/doliwamp/Languages/MyFrench.isl
Log Message:
-----------
Translation
Commit: ecc30b8ffecf073ac6fd0786cc074e2a9c9cf41f
https://github.com/Dolibarr/dolibarr/commit/ecc30b8ffecf073ac6fd0786cc074e2a9c9cf41f
Author: Laurent Destailleur <address@hidden>
Date: 2019-01-27 (Sun, 27 Jan 2019)
Changed paths:
M build/exe/doliwamp/Languages/MyEnglish.isl
M build/exe/doliwamp/Languages/MyFrench.isl
M build/exe/doliwamp/rundoliadmin.bat.install
M build/exe/doliwamp/rundolihelp.bat.install
M build/exe/doliwamp/rundoliwamp.bat.install
M htdocs/admin/modules.php
M htdocs/compta/facture/card.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/product/inventory/card.php
M htdocs/takepos/takepos.php
M htdocs/user/class/api_users.class.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/56838bc6598a...ecc30b8ffecf
**NOTE:** GitHub Services has been marked for deprecation:
https://developer.github.com/changes/2018-04-25-github-services-deprecation/
We will provide an alternative path for the email notifications by
January 31st, 2019.