[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 625285: Fixed translations and BILL_S
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 625285: Fixed translations and BILL_SUPPLIER_BUILDDOC trig... |
Date: |
Sat, 13 Apr 2013 16:47:04 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 6252857440d7f4ddf1f0549e8b89179473809977
https://github.com/Dolibarr/dolibarr/commit/6252857440d7f4ddf1f0549e8b89179473809977
Author: Marcos García <address@hidden>
Date: 2013-04-06 (Sat, 06 Apr 2013)
Changed paths:
M htdocs/adherents/admin/adherent_extrafields.php
M htdocs/admin/agenda_extrafields.php
M htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/langs/en_US/margins.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/margins.lang
M htdocs/langs/fr_FR/margins.lang
Log Message:
-----------
Fixed translations and BILL_SUPPLIER_BUILDDOC trigger
Commit: 56f48245f1a3825a2346581b863a4d769ebebcca
https://github.com/Dolibarr/dolibarr/commit/56f48245f1a3825a2346581b863a4d769ebebcca
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M htdocs/adherents/admin/adherent_extrafields.php
M htdocs/admin/agenda_extrafields.php
M htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/langs/en_US/margins.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/margins.lang
M htdocs/langs/fr_FR/margins.lang
Log Message:
-----------
Merge pull request #809 from marcosgdf/3.3
Improved translations and BILL_SUPPLIER_BUILDDOC trigger
Commit: 4ceeea4a1c24c8690e9e319877be557e2880c79b
https://github.com/Dolibarr/dolibarr/commit/4ceeea4a1c24c8690e9e319877be557e2880c79b
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M htdocs/fourn/facture/fiche.php
Log Message:
-----------
Fix: Can't reset payment due date
Commit: 64a96894733826d0ceafbf902d77e0a0ccc48f7e
https://github.com/Dolibarr/dolibarr/commit/64a96894733826d0ceafbf902d77e0a0ccc48f7e
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M htdocs/core/boxes/box_factures_fourn.php
Log Message:
-----------
Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on
payment
Commit: 515c5e58ca1fb4d9a6e5499509f24777cd0e1ca9
https://github.com/Dolibarr/dolibarr/commit/515c5e58ca1fb4d9a6e5499509f24777cd0e1ca9
Author: simnandez <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Update Changelog
Commit: 35279f652092162c2b6195872305b88166f2ad53
https://github.com/Dolibarr/dolibarr/commit/35279f652092162c2b6195872305b88166f2ad53
Author: simnandez <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Update ChangeLog
Commit: 8f67606685b67bb091e1209f4cd8164094b9f871
https://github.com/Dolibarr/dolibarr/commit/8f67606685b67bb091e1209f4cd8164094b9f871
Author: simnandez <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Spelling fix
Commit: 29124649bdb8e9cd8772b575e23029f5f41ab0e3
https://github.com/Dolibarr/dolibarr/commit/29124649bdb8e9cd8772b575e23029f5f41ab0e3
Author: Juanjo Menent <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge pull request #810 from simnandez/3.3
Update ChangeLog
Commit: b678183ff2d8f3046250cb5428ec5dcef8a861ed
https://github.com/Dolibarr/dolibarr/commit/b678183ff2d8f3046250cb5428ec5dcef8a861ed
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M htdocs/core/class/hookmanager.class.php
Log Message:
-----------
Log
Commit: 6013916d459e4b448ecf0a150755c49fc1edcb21
https://github.com/Dolibarr/dolibarr/commit/6013916d459e4b448ecf0a150755c49fc1edcb21
Author: Marcos García <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M htdocs/commande/orderstoinvoice.php
Log Message:
-----------
Removed duplicated code and fixed a problem with orders2invoice
Commit: 303cf3bc41062c945fa6e3a1132d00e11053cc3e
https://github.com/Dolibarr/dolibarr/commit/303cf3bc41062c945fa6e3a1132d00e11053cc3e
Author: Marcos García <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Updated changelog
Commit: 19c8336e6ead9ef007ab246d9b64641b69371868
https://github.com/Dolibarr/dolibarr/commit/19c8336e6ead9ef007ab246d9b64641b69371868
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge branch '3.3' of address@hidden:Dolibarr/dolibarr.git into 3.3
Commit: 4ce7a704118474b427a7d37c55dab2c7f4878c50
https://github.com/Dolibarr/dolibarr/commit/4ce7a704118474b427a7d37c55dab2c7f4878c50
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/commande/orderstoinvoice.php
Log Message:
-----------
Merge pull request #813 from marcosgdf/3.3
Removed duplicated code and fixed a problem with orders2invoice
Commit: f3bbfe375cc242ccca073f5f3f905c491b710b09
https://github.com/Dolibarr/dolibarr/commit/f3bbfe375cc242ccca073f5f3f905c491b710b09
Author: Regis Houssin <address@hidden>
Date: 2013-04-08 (Mon, 08 Apr 2013)
Changed paths:
M htdocs/paypal/lib/paypal.lib.php
Log Message:
-----------
Fix: for multicompany compatibility
Commit: 98aaec18a72e96ee98cb6bda909c7f84e8ca1202
https://github.com/Dolibarr/dolibarr/commit/98aaec18a72e96ee98cb6bda909c7f84e8ca1202
Author: fhenry <address@hidden>
Date: 2013-04-08 (Mon, 08 Apr 2013)
Changed paths:
M htdocs/admin/commande.php
Log Message:
-----------
Fix [ bug #810 ] Cannot update ODT template path
Commit: f17ba4814e9c175cb45b1aec80835ee0a15be90b
https://github.com/Dolibarr/dolibarr/commit/f17ba4814e9c175cb45b1aec80835ee0a15be90b
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-08 (Mon, 08 Apr 2013)
Changed paths:
M htdocs/admin/commande.php
Log Message:
-----------
Merge pull request #816 from FHenry/3.3
Fix [ bug #810 ] Cannot update ODT template path
Commit: 8118332dfb0419b68e07f93bd3330d3f9649a143
https://github.com/Dolibarr/dolibarr/commit/8118332dfb0419b68e07f93bd3330d3f9649a143
Author: Regis Houssin <address@hidden>
Date: 2013-04-10 (Wed, 10 Apr 2013)
Changed paths:
M htdocs/core/modules/mailings/contacts2.modules.php
Log Message:
-----------
Fix: security
Conflicts:
htdocs/core/modules/mailings/contacts2.modules.php
Commit: 38e30836a5972bea3621cb080801ef94c76f4dc3
https://github.com/Dolibarr/dolibarr/commit/38e30836a5972bea3621cb080801ef94c76f4dc3
Author: fhenry <address@hidden>
Date: 2013-04-10 (Wed, 10 Apr 2013)
Changed paths:
M htdocs/admin/syslog.php
M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
Log Message:
-----------
Fix bug with multicompany (SYSLOG_FILE on wrong entity)
Commit: eb78de19813619df9c8ee9357a80612d3ac3c9c7
https://github.com/Dolibarr/dolibarr/commit/eb78de19813619df9c8ee9357a80612d3ac3c9c7
Author: Regis Houssin <address@hidden>
Date: 2013-04-10 (Wed, 10 Apr 2013)
Changed paths:
M htdocs/admin/syslog.php
M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
Log Message:
-----------
Merge pull request #820 from FHenry/3.3
Fix bug with multicompany (SYSLOG_FILE on wrong entity)
Commit: 057365b69e837b6f1a8410acb55530ae47ac46d1
https://github.com/Dolibarr/dolibarr/commit/057365b69e837b6f1a8410acb55530ae47ac46d1
Author: Regis Houssin <address@hidden>
Date: 2013-04-10 (Wed, 10 Apr 2013)
Changed paths:
M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
Log Message:
-----------
Fix: change for experimental encryption
Commit: b80d4874e3c1e6428a22760d4d293549ef85dc88
https://github.com/Dolibarr/dolibarr/commit/b80d4874e3c1e6428a22760d4d293549ef85dc88
Author: Regis Houssin <address@hidden>
Date: 2013-04-10 (Wed, 10 Apr 2013)
Changed paths:
M htdocs/admin/commande.php
M htdocs/admin/syslog.php
M htdocs/core/modules/mailings/contacts2.modules.php
M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
Log Message:
-----------
Merge branch '3.3' of address@hidden:Dolibarr/dolibarr.git into 3.3
Conflicts:
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
Commit: 19e902ef8f104b5c5599168ed46220b902c5da38
https://github.com/Dolibarr/dolibarr/commit/19e902ef8f104b5c5599168ed46220b902c5da38
Author: Regis Houssin <address@hidden>
Date: 2013-04-10 (Wed, 10 Apr 2013)
Changed paths:
M htdocs/core/modules/mailings/contacts2.modules.php
Log Message:
-----------
Fix: filter on all contacts, not just those related to a company
Commit: 5d94b0c5768607928d567b5e55591d1d0f3d291c
https://github.com/Dolibarr/dolibarr/commit/5d94b0c5768607928d567b5e55591d1d0f3d291c
Author: fhenry <address@hidden>
Date: 2013-04-10 (Wed, 10 Apr 2013)
Changed paths:
M htdocs/admin/commande.php
M htdocs/admin/propal.php
Log Message:
-----------
Fix bug : change path of ODT template for commande and propal module
Commit: c4d0c4c3e50e5ce2af960a64e854904b27c1f26b
https://github.com/Dolibarr/dolibarr/commit/c4d0c4c3e50e5ce2af960a64e854904b27c1f26b
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-10 (Wed, 10 Apr 2013)
Changed paths:
M htdocs/admin/commande.php
M htdocs/admin/propal.php
Log Message:
-----------
Merge pull request #821 from FHenry/3.3
Fix bug : change path of ODT template for commande and propal module
Commit: 72f0ca194cdf087c884088dbfdd958cade1932da
https://github.com/Dolibarr/dolibarr/commit/72f0ca194cdf087c884088dbfdd958cade1932da
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-10 (Wed, 10 Apr 2013)
Changed paths:
M htdocs/langs/ar_SA/admin.lang
M htdocs/langs/bg_BG/admin.lang
M htdocs/langs/ca_ES/admin.lang
M htdocs/langs/da_DK/admin.lang
M htdocs/langs/de_AT/admin.lang
M htdocs/langs/de_DE/admin.lang
M htdocs/langs/el_GR/admin.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/et_EE/admin.lang
M htdocs/langs/fa_IR/admin.lang
M htdocs/langs/fi_FI/admin.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/he_IL/admin.lang
M htdocs/langs/hu_HU/admin.lang
M htdocs/langs/is_IS/admin.lang
M htdocs/langs/it_IT/admin.lang
M htdocs/langs/ja_JP/admin.lang
M htdocs/langs/nb_NO/admin.lang
M htdocs/langs/nl_BE/admin.lang
M htdocs/langs/nl_NL/admin.lang
M htdocs/langs/pl_PL/admin.lang
M htdocs/langs/pt_BR/admin.lang
M htdocs/langs/pt_PT/admin.lang
M htdocs/langs/ro_RO/admin.lang
M htdocs/langs/ru_RU/admin.lang
M htdocs/langs/sl_SI/admin.lang
M htdocs/langs/sv_SE/admin.lang
M htdocs/langs/tr_TR/admin.lang
M htdocs/langs/zh_CN/admin.lang
M htdocs/langs/zh_TW/admin.lang
Log Message:
-----------
Fix: Solve conflict of translation
Commit: 43d4bb6155d877b8d25ee6ca53a6c4f99c6955e4
https://github.com/Dolibarr/dolibarr/commit/43d4bb6155d877b8d25ee6ca53a6c4f99c6955e4
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-10 (Wed, 10 Apr 2013)
Changed paths:
M htdocs/admin/commande.php
M htdocs/admin/propal.php
M htdocs/admin/syslog.php
M htdocs/core/modules/mailings/contacts2.modules.php
M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
Log Message:
-----------
Merge branch '3.3' of address@hidden:Dolibarr/dolibarr.git into 3.3
Commit: 3bcd506e73dd753d8afdaea2e2fa1fedec4ffbf3
https://github.com/Dolibarr/dolibarr/commit/3bcd506e73dd753d8afdaea2e2fa1fedec4ffbf3
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-10 (Wed, 10 Apr 2013)
Changed paths:
M htdocs/public/demo/index.php
Log Message:
-----------
Fix: demo modules list
Commit: d570aa02d4b097c5dc3249fca86831d04c3a3ccc
https://github.com/Dolibarr/dolibarr/commit/d570aa02d4b097c5dc3249fca86831d04c3a3ccc
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-10 (Wed, 10 Apr 2013)
Changed paths:
M htdocs/public/demo/index.php
Log Message:
-----------
Fix: bad url
Commit: 76c180aaafd5e72846f9b7d1378a9dc8e2d9eaf5
https://github.com/Dolibarr/dolibarr/commit/76c180aaafd5e72846f9b7d1378a9dc8e2d9eaf5
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-10 (Wed, 10 Apr 2013)
Changed paths:
M htdocs/public/demo/index.php
Log Message:
-----------
Fix: encoding at wrong place
Commit: 662d9cfa6efa5d5a212c7d132d33ab012b8a5b32
https://github.com/Dolibarr/dolibarr/commit/662d9cfa6efa5d5a212c7d132d33ab012b8a5b32
Author: Regis Houssin <address@hidden>
Date: 2013-04-11 (Thu, 11 Apr 2013)
Changed paths:
M htdocs/core/class/conf.class.php
Log Message:
-----------
Fix: for avoid problem with multicompany thirdparty sharing
Commit: 9ec74194a0cff38ec994244937dcb2dd5f6ea34b
https://github.com/Dolibarr/dolibarr/commit/9ec74194a0cff38ec994244937dcb2dd5f6ea34b
Author: Marcos García <address@hidden>
Date: 2013-04-11 (Thu, 11 Apr 2013)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Translated linked object propal module name
Commit: 49108711800fbdfc6f0f88414d6cee31a0d150ff
https://github.com/Dolibarr/dolibarr/commit/49108711800fbdfc6f0f88414d6cee31a0d150ff
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-11 (Thu, 11 Apr 2013)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Merge pull request #824 from marcosgdf/3.3
Translated linked object propal module name
Commit: 85e09a953f87481cd3a74d5049760f48ec72b9be
https://github.com/Dolibarr/dolibarr/commit/85e09a953f87481cd3a74d5049760f48ec72b9be
Author: Regis Houssin <address@hidden>
Date: 2013-04-12 (Fri, 12 Apr 2013)
Changed paths:
M htdocs/core/lib/files.lib.php
Log Message:
-----------
Fix: missing return with hook
Commit: 9596134e47b810a00bf574e96c1560026aa91296
https://github.com/Dolibarr/dolibarr/commit/9596134e47b810a00bf574e96c1560026aa91296
Author: Regis Houssin <address@hidden>
Date: 2013-04-12 (Fri, 12 Apr 2013)
Changed paths:
M htdocs/core/lib/files.lib.php
Log Message:
-----------
Fix: use new method
Commit: b6f765ef3c7cb3af194c76b96286f31eae65fe5f
https://github.com/Dolibarr/dolibarr/commit/b6f765ef3c7cb3af194c76b96286f31eae65fe5f
Author: Marcos García <address@hidden>
Date: 2013-04-12 (Fri, 12 Apr 2013)
Changed paths:
M htdocs/langs/es_ES/errors.lang
M htdocs/langs/es_ES/install.lang
Log Message:
-----------
Improved es_ES translations
Commit: ac0cd975cd5b688a410aafcc98581226a41b8a1b
https://github.com/Dolibarr/dolibarr/commit/ac0cd975cd5b688a410aafcc98581226a41b8a1b
Author: Marcos García <address@hidden>
Date: 2013-04-13 (Sat, 13 Apr 2013)
Changed paths:
M htdocs/fourn/facture/fiche.php
Log Message:
-----------
Added missing table head strings into supplier invoices
Commit: 1409b2b81ade640fc71534d58b24ab0967c610e9
https://github.com/Dolibarr/dolibarr/commit/1409b2b81ade640fc71534d58b24ab0967c610e9
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-13 (Sat, 13 Apr 2013)
Changed paths:
M htdocs/fourn/facture/fiche.php
M htdocs/langs/es_ES/errors.lang
M htdocs/langs/es_ES/install.lang
Log Message:
-----------
Merge pull request #826 from marcosgdf/3.3
Improved translations
Commit: d6b42ac87924a38ed3307e93c38c6dedf4563ef7
https://github.com/Dolibarr/dolibarr/commit/d6b42ac87924a38ed3307e93c38c6dedf4563ef7
Author: Marcos García <address@hidden>
Date: 2013-04-13 (Sat, 13 Apr 2013)
Changed paths:
M htdocs/compta/journal/sellsjournal.php
M htdocs/langs/es_ES/compta.lang
Log Message:
-----------
[ bug #816 ] Sales journal does not reflect localtaxes
Commit: 3ed4d7bfbf5c9a86058a3614fa77770a599f2b0c
https://github.com/Dolibarr/dolibarr/commit/3ed4d7bfbf5c9a86058a3614fa77770a599f2b0c
Author: Marcos García <address@hidden>
Date: 2013-04-13 (Sat, 13 Apr 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Updated changelog
Commit: b3a035951fa85f1903d93d5ed36e5fd217b0793a
https://github.com/Dolibarr/dolibarr/commit/b3a035951fa85f1903d93d5ed36e5fd217b0793a
Author: Marcos García <address@hidden>
Date: 2013-04-13 (Sat, 13 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/compta/journal/purchasesjournal.php
Log Message:
-----------
[ bug #817 ] Purchases journal does not reflect localtaxes
Commit: 404ad184253b0f7a14be31ac2f6fb26dd67766bc
https://github.com/Dolibarr/dolibarr/commit/404ad184253b0f7a14be31ac2f6fb26dd67766bc
Author: Marcos García <address@hidden>
Date: 2013-04-13 (Sat, 13 Apr 2013)
Changed paths:
M htdocs/langs/en_US/bills.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/fr_FR/bills.lang
Log Message:
-----------
Added missing translation
Commit: 85866ff9a645a7125b947bd4bda312f72b3c03b3
https://github.com/Dolibarr/dolibarr/commit/85866ff9a645a7125b947bd4bda312f72b3c03b3
Author: Marcos García <address@hidden>
Date: 2013-04-13 (Sat, 13 Apr 2013)
Changed paths:
M htdocs/langs/en_US/bills.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/fr_FR/bills.lang
Log Message:
-----------
Revert "Added missing translation"
This reverts commit 404ad184253b0f7a14be31ac2f6fb26dd67766bc.
Commit: 580881c205080fec5447039d91726a209597fa43
https://github.com/Dolibarr/dolibarr/commit/580881c205080fec5447039d91726a209597fa43
Author: Marcos García <address@hidden>
Date: 2013-04-13 (Sat, 13 Apr 2013)
Changed paths:
M htdocs/compta/facture/impayees.php
Log Message:
-----------
Replaced `Rest` not translated string with `AlreadyPaid`
Commit: a6ed2551fbb44b1a23f8da989a08d988730c0385
https://github.com/Dolibarr/dolibarr/commit/a6ed2551fbb44b1a23f8da989a08d988730c0385
Author: Marcos García <address@hidden>
Date: 2013-04-13 (Sat, 13 Apr 2013)
Changed paths:
M htdocs/compta/facture/impayees.php
Log Message:
-----------
Revert "Replaced `Rest` not translated string with `AlreadyPaid`"
This reverts commit 580881c205080fec5447039d91726a209597fa43.
Commit: 418921f360e88299285bae6bb6ac11db80ec5ac5
https://github.com/Dolibarr/dolibarr/commit/418921f360e88299285bae6bb6ac11db80ec5ac5
Author: Marcos García <address@hidden>
Date: 2013-04-13 (Sat, 13 Apr 2013)
Changed paths:
M htdocs/langs/en_US/bills.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/fr_FR/bills.lang
Log Message:
-----------
Revert "Revert "Added missing translation""
This reverts commit 85866ff9a645a7125b947bd4bda312f72b3c03b3.
Commit: 7c4b901b0a7098e74e487fa3837f3d2310723fcd
https://github.com/Dolibarr/dolibarr/commit/7c4b901b0a7098e74e487fa3837f3d2310723fcd
Author: Marcos García <address@hidden>
Date: 2013-04-13 (Sat, 13 Apr 2013)
Changed paths:
M htdocs/compta/facture.php
M htdocs/langs/es_ES/bills.lang
Log Message:
-----------
Improved es_ES translations and replaced missing translation
Commit: 8d4da9df1e32cbd75ca8ab4912736b4f076572b3
https://github.com/Dolibarr/dolibarr/commit/8d4da9df1e32cbd75ca8ab4912736b4f076572b3
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-13 (Sat, 13 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/compta/journal/sellsjournal.php
M htdocs/langs/es_ES/compta.lang
Log Message:
-----------
Merge pull request #827 from marcosgdf/bug-816
[ bug #816 ] Sales journal does not reflect localtaxes
Commit: 7e48e341adf9269766192300a23496e318753dd7
https://github.com/Dolibarr/dolibarr/commit/7e48e341adf9269766192300a23496e318753dd7
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-13 (Sat, 13 Apr 2013)
Changed paths:
M htdocs/compta/facture.php
M htdocs/langs/en_US/bills.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/fr_FR/bills.lang
Log Message:
-----------
Merge pull request #829 from marcosgdf/translations
Added missing translation
Commit: 486425d2584c29b6fac115e8c4b050bd2b89942d
https://github.com/Dolibarr/dolibarr/commit/486425d2584c29b6fac115e8c4b050bd2b89942d
Author: Marcos García <address@hidden>
Date: 2013-04-13 (Sat, 13 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/compta/facture.php
M htdocs/compta/journal/sellsjournal.php
M htdocs/langs/en_US/bills.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/es_ES/compta.lang
M htdocs/langs/fr_FR/bills.lang
Log Message:
-----------
Merge branch '3.3' into bug-817
Conflicts:
ChangeLog
Commit: 6ebeb53a2ca9d2cb740489d6504eb9b72c85f7eb
https://github.com/Dolibarr/dolibarr/commit/6ebeb53a2ca9d2cb740489d6504eb9b72c85f7eb
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-13 (Sat, 13 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/compta/journal/purchasesjournal.php
Log Message:
-----------
Merge pull request #828 from marcosgdf/bug-817
[ bug #817 ] Purchases journal does not reflect localtaxes
Commit: e5a945ba5b3b8c99b8d4f3180b7c91a85b3a21f6
https://github.com/Dolibarr/dolibarr/commit/e5a945ba5b3b8c99b8d4f3180b7c91a85b3a21f6
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-13 (Sat, 13 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/adherents/admin/adherent_extrafields.php
M htdocs/admin/agenda_extrafields.php
M htdocs/admin/commande.php
M htdocs/admin/syslog.php
M htdocs/commande/orderstoinvoice.php
M htdocs/compta/facture.php
M htdocs/compta/journal/purchasesjournal.php
M htdocs/compta/journal/sellsjournal.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/fourn/facture/fiche.php
M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
M htdocs/langs/de_AT/admin.lang
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/margins.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/es_ES/compta.lang
M htdocs/langs/es_ES/errors.lang
M htdocs/langs/es_ES/install.lang
M htdocs/langs/es_ES/margins.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/bills.lang
M htdocs/langs/fr_FR/margins.lang
M htdocs/langs/it_IT/admin.lang
M htdocs/langs/pt_PT/admin.lang
M htdocs/langs/tr_TR/admin.lang
M htdocs/paypal/lib/paypal.lib.php
M htdocs/public/demo/index.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
ChangeLog
htdocs/admin/propal.php
htdocs/compta/journal/purchasesjournal.php
htdocs/compta/journal/sellsjournal.php
htdocs/core/class/conf.class.php
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/files.lib.php
htdocs/core/modules/mailings/contacts2.modules.php
htdocs/langs/ca_ES/admin.lang
htdocs/langs/en_US/admin.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/fr_FR/admin.lang
htdocs/public/demo/index.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/38cb9a530fff...e5a945ba5b3b