[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 1baf25: FIX ISSUE #4506 : make workin
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 1baf25: FIX ISSUE #4506 : make working the PROPAL_CLONE_ON... |
|
Date: |
Sun, 14 Feb 2016 16:39:23 -0800 |
Branch: refs/heads/3.9
Home: https://github.com/Dolibarr/dolibarr
Commit: 1baf25de3c279f3b2663238d7aecd0fc355cab07
https://github.com/Dolibarr/dolibarr/commit/1baf25de3c279f3b2663238d7aecd0fc355cab07
Author: Christophe Battarel <address@hidden>
Date: 2016-01-27 (Wed, 27 Jan 2016)
Changed paths:
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
FIX ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden
constant
Commit: 6260c1ae9e259f25d14cfc109ad4e6eed3184e37
https://github.com/Dolibarr/dolibarr/commit/6260c1ae9e259f25d14cfc109ad4e6eed3184e37
Author: fmarcet <address@hidden>
Date: 2016-02-03 (Wed, 03 Feb 2016)
Changed paths:
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
FIX: Check stock of batch on shippment
Commit: 01f21808222e396a5d9f873dd24329f893ec9790
https://github.com/Dolibarr/dolibarr/commit/01f21808222e396a5d9f873dd24329f893ec9790
Author: fmarcet <address@hidden>
Date: 2016-02-05 (Fri, 05 Feb 2016)
Changed paths:
M htdocs/core/class/CMailFile.class.php
M htdocs/main.inc.php
M htdocs/product/card.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.8
Commit: ede4453164c2432d1145626a8c5a4cf9335d07e2
https://github.com/Dolibarr/dolibarr/commit/ede4453164c2432d1145626a8c5a4cf9335d07e2
Author: fmarcet <address@hidden>
Date: 2016-02-05 (Fri, 05 Feb 2016)
Changed paths:
M htdocs/expedition/card.php
Log Message:
-----------
Fix: Avoid errors when batch stock is negative
Commit: 36c7697b63ef561f261853327fd0ef98aa49562f
https://github.com/Dolibarr/dolibarr/commit/36c7697b63ef561f261853327fd0ef98aa49562f
Author: Christophe Battarel <address@hidden>
Date: 2016-02-05 (Fri, 05 Feb 2016)
Changed paths:
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
FIX: retrieve correct pu_ttc (set by printObjectLine function) like in
3.7
Commit: f0aef885893cd217904eddb63c7a907e76abed4b
https://github.com/Dolibarr/dolibarr/commit/f0aef885893cd217904eddb63c7a907e76abed4b
Author: Christophe Battarel <address@hidden>
Date: 2016-02-05 (Fri, 05 Feb 2016)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
better fix
Commit: 02c54f4ea6230c6321a2b3fc7465416a1fc742a9
https://github.com/Dolibarr/dolibarr/commit/02c54f4ea6230c6321a2b3fc7465416a1fc742a9
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-05 (Fri, 05 Feb 2016)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #4573 from altatof/fix_ttc
FIX: retrieve correct pu_ttc (set by printObjectLine function) like in 3.7
Commit: bf7181a0640df531b033c507e501bb206392733f
https://github.com/Dolibarr/dolibarr/commit/bf7181a0640df531b033c507e501bb206392733f
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-05 (Fri, 05 Feb 2016)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
All messages separated with , into errorsToString
Commit: 7044e62afa6a0da83023a8385a5a402178eece7b
https://github.com/Dolibarr/dolibarr/commit/7044e62afa6a0da83023a8385a5a402178eece7b
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-05 (Fri, 05 Feb 2016)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 36a29872b1faf595db66b5d5af94ea84d660490e
https://github.com/Dolibarr/dolibarr/commit/36a29872b1faf595db66b5d5af94ea84d660490e
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-05 (Fri, 05 Feb 2016)
Changed paths:
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Merge pull request #4559 from fmarcet/3.8
FIX: Check stock of batch on shippment
Commit: 7a6c7f10a6c14bcd93003a0e7ee29277d9d65535
https://github.com/Dolibarr/dolibarr/commit/7a6c7f10a6c14bcd93003a0e7ee29277d9d65535
Author: Christophe Battarel <address@hidden>
Date: 2016-02-05 (Fri, 05 Feb 2016)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
FIX: add missing global def for ttc column
Commit: 96bf59f065bf44a44aa9903a4d5399d11e32cacf
https://github.com/Dolibarr/dolibarr/commit/96bf59f065bf44a44aa9903a4d5399d11e32cacf
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-05 (Fri, 05 Feb 2016)
Changed paths:
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: c4c7ea2f221199b1566dad96c038d2f197184776
https://github.com/Dolibarr/dolibarr/commit/c4c7ea2f221199b1566dad96c038d2f197184776
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-08 (Mon, 08 Feb 2016)
Changed paths:
M htdocs/comm/remise.php
Log Message:
-----------
FIX Relative discount decimals are not saved
Commit: a15d03a67644e0247a9efa00884a7c7d76c2a85f
https://github.com/Dolibarr/dolibarr/commit/a15d03a67644e0247a9efa00884a7c7d76c2a85f
Author: philippe grand <address@hidden>
Date: 2016-02-08 (Mon, 08 Feb 2016)
Changed paths:
M htdocs/core/modules/modSociete.class.php
Log Message:
-----------
fix : Strict Standards: Only variables should be passed by reference
Commit: 9b10f030bf5eb5143107a7a1ecea51ba4b3d5890
https://github.com/Dolibarr/dolibarr/commit/9b10f030bf5eb5143107a7a1ecea51ba4b3d5890
Author: Regis Houssin <address@hidden>
Date: 2016-02-08 (Mon, 08 Feb 2016)
Changed paths:
M htdocs/comm/mailing/card.php
M scripts/emailings/mailing-send.php
Log Message:
-----------
Fix: missing signature and uniformize code between card and script
Commit: 0b2560130758506c8bc94e01bbc5138bc92a92d9
https://github.com/Dolibarr/dolibarr/commit/0b2560130758506c8bc94e01bbc5138bc92a92d9
Author: Regis Houssin <address@hidden>
Date: 2016-02-08 (Mon, 08 Feb 2016)
Changed paths:
M htdocs/comm/mailing/card.php
M scripts/emailings/mailing-send.php
Log Message:
-----------
Fix: wrong object name
Commit: 7ef0415aca64a95e401918724d70bb1246c6322b
https://github.com/Dolibarr/dolibarr/commit/7ef0415aca64a95e401918724d70bb1246c6322b
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-09 (Tue, 09 Feb 2016)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Small per enhancement
Commit: d02f8393dcc37d2d4bfcc181e9cbb5dcd97c8933
https://github.com/Dolibarr/dolibarr/commit/d02f8393dcc37d2d4bfcc181e9cbb5dcd97c8933
Author: philippe grand <address@hidden>
Date: 2016-02-10 (Wed, 10 Feb 2016)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8
Commit: 756b50b9d320ebbc0d5cc3103051aa20313d452a
https://github.com/Dolibarr/dolibarr/commit/756b50b9d320ebbc0d5cc3103051aa20313d452a
Author: gauthier <address@hidden>
Date: 2016-02-12 (Fri, 12 Feb 2016)
Changed paths:
M htdocs/product/class/productcustomerprice.class.php
M htdocs/societe/price.php
Log Message:
-----------
FIX : search product in customer product prices doesn't work
Commit: a022665db8823df41c7e9562835e9b9072c94620
https://github.com/Dolibarr/dolibarr/commit/a022665db8823df41c7e9562835e9b9072c94620
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-14 (Sun, 14 Feb 2016)
Changed paths:
M htdocs/product/class/productcustomerprice.class.php
M htdocs/societe/price.php
Log Message:
-----------
Merge pull request #4607 from
atm-gauthier/3.8_fix_search_customer_product_price
FIX : search product in customer product prices doesn't work
Commit: e28c3a3ee7eccfbd6ea78ea215548716a7b4aef2
https://github.com/Dolibarr/dolibarr/commit/e28c3a3ee7eccfbd6ea78ea215548716a7b4aef2
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-14 (Sun, 14 Feb 2016)
Changed paths:
M htdocs/core/modules/modSociete.class.php
Log Message:
-----------
Merge pull request #4585 from grandoc/3.8
fix : Strict Standards: Only variables should be passed by reference
Commit: b091d4e897bce2fce399a273a0f850cf4786e5a5
https://github.com/Dolibarr/dolibarr/commit/b091d4e897bce2fce399a273a0f850cf4786e5a5
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-14 (Sun, 14 Feb 2016)
Changed paths:
M htdocs/comm/mailing/card.php
M scripts/emailings/mailing-send.php
Log Message:
-----------
Merge pull request #4586 from hregis/3.8_bug
Fix: missing signature and uniformize code between card and script
Commit: cc174daa13a859075a90e34371e5584e2242c049
https://github.com/Dolibarr/dolibarr/commit/cc174daa13a859075a90e34371e5584e2242c049
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-14 (Sun, 14 Feb 2016)
Changed paths:
M htdocs/filefunc.inc.php
Log Message:
-----------
Prepare 3.8.4
Commit: 834f0b20ae4cd9dff9b9ccad1064d82ae5ac67fb
https://github.com/Dolibarr/dolibarr/commit/834f0b20ae4cd9dff9b9ccad1064d82ae5ac67fb
Author: abb <address@hidden>
Date: 2016-02-14 (Sun, 14 Feb 2016)
Changed paths:
M htdocs/core/class/commonobjectline.class.php
Log Message:
-----------
fix:no transaction in this place
Commit: 13c85516eee4ec976194248df856aae98742e474
https://github.com/Dolibarr/dolibarr/commit/13c85516eee4ec976194248df856aae98742e474
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-14 (Sun, 14 Feb 2016)
Changed paths:
M htdocs/comm/propal.php
Log Message:
-----------
Doc comment
Commit: 04b390f21c994b78c8d878b6eb8b113bf0b3d153
https://github.com/Dolibarr/dolibarr/commit/04b390f21c994b78c8d878b6eb8b113bf0b3d153
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-14 (Sun, 14 Feb 2016)
Changed paths:
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Merge pull request #4507 from altatof/PROPAL_CLONE_ON_CREATE_PAGE
FIX ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden constant
Commit: 3925ae0742f2d5b0b22f513986e280026e76a925
https://github.com/Dolibarr/dolibarr/commit/3925ae0742f2d5b0b22f513986e280026e76a925
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-14 (Sun, 14 Feb 2016)
Changed paths:
M htdocs/core/class/html.formcompany.class.php
M htdocs/core/lib/ajax.lib.php
Log Message:
-----------
Fix: we loose ability to refresh contact list when changing a company on
contact tab
Commit: a9aab7545e5af3b44f7fb5fceb26f2dd46e2b114
https://github.com/Dolibarr/dolibarr/commit/a9aab7545e5af3b44f7fb5fceb26f2dd46e2b114
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-15 (Mon, 15 Feb 2016)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #4575 from altatof/fix_ttc_display
FIX: add missing global def for ttc column
Commit: c85b7932a975fa8ea1c1b22ef82eaebd81a904d9
https://github.com/Dolibarr/dolibarr/commit/c85b7932a975fa8ea1c1b22ef82eaebd81a904d9
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-15 (Mon, 15 Feb 2016)
Changed paths:
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/core/class/commonobject.class.php
Commit: 1cf2b1b3af138f49d82ddc350431c14aa8763acc
https://github.com/Dolibarr/dolibarr/commit/1cf2b1b3af138f49d82ddc350431c14aa8763acc
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-15 (Mon, 15 Feb 2016)
Changed paths:
A htdocs/accountancy/bookkeeping/balance.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/adherents/list.php
M htdocs/admin/delais.php
M htdocs/admin/dict.php
M htdocs/admin/oauth.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/oauth/google_oauthcallback.php
M htdocs/core/modules/printing/printgcp.modules.php
M htdocs/exports/class/export.class.php
M htdocs/imports/class/import.class.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 3bcc7b0f8ff4fa4001118529792f65f6c68931dd
https://github.com/Dolibarr/dolibarr/commit/3bcc7b0f8ff4fa4001118529792f65f6c68931dd
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-15 (Mon, 15 Feb 2016)
Changed paths:
M htdocs/comm/mailing/card.php
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/remise.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/modSociete.class.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/product/class/productcustomerprice.class.php
M htdocs/societe/price.php
M scripts/emailings/mailing-send.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/comm/remise.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/filefunc.inc.php
htdocs/societe/price.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/f1c9a6fe4831...3bcc7b0f8ff4