[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] f71b39: Added missing class member
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] f71b39: Added missing class member |
|
Date: |
Fri, 13 Dec 2013 18:14:55 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: f71b39b1c3279abbffdd4aa5ab3a5dd75a04a711
https://github.com/Dolibarr/dolibarr/commit/f71b39b1c3279abbffdd4aa5ab3a5dd75a04a711
Author: Raphaël Doursenaud <address@hidden>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M htdocs/contact/class/contact.class.php
Log Message:
-----------
Added missing class member
Commit: 771d576e2bd14a0a87081fc0f22fef94d8bec29d
https://github.com/Dolibarr/dolibarr/commit/771d576e2bd14a0a87081fc0f22fef94d8bec29d
Author: Raphaël Doursenaud <address@hidden>
Date: 2013-11-29 (Fri, 29 Nov 2013)
Changed paths:
M htdocs/master.inc.php
Log Message:
-----------
Better error wording
Commit: e24555822e74eb5c8f3103382068138b7c56e7c1
https://github.com/Dolibarr/dolibarr/commit/e24555822e74eb5c8f3103382068138b7c56e7c1
Author: Raphaël Doursenaud <address@hidden>
Date: 2013-11-29 (Fri, 29 Nov 2013)
Changed paths:
M htdocs/install/etape1.php
Log Message:
-----------
Fixed install generated $dolibarr_main_url_root_alt path
We now use relative paths.
So let's remove the absolute part from the install generated configuration file.
Commit: 395066519b5c7f3d6dafa8dcdd45583509f612d1
https://github.com/Dolibarr/dolibarr/commit/395066519b5c7f3d6dafa8dcdd45583509f612d1
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M ChangeLog
M htdocs/fourn/commande/liste.php
Log Message:
-----------
Fix: [ bug #1163 ] SQL Error when searching for supplier orders
Commit: 8f1a5533951ccd7847252fa2f3315a836ecffbd6
https://github.com/Dolibarr/dolibarr/commit/8f1a5533951ccd7847252fa2f3315a836ecffbd6
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M ChangeLog
M htdocs/langs/en_US/main.lang
M htdocs/langs/fr_FR/main.lang
Log Message:
-----------
Fix: [ bug #1162 ] Traduction des mi-journées
Commit: 84e345702378c617d6ce1ff9df6cdbe022ae5f7e
https://github.com/Dolibarr/dolibarr/commit/84e345702378c617d6ce1ff9df6cdbe022ae5f7e
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M ChangeLog
M htdocs/societe/consumption.php
Log Message:
-----------
Fix: [ bug #1161 ] Search on product label
Commit: eaa6d987b6012e7d45f924fa8146b9096d5e7172
https://github.com/Dolibarr/dolibarr/commit/eaa6d987b6012e7d45f924fa8146b9096d5e7172
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/ecm/ajax/ecmdatabase.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/ecm/index.php
M htdocs/ecm/tpl/builddatabase.tpl.php
Log Message:
-----------
Fix: When database is not synchronized with dir, we clean database.
Commit: fdc12099860f65e258b29207704d0be353fc4289
https://github.com/Dolibarr/dolibarr/commit/fdc12099860f65e258b29207704d0be353fc4289
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix: [ bug #1163 ] SQL Error when searching for supplier orders
Conflicts:
ChangeLog
Commit: f207aabe7a2a420cfb127ad639fe63a07706df74
https://github.com/Dolibarr/dolibarr/commit/f207aabe7a2a420cfb127ad639fe63a07706df74
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/projet/fiche.php
Log Message:
-----------
Fix: When editing thirdparty, result is not refreshed
Commit: bfd229d484023b6399aed71c0850706c93785cb9
https://github.com/Dolibarr/dolibarr/commit/bfd229d484023b6399aed71c0850706c93785cb9
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/install/mysql/data/llx_c_type_contact.sql
M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
M htdocs/install/mysql/tables/llx_c_type_contact.sql
M htdocs/projet/class/project.class.php
M htdocs/projet/liste.php
Log Message:
-----------
Fix: [ bug #1079 ] External users can't access projects even if it is a
contact.
Commit: a6e4ba70012be5641d73bc532ba75ccd21abbf07
https://github.com/Dolibarr/dolibarr/commit/a6e4ba70012be5641d73bc532ba75ccd21abbf07
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/compta/index.php
Log Message:
-----------
Fix: No limits for drafts lists
Commit: 30428ec6e5a6119f10fbf600440bd6e66877a7c7
https://github.com/Dolibarr/dolibarr/commit/30428ec6e5a6119f10fbf600440bd6e66877a7c7
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Fix: Control on minimum amount must be one only on standard and
replacement invoices.
Conflicts:
htdocs/compta/facture.php
Commit: 0b9e8d6832e627e5f70654810653eb604e18bb21
https://github.com/Dolibarr/dolibarr/commit/0b9e8d6832e627e5f70654810653eb604e18bb21
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/core/tpl/freeproductline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix: Alignement
Commit: 820cdde97b71388e5806afc705d4b796693a590a
https://github.com/Dolibarr/dolibarr/commit/820cdde97b71388e5806afc705d4b796693a590a
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/cashdesk/tpl/ticket.tpl.php
Log Message:
-----------
Fix: Currency is not visible
Commit: dbd1c57f0a728ef60dce158247d12fc089f563ae
https://github.com/Dolibarr/dolibarr/commit/dbd1c57f0a728ef60dce158247d12fc089f563ae
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/cashdesk/validation_verif.php
Log Message:
-----------
Fix: [ bug #1075 ] POS module doesn't decrement stock of products in
Delayed payment mode.
Commit: 2f88406677c94686040c8c607d5f4cb45d477ebc
https://github.com/Dolibarr/dolibarr/commit/2f88406677c94686040c8c607d5f4cb45d477ebc
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/cashdesk/validation_verif.php
Log Message:
-----------
Fix: [ bug #1075 ] POS module doesn't decrement stock of products in
Delayed payment mode.
Commit: 131bbce6f3c60854368ee2b98214929e2e73fad1
https://github.com/Dolibarr/dolibarr/commit/131bbce6f3c60854368ee2b98214929e2e73fad1
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Update changelog
Commit: 45b12739929291ef5b79afbde7de43773e876a53
https://github.com/Dolibarr/dolibarr/commit/45b12739929291ef5b79afbde7de43773e876a53
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/fichinter/class/fichinter.class.php
Log Message:
-----------
Fix: [ bug #1171 ] Documents lost in interventions after validating
Commit: c54c06e8d320bf6859aa4fe40397ae9b79c85924
https://github.com/Dolibarr/dolibarr/commit/c54c06e8d320bf6859aa4fe40397ae9b79c85924
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/fichinter/class/fichinter.class.php
Log Message:
-----------
Fix: [ bug #1171 ] Documents lost in interventions after validating
Commit: 4aea74d6fd7807a6154e1eb3dc9eac3897074489
https://github.com/Dolibarr/dolibarr/commit/4aea74d6fd7807a6154e1eb3dc9eac3897074489
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix: [ bug #1171 ] Documents lost in interventions after validating
Commit: c6991f97d40a3e710900dcb12bd9e06ef7e3f68c
https://github.com/Dolibarr/dolibarr/commit/c6991f97d40a3e710900dcb12bd9e06ef7e3f68c
Author: Florian Henry <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M ChangeLog
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
[ bug #1174 ] Product translated description not good into PDF
Country
Commit: 11efc207559f005ce8edaa8966821047ba29ad5b
https://github.com/Dolibarr/dolibarr/commit/11efc207559f005ce8edaa8966821047ba29ad5b
Author: Florian Henry <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M htdocs/cashdesk/validation_verif.php
M htdocs/ecm/ajax/ecmdatabase.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/ecm/index.php
M htdocs/ecm/tpl/builddatabase.tpl.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fourn/commande/liste.php
M htdocs/langs/en_US/main.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/societe/consumption.php
Log Message:
-----------
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Conflicts:
ChangeLog
Change-Id: I90f7ee62c65ef449c8ca43857d9743d0d953cf4b
Commit: 6c266842847df8861368241e32a6aac468917835
https://github.com/Dolibarr/dolibarr/commit/6c266842847df8861368241e32a6aac468917835
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/admin/bank.php
M htdocs/compta/bank/bankid_fr.php
M htdocs/compta/bank/index.php
M htdocs/societe/rib.php
Log Message:
-----------
Fix: [ bug #1166 ] Supplier account number in its card does not respect
order set in Banks module.
Commit: ff9c84fd0e8fd6e1cd1939f77ad1a3145578e62a
https://github.com/Dolibarr/dolibarr/commit/ff9c84fd0e8fd6e1cd1939f77ad1a3145578e62a
Author: Florian Henry <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Better test for HTMLentities desc translation
Commit: c0ef63fd746e99f31eb1870e5048108441d11c68
https://github.com/Dolibarr/dolibarr/commit/c0ef63fd746e99f31eb1870e5048108441d11c68
Author: Florian Henry <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/comm/propal.php
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Bteer fix
Commit: 1e505434969e35ce2e2e21b1038553feed3bfdf6
https://github.com/Dolibarr/dolibarr/commit/1e505434969e35ce2e2e21b1038553feed3bfdf6
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/contact/class/contact.class.php
M htdocs/install/etape1.php
M htdocs/master.inc.php
Log Message:
-----------
Merge pull request #1331 from GPCsolutions/35b-review
Fixes for 3.5 beta
Commit: b12fb56be41dabff86e72c9da95f8e31bed6898c
https://github.com/Dolibarr/dolibarr/commit/b12fb56be41dabff86e72c9da95f8e31bed6898c
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix regression
Commit: 38e695b960a91a79340ea970030f288b15477c8e
https://github.com/Dolibarr/dolibarr/commit/38e695b960a91a79340ea970030f288b15477c8e
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/societe/soc.php
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Look: Better support for jmobile
Commit: 1b38d36f2884a56e3e265f3cf6a1b099489d791f
https://github.com/Dolibarr/dolibarr/commit/1b38d36f2884a56e3e265f3cf6a1b099489d791f
Author: Florian Henry <address@hidden>
Date: 2013-12-02 (Mon, 02 Dec 2013)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Better Fix
Commit: 1ad1b25f6e6f19040d0eb559a6a8e2b312f5981f
https://github.com/Dolibarr/dolibarr/commit/1ad1b25f6e6f19040d0eb559a6a8e2b312f5981f
Author: Florian Henry <address@hidden>
Date: 2013-12-02 (Mon, 02 Dec 2013)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
remove useless space
Commit: 0907d81fcb816263ae2ddfc1b4b2179b492bde4a
https://github.com/Dolibarr/dolibarr/commit/0907d81fcb816263ae2ddfc1b4b2179b492bde4a
Author: Florian Henry <address@hidden>
Date: 2013-12-02 (Mon, 02 Dec 2013)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Avoid strpos bug if string is empty or null
Commit: 3e712c9c8c8f33a80d74ab04e965394aeea5d7b3
https://github.com/Dolibarr/dolibarr/commit/3e712c9c8c8f33a80d74ab04e965394aeea5d7b3
Author: Florian Henry <address@hidden>
Date: 2013-12-02 (Mon, 02 Dec 2013)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Finnaly make it works
Commit: b6a910cf34f93a1d7e1849f6e17d04a849a2c4f1
https://github.com/Dolibarr/dolibarr/commit/b6a910cf34f93a1d7e1849f6e17d04a849a2c4f1
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-02 (Mon, 02 Dec 2013)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Fix: jmobile is crazy, we can disable it
Commit: bc4cfd66dbd13c12f498527dcba108dd7abb64a7
https://github.com/Dolibarr/dolibarr/commit/bc4cfd66dbd13c12f498527dcba108dd7abb64a7
Author: Florian Henry <address@hidden>
Date: 2013-12-02 (Mon, 02 Dec 2013)
Changed paths:
M ChangeLog
M htdocs/comm/mailing/fiche.php
Log Message:
-----------
Fix: fix unsubscribe URL into mailing when sending manually (not by
script)
Commit: 2c928184882b61c7b5a09a28bac32d7445d9bf89
https://github.com/Dolibarr/dolibarr/commit/2c928184882b61c7b5a09a28bac32d7445d9bf89
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-02 (Mon, 02 Dec 2013)
Changed paths:
M htdocs/langs/en_US/languages.lang
M htdocs/langs/fr_FR/languages.lang
Log Message:
-----------
Missing translations
Commit: 0ff953378620856138f933667b0d4967e1fe82cc
https://github.com/Dolibarr/dolibarr/commit/0ff953378620856138f933667b0d4967e1fe82cc
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-02 (Mon, 02 Dec 2013)
Changed paths:
M htdocs/contact/fiche.php
Log Message:
-----------
Missing css
Commit: d7bb138f439902978f4b2c8d6dee2a6ad750d0a3
https://github.com/Dolibarr/dolibarr/commit/d7bb138f439902978f4b2c8d6dee2a6ad750d0a3
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-02 (Mon, 02 Dec 2013)
Changed paths:
M htdocs/contact/class/contact.class.php
Log Message:
-----------
Fix: Missing status 4 and 5
Commit: a3372a9a0a831b883aec46ab0011d352e96e7b25
https://github.com/Dolibarr/dolibarr/commit/a3372a9a0a831b883aec46ab0011d352e96e7b25
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-02 (Mon, 02 Dec 2013)
Changed paths:
M htdocs/societe/soc.php
Log Message:
-----------
Fix: Regression
Commit: 6c7e173bba39c2c7e7abc1b6e1d5c7bfa5df4393
https://github.com/Dolibarr/dolibarr/commit/6c7e173bba39c2c7e7abc1b6e1d5c7bfa5df4393
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-02 (Mon, 02 Dec 2013)
Changed paths:
M htdocs/core/tpl/contacts.tpl.php
M htdocs/public/test/test_arrays.php
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix: jmobile broken with css tagtable, tagtr and tagtd
Commit: c2a8967b52cf3b154be7d35fdec1eaa427156111
https://github.com/Dolibarr/dolibarr/commit/c2a8967b52cf3b154be7d35fdec1eaa427156111
Author: Florian Henry <address@hidden>
Date: 2013-12-03 (Tue, 03 Dec 2013)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Much better fix for translated product description into PDF
Commit: 533199c1515fe61cade920b2fa824cd2321e4393
https://github.com/Dolibarr/dolibarr/commit/533199c1515fe61cade920b2fa824cd2321e4393
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-03 (Tue, 03 Dec 2013)
Changed paths:
M htdocs/compta/tva/index.php
Log Message:
-----------
Fix: Missing translation and missing comments
Commit: f2ba1a538b92835fa4d100d817c73ad0e3254c73
https://github.com/Dolibarr/dolibarr/commit/f2ba1a538b92835fa4d100d817c73ad0e3254c73
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-03 (Tue, 03 Dec 2013)
Changed paths:
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix: Useless css styles make jmobile wrong
Commit: 24ce511671acb580d74130eee3d282f88909f05d
https://github.com/Dolibarr/dolibarr/commit/24ce511671acb580d74130eee3d282f88909f05d
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-04 (Wed, 04 Dec 2013)
Changed paths:
M htdocs/core/lib/bank.lib.php
M htdocs/societe/class/companybankaccount.class.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/rib.php
Log Message:
-----------
Fix: [ bug #1167 ] Supplier IBAN account number set but no account
specified warning
Commit: d4c007a9094dfb1cb76e698f56e215a7cc347ccf
https://github.com/Dolibarr/dolibarr/commit/d4c007a9094dfb1cb76e698f56e215a7cc347ccf
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-04 (Wed, 04 Dec 2013)
Changed paths:
M ChangeLog
M htdocs/comm/mailing/fiche.php
M htdocs/comm/propal.php
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Merge pull request #1335 from FHenry/3.4
[ bug #1174 ] Product translated description not good into PDF Country
Commit: 42a3cbd27c4680988b78f182e5bbbac6fa2c0ba2
https://github.com/Dolibarr/dolibarr/commit/42a3cbd27c4680988b78f182e5bbbac6fa2c0ba2
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-04 (Wed, 04 Dec 2013)
Changed paths:
M htdocs/admin/company.php
Log Message:
-----------
Fix: Missing css class
Commit: b96c977fa1e3dd7e32ece85795df7471b011a068
https://github.com/Dolibarr/dolibarr/commit/b96c977fa1e3dd7e32ece85795df7471b011a068
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-04 (Wed, 04 Dec 2013)
Changed paths:
M build/doxygen/doxygen_footer.html
Log Message:
-----------
Fix: W3C
Commit: b99eddc73e51fd8bf11198503178474084d76a4d
https://github.com/Dolibarr/dolibarr/commit/b99eddc73e51fd8bf11198503178474084d76a4d
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-05 (Thu, 05 Dec 2013)
Changed paths:
M htdocs/langs/fr_FR/other.lang
Log Message:
-----------
Fix: unit
Commit: f60f5b275127950b01f96f91a67f7dd4d33745ee
https://github.com/Dolibarr/dolibarr/commit/f60f5b275127950b01f96f91a67f7dd4d33745ee
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-06 (Fri, 06 Dec 2013)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix: css
Commit: 598a2413667d732b23904d881892df27f7448dd6
https://github.com/Dolibarr/dolibarr/commit/598a2413667d732b23904d881892df27f7448dd6
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-06 (Fri, 06 Dec 2013)
Changed paths:
M htdocs/core/lib/usergroups.lib.php
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
Log Message:
-----------
Fix: minor css.
Fix: Alignement of screenshot was wrong. Wrapping too.
Commit: 87db1d880bf336d0ae0f2fb3f0ab82f567903ea1
https://github.com/Dolibarr/dolibarr/commit/87db1d880bf336d0ae0f2fb3f0ab82f567903ea1
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-06 (Fri, 06 Dec 2013)
Changed paths:
M htdocs/theme/amarok/style.css.php
Log Message:
-----------
Fix: css
Commit: 76d111b09f415818dae4dbc7b320e347dcd25ae5
https://github.com/Dolibarr/dolibarr/commit/76d111b09f415818dae4dbc7b320e347dcd25ae5
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-06 (Fri, 06 Dec 2013)
Changed paths:
M htdocs/admin/const.php
Log Message:
-----------
Fix: W3C form must be outside table tag
Commit: 62e209520a48a11b350b807f82747ca1fc2e8fa9
https://github.com/Dolibarr/dolibarr/commit/62e209520a48a11b350b807f82747ca1fc2e8fa9
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-06 (Fri, 06 Dec 2013)
Changed paths:
M htdocs/admin/const.php
Log Message:
-----------
Fix: Update when submitting form
Commit: 01a9b23f26de60fe8240f32b96bad5548c7f4dd8
https://github.com/Dolibarr/dolibarr/commit/01a9b23f26de60fe8240f32b96bad5548c7f4dd8
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-06 (Fri, 06 Dec 2013)
Changed paths:
M htdocs/product/fournisseurs.php
Log Message:
-----------
Fix: Vat rate was not set during update
Commit: fa0470bdb98b70490b1b1db0a58bfab955187205
https://github.com/Dolibarr/dolibarr/commit/fa0470bdb98b70490b1b1db0a58bfab955187205
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-06 (Fri, 06 Dec 2013)
Changed paths:
M htdocs/product/admin/product_tools.php
Log Message:
-----------
Fix: Mass update of vat must work also for supplier prices
Commit: adf55408a4737c28cd788461b215fe73ce8f4f85
https://github.com/Dolibarr/dolibarr/commit/adf55408a4737c28cd788461b215fe73ce8f4f85
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-06 (Fri, 06 Dec 2013)
Changed paths:
M htdocs/paypal/lib/paypal.lib.php
M htdocs/public/paypal/paymentko.php
M htdocs/public/paypal/paymentok.php
Log Message:
-----------
Fix: Bad parameter that duplicate info.
Commit: 73e60e0629c4af5da868ec4e1c19b6ba7e6b4bd3
https://github.com/Dolibarr/dolibarr/commit/73e60e0629c4af5da868ec4e1c19b6ba7e6b4bd3
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-07 (Sat, 07 Dec 2013)
Changed paths:
M htdocs/product/admin/product_tools.php
Log Message:
-----------
Fix: Mass update of vat must work also for supplier prices
Conflicts:
htdocs/product/admin/product_tools.php
Commit: 0e819ab5cdf258f1f708669ef709e1b17e491395
https://github.com/Dolibarr/dolibarr/commit/0e819ab5cdf258f1f708669ef709e1b17e491395
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-07 (Sat, 07 Dec 2013)
Changed paths:
M htdocs/.gitignore
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Fix: Missing test
Commit: b637b28c8b5f086b9a6586f3e15c24c10b565e84
https://github.com/Dolibarr/dolibarr/commit/b637b28c8b5f086b9a6586f3e15c24c10b565e84
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-07 (Sat, 07 Dec 2013)
Changed paths:
M htdocs/.gitignore
Log Message:
-----------
Update ignore files
Commit: d8cd7571ec1117b1e2cf33b0802954148107a147
https://github.com/Dolibarr/dolibarr/commit/d8cd7571ec1117b1e2cf33b0802954148107a147
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-07 (Sat, 07 Dec 2013)
Changed paths:
M htdocs/product/admin/product_tools.php
Log Message:
-----------
Merge branch '3.4' of address@hidden:Dolibarr/dolibarr.git into 3.4
Commit: 37b0780523fce7cd5d31f6150236704c5378195f
https://github.com/Dolibarr/dolibarr/commit/37b0780523fce7cd5d31f6150236704c5378195f
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-07 (Sat, 07 Dec 2013)
Changed paths:
M ChangeLog
M htdocs/comm/propal.php
M htdocs/core/lib/pdf.lib.php
M htdocs/ecm/ajax/ecmdatabase.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/ecm/index.php
M htdocs/ecm/tpl/builddatabase.tpl.php
M htdocs/fourn/commande/liste.php
M htdocs/langs/en_US/main.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/societe/consumption.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/ecm/tpl/builddatabase.tpl.php
htdocs/fourn/commande/liste.php
htdocs/product/admin/product_tools.php
Commit: 7aa2c9dcd18ae233ba00083ad213613ce796836b
https://github.com/Dolibarr/dolibarr/commit/7aa2c9dcd18ae233ba00083ad213613ce796836b
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-07 (Sat, 07 Dec 2013)
Changed paths:
M htdocs/admin/modules.php
M htdocs/admin/system/modules.php
Log Message:
-----------
Fix: Error management with corrupted module files
Commit: a05d9b864a28ef2e18e545ca89e06e604d8b4e3f
https://github.com/Dolibarr/dolibarr/commit/a05d9b864a28ef2e18e545ca89e06e604d8b4e3f
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-08 (Sun, 08 Dec 2013)
Changed paths:
M htdocs/compta/facture.php
M htdocs/fourn/commande/fiche.php
Log Message:
-----------
Fix: Test must never be done on a translated string
Commit: beb93e9245c661c41393d0fcdc926130ab556562
https://github.com/Dolibarr/dolibarr/commit/beb93e9245c661c41393d0fcdc926130ab556562
Author: Marcos García de La Fuente <address@hidden>
Date: 2013-12-08 (Sun, 08 Dec 2013)
Changed paths:
M ChangeLog
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Resolved bug #1182: ODT company_country tag is htmlencoded
Commit: 825640d645a6ee4432cebdee0e5a40df8122dcac
https://github.com/Dolibarr/dolibarr/commit/825640d645a6ee4432cebdee0e5a40df8122dcac
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-08 (Sun, 08 Dec 2013)
Changed paths:
M htdocs/core/modules/modFacture.class.php
Log Message:
-----------
Fix: Missing special code into export
Commit: f804833b9cff137ac731bf230a859372b9132355
https://github.com/Dolibarr/dolibarr/commit/f804833b9cff137ac731bf230a859372b9132355
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-08 (Sun, 08 Dec 2013)
Changed paths:
M htdocs/core/modules/modFacture.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
htdocs/core/modules/modFacture.class.php
Commit: bf07bd5b2489e3185ef6d5299f8b00890884a79e
https://github.com/Dolibarr/dolibarr/commit/bf07bd5b2489e3185ef6d5299f8b00890884a79e
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-08 (Sun, 08 Dec 2013)
Changed paths:
M htdocs/langs/en_US/stocks.lang
M htdocs/langs/fr_FR/stocks.lang
Log Message:
-----------
Fix: Missing translation
Commit: 565fb615bce7f32a7b6b7c6611298598ce24afa1
https://github.com/Dolibarr/dolibarr/commit/565fb615bce7f32a7b6b7c6611298598ce24afa1
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-08 (Sun, 08 Dec 2013)
Changed paths:
M htdocs/.gitignore
Log Message:
-----------
Update gitignore
Commit: 705192215a6fad7a1494c888bbe6d19449a92e15
https://github.com/Dolibarr/dolibarr/commit/705192215a6fad7a1494c888bbe6d19449a92e15
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-08 (Sun, 08 Dec 2013)
Changed paths:
M ChangeLog
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge pull request #1341 from marcosgdf/bug-1182
Resolved bug #1182: ODT company_country tag is htmlencoded
Commit: 72250f656ea259d6c87272dbb547a0c2a374be8e
https://github.com/Dolibarr/dolibarr/commit/72250f656ea259d6c87272dbb547a0c2a374be8e
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-08 (Sun, 08 Dec 2013)
Changed paths:
M ChangeLog
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.5
Commit: c49af3da48c5772feac26a9729a2e21f807b7610
https://github.com/Dolibarr/dolibarr/commit/c49af3da48c5772feac26a9729a2e21f807b7610
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
Fix: fields too large
Commit: a89a4ee81ab747fd2d5326b006dcdbb9fa188182
https://github.com/Dolibarr/dolibarr/commit/a89a4ee81ab747fd2d5326b006dcdbb9fa188182
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M htdocs/compta/tva/fiche.php
Log Message:
-----------
Fix: Delete vat entry when bank line was already deleted.
Commit: 286bdf91d4f839b60d92fcbf22fd0c4cbda06e90
https://github.com/Dolibarr/dolibarr/commit/286bdf91d4f839b60d92fcbf22fd0c4cbda06e90
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-10 (Tue, 10 Dec 2013)
Changed paths:
M htdocs/admin/triggers.php
M htdocs/core/class/interfaces.class.php
Log Message:
-----------
Better detection of corrupted module files.
Commit: ce3047203fa6dc22445d540735b8e956d4dcdad3
https://github.com/Dolibarr/dolibarr/commit/ce3047203fa6dc22445d540735b8e956d4dcdad3
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-10 (Tue, 10 Dec 2013)
Changed paths:
M htdocs/comm/propal.php
Log Message:
-----------
Fix: Missing db transaction
Commit: aa4ae6082690683ab95f03ea18263ea9f111efe6
https://github.com/Dolibarr/dolibarr/commit/aa4ae6082690683ab95f03ea18263ea9f111efe6
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-10 (Tue, 10 Dec 2013)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix: sql where on an int must not contains '
Commit: ad420bbf42c9398a8f99a5302bf3ae7d983aa25b
https://github.com/Dolibarr/dolibarr/commit/ad420bbf42c9398a8f99a5302bf3ae7d983aa25b
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-10 (Tue, 10 Dec 2013)
Changed paths:
M htdocs/margin/lib/margins.lib.php
Log Message:
-----------
Mark file as bugged (seriously)
Commit: a6b188ed937c9150f56b53bc59fffbf0e43d6baa
https://github.com/Dolibarr/dolibarr/commit/a6b188ed937c9150f56b53bc59fffbf0e43d6baa
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-10 (Tue, 10 Dec 2013)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix: We should not load stock details at each product fetch
Commit: f0eb98c27acdcb45f7b6726120c7a469c0a8b11f
https://github.com/Dolibarr/dolibarr/commit/f0eb98c27acdcb45f7b6726120c7a469c0a8b11f
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-10 (Tue, 10 Dec 2013)
Changed paths:
M htdocs/expedition/shipment.php
M htdocs/product/class/product.class.php
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/product/stock/product.php
M htdocs/webservices/server_productorservice.php
Log Message:
-----------
Fix: Serious pb with loading stocks. If we use product->stock_reel or
product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().
Commit: 75703a03ccd006097a7de26b13c56975289c0a0a
https://github.com/Dolibarr/dolibarr/commit/75703a03ccd006097a7de26b13c56975289c0a0a
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-10 (Tue, 10 Dec 2013)
Changed paths:
M htdocs/compta/tva/fiche.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.5
Commit: 0247241277978d9a6255b2d5da3192d34b8e72a4
https://github.com/Dolibarr/dolibarr/commit/0247241277978d9a6255b2d5da3192d34b8e72a4
Author: Regis Houssin <address@hidden>
Date: 2013-12-11 (Wed, 11 Dec 2013)
Changed paths:
M htdocs/core/filemanagerdol/connectors/php/config.php
Log Message:
-----------
Fix: wrong path with multicompany module
Commit: c51fa7048cd6d6a414586758f094ce9fdb49541e
https://github.com/Dolibarr/dolibarr/commit/c51fa7048cd6d6a414586758f094ce9fdb49541e
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M htdocs/public/paybox/paymentko.php
M htdocs/public/paybox/paymentok.php
M htdocs/public/paypal/paymentko.php
M htdocs/public/paypal/paymentok.php
Log Message:
-----------
Fix: text must not be encoded when provided as data of a function.
Commit: 5cd6c053849958279ee0ac85bfe6a1592bc24218
https://github.com/Dolibarr/dolibarr/commit/5cd6c053849958279ee0ac85bfe6a1592bc24218
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M htdocs/public/members/new.php
Log Message:
-----------
Fix: Uniformize amounts
Commit: 88aa0ad4dae425ddfa15b38b1f63ba2286e1370a
https://github.com/Dolibarr/dolibarr/commit/88aa0ad4dae425ddfa15b38b1f63ba2286e1370a
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M build/doxygen/doxygen_footer.html
M htdocs/admin/agenda_other.php
M htdocs/cashdesk/deconnexion.php
M htdocs/cashdesk/facturation_dhtml.php
M htdocs/cashdesk/facturation_verif.php
M htdocs/cashdesk/index_verif.php
M htdocs/cashdesk/validation.php
M htdocs/cashdesk/validation_ok.php
M htdocs/cashdesk/validation_ticket.php
M htdocs/cashdesk/validation_verif.php
M htdocs/comm/admin/propal_extrafields.php
M htdocs/comm/propal/document.php
M htdocs/comm/propal/info.php
M htdocs/comm/propal/list.php
M htdocs/comm/propal/note.php
M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
Log Message:
-----------
Fix: Doxygen problems
Commit: b83f664cedd8c2053468c658082270b42aec1515
https://github.com/Dolibarr/dolibarr/commit/b83f664cedd8c2053468c658082270b42aec1515
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M htdocs/core/filemanagerdol/connectors/php/config.php
Log Message:
-----------
Merge branch '3.4' of address@hidden:Dolibarr/dolibarr.git into 3.4
Commit: 42f032ded31a77537e064fe3806ee3db498600c1
https://github.com/Dolibarr/dolibarr/commit/42f032ded31a77537e064fe3806ee3db498600c1
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M htdocs/admin/agenda_other.php
M htdocs/cashdesk/deconnexion.php
M htdocs/cashdesk/facturation_dhtml.php
M htdocs/cashdesk/facturation_verif.php
M htdocs/cashdesk/index_verif.php
M htdocs/cashdesk/validation.php
M htdocs/cashdesk/validation_ok.php
M htdocs/cashdesk/validation_ticket.php
M htdocs/cashdesk/validation_verif.php
M htdocs/comm/admin/propal_extrafields.php
M htdocs/comm/propal/document.php
M htdocs/comm/propal/info.php
M htdocs/comm/propal/list.php
M htdocs/comm/propal/note.php
M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
M htdocs/core/filemanagerdol/connectors/php/config.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.5
Commit: c94083b56e47c28ea73e344f2f080b73e8082635
https://github.com/Dolibarr/dolibarr/commit/c94083b56e47c28ea73e344f2f080b73e8082635
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M htdocs/compta/facture/impayees.php
Log Message:
-----------
Fix: W3C. No form into table. Make some browsers crazy.
Commit: 1f3f6cc7b882789336e1e5dad083cdd396980f6f
https://github.com/Dolibarr/dolibarr/commit/1f3f6cc7b882789336e1e5dad083cdd396980f6f
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Fix: Avoid to have external package into standard distribution
Commit: 4d84fc46a4084911319df3f96b9de15f9e4fef73
https://github.com/Dolibarr/dolibarr/commit/4d84fc46a4084911319df3f96b9de15f9e4fef73
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
build/makepack-dolibarr.pl
Commit: 684be44846d422a178b5fc8bf47f7990a8618c56
https://github.com/Dolibarr/dolibarr/commit/684be44846d422a178b5fc8bf47f7990a8618c56
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.5
Commit: 7af5cc18bc3db82005ecf836878a4c7dc73e4119
https://github.com/Dolibarr/dolibarr/commit/7af5cc18bc3db82005ecf836878a4c7dc73e4119
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M htdocs/langs/ar_SA/bills.lang
M htdocs/langs/ar_SA/main.lang
M htdocs/langs/ar_SA/other.lang
M htdocs/langs/ar_SA/withdrawals.lang
M htdocs/langs/bg_BG/admin.lang
M htdocs/langs/bg_BG/bills.lang
M htdocs/langs/bg_BG/main.lang
M htdocs/langs/bg_BG/other.lang
M htdocs/langs/bg_BG/withdrawals.lang
M htdocs/langs/ca_ES/admin.lang
M htdocs/langs/ca_ES/bills.lang
M htdocs/langs/ca_ES/cron.lang
M htdocs/langs/ca_ES/main.lang
M htdocs/langs/ca_ES/other.lang
M htdocs/langs/da_DK/bills.lang
M htdocs/langs/da_DK/main.lang
M htdocs/langs/da_DK/other.lang
M htdocs/langs/da_DK/withdrawals.lang
M htdocs/langs/de_DE/opensurvey.lang
M htdocs/langs/el_GR/install.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/companies.lang
M htdocs/langs/es_ES/cron.lang
M htdocs/langs/es_ES/help.lang
M htdocs/langs/es_ES/languages.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/es_ES/stocks.lang
M htdocs/langs/et_EE/main.lang
M htdocs/langs/fa_IR/bills.lang
M htdocs/langs/fa_IR/main.lang
M htdocs/langs/fa_IR/other.lang
M htdocs/langs/fa_IR/withdrawals.lang
M htdocs/langs/fi_FI/bills.lang
M htdocs/langs/fi_FI/main.lang
M htdocs/langs/fi_FI/other.lang
M htdocs/langs/fi_FI/withdrawals.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/companies.lang
M htdocs/langs/fr_FR/cron.lang
M htdocs/langs/fr_FR/help.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/langs/fr_FR/projects.lang
M htdocs/langs/he_IL/main.lang
M htdocs/langs/hu_HU/bills.lang
M htdocs/langs/hu_HU/main.lang
M htdocs/langs/hu_HU/other.lang
M htdocs/langs/hu_HU/withdrawals.lang
M htdocs/langs/is_IS/bills.lang
M htdocs/langs/is_IS/main.lang
M htdocs/langs/is_IS/other.lang
M htdocs/langs/is_IS/withdrawals.lang
M htdocs/langs/it_IT/admin.lang
M htdocs/langs/it_IT/agenda.lang
M htdocs/langs/it_IT/banks.lang
M htdocs/langs/it_IT/compta.lang
M htdocs/langs/it_IT/cron.lang
M htdocs/langs/it_IT/main.lang
M htdocs/langs/it_IT/other.lang
M htdocs/langs/it_IT/withdrawals.lang
M htdocs/langs/ja_JP/bills.lang
M htdocs/langs/ja_JP/main.lang
M htdocs/langs/ja_JP/other.lang
M htdocs/langs/ja_JP/withdrawals.lang
M htdocs/langs/ko_KR/main.lang
M htdocs/langs/lv_LV/companies.lang
M htdocs/langs/lv_LV/contracts.lang
M htdocs/langs/lv_LV/install.lang
M htdocs/langs/lv_LV/main.lang
M htdocs/langs/nb_NO/bills.lang
M htdocs/langs/nb_NO/main.lang
M htdocs/langs/nb_NO/other.lang
M htdocs/langs/nb_NO/withdrawals.lang
M htdocs/langs/nl_NL/bills.lang
M htdocs/langs/nl_NL/main.lang
M htdocs/langs/nl_NL/margins.lang
M htdocs/langs/nl_NL/other.lang
M htdocs/langs/nl_NL/withdrawals.lang
M htdocs/langs/pl_PL/bills.lang
M htdocs/langs/pl_PL/main.lang
M htdocs/langs/pl_PL/other.lang
M htdocs/langs/pl_PL/withdrawals.lang
M htdocs/langs/pt_PT/bills.lang
M htdocs/langs/pt_PT/main.lang
M htdocs/langs/pt_PT/other.lang
M htdocs/langs/ro_RO/products.lang
M htdocs/langs/ro_RO/projects.lang
M htdocs/langs/ro_RO/users.lang
M htdocs/langs/ru_RU/bills.lang
M htdocs/langs/ru_RU/main.lang
M htdocs/langs/ru_RU/other.lang
M htdocs/langs/ru_RU/withdrawals.lang
M htdocs/langs/sl_SI/bills.lang
M htdocs/langs/sl_SI/main.lang
M htdocs/langs/sl_SI/other.lang
M htdocs/langs/sl_SI/withdrawals.lang
M htdocs/langs/sv_SE/bills.lang
M htdocs/langs/sv_SE/main.lang
M htdocs/langs/sv_SE/other.lang
M htdocs/langs/sv_SE/withdrawals.lang
M htdocs/langs/uz_UZ/main.lang
M htdocs/langs/vi_VN/main.lang
M htdocs/langs/zh_CN/admin.lang
M htdocs/langs/zh_CN/main.lang
M htdocs/langs/zh_CN/other.lang
M htdocs/langs/zh_TW/bills.lang
M htdocs/langs/zh_TW/main.lang
M htdocs/langs/zh_TW/other.lang
M htdocs/langs/zh_TW/withdrawals.lang
Log Message:
-----------
Sync from transifex
Commit: eaf151d7f5a9e8c45ca6b6f995303977f8a534d1
https://github.com/Dolibarr/dolibarr/commit/eaf151d7f5a9e8c45ca6b6f995303977f8a534d1
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M ChangeLog
M build/doxygen/doxygen_footer.html
M build/makepack-dolibarr.pl
M htdocs/.gitignore
M htdocs/admin/agenda_other.php
M htdocs/admin/company.php
M htdocs/admin/const.php
M htdocs/admin/dict.php
M htdocs/admin/triggers.php
M htdocs/cashdesk/deconnexion.php
M htdocs/cashdesk/facturation_dhtml.php
M htdocs/cashdesk/facturation_verif.php
M htdocs/cashdesk/index_verif.php
M htdocs/cashdesk/validation.php
M htdocs/cashdesk/validation_ok.php
M htdocs/cashdesk/validation_ticket.php
M htdocs/cashdesk/validation_verif.php
M htdocs/comm/admin/propal_extrafields.php
M htdocs/comm/propal.php
M htdocs/comm/propal/document.php
M htdocs/comm/propal/info.php
M htdocs/comm/propal/list.php
M htdocs/comm/propal/note.php
M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
M htdocs/compta/tva/fiche.php
M htdocs/contact/class/contact.class.php
M htdocs/contact/fiche.php
M htdocs/core/filemanagerdol/connectors/php/config.php
M htdocs/core/lib/bank.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/usergroups.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/modFacture.class.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/ecm/ajax/ecmdatabase.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/ecm/index.php
M htdocs/ecm/tpl/builddatabase.tpl.php
M htdocs/fourn/commande/liste.php
M htdocs/install/etape1.php
M htdocs/langs/en_US/languages.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/stocks.lang
M htdocs/langs/fr_FR/languages.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/langs/fr_FR/other.lang
M htdocs/langs/fr_FR/stocks.lang
M htdocs/main.inc.php
M htdocs/master.inc.php
M htdocs/paypal/lib/paypal.lib.php
M htdocs/product/admin/product_tools.php
M htdocs/product/fournisseurs.php
M htdocs/public/members/new.php
M htdocs/public/paybox/paymentko.php
M htdocs/public/paybox/paymentok.php
M htdocs/public/paypal/paymentko.php
M htdocs/public/paypal/paymentok.php
M htdocs/public/test/test_arrays.php
M htdocs/societe/class/companybankaccount.class.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/consumption.php
M htdocs/societe/rib.php
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
htdocs/.gitignore
htdocs/contact/fiche.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/873f4b902df3...eaf151d7f5a9