[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 3dc5ff: FIX send mail, copy sendto do
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 3dc5ff: FIX send mail, copy sendto don't read the list of ... |
|
Date: |
Sat, 30 May 2015 18:30:54 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
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: f0a1b7984f7a3659e557fd9aab43afa379ac097f
https://github.com/Dolibarr/dolibarr/commit/f0a1b7984f7a3659e557fd9aab43afa379ac097f
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-18 (Mon, 18 May 2015)
Changed paths:
M htdocs/public/test/test_arrays.php
M htdocs/public/test/test_forms.php
Log Message:
-----------
More complete test pages
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: bcb4754585f0b8651249f2341546a2b0b8064cf5
https://github.com/Dolibarr/dolibarr/commit/bcb4754585f0b8651249f2341546a2b0b8064cf5
Author: maxime peyrot <address@hidden>
Date: 2015-05-21 (Thu, 21 May 2015)
Changed paths:
M htdocs/product/stock/massstockmove.php
Log Message:
-----------
FIX #2856 : Wrong table design
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: 9cf8d6f595ed7db9c6432fd91101d69dd74a382a
https://github.com/Dolibarr/dolibarr/commit/9cf8d6f595ed7db9c6432fd91101d69dd74a382a
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-21 (Thu, 21 May 2015)
Changed paths:
M htdocs/product/stock/massstockmove.php
Log Message:
-----------
Merge pull request #2874 from atm-maximep/fix_table_design
FIX #2856 : Wrong table design
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: 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: 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: 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: 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: 01aad8516ddc0758f37bc19702061c19a50cc983
https://github.com/Dolibarr/dolibarr/commit/01aad8516ddc0758f37bc19702061c19a50cc983
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/adherents/list.php
M htdocs/comm/action/card.php
M htdocs/comm/propal.php
M htdocs/compta/facture/class/facturestats.class.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/html.form.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/don/card.php
M htdocs/don/class/don.class.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
M htdocs/product/list.php
M htdocs/product/reassort.php
M htdocs/product/stock/massstockmove.php
M htdocs/societe/soc.php
M htdocs/societe/societe.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/adherents/list.php
htdocs/compta/dons/card.php
htdocs/compta/dons/class/don.class.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/security.lib.php
htdocs/main.inc.php
htdocs/product/stock/massstockmove.php
htdocs/public/test/test_arrays.php
htdocs/public/test/test_forms.php
htdocs/societe/societe.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/86a5e88d7e18...01aad8516ddc