[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 91885c: FIX when multicompany was ena
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 91885c: FIX when multicompany was enabled, this function d... |
|
Date: |
Fri, 05 Jun 2015 07:50:57 -0700 |
Branch: refs/heads/3.7
Home: https://github.com/Dolibarr/dolibarr
Commit: 91885c9d6fee6c785f3de70a059d07b185669043
https://github.com/Dolibarr/dolibarr/commit/91885c9d6fee6c785f3de70a059d07b185669043
Author: Alexis Algoud <address@hidden>
Date: 2015-05-22 (Fri, 22 May 2015)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
FIX when multicompany was enabled, this function didn't check just on the
good entity (problem when both company use same mask)
Commit: 44c46d68ed4a443962dbdbb8d8ad130f9ee31f82
https://github.com/Dolibarr/dolibarr/commit/44c46d68ed4a443962dbdbb8d8ad130f9ee31f82
Author: Alexis ALGOUD <address@hidden>
Date: 2015-05-23 (Sat, 23 May 2015)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Remove the useless if
Commit: ab0f8050442e3bc3d61992f9de2e4663f4ea6927
https://github.com/Dolibarr/dolibarr/commit/ab0f8050442e3bc3d61992f9de2e4663f4ea6927
Author: Alexis Algoud <address@hidden>
Date: 2015-05-29 (Fri, 29 May 2015)
Changed paths:
M htdocs/adherents/liste.php
M htdocs/contact/list.php
M htdocs/contrat/liste.php
M htdocs/product/liste.php
M htdocs/societe/societe.php
Log Message:
-----------
Merge branch '3.6' of https://github.com/Dolibarr/dolibarr into
fix_multientity_num_check
Commit: dd7febe2b984f0ab2c60d435279e3a0a6374a5c0
https://github.com/Dolibarr/dolibarr/commit/dd7febe2b984f0ab2c60d435279e3a0a6374a5c0
Author: Alexis Algoud <address@hidden>
Date: 2015-05-29 (Fri, 29 May 2015)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
replace test by getEntity()
Commit: 148c36c9d375cedc88b2d5cd14259f2c1c4b53d3
https://github.com/Dolibarr/dolibarr/commit/148c36c9d375cedc88b2d5cd14259f2c1c4b53d3
Author: Alexis Algoud <address@hidden>
Date: 2015-05-29 (Fri, 29 May 2015)
Log Message:
-----------
Merge branch 'fix_multientity_num_check' of github.com:atm-alexis/dolibarr
into fix_multientity_num_check
Conflicts:
htdocs/core/class/commonobject.class.php
Commit: 4324ed82b39eb91f6c1230c2de689701fa484303
https://github.com/Dolibarr/dolibarr/commit/4324ed82b39eb91f6c1230c2de689701fa484303
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-29 (Fri, 29 May 2015)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #2878 from atm-alexis/fix_multientity_num_check
FIX when multicompany was enabled, isExistingObject check wrong
Commit: a60ab7dd29d5e7e90079bd50859ada99a826ebf9
https://github.com/Dolibarr/dolibarr/commit/a60ab7dd29d5e7e90079bd50859ada99a826ebf9
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-30 (Sat, 30 May 2015)
Changed paths:
M htdocs/product/reassort.php
Log Message:
-----------
Merge pull request #2912 from atm-ph/fix_36_reassort_target
FIX top links menu have target attribute with wrong value
Commit: 3f1613197e006e29163b4cdaa1e4c2519827e217
https://github.com/Dolibarr/dolibarr/commit/3f1613197e006e29163b4cdaa1e4c2519827e217
Author: Florian HENRY <address@hidden>
Date: 2015-06-02 (Tue, 02 Jun 2015)
Changed paths:
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
Log Message:
-----------
FIX : If supplier invoice block linked element is display after other
block total HT amount is not reset to 0 and sum other block (like
customer orders values)
Commit: bdaf83a653600ac573397428606749578b5a45f7
https://github.com/Dolibarr/dolibarr/commit/bdaf83a653600ac573397428606749578b5a45f7
Author: Florian HENRY <address@hidden>
Date: 2015-06-02 (Tue, 02 Jun 2015)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/product/reassort.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: fb29fa486afbbb92be7e5da3ba2b1dcdb84bb2e7
https://github.com/Dolibarr/dolibarr/commit/fb29fa486afbbb92be7e5da3ba2b1dcdb84bb2e7
Author: Florian HENRY <address@hidden>
Date: 2015-06-02 (Tue, 02 Jun 2015)
Changed paths:
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
Log Message:
-----------
FIX : total amount in tpl linked object are not reset
Commit: 195a1b2708655a2d62d00879c574e93d22d7bcdc
https://github.com/Dolibarr/dolibarr/commit/195a1b2708655a2d62d00879c574e93d22d7bcdc
Author: jfefe <address@hidden>
Date: 2015-06-04 (Thu, 04 Jun 2015)
Changed paths:
M htdocs/fourn/class/fournisseur.product.class.php
Log Message:
-----------
FIX #2957 : missing $langs object for trigger
Commit: 15060d973c4729c83bc274ba016f6cf7dbf4e1d5
https://github.com/Dolibarr/dolibarr/commit/15060d973c4729c83bc274ba016f6cf7dbf4e1d5
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M htdocs/fourn/class/fournisseur.product.class.php
Log Message:
-----------
Merge pull request #2958 from jfefe/patch-8
FIX #2957 : missing $langs object for trigger
Commit: f7493de50c4c16bf698f04b4d887a9f67442a1d7
https://github.com/Dolibarr/dolibarr/commit/f7493de50c4c16bf698f04b4d887a9f67442a1d7
Author: Maxime Kohlhaas <address@hidden>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Fix : supplier order clone was buggy if notes contains apostrophe
Commit: d138e441f887d4a83ac6b48ee625c25c142fb994
https://github.com/Dolibarr/dolibarr/commit/d138e441f887d4a83ac6b48ee625c25c142fb994
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge pull request #2964 from atm-maxime/3.6
Fix : supplier order clone was buggy if notes contains apostrophe
Commit: 3c8d54d55fc087a13c9a7b4201c02bdf9658bf28
https://github.com/Dolibarr/dolibarr/commit/3c8d54d55fc087a13c9a7b4201c02bdf9658bf28
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
Log Message:
-----------
Merge pull request #2938 from FHenry/3.6
FIX : If supplier invoice block linked element is display after other block
total HT amount is not reset to 0 and sum other block (like customer orders
values)
Commit: 1252a500ce191c6f958537699ac7d11a1fdf1ef6
https://github.com/Dolibarr/dolibarr/commit/1252a500ce191c6f958537699ac7d11a1fdf1ef6
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/fourn/class/fournisseur.product.class.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/51d275ee7746...1252a500ce19