[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 659570: add a script for migrating pi
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 659570: add a script for migrating pictures of products |
|
Date: |
Sat, 20 Jun 2015 19:45:21 -0700 |
Branch: refs/heads/3.7_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: 659570a6ab69a663f2a638b08777e4e7b1207031
https://github.com/Dolibarr/dolibarr/commit/659570a6ab69a663f2a638b08777e4e7b1207031
Author: jean <address@hidden>
Date: 2015-05-04 (Mon, 04 May 2015)
Changed paths:
A scripts/product/migrate_picture_path.php
Log Message:
-----------
add a script for migrating pictures of products
Commit: 3dc5ffa871226cf4a263aa6923a124e4a6711707
https://github.com/Dolibarr/dolibarr/commit/3dc5ffa871226cf4a263aa6923a124e4a6711707
Author: Alexis Algoud <address@hidden>
Date: 2015-05-13 (Wed, 13 May 2015)
Changed paths:
M htdocs/comm/propal.php
M htdocs/compta/facture.php
Log Message:
-----------
FIX send mail, copy sendto don't read the list of contact
Commit: a4df49f6c889716217027c218fd5a9dbc04c64d5
https://github.com/Dolibarr/dolibarr/commit/a4df49f6c889716217027c218fd5a9dbc04c64d5
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-16 (Sat, 16 May 2015)
Changed paths:
M build/exe/doliwamp/doliwamp.iss
Log Message:
-----------
Prepare packaging
Commit: a4031a3680241275ac3404ba3d4835a3c6ba3701
https://github.com/Dolibarr/dolibarr/commit/a4031a3680241275ac3404ba3d4835a3c6ba3701
Author: Alexis Algoud <address@hidden>
Date: 2015-05-18 (Mon, 18 May 2015)
Changed paths:
M htdocs/comm/propal.php
M htdocs/compta/facture.php
Log Message:
-----------
if contact in sellist, it's an Id
Commit: 40ef5737fcb25bcfefb0c5f25ff348c88c7fb321
https://github.com/Dolibarr/dolibarr/commit/40ef5737fcb25bcfefb0c5f25ff348c88c7fb321
Author: Francis Appels <address@hidden>
Date: 2015-05-19 (Tue, 19 May 2015)
Changed paths:
M htdocs/compta/facture/class/facturestats.class.php
Log Message:
-----------
Fix: SQL error in facturestats on no view rights
table alias sc must be available when user has no rights to view
customers. see where defenition line 80
Commit: 439b416daf9ca722c1a616dfe4e3c8fb069c0ef5
https://github.com/Dolibarr/dolibarr/commit/439b416daf9ca722c1a616dfe4e3c8fb069c0ef5
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-20 (Wed, 20 May 2015)
Changed paths:
M htdocs/compta/facture/class/facturestats.class.php
Log Message:
-----------
Merge pull request #2846 from fappels/3.6
Fix: SQL error in facturestats on no view rights
Commit: a7f6bbd316e9b96216e9b2c7a065c9251c9a8907
https://github.com/Dolibarr/dolibarr/commit/a7f6bbd316e9b96216e9b2c7a065c9251c9a8907
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-05-20 (Wed, 20 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:
-----------
Properly escape untrusted data to prevent HTML injection.
First pass for #2857
Commit: bc672c2c2365a1dd682505983d7e7ad40cd9e66b
https://github.com/Dolibarr/dolibarr/commit/bc672c2c2365a1dd682505983d7e7ad40cd9e66b
Author: Alexis Algoud <address@hidden>
Date: 2015-05-21 (Thu, 21 May 2015)
Changed paths:
M htdocs/core/lib/security.lib.php
Log Message:
-----------
FIX event for restricted user was restricted if company null
Commit: 9184b08f94a7e9eaa7032ec8a1b33c4a62df68f0
https://github.com/Dolibarr/dolibarr/commit/9184b08f94a7e9eaa7032ec8a1b33c4a62df68f0
Author: Alexis Algoud <address@hidden>
Date: 2015-05-21 (Thu, 21 May 2015)
Changed paths:
M htdocs/compta/sociales/charges.php
Log Message:
-----------
FIX button create payment hide if tax amount is less than 1
Commit: f32215a9fc3abfa69c34d4cf65a044b60ff8e93a
https://github.com/Dolibarr/dolibarr/commit/f32215a9fc3abfa69c34d4cf65a044b60ff8e93a
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-21 (Thu, 21 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 pull request #2866 from GPCsolutions/3.5-2857
Properly escape untrusted data to prevent HTML injection.
Commit: 8244d1bd444c0bc516bd1d820eecdd53e0505010
https://github.com/Dolibarr/dolibarr/commit/8244d1bd444c0bc516bd1d820eecdd53e0505010
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-21 (Thu, 21 May 2015)
Changed paths:
M htdocs/core/lib/security.lib.php
Log Message:
-----------
Merge pull request #2869 from
atm-alexis/fix_event_for_user_restricted_if_no_company
FIX event for restricted user was restricted if company null
Commit: 81a919e8a3c5f66e8856bfb952abf457bbee2e9c
https://github.com/Dolibarr/dolibarr/commit/81a919e8a3c5f66e8856bfb952abf457bbee2e9c
Author: Alexis Algoud <address@hidden>
Date: 2015-05-22 (Fri, 22 May 2015)
Changed paths:
M htdocs/compta/sociales/charges.php
Log Message:
-----------
round to price2num
Commit: ff6708840ddd8c30deade00ed72d7c27c5a3813a
https://github.com/Dolibarr/dolibarr/commit/ff6708840ddd8c30deade00ed72d7c27c5a3813a
Author: Maxime Kohlhaas <address@hidden>
Date: 2015-05-22 (Fri, 22 May 2015)
Changed paths:
M htdocs/compta/facture/class/facturestats.class.php
Log Message:
-----------
Fix : facturestats was not filtering on invoice type
Commit: b9ed61eed45fc9d8d0d961084e50d6cee8aa93ed
https://github.com/Dolibarr/dolibarr/commit/b9ed61eed45fc9d8d0d961084e50d6cee8aa93ed
Author: phf <address@hidden>
Date: 2015-05-22 (Fri, 22 May 2015)
Changed paths:
M htdocs/user/group/card.php
Log Message:
-----------
FIX : update usergroup name
Commit: 9c9afc0a93dba3bcaa556542b79a019105dc4194
https://github.com/Dolibarr/dolibarr/commit/9c9afc0a93dba3bcaa556542b79a019105dc4194
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-22 (Fri, 22 May 2015)
Changed paths:
M htdocs/compta/facture/class/facturestats.class.php
Log Message:
-----------
Merge pull request #2876 from atm-maxime/3.6
Fix : facturestats was not filtering on invoice type
Commit: 4de46892d17f93c381554984f3ee030cf2547b7e
https://github.com/Dolibarr/dolibarr/commit/4de46892d17f93c381554984f3ee030cf2547b7e
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-22 (Fri, 22 May 2015)
Changed paths:
M htdocs/compta/sociales/charges.php
Log Message:
-----------
Merge pull request #2872 from
atm-alexis/fix_button_create_payment_on_social_tax_less_than_1euro
FIX button create payment hide if tax amount is less than 1
Commit: 2f5d1f5965419144979383f6ea2086cfb9d96585
https://github.com/Dolibarr/dolibarr/commit/2f5d1f5965419144979383f6ea2086cfb9d96585
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-22 (Fri, 22 May 2015)
Changed paths:
M htdocs/comm/propal.php
M htdocs/compta/facture.php
Log Message:
-----------
Merge pull request #2842 from atm-alexis/fix_email_cc_in_selectlist_on_propal
Fix email cc in selectlist on propal/bill
Commit: dcc197eb6be63a5ab5fdb9cb5fd4a2ac651e51b9
https://github.com/Dolibarr/dolibarr/commit/dcc197eb6be63a5ab5fdb9cb5fd4a2ac651e51b9
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-22 (Fri, 22 May 2015)
Changed paths:
M htdocs/comm/propal.php
M htdocs/compta/facture.php
Log Message:
-----------
Fix bug debian 786479
Commit: 0b4050287892ed3b569ff55ea409b26bbb85dbf8
https://github.com/Dolibarr/dolibarr/commit/0b4050287892ed3b569ff55ea409b26bbb85dbf8
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-22 (Fri, 22 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.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: fe2329518bde1becb6c3f41fcdd9c9176708accb
https://github.com/Dolibarr/dolibarr/commit/fe2329518bde1becb6c3f41fcdd9c9176708accb
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-22 (Fri, 22 May 2015)
Changed paths:
M htdocs/user/group/card.php
Log Message:
-----------
Merge pull request #2877 from atm-ph/fix_37_update_usergroup
FIX : update usergroup name
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: a5f26171663f6ca302d36ccaf15218603c997ec2
https://github.com/Dolibarr/dolibarr/commit/a5f26171663f6ca302d36ccaf15218603c997ec2
Author: phf <address@hidden>
Date: 2015-05-25 (Mon, 25 May 2015)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
FIX : "script" balise with wrong syntax
Commit: 33ad86261afee424a174aec6048951ced02e2147
https://github.com/Dolibarr/dolibarr/commit/33ad86261afee424a174aec6048951ced02e2147
Author: phf <address@hidden>
Date: 2015-05-25 (Mon, 25 May 2015)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
FIX : width multiselect
Commit: 7b163d3b29a4d5a1423c267b4a57c6d75c07361b
https://github.com/Dolibarr/dolibarr/commit/7b163d3b29a4d5a1423c267b4a57c6d75c07361b
Author: phf <address@hidden>
Date: 2015-05-25 (Mon, 25 May 2015)
Changed paths:
M htdocs/contact/card.php
Log Message:
-----------
FIX : create contact with extrafiel is null when it is require
Commit: a33809a52632fd992150e3714ec17057eedb3176
https://github.com/Dolibarr/dolibarr/commit/a33809a52632fd992150e3714ec17057eedb3176
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-25 (Mon, 25 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 remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
Commit: 11d4a945b01e57aa46cd47974348bdba7d9a0101
https://github.com/Dolibarr/dolibarr/commit/11d4a945b01e57aa46cd47974348bdba7d9a0101
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-25 (Mon, 25 May 2015)
Changed paths:
M build/exe/doliwamp/doliwamp.iss
M htdocs/adherents/list.php
M htdocs/comm/propal.php
M htdocs/compta/facture/class/facturestats.class.php
M htdocs/compta/sociales/charges.php
M htdocs/contact/list.php
M htdocs/contrat/list.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/product/list.php
M htdocs/societe/societe.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/contact/list.php
htdocs/contrat/liste.php
htdocs/product/liste.php
Commit: c2decc8aea429fbfac178a14d1d1041c624346cd
https://github.com/Dolibarr/dolibarr/commit/c2decc8aea429fbfac178a14d1d1041c624346cd
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-25 (Mon, 25 May 2015)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/main.inc.php
Log Message:
-----------
Merge pull request #2895 from atm-ph/fix_37_balise_script
FIX : "script" balise with wrong syntax
Commit: cb0b0fba7cd3c1dd8524fe291b83c40eb27df3cd
https://github.com/Dolibarr/dolibarr/commit/cb0b0fba7cd3c1dd8524fe291b83c40eb27df3cd
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-25 (Mon, 25 May 2015)
Changed paths:
M htdocs/contact/card.php
Log Message:
-----------
Merge pull request #2897 from atm-ph/fix_37_create_contact
FIX : create contact with extrafiel is null when it is require
Commit: 3c0da7e2d767b8185b0a090c7de598d9f889bbd4
https://github.com/Dolibarr/dolibarr/commit/3c0da7e2d767b8185b0a090c7de598d9f889bbd4
Author: phf <address@hidden>
Date: 2015-05-26 (Tue, 26 May 2015)
Changed paths:
M htdocs/societe/soc.php
Log Message:
-----------
FIX : extrafields required on thirdparty
Commit: 74c4db0f57364a9cd8c73fc1d6b6326229c4c6d3
https://github.com/Dolibarr/dolibarr/commit/74c4db0f57364a9cd8c73fc1d6b6326229c4c6d3
Author: atm-ph <address@hidden>
Date: 2015-05-26 (Tue, 26 May 2015)
Changed paths:
M htdocs/societe/soc.php
Log Message:
-----------
Remove comment
This comment is false, my $_SESSION was wrong
Commit: 087b026f54d06332326ef6ddc01c4944628444bc
https://github.com/Dolibarr/dolibarr/commit/087b026f54d06332326ef6ddc01c4944628444bc
Author: phf <address@hidden>
Date: 2015-05-26 (Tue, 26 May 2015)
Changed paths:
M htdocs/contact/class/contact.class.php
Log Message:
-----------
Add fetch extrafields in contact's fetch function
Commit: 5a006d824ebe1f89b27701713fa0ae3f2a919b8d
https://github.com/Dolibarr/dolibarr/commit/5a006d824ebe1f89b27701713fa0ae3f2a919b8d
Author: phf <address@hidden>
Date: 2015-05-27 (Wed, 27 May 2015)
Changed paths:
M htdocs/product/reassort.php
Log Message:
-----------
FIX : top links menu have target attribute with wrong value
Commit: a676d3a0d165066b6f5f0dd31c0356668fcdd1de
https://github.com/Dolibarr/dolibarr/commit/a676d3a0d165066b6f5f0dd31c0356668fcdd1de
Author: phf <address@hidden>
Date: 2015-05-27 (Wed, 27 May 2015)
Changed paths:
M htdocs/product/reassort.php
Log Message:
-----------
Merge branch '3.6' into 3.7
Commit: 131c3fcef85d76dadf5018c9117e768b41494b9f
https://github.com/Dolibarr/dolibarr/commit/131c3fcef85d76dadf5018c9117e768b41494b9f
Author: Regis Houssin <address@hidden>
Date: 2015-05-29 (Fri, 29 May 2015)
Changed paths:
M htdocs/core/login/functions_dolibarr.php
Log Message:
-----------
Fix: check the user status during authentication
Commit: a707d4025161c05539d402e9c39ca5268f76dc92
https://github.com/Dolibarr/dolibarr/commit/a707d4025161c05539d402e9c39ca5268f76dc92
Author: Gauthier <address@hidden>
Date: 2015-05-29 (Fri, 29 May 2015)
Changed paths:
M htdocs/comm/action/card.php
Log Message:
-----------
FIX : when we create an agenda event with "Not applicable" status, it is
automatically saved with "To do" status
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: ab29c594e8c125ad9ede64c187f534b602d1024c
https://github.com/Dolibarr/dolibarr/commit/ab29c594e8c125ad9ede64c187f534b602d1024c
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-29 (Fri, 29 May 2015)
Changed paths:
M htdocs/core/login/functions_dolibarr.php
Log Message:
-----------
Merge pull request #2920 from hregis/3.7
Fix: check the user status during authentication
Commit: 81b66559403f7b21656914a9369a761e04c1ead5
https://github.com/Dolibarr/dolibarr/commit/81b66559403f7b21656914a9369a761e04c1ead5
Author: phf <address@hidden>
Date: 2015-05-29 (Fri, 29 May 2015)
Changed paths:
M htdocs/core/login/functions_dolibarr.php
Log Message:
-----------
Merge branch '3.7' of https://github.com/Dolibarr/dolibarr into 3.7
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: abcd7ae667c746e80b937d73488d8b27673da03c
https://github.com/Dolibarr/dolibarr/commit/abcd7ae667c746e80b937d73488d8b27673da03c
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-29 (Fri, 29 May 2015)
Changed paths:
M htdocs/societe/soc.php
Log Message:
-----------
Merge pull request #2903 from atm-ph/fix_37_thirdparty_extrafield
FIX : extrafields required on thirdparty
Commit: 9f52b9e800fde722b57677c11c78774583261647
https://github.com/Dolibarr/dolibarr/commit/9f52b9e800fde722b57677c11c78774583261647
Author: phf <address@hidden>
Date: 2015-05-29 (Fri, 29 May 2015)
Changed paths:
M htdocs/compta/dons/card.php
M htdocs/compta/dons/class/don.class.php
Log Message:
-----------
FIX : #2901
Commit: 2fb44caedb54021056cd047d78955150a9629cc4
https://github.com/Dolibarr/dolibarr/commit/2fb44caedb54021056cd047d78955150a9629cc4
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-29 (Fri, 29 May 2015)
Changed paths:
M htdocs/contact/class/contact.class.php
Log Message:
-----------
Merge pull request #2906 from atm-ph/fix_37_fetch_contact
FIX : Compare array_options with oldcopy
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: d9e8b6d9774a4b277f1399d4d88e8f474e649b6e
https://github.com/Dolibarr/dolibarr/commit/d9e8b6d9774a4b277f1399d4d88e8f474e649b6e
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-30 (Sat, 30 May 2015)
Changed paths:
M htdocs/comm/action/card.php
Log Message:
-----------
Merge pull request #2921 from atm-gauthier/3.7
FIX : when we create an agenda event with "Not applicable" status, it…
Commit: 3690274375a99b241223bcb7c0302e025954ceca
https://github.com/Dolibarr/dolibarr/commit/3690274375a99b241223bcb7c0302e025954ceca
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-31 (Sun, 31 May 2015)
Changed paths:
M htdocs/compta/dons/card.php
M htdocs/compta/dons/class/don.class.php
M htdocs/product/reassort.php
Log Message:
-----------
Merge pull request #2930 from atm-ph/fix_issue_2901
Fix issue 2901
Commit: 7c4c09631076a985411a71eaf26143276807b03f
https://github.com/Dolibarr/dolibarr/commit/7c4c09631076a985411a71eaf26143276807b03f
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-31 (Sun, 31 May 2015)
Changed paths:
M htdocs/langs/en_US/categories.lang
M htdocs/langs/en_US/sendings.lang
Log Message:
-----------
Fix typo
Commit: 3cfe4dc86eef138925028150a38de4194df6929a
https://github.com/Dolibarr/dolibarr/commit/3cfe4dc86eef138925028150a38de4194df6929a
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-31 (Sun, 31 May 2015)
Changed paths:
M dev/fixaltlanguages.sh
M dev/translation/strip_language_file.php
M htdocs/langs/ar_SA/install.lang
M htdocs/langs/ca_ES/accountancy.lang
M htdocs/langs/ca_ES/trips.lang
M htdocs/langs/cs_CZ/accountancy.lang
M htdocs/langs/cs_CZ/admin.lang
M htdocs/langs/cs_CZ/agenda.lang
M htdocs/langs/cs_CZ/bills.lang
M htdocs/langs/cs_CZ/boxes.lang
M htdocs/langs/cs_CZ/cashdesk.lang
M htdocs/langs/cs_CZ/categories.lang
M htdocs/langs/cs_CZ/commercial.lang
M htdocs/langs/cs_CZ/companies.lang
M htdocs/langs/cs_CZ/compta.lang
M htdocs/langs/cs_CZ/contracts.lang
M htdocs/langs/cs_CZ/cron.lang
M htdocs/langs/cs_CZ/deliveries.lang
M htdocs/langs/cs_CZ/donations.lang
M htdocs/langs/cs_CZ/ecm.lang
M htdocs/langs/cs_CZ/externalsite.lang
M htdocs/langs/cs_CZ/holiday.lang
M htdocs/langs/cs_CZ/install.lang
M htdocs/langs/cs_CZ/interventions.lang
M htdocs/langs/cs_CZ/languages.lang
M htdocs/langs/cs_CZ/link.lang
M htdocs/langs/cs_CZ/mails.lang
M htdocs/langs/cs_CZ/main.lang
M htdocs/langs/cs_CZ/margins.lang
M htdocs/langs/cs_CZ/opensurvey.lang
M htdocs/langs/cs_CZ/orders.lang
M htdocs/langs/cs_CZ/other.lang
M htdocs/langs/cs_CZ/paybox.lang
M htdocs/langs/cs_CZ/paypal.lang
M htdocs/langs/cs_CZ/printipp.lang
M htdocs/langs/cs_CZ/productbatch.lang
M htdocs/langs/cs_CZ/products.lang
M htdocs/langs/cs_CZ/projects.lang
M htdocs/langs/cs_CZ/propal.lang
M htdocs/langs/cs_CZ/resource.lang
M htdocs/langs/cs_CZ/salaries.lang
M htdocs/langs/cs_CZ/sendings.lang
M htdocs/langs/cs_CZ/stocks.lang
M htdocs/langs/cs_CZ/suppliers.lang
M htdocs/langs/cs_CZ/trips.lang
M htdocs/langs/cs_CZ/users.lang
M htdocs/langs/cs_CZ/withdrawals.lang
M htdocs/langs/cs_CZ/workflow.lang
M htdocs/langs/de_AT/main.lang
M htdocs/langs/de_AT/other.lang
M htdocs/langs/de_DE/admin.lang
M htdocs/langs/de_DE/agenda.lang
M htdocs/langs/de_DE/banks.lang
M htdocs/langs/de_DE/bills.lang
M htdocs/langs/de_DE/bookmarks.lang
M htdocs/langs/de_DE/boxes.lang
M htdocs/langs/de_DE/cashdesk.lang
M htdocs/langs/de_DE/categories.lang
M htdocs/langs/de_DE/commercial.lang
M htdocs/langs/de_DE/companies.lang
M htdocs/langs/de_DE/compta.lang
M htdocs/langs/de_DE/contracts.lang
M htdocs/langs/de_DE/cron.lang
M htdocs/langs/de_DE/dict.lang
M htdocs/langs/de_DE/errors.lang
M htdocs/langs/de_DE/exports.lang
M htdocs/langs/de_DE/externalsite.lang
M htdocs/langs/de_DE/holiday.lang
M htdocs/langs/de_DE/install.lang
M htdocs/langs/de_DE/link.lang
M htdocs/langs/de_DE/mails.lang
M htdocs/langs/de_DE/main.lang
M htdocs/langs/de_DE/members.lang
M htdocs/langs/de_DE/opensurvey.lang
M htdocs/langs/de_DE/orders.lang
M htdocs/langs/de_DE/other.lang
M htdocs/langs/de_DE/paybox.lang
M htdocs/langs/de_DE/printipp.lang
M htdocs/langs/de_DE/products.lang
M htdocs/langs/de_DE/projects.lang
M htdocs/langs/de_DE/propal.lang
M htdocs/langs/de_DE/sendings.lang
M htdocs/langs/de_DE/stocks.lang
M htdocs/langs/de_DE/suppliers.lang
M htdocs/langs/de_DE/trips.lang
M htdocs/langs/de_DE/users.lang
M htdocs/langs/de_DE/withdrawals.lang
M htdocs/langs/de_DE/workflow.lang
A htdocs/langs/en_GB/categories.lang
A htdocs/langs/en_GB/sendings.lang
A htdocs/langs/es_AR/categories.lang
A htdocs/langs/es_AR/sendings.lang
A htdocs/langs/es_CO/categories.lang
A htdocs/langs/es_CO/sendings.lang
M htdocs/langs/es_MX/admin.lang
M htdocs/langs/es_MX/banks.lang
M htdocs/langs/es_MX/bills.lang
M htdocs/langs/es_MX/categories.lang
A htdocs/langs/es_MX/commercial.lang
R htdocs/langs/es_MX/companies.lang
A htdocs/langs/es_MX/cron.lang
A htdocs/langs/es_MX/interventions.lang
A htdocs/langs/es_MX/mails.lang
M htdocs/langs/es_MX/main.lang
A htdocs/langs/es_MX/orders.lang
A htdocs/langs/es_MX/other.lang
A htdocs/langs/es_MX/productbatch.lang
A htdocs/langs/es_MX/sendings.lang
M htdocs/langs/es_MX/stocks.lang
A htdocs/langs/es_MX/suppliers.lang
A htdocs/langs/es_MX/trips.lang
M htdocs/langs/et_EE/accountancy.lang
M htdocs/langs/et_EE/cashdesk.lang
M htdocs/langs/et_EE/companies.lang
M htdocs/langs/et_EE/install.lang
M htdocs/langs/et_EE/main.lang
M htdocs/langs/et_EE/products.lang
M htdocs/langs/fr_CA/admin.lang
A htdocs/langs/fr_CA/banks.lang
A htdocs/langs/fr_CA/bills.lang
A htdocs/langs/fr_CA/categories.lang
A htdocs/langs/fr_CA/commercial.lang
R htdocs/langs/fr_CA/companies.lang
A htdocs/langs/fr_CA/cron.lang
A htdocs/langs/fr_CA/interventions.lang
A htdocs/langs/fr_CA/mails.lang
M htdocs/langs/fr_CA/main.lang
A htdocs/langs/fr_CA/orders.lang
A htdocs/langs/fr_CA/other.lang
A htdocs/langs/fr_CA/productbatch.lang
A htdocs/langs/fr_CA/sendings.lang
A htdocs/langs/fr_CA/suppliers.lang
A htdocs/langs/fr_CA/trips.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/banks.lang
M htdocs/langs/fr_FR/members.lang
M htdocs/langs/fr_FR/orders.lang
M htdocs/langs/fr_FR/other.lang
M htdocs/langs/fr_FR/productbatch.lang
M htdocs/langs/fr_FR/projects.lang
M htdocs/langs/it_IT/accountancy.lang
M htdocs/langs/it_IT/admin.lang
M htdocs/langs/it_IT/agenda.lang
M htdocs/langs/it_IT/bills.lang
M htdocs/langs/it_IT/categories.lang
M htdocs/langs/it_IT/donations.lang
M htdocs/langs/it_IT/errors.lang
M htdocs/langs/it_IT/orders.lang
M htdocs/langs/it_IT/other.lang
M htdocs/langs/lv_LV/admin.lang
M htdocs/langs/lv_LV/bills.lang
M htdocs/langs/lv_LV/boxes.lang
M htdocs/langs/lv_LV/commercial.lang
M htdocs/langs/lv_LV/dict.lang
M htdocs/langs/nb_NO/admin.lang
M htdocs/langs/nb_NO/agenda.lang
M htdocs/langs/nb_NO/bills.lang
M htdocs/langs/nb_NO/boxes.lang
M htdocs/langs/nb_NO/commercial.lang
M htdocs/langs/nb_NO/contracts.lang
M htdocs/langs/nb_NO/cron.lang
M htdocs/langs/nb_NO/deliveries.lang
M htdocs/langs/nb_NO/errors.lang
M htdocs/langs/nb_NO/install.lang
M htdocs/langs/nb_NO/languages.lang
M htdocs/langs/nb_NO/mailmanspip.lang
M htdocs/langs/nb_NO/main.lang
M htdocs/langs/nb_NO/opensurvey.lang
M htdocs/langs/nb_NO/orders.lang
M htdocs/langs/nb_NO/productbatch.lang
M htdocs/langs/nb_NO/products.lang
M htdocs/langs/nb_NO/propal.lang
M htdocs/langs/nb_NO/salaries.lang
M htdocs/langs/nb_NO/suppliers.lang
M htdocs/langs/nb_NO/trips.lang
A htdocs/langs/pt_BR/productbatch.lang
M htdocs/langs/pt_PT/productbatch.lang
M htdocs/langs/tr_TR/bills.lang
Log Message:
-----------
Sync language files
Commit: 36de50f60dba23a1d88dd5019847d4749005fbeb
https://github.com/Dolibarr/dolibarr/commit/36de50f60dba23a1d88dd5019847d4749005fbeb
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-31 (Sun, 31 May 2015)
Changed paths:
M htdocs/comm/action/card.php
M htdocs/compta/dons/card.php
M htdocs/compta/dons/class/don.class.php
M htdocs/contact/class/contact.class.php
M htdocs/product/reassort.php
M htdocs/societe/soc.php
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: 19694710b2fef16a94c34175421b25e6721fabfd
https://github.com/Dolibarr/dolibarr/commit/19694710b2fef16a94c34175421b25e6721fabfd
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-31 (Sun, 31 May 2015)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Keep this constant visible
Commit: 227f2842c2f5bef4446e0a9daac9b749a667517e
https://github.com/Dolibarr/dolibarr/commit/227f2842c2f5bef4446e0a9daac9b749a667517e
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-31 (Sun, 31 May 2015)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
Log Message:
-----------
Prepare version 3.7.1
Commit: 9753097731f56a558b14abde3c9141726e6ab963
https://github.com/Dolibarr/dolibarr/commit/9753097731f56a558b14abde3c9141726e6ab963
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-31 (Sun, 31 May 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Prepare 3.7.1
Commit: cf4308aa3b7d354de7886c60721c29e782975f13
https://github.com/Dolibarr/dolibarr/commit/cf4308aa3b7d354de7886c60721c29e782975f13
Author: Gauthier <address@hidden>
Date: 2015-06-01 (Mon, 01 Jun 2015)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
FIX : When we automatically creta an order from a proposal with workflow
module, if some extrafields of propal don't exist in order object,
insertExtraFields() function tries to insert extrafields in unexistant column
of commande_extrafields table.
Commit: 0523f226cfba8f0527a9e483920837fa8d6b71c4
https://github.com/Dolibarr/dolibarr/commit/0523f226cfba8f0527a9e483920837fa8d6b71c4
Author: phf <address@hidden>
Date: 2015-06-01 (Mon, 01 Jun 2015)
Changed paths:
M htdocs/comm/mailing/class/mailing.class.php
Log Message:
-----------
FIX : when mailing is deleted, the targets list was kept in database
Commit: cc7f2518b62b06ef29be5d1212a251d56e432526
https://github.com/Dolibarr/dolibarr/commit/cc7f2518b62b06ef29be5d1212a251d56e432526
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-01 (Mon, 01 Jun 2015)
Changed paths:
M htdocs/comm/mailing/class/mailing.class.php
Log Message:
-----------
Merge pull request #2937 from atm-ph/fix_target_list_emailing
FIX : when mailing is deleted, the targets list was kept in database
Commit: 9ed5d817c4d95afd86570332f433f48a72abb12c
https://github.com/Dolibarr/dolibarr/commit/9ed5d817c4d95afd86570332f433f48a72abb12c
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-01 (Mon, 01 Jun 2015)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Merge pull request #2936 from atm-gauthier/3.7
FIX : When we automatically create an order from a proposal with workf…
Commit: d01a777b3ebe1b07a83f20a28ce96a141ec868ce
https://github.com/Dolibarr/dolibarr/commit/d01a777b3ebe1b07a83f20a28ce96a141ec868ce
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-01 (Mon, 01 Jun 2015)
Changed paths:
A scripts/product/migrate_picture_path.php
Log Message:
-----------
Merge pull request #2761 from tiaris/3_7_picturepath_script
FIX add a script for migrating pictures of products
Commit: f0257d02b5d12dc754f0e912e22b42796806e8b7
https://github.com/Dolibarr/dolibarr/commit/f0257d02b5d12dc754f0e912e22b42796806e8b7
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-01 (Mon, 01 Jun 2015)
Changed paths:
M scripts/product/migrate_picture_path.php
Log Message:
-----------
Minor fix
Commit: 4f75ab79dbce0faae28a81abcc81aa6daf9c8a51
https://github.com/Dolibarr/dolibarr/commit/4f75ab79dbce0faae28a81abcc81aa6daf9c8a51
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-01 (Mon, 01 Jun 2015)
Changed paths:
M build/debian/changelog
M htdocs/filefunc.inc.php
Log Message:
-----------
Prepare 3.7.2
Commit: 6e72d3c8cc13972a845a8e868ac32ddaa71901e2
https://github.com/Dolibarr/dolibarr/commit/6e72d3c8cc13972a845a8e868ac32ddaa71901e2
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-01 (Mon, 01 Jun 2015)
Changed paths:
M htdocs/core/modules/modCategorie.class.php
Log Message:
-----------
FIX Export of tags for contact and member
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: 3f4ded4780df440d2aae99ef8a9c224a464e3a5d
https://github.com/Dolibarr/dolibarr/commit/3f4ded4780df440d2aae99ef8a9c224a464e3a5d
Author: Gauthier <address@hidden>
Date: 2015-06-02 (Tue, 02 Jun 2015)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
FIX : When we clone a propal, if it has a project which is not assigned to a
third, it was not on new propal because fk_project was always set to empty
string if new propal is for another third.
Commit: f437bd2d6da63002ad366ea5bead1253d27fa98a
https://github.com/Dolibarr/dolibarr/commit/f437bd2d6da63002ad366ea5bead1253d27fa98a
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
FIX No check warehouse is provided if module stock is not enabled.
Commit: 6a3310daf7aecda23535f21d8848bf2185e6d030
https://github.com/Dolibarr/dolibarr/commit/6a3310daf7aecda23535f21d8848bf2185e6d030
Author: Regis Houssin <address@hidden>
Date: 2015-06-04 (Thu, 04 Jun 2015)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 for multicompany
Fix: use encrypt/decrypt with llx_const for experimental encryption of
sensitive data
Commit: 5139954365489c3d7e65a7525a27d094944b8ab3
https://github.com/Dolibarr/dolibarr/commit/5139954365489c3d7e65a7525a27d094944b8ab3
Author: Regis Houssin <address@hidden>
Date: 2015-06-04 (Thu, 04 Jun 2015)
Changed paths:
M htdocs/comm/propal.php
M htdocs/commande/card.php
M htdocs/compta/facture.php
M htdocs/expedition/card.php
M htdocs/fichinter/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
Log Message:
-----------
Fix: add filter in "dol_most_recent_files" for avoid conflict with
option "Save file on server with name "FA0700034_Original filename""
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: e78dba809be12d616226a3faa9195c799e7ecbc7
https://github.com/Dolibarr/dolibarr/commit/e78dba809be12d616226a3faa9195c799e7ecbc7
Author: Regis Houssin <address@hidden>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 for multicompany
Fix: use encrypt/decrypt with llx_const for experimental encryption of
sensitive data
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: a8433aadbecc5a0218b3f79e3b3ce640f3cb7259
https://github.com/Dolibarr/dolibarr/commit/a8433aadbecc5a0218b3f79e3b3ce640f3cb7259
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Merge pull request #2962 from hregis/3.7_bug2
Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 for multicompany
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: 51d275ee7746fac9fea4d660e0ef7511c5598b68
https://github.com/Dolibarr/dolibarr/commit/51d275ee7746fac9fea4d660e0ef7511c5598b68
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Merge pull request #2941 from atm-gauthier/3.7
FIX : When we clone a propal, if it has a project which is not assign…
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
Commit: b57f0a0e5fb4ab17565551bcc1f70fdd31054abf
https://github.com/Dolibarr/dolibarr/commit/b57f0a0e5fb4ab17565551bcc1f70fdd31054abf
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Fix option to use old path for product is for compatibility if user come
from 3.6 or lower. Must not be enabled on 3.7.0 or +.
Commit: 9a812a6c287913437e0262b4aea5e5acb37318bb
https://github.com/Dolibarr/dolibarr/commit/9a812a6c287913437e0262b4aea5e5acb37318bb
Author: Regis Houssin <address@hidden>
Date: 2015-06-06 (Sat, 06 Jun 2015)
Changed paths:
M htdocs/comm/propal.php
M htdocs/commande/card.php
M htdocs/compta/facture.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/expedition/card.php
M htdocs/fichinter/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
Log Message:
-----------
Fix: add filter for "dol_most_recent_files" for avoid conflict with
option "Save file on server with name "FA0700034-Original filename""
Commit: 536f565d4e4105844e536a3e573da54ab6e50aff
https://github.com/Dolibarr/dolibarr/commit/536f565d4e4105844e536a3e573da54ab6e50aff
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-07 (Sun, 07 Jun 2015)
Changed paths:
M htdocs/core/lib/company.lib.php
Log Message:
-----------
Fix Return value is always utf8 encoded and without entities.
Commit: 65b049fdf559aee19a45a6d4bca664c9767114c9
https://github.com/Dolibarr/dolibarr/commit/65b049fdf559aee19a45a6d4bca664c9767114c9
Author: Regis Houssin <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Fix: Drop foreign key for avoid Mysql crash
Commit: de0dd5da603e93998e9e38d745788ff0fd1dad64
https://github.com/Dolibarr/dolibarr/commit/de0dd5da603e93998e9e38d745788ff0fd1dad64
Author: Regis Houssin <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Fix: Drop foreign key for avoid Mysql crash
Commit: 792911b14f02b7c2226b626a2761bc949c624ac5
https://github.com/Dolibarr/dolibarr/commit/792911b14f02b7c2226b626a2761bc949c624ac5
Author: Regis Houssin <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Revert "Fix: Drop foreign key for avoid Mysql crash"
This reverts commit 65b049fdf559aee19a45a6d4bca664c9767114c9.
Commit: dc3ae2237904bb47737b46bd3194963ac5359645
https://github.com/Dolibarr/dolibarr/commit/dc3ae2237904bb47737b46bd3194963ac5359645
Author: Juanjo Menent <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Merge pull request #2980 from hregis/3.7_crash
Close #2951
Commit: 8d824785f0420ddfd74de79917e610f08fc609eb
https://github.com/Dolibarr/dolibarr/commit/8d824785f0420ddfd74de79917e610f08fc609eb
Author: Regis Houssin <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/company.lib.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
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Merge remote-tracking branch 'dolibarr/3.7' into 3.7
Commit: 7f16eea13b5b248d3f57290a49d005972ad19816
https://github.com/Dolibarr/dolibarr/commit/7f16eea13b5b248d3f57290a49d005972ad19816
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/comm/propal.php
M htdocs/commande/card.php
M htdocs/compta/facture.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/expedition/card.php
M htdocs/fichinter/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
Log Message:
-----------
Merge pull request #2978 from hregis/3.7-bug
Fix: use dash instead underscore and add filter for "dol_most_recent_files" for
avoid conflict
Commit: 08c9dd358d12581c8774d6ae10f707ec745625e8
https://github.com/Dolibarr/dolibarr/commit/08c9dd358d12581c8774d6ae10f707ec745625e8
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
FIX #2983 Load gravatar avatar images securely over HTTPS
Commit: 9e1dd42b56d37f1666bef1db15d348a44eadef51
https://github.com/Dolibarr/dolibarr/commit/9e1dd42b56d37f1666bef1db15d348a44eadef51
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/public/demo/index.php
Log Message:
-----------
Fix #2986
Commit: 3ed200766ccc864216f2a0e7554b233b2859b6b8
https://github.com/Dolibarr/dolibarr/commit/3ed200766ccc864216f2a0e7554b233b2859b6b8
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/comm/propal.php
M htdocs/commande/card.php
M htdocs/compta/facture.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/expedition/card.php
M htdocs/fichinter/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: fd42b17027622f84a65f0a506589e4bc6644d379
https://github.com/Dolibarr/dolibarr/commit/fd42b17027622f84a65f0a506589e4bc6644d379
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge pull request #2984 from GPCsolutions/dolibarr-2983
FIX #2983 Load gravatar avatar images securely over HTTPS
Commit: 35dd069ec974fe1619aac532858ce5fbf83b5b9a
https://github.com/Dolibarr/dolibarr/commit/35dd069ec974fe1619aac532858ce5fbf83b5b9a
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/core/lib/functions.lib.php
M htdocs/public/members/public_card.php
M htdocs/public/members/public_list.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix #2994
Commit: f9d85973aa0d2900e4caea8f0a0b61d415a6325b
https://github.com/Dolibarr/dolibarr/commit/f9d85973aa0d2900e4caea8f0a0b61d415a6325b
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Commit: 05a653ee5f27efa734b21543dd7ed5ea3a5ce725
https://github.com/Dolibarr/dolibarr/commit/05a653ee5f27efa734b21543dd7ed5ea3a5ce725
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/core/class/html.form.class.php
Commit: 14780747fcc9b232acb73558fe5032665988b426
https://github.com/Dolibarr/dolibarr/commit/14780747fcc9b232acb73558fe5032665988b426
Author: Regis Houssin <address@hidden>
Date: 2015-06-10 (Wed, 10 Jun 2015)
Changed paths:
M htdocs/comm/propal.php
M htdocs/commande/card.php
M htdocs/compta/facture.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/expedition/card.php
M htdocs/fichinter/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/public/demo/index.php
M htdocs/public/members/public_card.php
M htdocs/public/members/public_list.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge remote-tracking branch 'dolibarr/3.7' into 3.7
Commit: d89955047b9e257dcb154fcd7baa376b41e77c2a
https://github.com/Dolibarr/dolibarr/commit/d89955047b9e257dcb154fcd7baa376b41e77c2a
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-06-11 (Thu, 11 Jun 2015)
Changed paths:
M htdocs/product/liste.php
Log Message:
-----------
FIX #3009: Better filtering to prevent SQL injection
Commit: 4ee6c1810ef54af0613053cf252fa30fd9e84f9f
https://github.com/Dolibarr/dolibarr/commit/4ee6c1810ef54af0613053cf252fa30fd9e84f9f
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-06-11 (Thu, 11 Jun 2015)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
FIX #3009: Better filtering to prevent SQL injection
Commit: 5783c185bddfe5bc0d8c89b97319d4de2d55bd89
https://github.com/Dolibarr/dolibarr/commit/5783c185bddfe5bc0d8c89b97319d4de2d55bd89
Author: fmarcet <address@hidden>
Date: 2015-06-11 (Thu, 11 Jun 2015)
Changed paths:
M htdocs/product/card.php
Log Message:
-----------
Fix: Not reading external barcode numeration module
Commit: 4a726f6315bcd3419fe857c9e16662021b27e62a
https://github.com/Dolibarr/dolibarr/commit/4a726f6315bcd3419fe857c9e16662021b27e62a
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-12 (Fri, 12 Jun 2015)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix css
Commit: 1a2bde14fb2fad0fab128f25a172579c8667cb15
https://github.com/Dolibarr/dolibarr/commit/1a2bde14fb2fad0fab128f25a172579c8667cb15
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-12 (Fri, 12 Jun 2015)
Changed paths:
M htdocs/core/class/html.formother.class.php
M htdocs/core/lib/functions2.lib.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
FIX Better management error into the color conversion functions
Commit: 87a00d6924ff34014eb74acf6373410f6d1db6af
https://github.com/Dolibarr/dolibarr/commit/87a00d6924ff34014eb74acf6373410f6d1db6af
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-06-12 (Fri, 12 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/core/lib/report.lib.php
Log Message:
-----------
FIX Close bug #2976: "Report" tab is the current tab but it is not marked as
selected by the UI
Commit: 60711d35b8d4cf0190a3cdcb9897c5275b432434
https://github.com/Dolibarr/dolibarr/commit/60711d35b8d4cf0190a3cdcb9897c5275b432434
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-06-12 (Fri, 12 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/societe/soc.php
Log Message:
-----------
FIX Close bug #2900 Courtesy title is not stored in create thirdparty form
Commit: 300cfd22931b0569668a096a912c9b9839ca1ef0
https://github.com/Dolibarr/dolibarr/commit/300cfd22931b0569668a096a912c9b9839ca1ef0
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-06-12 (Fri, 12 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/categories/edit.php
M htdocs/categories/fiche.php
M htdocs/categories/viewcat.php
Log Message:
-----------
FIX Close bug #2891 Category hooks do not work
Commit: 200eb7b1bbf1d2b0b3b63ac18de7913a674a5aa3
https://github.com/Dolibarr/dolibarr/commit/200eb7b1bbf1d2b0b3b63ac18de7913a674a5aa3
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-06-12 (Fri, 12 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/compta/localtax/clients.php
M htdocs/compta/localtax/quadri_detail.php
Log Message:
-----------
FIX Close bug #2855 Wrong translation key in localtax report page
Commit: 03358925215f3b512fcee4d18e4e1402b1188482
https://github.com/Dolibarr/dolibarr/commit/03358925215f3b512fcee4d18e4e1402b1188482
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-06-12 (Fri, 12 Jun 2015)
Changed paths:
M htdocs/install/upgrade2.php
Log Message:
-----------
FIX Close bug #2861 Undefined variable $res when migrating from 3.6.2 to 3.7.0
Commit: e3aa63f3c3bc319672008e430ddb72398d9ce79a
https://github.com/Dolibarr/dolibarr/commit/e3aa63f3c3bc319672008e430ddb72398d9ce79a
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-06-12 (Fri, 12 Jun 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Added log
Commit: 2051a66cd736ddf8cb671a5084d8b9e29bc037b2
https://github.com/Dolibarr/dolibarr/commit/2051a66cd736ddf8cb671a5084d8b9e29bc037b2
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-06-12 (Fri, 12 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/product/liste.php
Log Message:
-----------
FIX Close #2837 Product list table column header does not match column body
Commit: f9574fa4588fb94491ec2b8c65dc2450000c3747
https://github.com/Dolibarr/dolibarr/commit/f9574fa4588fb94491ec2b8c65dc2450000c3747
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-06-12 (Fri, 12 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/product/price.php
Log Message:
-----------
FIX Close #2835 Customer prices of a product shows incorrect history order
Commit: 10d27ea59491fd1f19e79773cd5f796f3f905ef1
https://github.com/Dolibarr/dolibarr/commit/10d27ea59491fd1f19e79773cd5f796f3f905ef1
Author: Juanjo Menent <address@hidden>
Date: 2015-06-12 (Fri, 12 Jun 2015)
Changed paths:
M htdocs/product/card.php
Log Message:
-----------
Merge pull request #3012 from fmarcet/3.7
Fix: Not reading external barcode numeration module
Commit: ab3190df25b453d6c6a11e83976ca3d282db9ae5
https://github.com/Dolibarr/dolibarr/commit/ab3190df25b453d6c6a11e83976ca3d282db9ae5
Author: Juanjo Menent <address@hidden>
Date: 2015-06-12 (Fri, 12 Jun 2015)
Changed paths:
M htdocs/product/liste.php
Log Message:
-----------
Merge pull request #3010 from GPCsolutions/3.6-3009
FIX #3009: Better filtering to prevent SQL injection
Commit: 567dece678ad9b77b30b9fe1e7e765a0e53c3428
https://github.com/Dolibarr/dolibarr/commit/567dece678ad9b77b30b9fe1e7e765a0e53c3428
Author: Juanjo Menent <address@hidden>
Date: 2015-06-12 (Fri, 12 Jun 2015)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
Merge pull request #3011 from GPCsolutions/3.7-3009
FIX #3009: Better filtering to prevent SQL injection
Commit: da535b08e5ca7a986906c788f628b9aebad1365e
https://github.com/Dolibarr/dolibarr/commit/da535b08e5ca7a986906c788f628b9aebad1365e
Author: Juanjo Menent <address@hidden>
Date: 2015-06-12 (Fri, 12 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/compta/localtax/clients.php
M htdocs/compta/localtax/quadri_detail.php
Log Message:
-----------
Merge pull request #3027 from marcosgdf/bug-2855
FIX Close bug #2855 Wrong translation key in localtax report page
Commit: f068203a794b37fd41f51b725f9372372fbdc6d7
https://github.com/Dolibarr/dolibarr/commit/f068203a794b37fd41f51b725f9372372fbdc6d7
Author: Juanjo Menent <address@hidden>
Date: 2015-06-12 (Fri, 12 Jun 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Update changelog
Commit: babd48023fd1b13307c5764166adf6010c6daff7
https://github.com/Dolibarr/dolibarr/commit/babd48023fd1b13307c5764166adf6010c6daff7
Author: Juanjo Menent <address@hidden>
Date: 2015-06-12 (Fri, 12 Jun 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge pull request #3032 from simnandez/3.7
Update changelog
Commit: 7bddca94ef4e429a05c32b7f1306a51cd5f21328
https://github.com/Dolibarr/dolibarr/commit/7bddca94ef4e429a05c32b7f1306a51cd5f21328
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-06-13 (Sat, 13 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/compta/localtax/clients.php
M htdocs/compta/localtax/quadri_detail.php
M htdocs/product/card.php
M htdocs/product/list.php
Log Message:
-----------
Merge branch '3.7' into bug-2900
Conflicts:
ChangeLog
Commit: 12155029279fe748da1ce78275739f38230f1639
https://github.com/Dolibarr/dolibarr/commit/12155029279fe748da1ce78275739f38230f1639
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-06-13 (Sat, 13 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix Close bug #2814 JPEG photos are not displayed in Product photos page
Commit: ea625628cea6930d785267f34f7424306863ba6c
https://github.com/Dolibarr/dolibarr/commit/ea625628cea6930d785267f34f7424306863ba6c
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-06-13 (Sat, 13 Jun 2015)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
Fix Close bug #2786 Objectline_add template shows "0" for non-vat suppliers
Commit: 296b76603a2354134bad2d0dc913d95ba260f780
https://github.com/Dolibarr/dolibarr/commit/296b76603a2354134bad2d0dc913d95ba260f780
Author: Regis Houssin <address@hidden>
Date: 2015-06-13 (Sat, 13 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/compta/localtax/clients.php
M htdocs/compta/localtax/quadri_detail.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/lib/functions2.lib.php
M htdocs/product/card.php
M htdocs/product/list.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.7_bug
Commit: f5168625d810fb14d4c8b976979eae05eabc2ded
https://github.com/Dolibarr/dolibarr/commit/f5168625d810fb14d4c8b976979eae05eabc2ded
Author: Regis Houssin <address@hidden>
Date: 2015-06-13 (Sat, 13 Jun 2015)
Changed paths:
M htdocs/cashdesk/facturation_dhtml.php
M htdocs/cashdesk/javascript/dhtml.js
M htdocs/cashdesk/tpl/facturation1.tpl.php
Log Message:
-----------
Fix: broken feature: barcode search #3019
Commit: 6514f418e5d4b946717c9fe1b43199c45ed779bf
https://github.com/Dolibarr/dolibarr/commit/6514f418e5d4b946717c9fe1b43199c45ed779bf
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-06-13 (Sat, 13 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
Fix [ bug 1852 ] JS error when editing a customer order line
Commit: f67af6dac5cf98bc1abc163b697b841e4c79a9e3
https://github.com/Dolibarr/dolibarr/commit/f67af6dac5cf98bc1abc163b697b841e4c79a9e3
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-14 (Sun, 14 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/categories/edit.php
M htdocs/categories/fiche.php
M htdocs/categories/viewcat.php
Log Message:
-----------
Merge pull request #3026 from marcosgdf/bug-2891
FIX Close bug #2891 Category hooks do not work
Commit: 4dbb3789a23e6a7bed32767ce62f222552d9a834
https://github.com/Dolibarr/dolibarr/commit/4dbb3789a23e6a7bed32767ce62f222552d9a834
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-14 (Sun, 14 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
Merge pull request #3037 from marcosgdf/bug-1852
Fix [ bug 1852 ] JS error when editing a customer order line
Commit: a9bf38b8d3194c8e91f8aca7b3e1f12d072f466f
https://github.com/Dolibarr/dolibarr/commit/a9bf38b8d3194c8e91f8aca7b3e1f12d072f466f
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-14 (Sun, 14 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/core/lib/report.lib.php
Log Message:
-----------
Merge pull request #3022 from marcosgdf/bug-2976
FIX Close bug #2976: "Report" tab is the current tab but it is not marked as
selected by the UI
Commit: aecc5d27a3b8087506a168e6e78bdcdafdf0e941
https://github.com/Dolibarr/dolibarr/commit/aecc5d27a3b8087506a168e6e78bdcdafdf0e941
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-14 (Sun, 14 Jun 2015)
Changed paths:
M htdocs/cashdesk/facturation_dhtml.php
M htdocs/cashdesk/javascript/dhtml.js
M htdocs/cashdesk/tpl/facturation1.tpl.php
M htdocs/expedition/card.php
Log Message:
-----------
Merge pull request #3036 from hregis/3.7_bug
Fix: broken feature: barcode search #3019
Commit: fdced80a48eace414f5052b11fdb4597837d03c4
https://github.com/Dolibarr/dolibarr/commit/fdced80a48eace414f5052b11fdb4597837d03c4
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-14 (Sun, 14 Jun 2015)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
Merge pull request #3035 from marcosgdf/bug-2786
FIX #2786 Objectline_add template shows "0" for non-vat suppliers
Commit: b96ed082605596c03b8befdc9246926918aa97a9
https://github.com/Dolibarr/dolibarr/commit/b96ed082605596c03b8befdc9246926918aa97a9
Author: Regis Houssin <address@hidden>
Date: 2015-06-14 (Sun, 14 Jun 2015)
Changed paths:
M htdocs/compta/bank/virement.php
Log Message:
-----------
Fix: select date problem with mobile device (#3039)
Commit: b42f9a670601710ae35f9b623fc493bad22b74ab
https://github.com/Dolibarr/dolibarr/commit/b42f9a670601710ae35f9b623fc493bad22b74ab
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-14 (Sun, 14 Jun 2015)
Changed paths:
M htdocs/cashdesk/tpl/facturation1.tpl.php
Log Message:
-----------
Fix phpcs
Commit: f8d2e938780090038c76555308e790d3e9fa2ea0
https://github.com/Dolibarr/dolibarr/commit/f8d2e938780090038c76555308e790d3e9fa2ea0
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-14 (Sun, 14 Jun 2015)
Changed paths:
M htdocs/compta/bank/virement.php
Log Message:
-----------
Merge pull request #3044 from hregis/3.5_bug
Fix: select date problem with mobile device (#3039)
Commit: 892ff3b0536c56df98a3023e3bac615482c9f514
https://github.com/Dolibarr/dolibarr/commit/892ff3b0536c56df98a3023e3bac615482c9f514
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-14 (Sun, 14 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/societe/soc.php
Log Message:
-----------
Merge branch 'bug-2900' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-2900
Conflicts:
ChangeLog
Commit: 08a68f2fa3921504d139929ab6e311005f699b2a
https://github.com/Dolibarr/dolibarr/commit/08a68f2fa3921504d139929ab6e311005f699b2a
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-14 (Sun, 14 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/societe/soc.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-2900' into 3.7
Commit: e915a54c39a2ab70166c159d9c713cdac15d2bd4
https://github.com/Dolibarr/dolibarr/commit/e915a54c39a2ab70166c159d9c713cdac15d2bd4
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-14 (Sun, 14 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/install/upgrade2.php
Log Message:
-----------
Merge branch 'bug-2861' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-2861
Conflicts:
ChangeLog
Commit: 288ae5de78aebf4039fef74083189ae8a39d17bb
https://github.com/Dolibarr/dolibarr/commit/288ae5de78aebf4039fef74083189ae8a39d17bb
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-14 (Sun, 14 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/install/upgrade2.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-2861' into 3.5
Commit: d0b2c492a0e8b0e51fad6673f3f2a376fe16ae6c
https://github.com/Dolibarr/dolibarr/commit/d0b2c492a0e8b0e51fad6673f3f2a376fe16ae6c
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-14 (Sun, 14 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/product/liste.php
Log Message:
-----------
Merge branch 'bug-2837' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-2837
Conflicts:
ChangeLog
Commit: c4ff9c326a50240ea01399b5cc71152abc74eb34
https://github.com/Dolibarr/dolibarr/commit/c4ff9c326a50240ea01399b5cc71152abc74eb34
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-14 (Sun, 14 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/product/liste.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-2837' into 3.5
Commit: fadc640335f4b41b9dc946109eaf0f8a636cbfa7
https://github.com/Dolibarr/dolibarr/commit/fadc640335f4b41b9dc946109eaf0f8a636cbfa7
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-14 (Sun, 14 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/product/price.php
Log Message:
-----------
Merge branch 'bug-2835' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-2835
Conflicts:
ChangeLog
Commit: 1fc4716617436bb97b982084dcfbfd2e7fc6a672
https://github.com/Dolibarr/dolibarr/commit/1fc4716617436bb97b982084dcfbfd2e7fc6a672
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-14 (Sun, 14 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/product/price.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-2835' into 3.5
Commit: 14a8a2269ba4e8ac452c9b50bc46676de646b173
https://github.com/Dolibarr/dolibarr/commit/14a8a2269ba4e8ac452c9b50bc46676de646b173
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-14 (Sun, 14 Jun 2015)
Changed paths:
M htdocs/core/lib/functions.lib.php
M htdocs/main.inc.php
Log Message:
-----------
FIX End log must use same level then start log.
Commit: 1007aba6a9c3e95b4e936a6bbeeec68d1c29b48c
https://github.com/Dolibarr/dolibarr/commit/1007aba6a9c3e95b4e936a6bbeeec68d1c29b48c
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-14 (Sun, 14 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/categories/edit.php
M htdocs/categories/fiche.php
M htdocs/categories/viewcat.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/product/liste.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: f4da53c300ee20f472173d9080d89ca1ab838c79
https://github.com/Dolibarr/dolibarr/commit/f4da53c300ee20f472173d9080d89ca1ab838c79
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-14 (Sun, 14 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/compta/bank/virement.php
M htdocs/core/lib/report.lib.php
M htdocs/install/upgrade2.php
M htdocs/product/liste.php
M htdocs/product/price.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/product/liste.php
htdocs/product/price.php
Commit: a7cec18081bcbc98c662e7fdf6a6dbdb18064fc5
https://github.com/Dolibarr/dolibarr/commit/a7cec18081bcbc98c662e7fdf6a6dbdb18064fc5
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-14 (Sun, 14 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/categories/card.php
M htdocs/categories/edit.php
M htdocs/categories/viewcat.php
M htdocs/compta/bank/virement.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/report.lib.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/main.inc.php
M htdocs/product/price.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/categories/fiche.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/upgrade2.php
htdocs/product/liste.php
Commit: adc1998b7306ecdedce37b3e5735b5ae78e3cb21
https://github.com/Dolibarr/dolibarr/commit/adc1998b7306ecdedce37b3e5735b5ae78e3cb21
Author: Marcos García <address@hidden>
Date: 2015-06-15 (Mon, 15 Jun 2015)
Changed paths:
M htdocs/core/class/html.formprojet.class.php
Log Message:
-----------
Fixed undefined variable typo
Commit: 2d3ab3b658be95512a93c0791ae192387afc23fc
https://github.com/Dolibarr/dolibarr/commit/2d3ab3b658be95512a93c0791ae192387afc23fc
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-06-15 (Mon, 15 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/compta/bank/virement.php
M htdocs/core/lib/report.lib.php
M htdocs/install/upgrade2.php
M htdocs/product/liste.php
M htdocs/product/price.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.5' into bug-2814-2
Conflicts:
ChangeLog
Commit: db4d92ccb66aeb5bffd0fe54c836ad851b7393e9
https://github.com/Dolibarr/dolibarr/commit/db4d92ccb66aeb5bffd0fe54c836ad851b7393e9
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-15 (Mon, 15 Jun 2015)
Changed paths:
M htdocs/core/class/html.formprojet.class.php
Log Message:
-----------
Merge pull request #3047 from marcosgdf/patch-2
Fixed undefined variable typo
Commit: 5e25c698913fba31e3ce572a6dcf6d08c75cfb9a
https://github.com/Dolibarr/dolibarr/commit/5e25c698913fba31e3ce572a6dcf6d08c75cfb9a
Author: Regis Houssin <address@hidden>
Date: 2015-06-16 (Tue, 16 Jun 2015)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix: thumb "mini" not deleted
Commit: fa8defa1bf71d2c4de07fa940251d52d1d170b6f
https://github.com/Dolibarr/dolibarr/commit/fa8defa1bf71d2c4de07fa940251d52d1d170b6f
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-16 (Tue, 16 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge pull request #3034 from marcosgdf/bug-2814-2
Fix #2814 JPEG photos are not displayed in Product photos page
Commit: 34468644eff390a341666484655fe3a87cef0b59
https://github.com/Dolibarr/dolibarr/commit/34468644eff390a341666484655fe3a87cef0b59
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-16 (Tue, 16 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Commit: 85fee7ec49989411d33e2c76b8cccf4d7aaafb4f
https://github.com/Dolibarr/dolibarr/commit/85fee7ec49989411d33e2c76b8cccf4d7aaafb4f
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-16 (Tue, 16 Jun 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/product/class/product.class.php
Commit: ceb0d71f54de525f422ffdda46147294cba86130
https://github.com/Dolibarr/dolibarr/commit/ceb0d71f54de525f422ffdda46147294cba86130
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-16 (Tue, 16 Jun 2015)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge pull request #3054 from hregis/3.7_photos
Fix: thumb "mini" not deleted
Commit: 3807fafc1aa68eadc9d4f5cd36f9c8372cf0d414
https://github.com/Dolibarr/dolibarr/commit/3807fafc1aa68eadc9d4f5cd36f9c8372cf0d414
Author: Regis Houssin <address@hidden>
Date: 2015-06-16 (Tue, 16 Jun 2015)
Changed paths:
M htdocs/fichinter/card.php
Log Message:
-----------
Fix: no error message if extrafield is require
Commit: 844ca580962e57bde951bb71e031330a44c0411c
https://github.com/Dolibarr/dolibarr/commit/844ca580962e57bde951bb71e031330a44c0411c
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-17 (Wed, 17 Jun 2015)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Fix: custom dir is missing
Commit: c023c078aea2ed6f847c7f8da0548ea9c800e5a5
https://github.com/Dolibarr/dolibarr/commit/c023c078aea2ed6f847c7f8da0548ea9c800e5a5
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-17 (Wed, 17 Jun 2015)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: 2617d28f58689afd66e7eb82119413b0328028af
https://github.com/Dolibarr/dolibarr/commit/2617d28f58689afd66e7eb82119413b0328028af
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-17 (Wed, 17 Jun 2015)
Changed paths:
M htdocs/fichinter/card.php
Log Message:
-----------
Merge pull request #3057 from hregis/3.7_photos
Fix: no error message if extrafield is require
Commit: 9c6c3ad65d224e6ac44b8ac176ec7db83f7914c6
https://github.com/Dolibarr/dolibarr/commit/9c6c3ad65d224e6ac44b8ac176ec7db83f7914c6
Author: Regis Houssin <address@hidden>
Date: 2015-06-17 (Wed, 17 Jun 2015)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix: wrong user right
Commit: 29a218546222afd68f87504a60a38052ddf79c80
https://github.com/Dolibarr/dolibarr/commit/29a218546222afd68f87504a60a38052ddf79c80
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-19 (Fri, 19 Jun 2015)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge pull request #3063 from hregis/3.7_photos
Fix: wrong user right
Commit: d7f7b4826da3df0fb9c7436af752166842941b6c
https://github.com/Dolibarr/dolibarr/commit/d7f7b4826da3df0fb9c7436af752166842941b6c
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-21 (Sun, 21 Jun 2015)
Changed paths:
M ChangeLog
M build/debian/changelog
M build/exe/doliwamp/doliwamp.iss
M build/makepack-dolibarr.pl
M dev/fixaltlanguages.sh
M dev/translation/strip_language_file.php
M htdocs/adherents/list.php
M htdocs/cashdesk/facturation_dhtml.php
M htdocs/cashdesk/javascript/dhtml.js
M htdocs/cashdesk/tpl/facturation1.tpl.php
M htdocs/categories/card.php
M htdocs/categories/edit.php
M htdocs/categories/viewcat.php
M htdocs/comm/action/card.php
M htdocs/comm/mailing/class/mailing.class.php
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/virement.php
M htdocs/compta/dons/card.php
M htdocs/compta/dons/class/don.class.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facturestats.class.php
M htdocs/compta/localtax/clients.php
M htdocs/compta/localtax/quadri_detail.php
M htdocs/compta/sociales/charges.php
M htdocs/contact/card.php
M htdocs/contact/class/contact.class.php
M htdocs/contact/list.php
M htdocs/contrat/list.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/lib/report.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/modules/modCategorie.class.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/fichinter/card.php
M htdocs/filefunc.inc.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
M htdocs/langs/ar_SA/install.lang
M htdocs/langs/ca_ES/accountancy.lang
M htdocs/langs/ca_ES/trips.lang
M htdocs/langs/cs_CZ/accountancy.lang
M htdocs/langs/cs_CZ/admin.lang
M htdocs/langs/cs_CZ/agenda.lang
M htdocs/langs/cs_CZ/bills.lang
M htdocs/langs/cs_CZ/boxes.lang
M htdocs/langs/cs_CZ/cashdesk.lang
M htdocs/langs/cs_CZ/categories.lang
M htdocs/langs/cs_CZ/commercial.lang
M htdocs/langs/cs_CZ/companies.lang
M htdocs/langs/cs_CZ/compta.lang
M htdocs/langs/cs_CZ/contracts.lang
M htdocs/langs/cs_CZ/cron.lang
M htdocs/langs/cs_CZ/deliveries.lang
M htdocs/langs/cs_CZ/donations.lang
M htdocs/langs/cs_CZ/ecm.lang
M htdocs/langs/cs_CZ/externalsite.lang
M htdocs/langs/cs_CZ/holiday.lang
M htdocs/langs/cs_CZ/install.lang
M htdocs/langs/cs_CZ/interventions.lang
M htdocs/langs/cs_CZ/languages.lang
M htdocs/langs/cs_CZ/link.lang
M htdocs/langs/cs_CZ/mails.lang
M htdocs/langs/cs_CZ/main.lang
M htdocs/langs/cs_CZ/margins.lang
M htdocs/langs/cs_CZ/opensurvey.lang
M htdocs/langs/cs_CZ/orders.lang
M htdocs/langs/cs_CZ/other.lang
M htdocs/langs/cs_CZ/paybox.lang
M htdocs/langs/cs_CZ/paypal.lang
M htdocs/langs/cs_CZ/printipp.lang
M htdocs/langs/cs_CZ/productbatch.lang
M htdocs/langs/cs_CZ/products.lang
M htdocs/langs/cs_CZ/projects.lang
M htdocs/langs/cs_CZ/propal.lang
M htdocs/langs/cs_CZ/resource.lang
M htdocs/langs/cs_CZ/salaries.lang
M htdocs/langs/cs_CZ/sendings.lang
M htdocs/langs/cs_CZ/stocks.lang
M htdocs/langs/cs_CZ/suppliers.lang
M htdocs/langs/cs_CZ/trips.lang
M htdocs/langs/cs_CZ/users.lang
M htdocs/langs/cs_CZ/withdrawals.lang
M htdocs/langs/cs_CZ/workflow.lang
M htdocs/langs/de_AT/main.lang
M htdocs/langs/de_AT/other.lang
M htdocs/langs/de_DE/admin.lang
M htdocs/langs/de_DE/agenda.lang
M htdocs/langs/de_DE/banks.lang
M htdocs/langs/de_DE/bills.lang
M htdocs/langs/de_DE/bookmarks.lang
M htdocs/langs/de_DE/boxes.lang
M htdocs/langs/de_DE/cashdesk.lang
M htdocs/langs/de_DE/categories.lang
M htdocs/langs/de_DE/commercial.lang
M htdocs/langs/de_DE/companies.lang
M htdocs/langs/de_DE/compta.lang
M htdocs/langs/de_DE/contracts.lang
M htdocs/langs/de_DE/cron.lang
M htdocs/langs/de_DE/dict.lang
M htdocs/langs/de_DE/errors.lang
M htdocs/langs/de_DE/exports.lang
M htdocs/langs/de_DE/externalsite.lang
M htdocs/langs/de_DE/holiday.lang
M htdocs/langs/de_DE/install.lang
M htdocs/langs/de_DE/link.lang
M htdocs/langs/de_DE/mails.lang
M htdocs/langs/de_DE/main.lang
M htdocs/langs/de_DE/members.lang
M htdocs/langs/de_DE/opensurvey.lang
M htdocs/langs/de_DE/orders.lang
M htdocs/langs/de_DE/other.lang
M htdocs/langs/de_DE/paybox.lang
M htdocs/langs/de_DE/printipp.lang
M htdocs/langs/de_DE/products.lang
M htdocs/langs/de_DE/projects.lang
M htdocs/langs/de_DE/propal.lang
M htdocs/langs/de_DE/sendings.lang
M htdocs/langs/de_DE/stocks.lang
M htdocs/langs/de_DE/suppliers.lang
M htdocs/langs/de_DE/trips.lang
M htdocs/langs/de_DE/users.lang
M htdocs/langs/de_DE/withdrawals.lang
M htdocs/langs/de_DE/workflow.lang
A htdocs/langs/en_GB/categories.lang
A htdocs/langs/en_GB/sendings.lang
M htdocs/langs/en_US/categories.lang
M htdocs/langs/en_US/sendings.lang
A htdocs/langs/es_AR/categories.lang
A htdocs/langs/es_AR/sendings.lang
A htdocs/langs/es_CO/categories.lang
A htdocs/langs/es_CO/sendings.lang
M htdocs/langs/es_MX/admin.lang
M htdocs/langs/es_MX/banks.lang
M htdocs/langs/es_MX/bills.lang
M htdocs/langs/es_MX/categories.lang
A htdocs/langs/es_MX/commercial.lang
R htdocs/langs/es_MX/companies.lang
A htdocs/langs/es_MX/cron.lang
A htdocs/langs/es_MX/interventions.lang
A htdocs/langs/es_MX/mails.lang
M htdocs/langs/es_MX/main.lang
A htdocs/langs/es_MX/orders.lang
A htdocs/langs/es_MX/other.lang
A htdocs/langs/es_MX/productbatch.lang
A htdocs/langs/es_MX/sendings.lang
M htdocs/langs/es_MX/stocks.lang
A htdocs/langs/es_MX/suppliers.lang
A htdocs/langs/es_MX/trips.lang
M htdocs/langs/et_EE/accountancy.lang
M htdocs/langs/et_EE/cashdesk.lang
M htdocs/langs/et_EE/companies.lang
M htdocs/langs/et_EE/install.lang
M htdocs/langs/et_EE/main.lang
M htdocs/langs/et_EE/products.lang
M htdocs/langs/fr_CA/admin.lang
A htdocs/langs/fr_CA/banks.lang
A htdocs/langs/fr_CA/bills.lang
A htdocs/langs/fr_CA/categories.lang
A htdocs/langs/fr_CA/commercial.lang
R htdocs/langs/fr_CA/companies.lang
A htdocs/langs/fr_CA/cron.lang
A htdocs/langs/fr_CA/interventions.lang
A htdocs/langs/fr_CA/mails.lang
M htdocs/langs/fr_CA/main.lang
A htdocs/langs/fr_CA/orders.lang
A htdocs/langs/fr_CA/other.lang
A htdocs/langs/fr_CA/productbatch.lang
A htdocs/langs/fr_CA/sendings.lang
A htdocs/langs/fr_CA/suppliers.lang
A htdocs/langs/fr_CA/trips.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/banks.lang
M htdocs/langs/fr_FR/members.lang
M htdocs/langs/fr_FR/orders.lang
M htdocs/langs/fr_FR/other.lang
M htdocs/langs/fr_FR/productbatch.lang
M htdocs/langs/fr_FR/projects.lang
M htdocs/langs/it_IT/accountancy.lang
M htdocs/langs/it_IT/admin.lang
M htdocs/langs/it_IT/agenda.lang
M htdocs/langs/it_IT/bills.lang
M htdocs/langs/it_IT/categories.lang
M htdocs/langs/it_IT/donations.lang
M htdocs/langs/it_IT/errors.lang
M htdocs/langs/it_IT/orders.lang
M htdocs/langs/it_IT/other.lang
M htdocs/langs/lv_LV/admin.lang
M htdocs/langs/lv_LV/bills.lang
M htdocs/langs/lv_LV/boxes.lang
M htdocs/langs/lv_LV/commercial.lang
M htdocs/langs/lv_LV/dict.lang
M htdocs/langs/nb_NO/admin.lang
M htdocs/langs/nb_NO/agenda.lang
M htdocs/langs/nb_NO/bills.lang
M htdocs/langs/nb_NO/boxes.lang
M htdocs/langs/nb_NO/commercial.lang
M htdocs/langs/nb_NO/contracts.lang
M htdocs/langs/nb_NO/cron.lang
M htdocs/langs/nb_NO/deliveries.lang
M htdocs/langs/nb_NO/errors.lang
M htdocs/langs/nb_NO/install.lang
M htdocs/langs/nb_NO/languages.lang
M htdocs/langs/nb_NO/mailmanspip.lang
M htdocs/langs/nb_NO/main.lang
M htdocs/langs/nb_NO/opensurvey.lang
M htdocs/langs/nb_NO/orders.lang
M htdocs/langs/nb_NO/productbatch.lang
M htdocs/langs/nb_NO/products.lang
M htdocs/langs/nb_NO/propal.lang
M htdocs/langs/nb_NO/salaries.lang
M htdocs/langs/nb_NO/suppliers.lang
M htdocs/langs/nb_NO/trips.lang
A htdocs/langs/pt_BR/productbatch.lang
M htdocs/langs/pt_PT/productbatch.lang
M htdocs/langs/tr_TR/bills.lang
M htdocs/main.inc.php
M htdocs/product/card.php
M htdocs/product/class/product.class.php
M htdocs/product/list.php
M htdocs/product/price.php
M htdocs/product/reassort.php
M htdocs/public/demo/index.php
M htdocs/public/members/public_card.php
M htdocs/public/members/public_list.php
M htdocs/societe/soc.php
M htdocs/societe/societe.php
M htdocs/theme/eldy/style.css.php
M htdocs/user/group/card.php
A scripts/product/migrate_picture_path.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.7_backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/ebb0a7f5314a...d7f7b4826da3